static gint smtp_rcpt(SMTPSession *session);
static gint smtp_data(SMTPSession *session);
static gint smtp_send_data(SMTPSession *session);
-static gint smtp_rset(SMTPSession *session);
+/* static gint smtp_rset(SMTPSession *session); */
static gint smtp_quit(SMTPSession *session);
static gint smtp_eom(SMTPSession *session);
SMTPSession *session;
session = g_new0(SMTPSession, 1);
+
+ session_init(SESSION(session));
+
SESSION(session)->type = SESSION_SMTP;
- SESSION(session)->server = NULL;
- SESSION(session)->port = 0;
- SESSION(session)->sock = NULL;
- SESSION(session)->state = SESSION_READY;
- SESSION(session)->data = NULL;
SESSION(session)->recv_msg = smtp_session_recv_msg;
session->forced_auth_type = 0;
session->auth_type = 0;
+ session->error_val = SM_OK;
+ session->error_msg = NULL;
+
return SESSION(session);
}
g_free(smtp_session->from);
g_free(smtp_session->send_data);
+
+ g_free(smtp_session->error_msg);
}
static gint smtp_from(SMTPSession *session)
gint challengelen;
guchar hexdigest[33];
- challenge = g_malloc(strlen(buf + 4) + 1);
+ challenge = g_malloc(strlen(msg + 4) + 1);
challengelen = base64_decode(challenge, msg + 4, -1);
challenge[challengelen] = '\0';
log_print("ESMTP< [Decoded: %s]\n", challenge);
return SM_OK;
}
+#if 0
static gint smtp_rset(SMTPSession *session)
{
session->state = SMTP_RSET;
return SM_OK;
}
+#endif
static gint smtp_quit(SMTPSession *session)
{
SMTPSession *smtp_session = SMTP_SESSION(session);
gboolean cont = FALSE;
- if (strlen(msg) < 4)
+ if (strlen(msg) < 4) {
+ log_warning(_("bad SMTP response\n"));
return -1;
+ }
- log_print("SMTP< %s\n", msg);
+ switch (smtp_session->state) {
+ case SMTP_EHLO:
+ case SMTP_STARTTLS:
+ case SMTP_AUTH:
+ case SMTP_AUTH_LOGIN_USER:
+ case SMTP_AUTH_LOGIN_PASS:
+ case SMTP_AUTH_CRAM_MD5:
+ log_print("ESMTP< %s\n", msg);
+ break;
+ default:
+ log_print("SMTP< %s\n", msg);
+ break;
+ }
if (msg[0] == '5' && msg[1] == '0' &&
(msg[2] == '4' || msg[2] == '3' || msg[2] == '1')) {
+ log_warning(_("error occurred on SMTP session\n"));
smtp_session->state = SMTP_ERROR;
+ smtp_session->error_val = SM_ERROR;
+ g_free(smtp_session->error_msg);
+ smtp_session->error_msg = g_strdup(msg);
+ return -1;
+ }
+
+ if (!strncmp(msg, "535", 3)) {
+ log_warning(_("error occurred on authentication\n"));
+ smtp_session->state = SMTP_ERROR;
+ smtp_session->error_val = SM_AUTHFAIL;
+ g_free(smtp_session->error_msg);
+ smtp_session->error_msg = g_strdup(msg);
return -1;
}
if (msg[0] != '1' && msg[0] != '2' && msg[0] != '3') {
+ log_warning(_("error occurred on SMTP session\n"));
smtp_session->state = SMTP_ERROR;
+ smtp_session->error_val = SM_ERROR;
+ g_free(smtp_session->error_msg);
+ smtp_session->error_msg = g_strdup(msg);
return -1;
}
if (msg[3] == '-')
cont = TRUE;
else if (msg[3] != ' ' && msg[3] != '\0') {
+ log_warning(_("bad SMTP response\n"));
smtp_session->state = SMTP_ERROR;
+ smtp_session->error_val = SM_UNRECOVERABLE;
return -1;
}
+ /* ignore all multiline responses except for EHLO */
+ if (cont && smtp_session->state != SMTP_EHLO)
+ return session_recv_msg(session);
+
switch (smtp_session->state) {
case SMTP_READY:
case SMTP_CONNECTED:
break;
case SMTP_STARTTLS:
#if USE_OPENSSL
- if (session_start_tls(session) < 0)
+ if (session_start_tls(session) < 0) {
+ log_warning(_("can't start TLS session\n"));
+ smtp_session->state = SMTP_ERROR;
+ smtp_session->error_val = SM_ERROR;
return -1;
+ }
smtp_session->tls_init_done = TRUE;
smtp_ehlo(smtp_session);
#endif
break;
case SMTP_ERROR:
default:
+ log_warning(_("error occurred on SMTP session\n"));
+ smtp_session->error_val = SM_ERROR;
return -1;
}
if (cont)
- return 1;
+ return session_recv_msg(session);
return 0;
}