getmx() now uses our array class

[citadel.git] / citadel / modules / listdeliver / serv_listdeliver.c

diff --git a/citadel/modules/listdeliver/serv_listdeliver.c b/citadel/modules/listdeliver/serv_listdeliver.c
index 039937e678cda81c0f176b587c14b73b6b4c2495..29c1c5c82e737a78e9be648b49539db7e480a735 100644 (file)
--- a/citadel/modules/listdeliver/serv_listdeliver.c
+++ b/citadel/modules/listdeliver/serv_listdeliver.c
@@ -55,6 +55,8 @@ void listdeliver_do_msg(long msgnum, void *userdata) {
        struct lddata *ld = (struct lddata *) userdata;
        if (!ld) return;
        char buf[SIZ];
+       char *ch;
+       char bounce_to[256];
 
        ld->msgnum = msgnum;
        if (msgnum <= 0) return;
@@ -62,12 +64,20 @@ void listdeliver_do_msg(long msgnum, void *userdata) {
        struct CtdlMessage *TheMessage = CtdlFetchMessage(msgnum, 1);
        if (!TheMessage) return;
 
+       // If the subject line does not contain the name of the room, add it now.
+       if (!bmstrcasestr(TheMessage->cm_fields[eMsgSubject], CC->room.QRname)) {
+               snprintf(buf, sizeof buf, "[%s] %s", CC->room.QRname, TheMessage->cm_fields[eMsgSubject]);
+               CM_SetField(TheMessage, eMsgSubject, buf, strlen(buf));
+       }
 
+       // Reply-to: should be set so that replies come to the list.
+       snprintf(buf, sizeof buf, "room_%s@%s", CC->room.QRname, CtdlGetConfigStr("c_fqdn"));
+       for (ch=buf; *ch; ++ch) {
+               if (isspace(*ch)) *ch = '_';
+       }
+       CM_SetField(TheMessage, eReplyTo, buf, strlen(buf));
 
-       // FIXME munge the headers so it looks like it came from a mailing list
-
-
-
+       // With that out of the way, let's figure out who this message needs to be sent to.
        char *recipients = malloc(strlen(ld->netconf));
        if (recipients) {
                recipients[0] = 0;
@@ -88,10 +98,16 @@ void listdeliver_do_msg(long msgnum, void *userdata) {
                                strcat(recipients, &buf[11]);
                        }
                }
-               syslog(LOG_DEBUG, "\033[33m%s\033[0m", recipients);
+
+               // Where do we want bounces and other noise to be sent?  Certainly not to the list members!
+               snprintf(bounce_to, sizeof bounce_to, "room_aide@%s", CtdlGetConfigStr("c_fqdn"));
+
+               // Now submit the message
                struct recptypes *valid = validate_recipients(recipients, NULL, 0);
                if (valid) {
-                       long new_msgnum = CtdlSubmitMsg(TheMessage, valid, "");
+                       valid->bounce_to = strdup(bounce_to);
+                       valid->envelope_from = strdup(bounce_to);
+                       CtdlSubmitMsg(TheMessage, valid, "");
                        free_recipients(valid);
                }
        }
@@ -123,8 +139,6 @@ void listdeliver_sweep_room(char *roomname) {
                return;                         // no netconfig, no processing, no problem
        }
 
-       syslog(LOG_DEBUG, "listdeliver: sweeping %s", roomname);
-
        config_lines = num_tokens(netconfig, '\n');
        for (i=0; i<config_lines; ++i) {
                extract_token(buf, netconfig, i, '\n', sizeof buf);
@@ -141,12 +155,13 @@ void listdeliver_sweep_room(char *roomname) {
                syslog(LOG_DEBUG, "listdeliver: processing new messages in <%s> for <%d> recipients", CC->room.QRname, number_of_recipients);
                ld.netconf = netconfig;
                number_of_messages_processed = CtdlForEachMessage(MSGS_GT, lastsent, NULL, NULL, NULL, listdeliver_do_msg, &ld);
-               syslog(LOG_DEBUG, "listdeliver: processed %d messages", number_of_messages_processed);
+               syslog(LOG_INFO, "listdeliver: processed <%d> messages in <%s> for <%d> recipients", number_of_messages_processed, CC->room.QRname, number_of_recipients);
        
                if (number_of_messages_processed > 0) {
                        syslog(LOG_DEBUG, "listdeliver: new lastsent is %ld", ld.msgnum);
 
                        // Update this room's netconfig with the updated lastsent
+                       begin_critical_section(S_NETCONFIGS);
                        netconfig = LoadRoomNetConfigFile(CC->room.QRnumber);
                        if (!netconfig) {
                                netconfig = strdup("");
@@ -167,10 +182,11 @@ void listdeliver_sweep_room(char *roomname) {
 
                        // Write the new netconfig back to disk
                        SaveRoomNetConfigFile(CC->room.QRnumber, newnetconfig);
-                       free(newnetconfig);
+                       end_critical_section(S_NETCONFIGS);
+                       free(newnetconfig);     // this was the new netconfig, free it because we're done with it
                }
        }
-       free(netconfig);
+       free(netconfig);                        // this was the old netconfig, free it even if we didn't do anything
 }
 
 
@@ -223,19 +239,15 @@ void listdeliver_sweep(void) {
        syslog(LOG_DEBUG, "listdeliver: ended");
        last_run = time(NULL);
        doing_listdeliver = 0;
-
-       //exit(0);
 }
 
 
-
 /*
  * Module entry point
  */
 CTDL_MODULE_INIT(listdeliver)
 {
-       if (!threading)
-       {
+       if (!threading) {
                CtdlRegisterSessionHook(listdeliver_sweep, EVT_TIMER, PRIO_AGGR + 50);
        }