aboutsummaryrefslogtreecommitdiffstats
path: root/camel/providers/smtp
diff options
context:
space:
mode:
Diffstat (limited to 'camel/providers/smtp')
-rw-r--r--camel/providers/smtp/camel-smtp-transport.c739
1 files changed, 352 insertions, 387 deletions
diff --git a/camel/providers/smtp/camel-smtp-transport.c b/camel/providers/smtp/camel-smtp-transport.c
index c56aa98b08..cc57e29b1d 100644
--- a/camel/providers/smtp/camel-smtp-transport.c
+++ b/camel/providers/smtp/camel-smtp-transport.c
@@ -75,11 +75,11 @@ camel_smtp_transport_class_init (CamelSmtpTransportClass *camel_smtp_transport_c
{
CamelTransportClass *camel_transport_class =
CAMEL_TRANSPORT_CLASS (camel_smtp_transport_class);
- CamelServiceClass *camel_service_class =
+ CamelServiceClass *camel_service_class =
CAMEL_SERVICE_CLASS (camel_smtp_transport_class);
- /* virtual method overload */
- camel_service_class->connect = smtp_connect;
+ /* virtual method overload */
+ camel_service_class->connect = smtp_connect;
camel_service_class->disconnect = smtp_disconnect;
camel_service_class->query_auth_types = query_auth_types;
camel_service_class->free_auth_types = free_auth_types;
@@ -93,7 +93,7 @@ GtkType
camel_smtp_transport_get_type (void)
{
static GtkType camel_smtp_transport_type = 0;
-
+
if (!camel_smtp_transport_type) {
GtkTypeInfo camel_smtp_transport_info =
{
@@ -102,14 +102,14 @@ camel_smtp_transport_get_type (void)
sizeof (CamelSmtpTransportClass),
(GtkClassInitFunc) camel_smtp_transport_class_init,
(GtkObjectInitFunc) NULL,
- /* reserved_1 */ NULL,
- /* reserved_2 */ NULL,
+ /* reserved_1 */ NULL,
+ /* reserved_2 */ NULL,
(GtkClassInitFunc) NULL,
};
-
+
camel_smtp_transport_type = gtk_type_unique (CAMEL_TRANSPORT_TYPE, &camel_smtp_transport_info);
}
-
+
return camel_smtp_transport_type;
}
@@ -134,9 +134,8 @@ smtp_connect (CamelService *service, CamelException *ex)
memcpy (&sin.sin_addr, h->h_addr, sizeof (sin.sin_addr));
fd = socket (h->h_addrtype, SOCK_STREAM, 0);
- if (fd == -1 || connect (fd, (struct sockaddr *)&sin, sizeof(sin)) == -1)
- {
- camel_exception_setv (ex, CAMEL_EXCEPTION_SERVICE_UNAVAILABLE,
+ if (fd == -1 || connect (fd, (struct sockaddr *)&sin, sizeof(sin)) == -1) {
+ camel_exception_setv (ex, CAMEL_EXCEPTION_SERVICE_UNAVAILABLE,
"Could not connect to %s (port %s): %s",
service->url->host, service->url->port,
strerror(errno));
@@ -147,35 +146,32 @@ smtp_connect (CamelService *service, CamelException *ex)
}
transport->ostream = camel_stream_fs_new_with_fd (fd);
- transport->istream = camel_stream_buffer_new (transport->ostream,
- CAMEL_STREAM_BUFFER_READ);
+ transport->istream = camel_stream_buffer_new (transport->ostream,
+ CAMEL_STREAM_BUFFER_READ);
/* Read the greeting, note whether the server is ESMTP and if it requests AUTH. */
- do
- {
- /* Check for "220" */
- g_free(respbuf);
- respbuf = camel_stream_buffer_read_line (CAMEL_STREAM_BUFFER (transport->istream));
- if ( !respbuf || strncmp(respbuf, "220", 3) )
- {
- camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
- "Welcome response error: "
- "%s: possibly non-fatal",
- g_strerror (errno));
- return FALSE;
- }
- if (strstr(respbuf, "ESMTP"))
- smtp_is_esmtp = TRUE;
- if (smtp_is_esmtp && strstr(respbuf, "AUTH"))
- {
- /* parse for supported AUTH types */
- esmtp_get_authtypes(respbuf);
- }
+ do {
+ /* Check for "220" */
+ g_free(respbuf);
+ respbuf = camel_stream_buffer_read_line (CAMEL_STREAM_BUFFER (transport->istream));
+ if ( !respbuf || strncmp(respbuf, "220", 3) ) {
+ camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
+ "Welcome response error: "
+ "%s: possibly non-fatal",
+ g_strerror (errno));
+ return FALSE;
+ }
+ if (strstr(respbuf, "ESMTP"))
+ smtp_is_esmtp = TRUE;
+ if (smtp_is_esmtp && strstr(respbuf, "AUTH")) {
+ /* parse for supported AUTH types */
+ esmtp_get_authtypes(respbuf);
+ }
} while ( *(respbuf+3) == '-' ); /* if we got "220-" then loop again */
- g_free(respbuf);
+ g_free(respbuf);
- /* send HELO */
- smtp_helo(transport, ex);
+ /* send HELO */
+ smtp_helo(transport, ex);
return TRUE;
}
@@ -188,8 +184,8 @@ smtp_disconnect (CamelService *service, CamelException *ex)
if (!service->connected)
return TRUE;
- /* send the QUIT command to the SMTP server */
- smtp_quit(transport, ex);
+ /* send the QUIT command to the SMTP server */
+ smtp_quit(transport, ex);
if (!service_class->disconnect (service, ex))
return FALSE;
@@ -208,9 +204,9 @@ smtp_disconnect (CamelService *service, CamelException *ex)
static GList
*esmtp_get_authtypes(gchar *buffer)
{
- GList *ret = NULL;
+ GList *ret = NULL;
- return ret;
+ return ret;
}
static CamelServiceAuthType password_authtype = {
@@ -249,51 +245,47 @@ _send_to (CamelTransport *transport, CamelMedium *message,
GList *recipients, CamelException *ex)
{
GList *r;
- gchar *recipient, *s, *sender;
- guint i, len;
- CamelService *service = CAMEL_SERVICE (transport);
- CamelSmtpTransport *smtp_transport = CAMEL_SMTP_TRANSPORT(transport);
+ gchar *recipient, *s, *sender;
+ guint i, len;
+ CamelService *service = CAMEL_SERVICE (transport);
+ CamelSmtpTransport *smtp_transport = CAMEL_SMTP_TRANSPORT(transport);
- if (!camel_service_is_connected (service))
+ if (!camel_service_is_connected (service))
smtp_connect (service, ex);
- s = camel_mime_message_get_from (CAMEL_MIME_MESSAGE(message));
- if (!s)
- {
- camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
+ s = camel_mime_message_get_from (CAMEL_MIME_MESSAGE(message));
+ if (!s) {
+ camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
"Cannot send message: "
"sender address not defined.");
- return FALSE;
- }
+ return FALSE;
+ }
- sender = smtp_get_email_addr_from_text(s);
- smtp_mail(smtp_transport, sender, ex);
- g_free(sender);
- g_free(s);
+ sender = smtp_get_email_addr_from_text(s);
+ smtp_mail(smtp_transport, sender, ex);
+ g_free(sender);
+ g_free(s);
- if (!(len = g_list_length(recipients)))
- {
- camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
+ if (!(len = g_list_length(recipients))) {
+ camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
"Cannot send message: "
"no recipients defined.");
- return FALSE;
- }
- for (i = 0, r = recipients; i < len; i++, r = r->next)
- {
- recipient = smtp_get_email_addr_from_text(r->data);
- if (!smtp_rcpt(smtp_transport, recipient, ex))
- {
- g_free(recipient);
- return FALSE;
- }
- g_free(recipient);
- }
-
- if (!smtp_data(smtp_transport, message, ex))
- return FALSE;
-
- /* reset the service for our next transfer session */
- smtp_rset(smtp_transport, ex);
+ return FALSE;
+ }
+ for (i = 0, r = recipients; i < len; i++, r = r->next) {
+ recipient = smtp_get_email_addr_from_text(r->data);
+ if (!smtp_rcpt(smtp_transport, recipient, ex)) {
+ g_free(recipient);
+ return FALSE;
+ }
+ g_free(recipient);
+ }
+
+ if (!smtp_data(smtp_transport, message, ex))
+ return FALSE;
+
+ /* reset the service for our next transfer session */
+ smtp_rset(smtp_transport, ex);
return TRUE;
}
@@ -304,14 +296,14 @@ _send (CamelTransport *transport, CamelMedium *message,
{
GList *to, *cc, *bcc, *recipients;
- to = camel_mime_message_get_recipients ((CamelMimeMessage *) message, "To");
- cc = camel_mime_message_get_recipients ((CamelMimeMessage *) message, "Cc");
- bcc = camel_mime_message_get_recipients ((CamelMimeMessage *) message, "Bcc");
- recipients = g_list_concat(to, cc);
- recipients = g_list_concat(recipients, bcc);
- g_list_free(to);
- g_list_free(cc);
- g_list_free(bcc);
+ to = camel_mime_message_get_recipients ((CamelMimeMessage *) message, "To");
+ cc = camel_mime_message_get_recipients ((CamelMimeMessage *) message, "Cc");
+ bcc = camel_mime_message_get_recipients ((CamelMimeMessage *) message, "Bcc");
+ recipients = g_list_concat(to, cc);
+ recipients = g_list_concat(recipients, bcc);
+ g_list_free(to);
+ g_list_free(cc);
+ g_list_free(bcc);
return _send_to (transport, message, recipients, ex);
}
@@ -319,379 +311,352 @@ _send (CamelTransport *transport, CamelMedium *message,
static gchar
*smtp_get_email_addr_from_text (gchar *text)
{
- /* get the actual email address from the string passed and place it in addr
- * we can assume the address will be in one of the following forms:
- * 1) The Name <person@host.com>
- * 2) <person@host.com>
- * 3) person@host.com
- * 4) person@host.com (The Name)
- */
-
- gchar *tmp, *addr = NULL;
- gchar *addr_strt; /* points to start of addr */
- gchar *addr_end; /* points to end of addr */
- gchar *ptr1;
+ /* get the actual email address from the string passed and place it in addr
+ * we can assume the address will be in one of the following forms:
+ * 1) The Name <person@host.com>
+ * 2) <person@host.com>
+ * 3) person@host.com
+ * 4) person@host.com (The Name)
+ */
+
+ gchar *tmp, *addr = NULL;
+ gchar *addr_strt; /* points to start of addr */
+ gchar *addr_end; /* points to end of addr */
+ gchar *ptr1;
- /* check the incoming args */
- if (!text || !*text)
- return NULL;
-
- /* scan the string for an open brace */
- for (addr_strt = text; *addr_strt; addr_strt++)
- if (*addr_strt == '<')
- break;
-
- if (*addr_strt) /* we found an open brace */
- {
- /* let's look for it's counterpart */
- for (addr_end = addr_strt; *addr_end; addr_end++)
- if (*addr_end == '>')
- break;
-
- /* if we didn't find it, or braces are empty... */
- if (!(*addr_end) || (addr_strt == addr_end - 1))
- return NULL;
+ /* check the incoming args */
+ if (!text || !*text)
+ return NULL;
+
+ /* scan the string for an open brace */
+ for (addr_strt = text; *addr_strt; addr_strt++)
+ if (*addr_strt == '<')
+ break;
+
+ if (*addr_strt) {
+ /* we found an open brace, let's look for it's counterpart */
+ for (addr_end = addr_strt; *addr_end; addr_end++)
+ if (*addr_end == '>')
+ break;
+
+ /* if we didn't find it, or braces are empty... */
+ if (!(*addr_end) || (addr_strt == addr_end - 1))
+ return NULL;
- /* addr_strt points to '<' and addr_end points to '>'.
- * Now let's adjust 'em slightly to point to the beginning
- * and ending of the email addy
+ /* addr_strt points to '<' and addr_end points to '>'.
+ * Now let's adjust 'em slightly to point to the beginning
+ * and ending of the email addy
*/
- addr_strt++;
- addr_end--;
- }
- else /* no open brace...assume type 3 or 4? */
- {
- addr_strt = text;
+ addr_strt++;
+ addr_end--;
+ } else {
+ /* no open brace...assume type 3 or 4? */
+ addr_strt = text;
- /* find the end of the email addr/string */
- for (addr_end = addr_strt; *addr_end || *addr_end == ' '; addr_end++);
+ /* find the end of the email addr/string */
+ for (addr_end = addr_strt; *addr_end || *addr_end == ' '; addr_end++);
- addr_end--; /* points to NULL, move it back one char */
- }
-
- /* now addr_strt & addr_end point to the beginning & ending of the email addy */
-
- /* copy the string into addr */
- addr = g_strndup(addr_strt, (gint)(addr_end - addr_strt));
-
- for (ptr1 = addr_strt; ptr1 <= addr_end; ptr1++) /* look for an '@' sign */
- if (*ptr1 == '@')
- break;
-
- if (*ptr1 != '@')
- {
- /* here we found out the name doesn't have an '@' part
- * let's figure out what machine we're on & stick it on the end
- */
- gchar hostname[MAXHOSTNAMELEN];
-
- if (gethostname(hostname, MAXHOSTNAMELEN))
- {
- g_free(addr);
- return NULL;
- }
- tmp = addr;
- addr = g_strconcat(tmp, "@", hostname, NULL);
- g_free(tmp);
- }
-
- return addr;
+ addr_end--; /* points to NULL, move it back one char */
+ }
+
+ /* now addr_strt & addr_end point to the beginning & ending of the email addy */
+
+ /* copy the string into addr */
+ addr = g_strndup(addr_strt, (gint)(addr_end - addr_strt));
+
+ for (ptr1 = addr_strt; ptr1 <= addr_end; ptr1++) /* look for an '@' sign */
+ if (*ptr1 == '@')
+ break;
+
+ if (*ptr1 != '@') {
+ /* here we found out the name doesn't have an '@' part
+ * let's figure out what machine we're on & stick it on the end
+ */
+ gchar hostname[MAXHOSTNAMELEN];
+
+ if (gethostname(hostname, MAXHOSTNAMELEN)) {
+ g_free(addr);
+ return NULL;
+ }
+ tmp = addr;
+ addr = g_strconcat(tmp, "@", hostname, NULL);
+ g_free(tmp);
+ }
+
+ return addr;
}
static gboolean
smtp_helo (CamelSmtpTransport *transport, CamelException *ex)
{
- /* say hello to the server */
- gchar *cmdbuf, *respbuf = NULL;
- gchar localhost[MAXHOSTNAMELEN + MAXHOSTNAMELEN + 2];
- gchar domainname[MAXHOSTNAMELEN];
-
- /* get the localhost name */
- memset(localhost, 0, sizeof(localhost));
- gethostname (localhost, MAXHOSTNAMELEN);
- memset(domainname, 0, sizeof(domainname));
- getdomainname(domainname, MAXHOSTNAMELEN);
- if (*domainname && strcmp(domainname, "(none)"))
- {
- strcat(localhost, ".");
- strcat(localhost, domainname);
- }
-
- /* hiya server! how are you today? */
- if (smtp_is_esmtp)
- cmdbuf = g_strdup_printf ("EHLO %s\r\n", localhost);
- else
- cmdbuf = g_strdup_printf ("HELO %s\r\n", localhost);
- if ( camel_stream_write (transport->ostream, cmdbuf, strlen(cmdbuf)) == -1)
- {
- g_free(cmdbuf);
- camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
+ /* say hello to the server */
+ gchar *cmdbuf, *respbuf = NULL;
+ gchar localhost[MAXHOSTNAMELEN + MAXHOSTNAMELEN + 2];
+ gchar domainname[MAXHOSTNAMELEN];
+
+ /* get the localhost name */
+ memset(localhost, 0, sizeof(localhost));
+ gethostname (localhost, MAXHOSTNAMELEN);
+ memset(domainname, 0, sizeof(domainname));
+ getdomainname(domainname, MAXHOSTNAMELEN);
+ if (*domainname && strcmp(domainname, "(none)")) {
+ strcat(localhost, ".");
+ strcat(localhost, domainname);
+ }
+
+ /* hiya server! how are you today? */
+ if (smtp_is_esmtp)
+ cmdbuf = g_strdup_printf ("EHLO %s\r\n", localhost);
+ else
+ cmdbuf = g_strdup_printf ("HELO %s\r\n", localhost);
+ if ( camel_stream_write (transport->ostream, cmdbuf, strlen(cmdbuf)) == -1) {
+ g_free(cmdbuf);
+ camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
"HELO request timed out: "
"%s: non-fatal",
g_strerror (errno));
- return FALSE;
- }
- g_free(cmdbuf);
-
- do
- {
- /* Check for "250" */
- g_free(respbuf);
- respbuf = camel_stream_buffer_read_line (CAMEL_STREAM_BUFFER (transport->istream));
- if ( !respbuf || strncmp(respbuf, "250", 3) )
- {
- camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
- "HELO response error: "
- "%s: non-fatal",
- g_strerror (errno));
- return FALSE;
- }
+ return FALSE;
+ }
+ g_free(cmdbuf);
+
+ do {
+ /* Check for "250" */
+ g_free(respbuf);
+ respbuf = camel_stream_buffer_read_line (CAMEL_STREAM_BUFFER (transport->istream));
+ if ( !respbuf || strncmp(respbuf, "250", 3) ) {
+ camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
+ "HELO response error: "
+ "%s: non-fatal",
+ g_strerror (errno));
+ return FALSE;
+ }
} while ( *(respbuf+3) == '-' ); /* if we got "250-" then loop again */
- g_free(respbuf);
+ g_free(respbuf);
- return TRUE;
+ return TRUE;
}
static gboolean
smtp_mail (CamelSmtpTransport *transport, gchar *sender, CamelException *ex)
{
- /* we gotta tell the smtp server who we are. (our email addy) */
- gchar *cmdbuf, *respbuf = NULL;
-
- /* enclose address in <>'s since some SMTP daemons *require* that */
- cmdbuf = g_strdup_printf("MAIL FROM: <%s>\r\n", sender);
- if ( camel_stream_write (transport->ostream, cmdbuf, strlen(cmdbuf)) == -1)
- {
- g_free(cmdbuf);
- camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
+ /* we gotta tell the smtp server who we are. (our email addy) */
+ gchar *cmdbuf, *respbuf = NULL;
+
+ /* enclose address in <>'s since some SMTP daemons *require* that */
+ cmdbuf = g_strdup_printf("MAIL FROM: <%s>\r\n", sender);
+ if ( camel_stream_write (transport->ostream, cmdbuf, strlen(cmdbuf)) == -1) {
+ g_free(cmdbuf);
+ camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
"MAIL FROM request timed out: "
"%s: mail not sent",
g_strerror (errno));
- return FALSE;
- }
- g_free(cmdbuf);
-
- do
- {
- /* Check for "250 Sender OK..." */
- g_free(respbuf);
- respbuf = camel_stream_buffer_read_line (CAMEL_STREAM_BUFFER (transport->istream));
- if ( !respbuf || strncmp(respbuf, "250", 3) )
- {
- camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
- "MAIL FROM response error: "
- "%s: mail not sent",
- g_strerror (errno));
- return FALSE;
- }
+ return FALSE;
+ }
+ g_free(cmdbuf);
+
+ do {
+ /* Check for "250 Sender OK..." */
+ g_free(respbuf);
+ respbuf = camel_stream_buffer_read_line (CAMEL_STREAM_BUFFER (transport->istream));
+ if ( !respbuf || strncmp(respbuf, "250", 3) ) {
+ camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
+ "MAIL FROM response error: "
+ "%s: mail not sent",
+ g_strerror (errno));
+ return FALSE;
+ }
} while ( *(respbuf+3) == '-' ); /* if we got "250-" then loop again */
- g_free(respbuf);
+ g_free(respbuf);
- return TRUE;
+ return TRUE;
}
static gboolean
smtp_rcpt (CamelSmtpTransport *transport, gchar *recipient, CamelException *ex)
{
- /* we gotta tell the smtp server who we are going to be sending
- * our email to */
- gchar *cmdbuf, *respbuf = NULL;
-
- /* enclose address in <>'s since some SMTP daemons *require* that */
- cmdbuf = g_strdup_printf("RCPT TO: <%s>\r\n", recipient);
- if ( camel_stream_write (transport->ostream, cmdbuf, strlen(cmdbuf)) == -1)
- {
- g_free(cmdbuf);
- camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
+ /* we gotta tell the smtp server who we are going to be sending
+ * our email to */
+ gchar *cmdbuf, *respbuf = NULL;
+
+ /* enclose address in <>'s since some SMTP daemons *require* that */
+ cmdbuf = g_strdup_printf("RCPT TO: <%s>\r\n", recipient);
+ if ( camel_stream_write (transport->ostream, cmdbuf, strlen(cmdbuf)) == -1) {
+ g_free(cmdbuf);
+ camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
"RCPT TO request timed out: "
"%s: mail not sent",
g_strerror (errno));
- return FALSE;
- }
- g_free(cmdbuf);
-
- do
- {
- /* Check for "250 Sender OK..." */
- g_free(respbuf);
- respbuf = camel_stream_buffer_read_line (CAMEL_STREAM_BUFFER (transport->istream));
- if ( !respbuf || strncmp(respbuf, "250", 3) )
- {
- camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
- "RCPT TO response error: "
- "%s: mail not sent",
- g_strerror (errno));
- return FALSE;
- }
+ return FALSE;
+ }
+ g_free(cmdbuf);
+
+ do {
+ /* Check for "250 Sender OK..." */
+ g_free(respbuf);
+ respbuf = camel_stream_buffer_read_line (CAMEL_STREAM_BUFFER (transport->istream));
+ if ( !respbuf || strncmp(respbuf, "250", 3) ) {
+ camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
+ "RCPT TO response error: "
+ "%s: mail not sent",
+ g_strerror (errno));
+ return FALSE;
+ }
} while ( *(respbuf+3) == '-' ); /* if we got "250-" then loop again */
- g_free(respbuf);
+ g_free(respbuf);
- return TRUE;
+ return TRUE;
}
static gboolean
smtp_data (CamelSmtpTransport *transport, CamelMedium *message, CamelException *ex)
{
- /* now we can actually send what's important :p */
- gchar *cmdbuf, *respbuf = NULL;
- gchar *buf, *chunk;
- CamelStream *message_stream;
-
- /* enclose address in <>'s since some SMTP daemons *require* that */
- cmdbuf = g_strdup("DATA\r\n");
- if ( camel_stream_write (transport->ostream, cmdbuf, strlen(cmdbuf)) == -1)
- {
- g_free(cmdbuf);
- camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
+ /* now we can actually send what's important :p */
+ gchar *cmdbuf, *respbuf = NULL;
+ gchar *buf, *chunk;
+ CamelStream *message_stream;
+
+ /* enclose address in <>'s since some SMTP daemons *require* that */
+ cmdbuf = g_strdup("DATA\r\n");
+ if ( camel_stream_write (transport->ostream, cmdbuf, strlen(cmdbuf)) == -1) {
+ g_free(cmdbuf);
+ camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
"DATA request timed out: "
"%s: mail not sent",
g_strerror (errno));
- return FALSE;
- }
- g_free(cmdbuf);
-
- respbuf = camel_stream_buffer_read_line (CAMEL_STREAM_BUFFER (transport->istream));
- if ( !respbuf || strncmp(respbuf, "354", 3) )
- {
- /* we should have gotten instructions on how to use the DATA command:
- * 354 Enter mail, end with "." on a line by itself
- */
- g_free(respbuf);
- camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
+ return FALSE;
+ }
+ g_free(cmdbuf);
+
+ respbuf = camel_stream_buffer_read_line (CAMEL_STREAM_BUFFER (transport->istream));
+ if ( !respbuf || strncmp(respbuf, "354", 3) ) {
+ /* we should have gotten instructions on how to use the DATA command:
+ * 354 Enter mail, end with "." on a line by itself
+ */
+ g_free(respbuf);
+ camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
"DATA response error: "
"%s: mail not sent",
g_strerror (errno));
- return FALSE;
- }
+ return FALSE;
+ }
- /* now to send the actual data */
- message_stream = camel_stream_buffer_new(CAMEL_DATA_WRAPPER (message)->output_stream, CAMEL_STREAM_BUFFER_READ);
- while (1)
- {
- /* send 1 line at a time */
- buf = camel_stream_buffer_read_line (CAMEL_STREAM_BUFFER(message_stream));
- if (!buf)
- break;
-
- /* check for a lone '.' */
- if (!strcmp(buf, "."))
- chunk = g_strconcat(buf, ".\r\n", NULL);
- else
- chunk = g_strconcat(buf, "\r\n", NULL);
-
- /* write the line */
- if ( camel_stream_write (transport->ostream, chunk, strlen(chunk)) == -1)
- {
- g_free(chunk);
- camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
- "DATA send timed out: message body: "
- "%s: mail not sent",
- g_strerror (errno));
- return FALSE;
- }
- g_free(chunk);
- }
-
- /* terminate the message body */
- if ( camel_stream_write (transport->ostream, "\r\n.\r\n", 5) == -1)
- {
- camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
- "DATA send timed out: message termination: "
- "%s: mail not sent",
- g_strerror (errno));
- return FALSE;
- }
-
- do
- {
- /* Check for "250 Sender OK..." */
- g_free(respbuf);
- respbuf = camel_stream_buffer_read_line (CAMEL_STREAM_BUFFER (transport->istream));
- if ( !respbuf || strncmp(respbuf, "250", 3) )
- {
- camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
- "DATA response error: message termination: "
+ /* now to send the actual data */
+ message_stream = camel_stream_buffer_new(CAMEL_DATA_WRAPPER (message)->output_stream, CAMEL_STREAM_BUFFER_READ);
+ while (1) {
+ /* send 1 line at a time */
+ buf = camel_stream_buffer_read_line (CAMEL_STREAM_BUFFER(message_stream));
+ if (!buf)
+ break;
+
+ /* check for a lone '.' */
+ if (!strcmp(buf, "."))
+ chunk = g_strconcat(buf, ".\r\n", NULL);
+ else
+ chunk = g_strconcat(buf, "\r\n", NULL);
+
+ /* write the line */
+ if ( camel_stream_write (transport->ostream, chunk, strlen(chunk)) == -1) {
+ g_free(chunk);
+ camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
+ "DATA send timed out: message body: "
+ "%s: mail not sent",
+ g_strerror (errno));
+ return FALSE;
+ }
+ g_free(chunk);
+ }
+
+ /* terminate the message body */
+ if ( camel_stream_write (transport->ostream, "\r\n.\r\n", 5) == -1) {
+ camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
+ "DATA send timed out: message termination: "
"%s: mail not sent",
g_strerror (errno));
- return FALSE;
- }
+ return FALSE;
+ }
+
+ do {
+ /* Check for "250 Sender OK..." */
+ g_free(respbuf);
+ respbuf = camel_stream_buffer_read_line (CAMEL_STREAM_BUFFER (transport->istream));
+ if ( !respbuf || strncmp(respbuf, "250", 3) ) {
+ camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
+ "DATA response error: message termination: "
+ "%s: mail not sent",
+ g_strerror (errno));
+ return FALSE;
+ }
} while ( *(respbuf+3) == '-' ); /* if we got "250-" then loop again */
- g_free(respbuf);
+ g_free(respbuf);
- return TRUE;
+ return TRUE;
}
static gboolean
smtp_rset (CamelSmtpTransport *transport, CamelException *ex)
{
- /* we are going to reset the smtp server (just to be nice) */
- gchar *cmdbuf, *respbuf = NULL;
-
- cmdbuf = g_strdup ("RSET\r\n");
- if ( camel_stream_write (transport->ostream, cmdbuf, strlen(cmdbuf)) == -1)
- {
- g_free(cmdbuf);
- camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
+ /* we are going to reset the smtp server (just to be nice) */
+ gchar *cmdbuf, *respbuf = NULL;
+
+ cmdbuf = g_strdup ("RSET\r\n");
+ if ( camel_stream_write (transport->ostream, cmdbuf, strlen(cmdbuf)) == -1) {
+ g_free(cmdbuf);
+ camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
"RSET request timed out: "
"%s",
g_strerror (errno));
- return FALSE;
- }
- g_free(cmdbuf);
-
- do
- {
- /* Check for "250" */
- g_free(respbuf);
- respbuf = camel_stream_buffer_read_line (CAMEL_STREAM_BUFFER (transport->istream));
- if ( !respbuf || strncmp(respbuf, "250", 3) )
- {
- camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
- "RSET response error: "
- "%s",
- g_strerror (errno));
- return FALSE;
- }
+ return FALSE;
+ }
+ g_free(cmdbuf);
+
+ do {
+ /* Check for "250" */
+ g_free(respbuf);
+ respbuf = camel_stream_buffer_read_line (CAMEL_STREAM_BUFFER (transport->istream));
+ if ( !respbuf || strncmp(respbuf, "250", 3) ) {
+ camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
+ "RSET response error: "
+ "%s",
+ g_strerror (errno));
+ return FALSE;
+ }
} while ( *(respbuf+3) == '-' ); /* if we got "250-" then loop again */
- g_free(respbuf);
+ g_free(respbuf);
- return TRUE;
+ return TRUE;
}
static gboolean
smtp_quit (CamelSmtpTransport *transport, CamelException *ex)
{
- /* we are going to reset the smtp server (just to be nice) */
- gchar *cmdbuf, *respbuf = NULL;
-
- cmdbuf = g_strdup ("QUIT\r\n");
- if ( camel_stream_write (transport->ostream, cmdbuf, strlen(cmdbuf)) == -1)
- {
- g_free(cmdbuf);
- camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
+ /* we are going to reset the smtp server (just to be nice) */
+ gchar *cmdbuf, *respbuf = NULL;
+
+ cmdbuf = g_strdup ("QUIT\r\n");
+ if ( camel_stream_write (transport->ostream, cmdbuf, strlen(cmdbuf)) == -1) {
+ g_free(cmdbuf);
+ camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
"QUIT request timed out: "
"%s: non-fatal",
g_strerror (errno));
- return FALSE;
- }
- g_free(cmdbuf);
-
- do
- {
- /* Check for "221" */
- g_free(respbuf);
- respbuf = camel_stream_buffer_read_line (CAMEL_STREAM_BUFFER (transport->istream));
- if ( !respbuf || strncmp(respbuf, "221", 3) )
- {
- camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
- "QUIT response error: "
- "%s: non-fatal",
- g_strerror (errno));
- return FALSE;
- }
+ return FALSE;
+ }
+ g_free(cmdbuf);
+
+ do {
+ /* Check for "221" */
+ g_free(respbuf);
+ respbuf = camel_stream_buffer_read_line (CAMEL_STREAM_BUFFER (transport->istream));
+ if ( !respbuf || strncmp(respbuf, "221", 3) ) {
+ camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
+ "QUIT response error: "
+ "%s: non-fatal",
+ g_strerror (errno));
+ return FALSE;
+ }
} while ( *(respbuf+3) == '-' ); /* if we got "221-" then loop again */
- g_free(respbuf);
+ g_free(respbuf);
- return TRUE;
+ return TRUE;
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-05 07:47:50 +0800