[evolution-data-server/camel-socks-proxy-master: 4/10] Change CamelSmtpTransport to use the new API
- From: Federico Mena Quintero <federico src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evolution-data-server/camel-socks-proxy-master: 4/10] Change CamelSmtpTransport to use the new API
- Date: Sat, 24 Jul 2010 03:06:15 +0000 (UTC)
commit 2186288b55fc4d8923c6d52619aefe10060cff5e
Author: Federico Mena Quintero <federico novell com>
Date: Fri Jul 9 17:59:48 2010 -0500
Change CamelSmtpTransport to use the new API
Signed-off-by: Federico Mena Quintero <federico novell com>
camel/providers/smtp/camel-smtp-transport.c | 42 +++++++--------------------
1 files changed, 11 insertions(+), 31 deletions(-)
---
diff --git a/camel/providers/smtp/camel-smtp-transport.c b/camel/providers/smtp/camel-smtp-transport.c
index 5ffdf63..f3dcd8d 100644
--- a/camel/providers/smtp/camel-smtp-transport.c
+++ b/camel/providers/smtp/camel-smtp-transport.c
@@ -51,8 +51,8 @@ extern gint camel_verbose_debug;
#define d(x) (camel_verbose_debug ? (x) : 0)
/* Specified in RFC 821 */
-#define SMTP_PORT "25"
-#define SMTPS_PORT "465"
+#define SMTP_PORT 25
+#define SMTPS_PORT 465
/* camel smtp transport class prototypes */
static gboolean smtp_send_to (CamelTransport *transport, CamelMimeMessage *message,
@@ -183,7 +183,7 @@ enum {
static gboolean
connect_to_server (CamelService *service,
- struct addrinfo *ai,
+ const char *host, const char *serv, gint fallback_port,
gint ssl_mode,
GError **error)
{
@@ -229,7 +229,7 @@ connect_to_server (CamelService *service,
g_free (socks_host);
}
- if (camel_tcp_stream_connect ((CamelTcpStream *) tcp_stream, ai, error) == -1) {
+ if (camel_tcp_stream_connect ((CamelTcpStream *) tcp_stream, host, serv, fallback_port, error) == -1) {
g_object_unref (tcp_stream);
return FALSE;
}
@@ -365,7 +365,7 @@ connect_to_server (CamelService *service,
static struct {
const gchar *value;
const gchar *serv;
- const gchar *port;
+ gint fallback_port;
gint mode;
} ssl_options[] = {
{ "", "smtps", SMTPS_PORT, MODE_SSL }, /* really old (1.x) */
@@ -379,11 +379,10 @@ static gboolean
connect_to_server_wrapper (CamelService *service,
GError **error)
{
- struct addrinfo hints, *ai;
const gchar *ssl_mode;
- gint mode, ret, i;
+ gint mode, i;
gchar *serv;
- const gchar *port;
+ gint fallback_port;
GError *local_error = NULL;
if ((ssl_mode = camel_url_get_param (service->url, "use_ssl"))) {
@@ -392,39 +391,20 @@ connect_to_server_wrapper (CamelService *service,
break;
mode = ssl_options[i].mode;
serv = (gchar *) ssl_options[i].serv;
- port = ssl_options[i].port;
+ fallback_port = ssl_options[i].fallback_port;
} else {
mode = MODE_CLEAR;
serv = (gchar *) "smtp";
- port = SMTP_PORT;
+ fallback_port = SMTP_PORT;
}
if (service->url->port) {
serv = g_alloca (16);
sprintf (serv, "%d", service->url->port);
- port = NULL;
+ fallback_port = 0;
}
- memset (&hints, 0, sizeof (hints));
- hints.ai_socktype = SOCK_STREAM;
- hints.ai_family = PF_UNSPEC;
- ai = camel_getaddrinfo(service->url->host, serv, &hints, error);
- if (ai == NULL && port != NULL &&
- !g_error_matches (local_error, G_IO_ERROR, G_IO_ERROR_CANCELLED)) {
- g_clear_error (&local_error);
- ai = camel_getaddrinfo(service->url->host, port, &hints, &local_error);
- }
-
- if (local_error != NULL) {
- g_propagate_error (error, local_error);
- return FALSE;
- }
-
- ret = connect_to_server (service, ai, mode, error);
-
- camel_freeaddrinfo (ai);
-
- return ret;
+ return connect_to_server (service, service->url->host, serv, fallback_port, mode, error);
}
static gboolean
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]