]> code.citadel.org Git - citadel.git/blobdiff - citadel/serv_smtp.c
* Finished the inbound side of gateway domain service
[citadel.git] / citadel / serv_smtp.c
index 0345dd2395648d9315e0172bef27164980e6e382..8a7a3147c54749255e969ca12875d64f43321fc0 100644 (file)
 #include <sys/types.h>
 #include <sys/time.h>
 #include <sys/wait.h>
+#include <ctype.h>
 #include <string.h>
 #include <limits.h>
+#include <time.h>
 #include "citadel.h"
 #include "server.h"
-#include <time.h>
 #include "sysdep_decls.h"
 #include "citserver.h"
 #include "support.h"
 #include "config.h"
+#include "control.h"
 #include "dynloader.h"
 #include "room_ops.h"
 #include "user_ops.h"
 #include "tools.h"
 #include "internet_addressing.h"
 #include "genstamp.h"
+#include "domain.h"
+#include "clientsocket.h"
 
 
 struct citsmtp {               /* Information about the current session */
        int command_state;
+       char helo_node[256];
        struct usersupp vrfy_buffer;
        int vrfy_count;
        char vrfy_match[256];
@@ -58,6 +63,15 @@ enum {                               /* Delivery modes */
 long SYM_SMTP;
 long SYM_SMTP_RECP;
 
+
+
+/*****************************************************************************/
+/*                      SMTP SERVER (INBOUND) STUFF                          */
+/*****************************************************************************/
+
+
+
+
 /*
  * Here's where our SMTP session begins its happy day.
  */
@@ -70,7 +84,7 @@ void smtp_greeting(void) {
        CtdlAllocUserData(SYM_SMTP_RECP, 256);
        sprintf(SMTP_RECP, "%s", "");
 
-       cprintf("220 Welcome to the Citadel/UX ESMTP server at %s\n",
+       cprintf("220 Welcome to the Citadel/UX ESMTP server at %s\r\n",
                config.c_fqdn);
 }
 
@@ -80,14 +94,16 @@ void smtp_greeting(void) {
  */
 void smtp_hello(char *argbuf, int is_esmtp) {
 
+       safestrncpy(SMTP->helo_node, argbuf, sizeof SMTP->helo_node);
+
        if (!is_esmtp) {
-               cprintf("250 Greetings and joyous salutations.\n");
+               cprintf("250 Greetings and joyous salutations.\r\n");
        }
        else {
-               cprintf("250-Greetings and joyous salutations.\n");
-               cprintf("250-HELP\n");
-               cprintf("250-SIZE %ld\n", config.c_maxmsglen);
-               cprintf("250 AUTH=LOGIN\n");
+               cprintf("250-Greetings and joyous salutations.\r\n");
+               cprintf("250-HELP\r\n");
+               cprintf("250-SIZE %ld\r\n", config.c_maxmsglen);
+               cprintf("250 AUTH=LOGIN\r\n");
        }
 }
 
@@ -96,19 +112,19 @@ void smtp_hello(char *argbuf, int is_esmtp) {
  * Implement HELP command.
  */
 void smtp_help(void) {
-       cprintf("214-Here's the frequency, Kenneth:\n");
-       cprintf("214-    DATA\n");
-       cprintf("214-    EHLO\n");
-       cprintf("214-    EXPN\n");
-       cprintf("214-    HELO\n");
-       cprintf("214-    HELP\n");
-       cprintf("214-    MAIL\n");
-       cprintf("214-    NOOP\n");
-       cprintf("214-    QUIT\n");
-       cprintf("214-    RCPT\n");
-       cprintf("214-    RSET\n");
-       cprintf("214-    VRFY\n");
-       cprintf("214 I could tell you more, but then I'd have to kill you.\n");
+       cprintf("214-Here's the frequency, Kenneth:\r\n");
+       cprintf("214-    DATA\r\n");
+       cprintf("214-    EHLO\r\n");
+       cprintf("214-    EXPN\r\n");
+       cprintf("214-    HELO\r\n");
+       cprintf("214-    HELP\r\n");
+       cprintf("214-    MAIL\r\n");
+       cprintf("214-    NOOP\r\n");
+       cprintf("214-    QUIT\r\n");
+       cprintf("214-    RCPT\r\n");
+       cprintf("214-    RSET\r\n");
+       cprintf("214-    VRFY\r\n");
+       cprintf("214 I could tell you more, but then I'd have to kill you.\r\n");
 }
 
 
@@ -123,11 +139,11 @@ void smtp_get_user(char *argbuf) {
        lprintf(9, "Trying <%s>\n", username);
        if (CtdlLoginExistingUser(username) == login_ok) {
                encode_base64(buf, "Password:");
-               cprintf("334 %s\n", buf);
+               cprintf("334 %s\r\n", buf);
                SMTP->command_state = smtp_password;
        }
        else {
-               cprintf("500 No such user.\n");
+               cprintf("500 No such user.\r\n");
                SMTP->command_state = smtp_command;
        }
 }
@@ -142,13 +158,13 @@ void smtp_get_pass(char *argbuf) {
        decode_base64(password, argbuf);
        lprintf(9, "Trying <%s>\n", password);
        if (CtdlTryPassword(password) == pass_ok) {
-               cprintf("235 Authentication successful.\n");
-               lprintf(9, "SMTP auth login successful\n");
+               cprintf("235 Authentication successful.\r\n");
+               lprintf(9, "SMTP authenticated login successful\n");
                CC->internal_pgm = 0;
                CC->cs_flags &= ~CS_STEALTH;
        }
        else {
-               cprintf("500 Authentication failed.\n");
+               cprintf("500 Authentication failed.\r\n");
        }
        SMTP->command_state = smtp_command;
 }
@@ -161,7 +177,7 @@ void smtp_auth(char *argbuf) {
        char buf[256];
 
        if (strncasecmp(argbuf, "login", 5) ) {
-               cprintf("550 We only support LOGIN authentication.\n");
+               cprintf("550 We only support LOGIN authentication.\r\n");
                return;
        }
 
@@ -171,7 +187,7 @@ void smtp_auth(char *argbuf) {
 
        else {
                encode_base64(buf, "Username:");
-               cprintf("334 %s\n", buf);
+               cprintf("334 %s\r\n", buf);
                SMTP->command_state = smtp_user;
        }
 }
@@ -180,7 +196,7 @@ void smtp_auth(char *argbuf) {
 /*
  * Back end for smtp_vrfy() command
  */
-void smtp_vrfy_backend(struct usersupp *us) {
+void smtp_vrfy_backend(struct usersupp *us, void *data) {
 
        if (!fuzzy_match(us, SMTP->vrfy_match)) {
                ++SMTP->vrfy_count;
@@ -196,19 +212,19 @@ void smtp_vrfy_backend(struct usersupp *us) {
 void smtp_vrfy(char *argbuf) {
        SMTP->vrfy_count = 0;
        strcpy(SMTP->vrfy_match, argbuf);
-       ForEachUser(smtp_vrfy_backend);
+       ForEachUser(smtp_vrfy_backend, NULL);
 
        if (SMTP->vrfy_count < 1) {
-               cprintf("550 String does not match anything.\n");
+               cprintf("550 String does not match anything.\r\n");
        }
        else if (SMTP->vrfy_count == 1) {
-               cprintf("250 %s <cit%ld@%s>\n",
+               cprintf("250 %s <cit%ld@%s>\r\n",
                        SMTP->vrfy_buffer.fullname,
                        SMTP->vrfy_buffer.usernum,
                        config.c_fqdn);
        }
        else if (SMTP->vrfy_count > 1) {
-               cprintf("553 Request ambiguous: %d users matched.\n",
+               cprintf("553 Request ambiguous: %d users matched.\r\n",
                        SMTP->vrfy_count);
        }
 
@@ -219,12 +235,12 @@ void smtp_vrfy(char *argbuf) {
 /*
  * Back end for smtp_expn() command
  */
-void smtp_expn_backend(struct usersupp *us) {
+void smtp_expn_backend(struct usersupp *us, void *data) {
 
        if (!fuzzy_match(us, SMTP->vrfy_match)) {
 
                if (SMTP->vrfy_count >= 1) {
-                       cprintf("250-%s <cit%ld@%s>\n",
+                       cprintf("250-%s <cit%ld@%s>\r\n",
                                SMTP->vrfy_buffer.fullname,
                                SMTP->vrfy_buffer.usernum,
                                config.c_fqdn);
@@ -243,13 +259,13 @@ void smtp_expn_backend(struct usersupp *us) {
 void smtp_expn(char *argbuf) {
        SMTP->vrfy_count = 0;
        strcpy(SMTP->vrfy_match, argbuf);
-       ForEachUser(smtp_expn_backend);
+       ForEachUser(smtp_expn_backend, NULL);
 
        if (SMTP->vrfy_count < 1) {
-               cprintf("550 String does not match anything.\n");
+               cprintf("550 String does not match anything.\r\n");
        }
        else if (SMTP->vrfy_count >= 1) {
-               cprintf("250 %s <cit%ld@%s>\n",
+               cprintf("250 %s <cit%ld@%s>\r\n",
                        SMTP->vrfy_buffer.fullname,
                        SMTP->vrfy_buffer.usernum,
                        config.c_fqdn);
@@ -266,7 +282,7 @@ void smtp_expn(char *argbuf) {
 void smtp_rset(void) {
        memset(SMTP, 0, sizeof(struct citsmtp));
        if (CC->logged_in) logout(CC);
-       cprintf("250 Zap!\n");
+       cprintf("250 Zap!\r\n");
 }
 
 
@@ -280,12 +296,12 @@ void smtp_mail(char *argbuf) {
        int cvt;
 
        if (strlen(SMTP->from) != 0) {
-               cprintf("503 Only one sender permitted\n");
+               cprintf("503 Only one sender permitted\r\n");
                return;
        }
 
        if (strncasecmp(argbuf, "From:", 5)) {
-               cprintf("501 Syntax error\n");
+               cprintf("501 Syntax error\r\n");
                return;
        }
 
@@ -293,7 +309,7 @@ void smtp_mail(char *argbuf) {
        striplt(SMTP->from);
 
        if (strlen(SMTP->from) == 0) {
-               cprintf("501 Empty sender name is not permitted\n");
+               cprintf("501 Empty sender name is not permitted\r\n");
                return;
        }
 
@@ -305,7 +321,7 @@ void smtp_mail(char *argbuf) {
                cvt = convert_internet_address(user, node, SMTP->from);
                lprintf(9, "cvt=%d, citaddr=<%s@%s>\n", cvt, user, node);
                if ( (cvt != 0) || (strcasecmp(user, CC->usersupp.fullname))) {
-                       cprintf("550 <%s> is not your address.\n", SMTP->from);
+                       cprintf("550 <%s> is not your address.\r\n", SMTP->from);
                        strcpy(SMTP->from, "");
                        return;
                }
@@ -317,15 +333,15 @@ void smtp_mail(char *argbuf) {
        else {
                cvt = convert_internet_address(user, node, SMTP->from);
                lprintf(9, "cvt=%d, citaddr=<%s@%s>\n", cvt, user, node);
-               if (!strcasecmp(node, config.c_nodename)) { /* FIX use fcn */
-                       cprintf("550 You must log in to send mail from %s\n",
-                               config.c_fqdn);
+               if (CtdlHostAlias(node) == hostalias_localhost) {
+                       cprintf("550 You must log in to send mail from %s\r\n",
+                               node);
                        strcpy(SMTP->from, "");
                        return;
                }
        }
 
-       cprintf("250 Sender ok.  Groovy.\n");
+       cprintf("250 Sender ok.  Groovy.\r\n");
 }
 
 
@@ -338,15 +354,15 @@ void smtp_rcpt(char *argbuf) {
        char user[256];
        char node[256];
        char recp[256];
-       int is_spam = 0;        /* FIX implement anti-spamming */
+       int is_spam = 0;        /* FIXME implement anti-spamming */
 
        if (strlen(SMTP->from) == 0) {
-               cprintf("503 MAIL first, then RCPT.  Duh.\n");
+               cprintf("503 MAIL first, then RCPT.  Duh.\r\n");
                return;
        }
 
        if (strncasecmp(argbuf, "To:", 3)) {
-               cprintf("501 Syntax error\n");
+               cprintf("501 Syntax error\r\n");
                return;
        }
 
@@ -356,11 +372,11 @@ void smtp_rcpt(char *argbuf) {
 
        cvt = convert_internet_address(user, node, recp);
        sprintf(recp, "%s@%s", user, node);
-
+       lprintf(9, "cvt=%d, citaddr=<%s@%s>\n", cvt, user, node);
 
        switch(cvt) {
                case rfc822_address_locally_validated:
-                       cprintf("250 %s is a valid recipient.\n", user);
+                       cprintf("250 %s is a valid recipient.\r\n", user);
                        ++SMTP->number_of_recipients;
                        CtdlReallocUserData(SYM_SMTP_RECP,
                                strlen(SMTP_RECP) + 1024 );
@@ -369,32 +385,92 @@ void smtp_rcpt(char *argbuf) {
                        strcat(SMTP_RECP, "|0\n");
                        return;
 
+               case rfc822_room_delivery:
+                       cprintf("250 Delivering to room '%s'\r\n", user);
+                       ++SMTP->number_of_recipients;
+                       CtdlReallocUserData(SYM_SMTP_RECP,
+                               strlen(SMTP_RECP) + 1024 );
+                       strcat(SMTP_RECP, "room|");
+                       strcat(SMTP_RECP, user);
+                       strcat(SMTP_RECP, "|0|\n");
+                       return;
+
                case rfc822_no_such_user:
-                       cprintf("550 %s: no such user\n", recp);
+                       cprintf("550 %s: no such user\r\n", recp);
+                       return;
+
+               case rfc822_address_on_citadel_network:
+                       cprintf("250 %s is on the local network\r\n", recp);
+                       ++SMTP->number_of_recipients;
+                       CtdlReallocUserData(SYM_SMTP_RECP,
+                               strlen(SMTP_RECP) + 1024 );
+                       strcat(SMTP_RECP, "ignet|");
+                       strcat(SMTP_RECP, user);
+                       strcat(SMTP_RECP, "|");
+                       strcat(SMTP_RECP, node);
+                       strcat(SMTP_RECP, "|0|\n");
                        return;
 
-               case rfc822_address_invalid:
+               case rfc822_address_nonlocal:
                        if (is_spam) {
-                               cprintf("551 Away with thee, spammer!\n");
+                               cprintf("551 Away with thee, spammer!\r\n");
                        }
                        else {
-                               cprintf("250 Remote recipient %s ok\n", recp);
+                               cprintf("250 Remote recipient %s ok\r\n", recp);
                                ++SMTP->number_of_recipients;
                                CtdlReallocUserData(SYM_SMTP_RECP,
                                        strlen(SMTP_RECP) + 1024 );
                                strcat(SMTP_RECP, "remote|");
                                strcat(SMTP_RECP, recp);
-                               strcat(SMTP_RECP, "|0\n");
+                               strcat(SMTP_RECP, "|0|\n");
                                return;
                        }
                        return;
        }
 
-       cprintf("599 Unknown error\n");
+       cprintf("599 Unknown error\r\n");
 }
 
 
 
+/*
+ * Send a message out through the local network
+ * (This is kind of ugly.  IGnet should be done using clean server-to-server
+ * code instead of the old style spool.)
+ */
+void smtp_deliver_ignet(struct CtdlMessage *msg, char *user, char *dest) {
+       struct ser_ret smr;
+       char *hold_R, *hold_D;
+       FILE *fp;
+       char filename[256];
+       static int seq = 0;
+
+       lprintf(9, "smtp_deliver_ignet(msg, %s, %s)\n", user, dest);
+
+       hold_R = msg->cm_fields['R'];
+       hold_D = msg->cm_fields['D'];
+       msg->cm_fields['R'] = user;
+       msg->cm_fields['D'] = dest;
+
+       serialize_message(&smr, msg);
+
+       msg->cm_fields['R'] = hold_R;
+       msg->cm_fields['D'] = hold_D;
+
+       if (smr.len != 0) {
+               sprintf(filename, "./network/spoolin/%s.%04x.%04x",
+                       dest, getpid(), ++seq);
+               lprintf(9, "spool file name is <%s>\n", filename);
+               fp = fopen(filename, "wb");
+               if (fp != NULL) {
+                       fwrite(smr.ser, smr.len, 1, fp);
+                       fclose(fp);
+               }
+               phree(smr.ser);
+       }
+
+}
+
 
 
 /*
@@ -434,8 +510,10 @@ int smtp_message_delivery(struct CtdlMessage *msg) {
        ++successful_saves;
 
        instr = mallok(1024);
-       sprintf(instr, "Content-type: %s\n\nmsgid|%ld\n",
-               SPOOLMIME, msgid);
+       sprintf(instr, "Content-type: %s\n\nmsgid|%ld\nsubmitted|%ld\n"
+                       "bounceto|%s\n",
+               SPOOLMIME, msgid, time(NULL),
+               SMTP->from );
 
        for (i=0; i<SMTP->number_of_recipients; ++i) {
                extract_token(buf, SMTP_RECP, i, '\n');
@@ -454,6 +532,20 @@ int smtp_message_delivery(struct CtdlMessage *msg) {
                        }
                }
 
+               /* Delivery to local non-mailbox rooms */
+               if (!strcasecmp(dtype, "room")) {
+                       extract(room, buf, 1);
+                       CtdlSaveMsgPointerInRoom(room, msgid, 0);
+                       ++successful_saves;
+               }
+
+               /* Delivery over the local Citadel network (IGnet) */
+               if (!strcasecmp(dtype, "ignet")) {
+                       extract(user, buf, 1);
+                       extract(node, buf, 2);
+                       smtp_deliver_ignet(msg, user, node);
+               }
+
                /* Remote delivery */
                if (!strcasecmp(dtype, "remote")) {
                        extract(user, buf, 1);
@@ -500,30 +592,31 @@ void smtp_data(void) {
        char nowstamp[256];
 
        if (strlen(SMTP->from) == 0) {
-               cprintf("503 Need MAIL command first.\n");
+               cprintf("503 Need MAIL command first.\r\n");
                return;
        }
 
        if (SMTP->number_of_recipients < 1) {
-               cprintf("503 Need RCPT command first.\n");
+               cprintf("503 Need RCPT command first.\r\n");
                return;
        }
 
-       cprintf("354 Transmit message now; terminate with '.' by itself\n");
+       cprintf("354 Transmit message now; terminate with '.' by itself\r\n");
        
        generate_rfc822_datestamp(nowstamp, time(NULL));
        body = mallok(4096);
+
        if (body != NULL) sprintf(body,
                "Received: from %s\n"
                "       by %s;\n"
                "       %s\n",
-                       "FIX.FIX.com",
+                       SMTP->helo_node,
                        config.c_fqdn,
                        nowstamp);
        
        body = CtdlReadMessageBody(".", config.c_maxmsglen, body);
        if (body == NULL) {
-               cprintf("550 Unable to save message text: internal error.\n");
+               cprintf("550 Unable to save message text: internal error.\r\n");
                return;
        }
 
@@ -546,10 +639,10 @@ void smtp_data(void) {
        CtdlFreeMessage(msg);
 
        if (!retval) {
-               cprintf("250 Message accepted for delivery.\n");
+               cprintf("250 Message accepted for delivery.\r\n");
        }
        else {
-               cprintf("550 Internal delivery errors: %d\n", retval);
+               cprintf("550 Internal delivery errors: %d\r\n", retval);
        }
 }
 
@@ -609,11 +702,11 @@ void smtp_command_loop(void) {
        }
 
        else if (!strncasecmp(cmdbuf, "NOOP", 4)) {
-               cprintf("250 This command successfully did nothing.\n");
+               cprintf("250 This command successfully did nothing.\r\n");
        }
 
        else if (!strncasecmp(cmdbuf, "QUIT", 4)) {
-               cprintf("221 Goodbye...\n");
+               cprintf("221 Goodbye...\r\n");
                CC->kill_me = 1;
                return;
                }
@@ -631,12 +724,695 @@ void smtp_command_loop(void) {
        }
 
        else {
-               cprintf("502 I'm sorry Dave, I'm afraid I can't do that.\n");
+               cprintf("502 I'm sorry Dave, I'm afraid I can't do that.\r\n");
+       }
+
+}
+
+
+
+
+/*****************************************************************************/
+/*               SMTP CLIENT (OUTBOUND PROCESSING) STUFF                     */
+/*****************************************************************************/
+
+
+
+/*
+ * smtp_try()
+ *
+ * Called by smtp_do_procmsg() to attempt delivery to one SMTP host
+ *
+ */
+void smtp_try(char *key, char *addr, int *status, char *dsn, long msgnum)
+{
+       int sock = (-1);
+       char mxhosts[1024];
+       int num_mxhosts;
+       int mx;
+       int i;
+       char user[256], node[256], name[256];
+       char buf[1024];
+       char mailfrom[1024];
+       int lp, rp;
+       FILE *msg_fp = NULL;
+       size_t msg_size;
+       size_t blocksize = 0;
+       int scan_done;
+
+       /* Parse out the host portion of the recipient address */
+       process_rfc822_addr(addr, user, node, name);
+
+       lprintf(9, "Attempting SMTP delivery to <%s> @ <%s> (%s)\n",
+               user, node, name);
+
+       /* Load the message out of the database into a temp file */
+       msg_fp = tmpfile();
+       if (msg_fp == NULL) {
+               *status = 4;
+               sprintf(dsn, "Error creating temporary file");
+               return;
+       }
+       else {
+               CtdlRedirectOutput(msg_fp, -1);
+               CtdlOutputMsg(msgnum, MT_RFC822, 0, 0, 1);
+               CtdlRedirectOutput(NULL, -1);
+               fseek(msg_fp, 0L, SEEK_END);
+               msg_size = ftell(msg_fp);
+       }
+
+
+       /* Extract something to send later in the 'MAIL From:' command */
+       strcpy(mailfrom, "");
+       rewind(msg_fp);
+       scan_done = 0;
+       do {
+               if (fgets(buf, sizeof buf, msg_fp)==NULL) scan_done = 1;
+               if (!strncasecmp(buf, "From:", 5)) {
+                       safestrncpy(mailfrom, &buf[5], sizeof mailfrom);
+                       striplt(mailfrom);
+                       for (i=0; i<strlen(mailfrom); ++i) {
+                               if (!isprint(mailfrom[i])) {
+                                       strcpy(&mailfrom[i], &mailfrom[i+1]);
+                                       i=0;
+                               }
+                       }
+
+                       /* Strip out parenthesized names */
+                       lp = (-1);
+                       rp = (-1);
+                       for (i=0; i<strlen(mailfrom); ++i) {
+                               if (mailfrom[i] == '(') lp = i;
+                               if (mailfrom[i] == ')') rp = i;
+                       }
+                       if ((lp>0)&&(rp>lp)) {
+                               strcpy(&mailfrom[lp-1], &mailfrom[rp+1]);
+                       }
+
+                       /* Prefer brokketized names */
+                       lp = (-1);
+                       rp = (-1);
+                       for (i=0; i<strlen(mailfrom); ++i) {
+                               if (mailfrom[i] == '<') lp = i;
+                               if (mailfrom[i] == '>') rp = i;
+                       }
+                       if ((lp>=0)&&(rp>lp)) {
+                               mailfrom[rp] = 0;
+                               strcpy(mailfrom, &mailfrom[lp]);
+                       }
+
+                       scan_done = 1;
+               }
+       } while (scan_done == 0);
+       if (strlen(mailfrom)==0) strcpy(mailfrom, "someone@somewhere.org");
+
+
+       /* Figure out what mail exchanger host we have to connect to */
+       num_mxhosts = getmx(mxhosts, node);
+       lprintf(9, "Number of MX hosts for <%s> is %d\n", node, num_mxhosts);
+       if (num_mxhosts < 1) {
+               *status = 5;
+               sprintf(dsn, "No MX hosts found for <%s>", node);
+               return;
+       }
+
+       for (mx=0; mx<num_mxhosts; ++mx) {
+               extract(buf, mxhosts, mx);
+               lprintf(9, "Trying <%s>\n", buf);
+               sock = sock_connect(buf, "25", "tcp");
+               sprintf(dsn, "Could not connect: %s", strerror(errno));
+               if (sock >= 0) lprintf(9, "Connected!\n");
+               if (sock < 0) sprintf(dsn, "%s", strerror(errno));
+               if (sock >= 0) break;
+       }
+
+       if (sock < 0) {
+               *status = 4;    /* dsn is already filled in */
+               return;
+       }
+
+       /* Process the SMTP greeting from the server */
+       if (sock_gets(sock, buf) < 0) {
+               *status = 4;
+               strcpy(dsn, "Connection broken during SMTP conversation");
+               goto bail;
        }
+       lprintf(9, "<%s\n", buf);
+       if (buf[0] != '2') {
+               if (buf[0] == '4') {
+                       *status = 4;
+                       safestrncpy(dsn, &buf[4], 1023);
+                       goto bail;
+               }
+               else {
+                       *status = 5;
+                       safestrncpy(dsn, &buf[4], 1023);
+                       goto bail;
+               }
+       }
+
+       /* At this point we know we are talking to a real SMTP server */
 
+       /* Do a HELO command */
+       sprintf(buf, "HELO %s", config.c_fqdn);
+       lprintf(9, ">%s\n", buf);
+       sock_puts(sock, buf);
+       if (sock_gets(sock, buf) < 0) {
+               *status = 4;
+               strcpy(dsn, "Connection broken during SMTP conversation");
+               goto bail;
+       }
+       lprintf(9, "<%s\n", buf);
+       if (buf[0] != '2') {
+               if (buf[0] == '4') {
+                       *status = 4;
+                       safestrncpy(dsn, &buf[4], 1023);
+                       goto bail;
+               }
+               else {
+                       *status = 5;
+                       safestrncpy(dsn, &buf[4], 1023);
+                       goto bail;
+               }
+       }
+
+
+       /* HELO succeeded, now try the MAIL From: command */
+       sprintf(buf, "MAIL From: %s", mailfrom);
+       lprintf(9, ">%s\n", buf);
+       sock_puts(sock, buf);
+       if (sock_gets(sock, buf) < 0) {
+               *status = 4;
+               strcpy(dsn, "Connection broken during SMTP conversation");
+               goto bail;
+       }
+       lprintf(9, "<%s\n", buf);
+       if (buf[0] != '2') {
+               if (buf[0] == '4') {
+                       *status = 4;
+                       safestrncpy(dsn, &buf[4], 1023);
+                       goto bail;
+               }
+               else {
+                       *status = 5;
+                       safestrncpy(dsn, &buf[4], 1023);
+                       goto bail;
+               }
+       }
+
+
+       /* MAIL succeeded, now try the RCPT To: command */
+       sprintf(buf, "RCPT To: %s", addr);
+       lprintf(9, ">%s\n", buf);
+       sock_puts(sock, buf);
+       if (sock_gets(sock, buf) < 0) {
+               *status = 4;
+               strcpy(dsn, "Connection broken during SMTP conversation");
+               goto bail;
+       }
+       lprintf(9, "<%s\n", buf);
+       if (buf[0] != '2') {
+               if (buf[0] == '4') {
+                       *status = 4;
+                       safestrncpy(dsn, &buf[4], 1023);
+                       goto bail;
+               }
+               else {
+                       *status = 5;
+                       safestrncpy(dsn, &buf[4], 1023);
+                       goto bail;
+               }
+       }
+
+
+       /* RCPT succeeded, now try the DATA command */
+       lprintf(9, ">DATA\n");
+       sock_puts(sock, "DATA");
+       if (sock_gets(sock, buf) < 0) {
+               *status = 4;
+               strcpy(dsn, "Connection broken during SMTP conversation");
+               goto bail;
+       }
+       lprintf(9, "<%s\n", buf);
+       if (buf[0] != '3') {
+               if (buf[0] == '4') {
+                       *status = 3;
+                       safestrncpy(dsn, &buf[4], 1023);
+                       goto bail;
+               }
+               else {
+                       *status = 5;
+                       safestrncpy(dsn, &buf[4], 1023);
+                       goto bail;
+               }
+       }
+
+       /* If we reach this point, the server is expecting data */
+       rewind(msg_fp);
+       while (msg_size > 0) {
+               blocksize = sizeof(buf);
+               if (blocksize > msg_size) blocksize = msg_size;
+               fread(buf, blocksize, 1, msg_fp);
+               sock_write(sock, buf, blocksize);
+               msg_size -= blocksize;
+       }
+       if (buf[blocksize-1] != 10) {
+               lprintf(5, "Possible problem: message did not correctly "
+                       "terminate. (expecting 0x10, got 0x%02x)\n",
+                               buf[blocksize-1]);
+       }
+
+       sock_write(sock, ".\r\n", 3);
+       if (sock_gets(sock, buf) < 0) {
+               *status = 4;
+               strcpy(dsn, "Connection broken during SMTP conversation");
+               goto bail;
+       }
+       lprintf(9, "%s\n", buf);
+       if (buf[0] != '2') {
+               if (buf[0] == '4') {
+                       *status = 4;
+                       safestrncpy(dsn, &buf[4], 1023);
+                       goto bail;
+               }
+               else {
+                       *status = 5;
+                       safestrncpy(dsn, &buf[4], 1023);
+                       goto bail;
+               }
+       }
+
+       /* We did it! */
+       safestrncpy(dsn, &buf[4], 1023);
+       *status = 2;
+
+       lprintf(9, ">QUIT\n");
+       sock_puts(sock, "QUIT");
+       sock_gets(sock, buf);
+       lprintf(9, "<%s\n", buf);
+
+bail:  if (msg_fp != NULL) fclose(msg_fp);
+       sock_close(sock);
+       return;
 }
 
 
+
+/*
+ * smtp_do_bounce() is caled by smtp_do_procmsg() to scan a set of delivery
+ * instructions for "5" codes (permanent fatal errors) and produce/deliver
+ * a "bounce" message (delivery status notification).
+ */
+void smtp_do_bounce(char *instr) {
+       int i;
+       int lines;
+       int status;
+       char buf[1024];
+       char key[1024];
+       char addr[1024];
+       char dsn[1024];
+       char bounceto[1024];
+       int num_bounces = 0;
+       int bounce_this = 0;
+       long bounce_msgid = (-1);
+       time_t submitted = 0L;
+       struct CtdlMessage *bmsg = NULL;
+       int give_up = 0;
+       int mes_type = 0;
+
+       lprintf(9, "smtp_do_bounce() called\n");
+       strcpy(bounceto, "");
+
+       lines = num_tokens(instr, '\n');
+
+
+       /* See if it's time to give up on delivery of this message */
+       for (i=0; i<lines; ++i) {
+               extract_token(buf, instr, i, '\n');
+               extract(key, buf, 0);
+               extract(addr, buf, 1);
+               if (!strcasecmp(key, "submitted")) {
+                       submitted = atol(addr);
+               }
+       }
+
+       if ( (time(NULL) - submitted) > SMTP_GIVE_UP ) {
+               give_up = 1;
+       }
+
+
+
+       bmsg = (struct CtdlMessage *) mallok(sizeof(struct CtdlMessage));
+       if (bmsg == NULL) return;
+       memset(bmsg, 0, sizeof(struct CtdlMessage));
+
+        bmsg->cm_magic = CTDLMESSAGE_MAGIC;
+        bmsg->cm_anon_type = MES_NORMAL;
+        bmsg->cm_format_type = 1;
+        bmsg->cm_fields['A'] = strdoop("Citadel");
+        bmsg->cm_fields['O'] = strdoop(MAILROOM);
+        bmsg->cm_fields['N'] = strdoop(config.c_nodename);
+
+       if (give_up) bmsg->cm_fields['M'] = strdoop(
+"A message you sent could not be delivered to some or all of its recipients.\n"
+"The following addresses were undeliverable:\n\n"
+);
+
+        else bmsg->cm_fields['M'] = strdoop(
+"A message you sent could not be delivered to some or all of its recipients\n"
+"due to prolonged unavailability of its destination(s).\n"
+"Giving up on the following addresses:\n\n"
+);
+
+       /*
+        * Now go through the instructions checking for stuff.
+        */
+
+       for (i=0; i<lines; ++i) {
+               extract_token(buf, instr, i, '\n');
+               extract(key, buf, 0);
+               extract(addr, buf, 1);
+               status = extract_int(buf, 2);
+               extract(dsn, buf, 3);
+               bounce_this = 0;
+
+               lprintf(9, "key=<%s> addr=<%s> status=%d dsn=<%s>\n",
+                       key, addr, status, dsn);
+
+               if (!strcasecmp(key, "bounceto")) {
+                       strcpy(bounceto, addr);
+               }
+
+               if (
+                  (!strcasecmp(key, "local"))
+                  || (!strcasecmp(key, "remote"))
+                  || (!strcasecmp(key, "ignet"))
+                  || (!strcasecmp(key, "room"))
+               ) {
+                       if (status == 5) bounce_this = 1;
+                       if (give_up) bounce_this = 1;
+               }
+
+               if (bounce_this) {
+                       ++num_bounces;
+
+                       if (bmsg->cm_fields['M'] == NULL) {
+                               lprintf(2, "ERROR ... M field is null "
+                                       "(%s:%d)\n", __FILE__, __LINE__);
+                       }
+
+                       bmsg->cm_fields['M'] = reallok(bmsg->cm_fields['M'],
+                               strlen(bmsg->cm_fields['M']) + 1024 );
+                       strcat(bmsg->cm_fields['M'], addr);
+                       strcat(bmsg->cm_fields['M'], ": ");
+                       strcat(bmsg->cm_fields['M'], dsn);
+                       strcat(bmsg->cm_fields['M'], "\n");
+
+                       remove_token(instr, i, '\n');
+                       --i;
+                       --lines;
+               }
+       }
+
+       /* Deliver the bounce if there's anything worth mentioning */
+       lprintf(9, "num_bounces = %d\n", num_bounces);
+       if (num_bounces > 0) {
+
+               /* First try the user who sent the message */
+               lprintf(9, "bounce to user? <%s>\n", bounceto);
+               if (strlen(bounceto) == 0) {
+                       lprintf(7, "No bounce address specified\n");
+                       bounce_msgid = (-1L);
+               }
+               else if (mes_type = alias(bounceto), mes_type == MES_ERROR) {
+                       lprintf(7, "Invalid bounce address <%s>\n", bounceto);
+                       bounce_msgid = (-1L);
+               }
+               else {
+                       bounce_msgid = CtdlSaveMsg(bmsg,
+                               bounceto,
+                               "", mes_type, 1);
+               }
+
+               /* Otherwise, go to the Aide> room */
+               lprintf(9, "bounce to room?\n");
+               if (bounce_msgid < 0L) bounce_msgid = CtdlSaveMsg(bmsg,
+                       "", AIDEROOM,
+                       MES_LOCAL, 1);
+       }
+
+       CtdlFreeMessage(bmsg);
+       lprintf(9, "Done processing bounces\n");
+}
+
+
+/*
+ * smtp_purge_completed_deliveries() is caled by smtp_do_procmsg() to scan a
+ * set of delivery instructions for completed deliveries and remove them.
+ *
+ * It returns the number of incomplete deliveries remaining.
+ */
+int smtp_purge_completed_deliveries(char *instr) {
+       int i;
+       int lines;
+       int status;
+       char buf[1024];
+       char key[1024];
+       char addr[1024];
+       char dsn[1024];
+       int completed;
+       int incomplete = 0;
+
+       lines = num_tokens(instr, '\n');
+       for (i=0; i<lines; ++i) {
+               extract_token(buf, instr, i, '\n');
+               extract(key, buf, 0);
+               extract(addr, buf, 1);
+               status = extract_int(buf, 2);
+               extract(dsn, buf, 3);
+
+               completed = 0;
+
+               if (
+                  (!strcasecmp(key, "local"))
+                  || (!strcasecmp(key, "remote"))
+                  || (!strcasecmp(key, "ignet"))
+                  || (!strcasecmp(key, "room"))
+               ) {
+                       if (status == 2) completed = 1;
+                       else ++incomplete;
+               }
+
+               if (completed) {
+                       remove_token(instr, i, '\n');
+                       --i;
+                       --lines;
+               }
+       }
+
+       return(incomplete);
+}
+
+
+/*
+ * smtp_do_procmsg()
+ *
+ * Called by smtp_do_queue() to handle an individual message.
+ */
+void smtp_do_procmsg(long msgnum) {
+       struct CtdlMessage *msg;
+       char *instr = NULL;
+       char *results = NULL;
+       int i;
+       int lines;
+       int status;
+       char buf[1024];
+       char key[1024];
+       char addr[1024];
+       char dsn[1024];
+       long text_msgid = (-1);
+       int incomplete_deliveries_remaining;
+       time_t attempted = 0L;
+       time_t last_attempted = 0L;
+
+       msg = CtdlFetchMessage(msgnum);
+       if (msg == NULL) {
+               lprintf(3, "SMTP: tried %ld but no such message!\n", msgnum);
+               return;
+       }
+
+       instr = strdoop(msg->cm_fields['M']);
+       CtdlFreeMessage(msg);
+
+       /* Strip out the headers amd any other non-instruction line */
+       lines = num_tokens(instr, '\n');
+       for (i=0; i<lines; ++i) {
+               extract_token(buf, instr, i, '\n');
+               if (num_tokens(buf, '|') < 2) {
+                       lprintf(9, "removing <%s>\n", buf);
+                       remove_token(instr, i, '\n');
+                       --lines;
+                       --i;
+               }
+       }
+
+       /* Learn the message ID and find out about recent delivery attempts */
+       lines = num_tokens(instr, '\n');
+       for (i=0; i<lines; ++i) {
+               extract_token(buf, instr, i, '\n');
+               extract(key, buf, 0);
+               if (!strcasecmp(key, "msgid")) {
+                       text_msgid = extract_long(buf, 1);
+               }
+               if (!strcasecmp(key, "attempted")) {
+                       attempted = extract_long(buf, 1);
+                       if (attempted > last_attempted)
+                               last_attempted = attempted;
+               }
+       }
+
+
+       /*
+        * Postpone delivery if we've already tried recently.
+        */
+       if ( (time(NULL) - last_attempted) < SMTP_RETRY_INTERVAL) {
+               lprintf(7, "Retry time not yet reached.\n");
+               phree(instr);
+               return;
+       }
+
+
+       /*
+        * Bail out if there's no actual message associated with this
+        */
+       if (text_msgid < 0L) {
+               lprintf(3, "SMTP: no 'msgid' directive found!\n");
+               phree(instr);
+               return;
+       }
+
+       /* Plow through the instructions looking for 'remote' directives and
+        * a status of 0 (no delivery yet attempted) or 3 (transient errors
+        * were experienced and it's time to try again)
+        */
+       lines = num_tokens(instr, '\n');
+       for (i=0; i<lines; ++i) {
+               extract_token(buf, instr, i, '\n');
+               extract(key, buf, 0);
+               extract(addr, buf, 1);
+               status = extract_int(buf, 2);
+               extract(dsn, buf, 3);
+               if ( (!strcasecmp(key, "remote"))
+                  && ((status==0)||(status==3)) ) {
+                       remove_token(instr, i, '\n');
+                       --i;
+                       --lines;
+                       lprintf(9, "SMTP: Trying <%s>\n", addr);
+                       smtp_try(key, addr, &status, dsn, text_msgid);
+                       if (status != 2) {
+                               if (results == NULL) {
+                                       results = mallok(1024);
+                                       memset(results, 0, 1024);
+                               }
+                               else {
+                                       results = reallok(results,
+                                               strlen(results) + 1024);
+                               }
+                               sprintf(&results[strlen(results)],
+                                       "%s|%s|%d|%s\n",
+                                       key, addr, status, dsn);
+                       }
+               }
+       }
+
+       if (results != NULL) {
+               instr = reallok(instr, strlen(instr) + strlen(results) + 2);
+               strcat(instr, results);
+               phree(results);
+       }
+
+
+       /* Generate 'bounce' messages */
+       smtp_do_bounce(instr);
+
+       /* Go through the delivery list, deleting completed deliveries */
+       incomplete_deliveries_remaining = 
+               smtp_purge_completed_deliveries(instr);
+
+
+       /*
+        * No delivery instructions remain, so delete both the instructions
+        * message and the message message.
+        */
+       if (incomplete_deliveries_remaining <= 0)  {
+               CtdlDeleteMessages(SMTP_SPOOLOUT_ROOM, msgnum, NULL);    
+               CtdlDeleteMessages(SMTP_SPOOLOUT_ROOM, text_msgid, NULL);    
+       }
+
+
+       /*
+        * Uncompleted delivery instructions remain, so delete the old
+        * instructions and replace with the updated ones.
+        */
+       if (incomplete_deliveries_remaining > 0) {
+               CtdlDeleteMessages(SMTP_SPOOLOUT_ROOM, msgnum, NULL);    
+               msg = mallok(sizeof(struct CtdlMessage));
+               memset(msg, 0, sizeof(struct CtdlMessage));
+               msg->cm_magic = CTDLMESSAGE_MAGIC;
+               msg->cm_anon_type = MES_NORMAL;
+               msg->cm_format_type = FMT_RFC822;
+               msg->cm_fields['M'] = malloc(strlen(instr)+256);
+               sprintf(msg->cm_fields['M'],
+                       "Content-type: %s\n\n%s\nattempted|%ld\n",
+                       SPOOLMIME, instr, time(NULL) );
+               phree(instr);
+               CtdlSaveMsg(msg, "", SMTP_SPOOLOUT_ROOM, MES_LOCAL, 1);
+               CtdlFreeMessage(msg);
+       }
+
+}
+
+
+
+/*
+ * smtp_do_queue()
+ * 
+ * Run through the queue sending out messages.
+ */
+void smtp_do_queue(void) {
+       static int doing_queue = 0;
+
+       /*
+        * This is a simple concurrency check to make sure only one queue run
+        * is done at a time.  We could do this with a mutex, but since we
+        * don't really require extremely fine granularity here, we'll do it
+        * with a static variable instead.
+        */
+       if (doing_queue) return;
+       doing_queue = 1;
+
+       /* 
+        * Go ahead and run the queue
+        */
+       lprintf(5, "SMTP: processing outbound queue\n");
+
+       if (getroom(&CC->quickroom, SMTP_SPOOLOUT_ROOM) != 0) {
+               lprintf(3, "Cannot find room <%s>\n", SMTP_SPOOLOUT_ROOM);
+               return;
+       }
+       CtdlForEachMessage(MSGS_ALL, 0L, SPOOLMIME, NULL, smtp_do_procmsg);
+
+       lprintf(5, "SMTP: queue run completed\n");
+       doing_queue = 0;
+}
+
+
+
+/*****************************************************************************/
+/*                      MODULE INITIALIZATION STUFF                          */
+/*****************************************************************************/
+
+
 char *Dynamic_Module_Init(void)
 {
        SYM_SMTP = CtdlGetDynamicSymbol();
@@ -645,6 +1421,6 @@ char *Dynamic_Module_Init(void)
                                smtp_greeting,
                                smtp_command_loop);
        create_room(SMTP_SPOOLOUT_ROOM, 3, "", 0);
+       CtdlRegisterSessionHook(smtp_do_queue, EVT_TIMER);
        return "$Id$";
 }
-