X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fmodules%2Flistdeliver%2Fserv_listdeliver.c;h=4ceb75a657d8824be0e2ff83de526471d4c4ec7a;hb=156a9972863bd789ba11c77c759d579ea415a17d;hp=7dd34630a0750c5fc5977fcf4f663163a50d18b9;hpb=2d108c1f33c86b501a2540ba48eaedded8894f20;p=citadel.git diff --git a/citadel/modules/listdeliver/serv_listdeliver.c b/citadel/modules/listdeliver/serv_listdeliver.c index 7dd34630a..4ceb75a65 100644 --- 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,6 +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)); + + // 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; @@ -82,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); } } @@ -93,8 +115,12 @@ void listdeliver_do_msg(long msgnum, void *userdata) { } -void listdeliver_sweep_room(struct ctdlroom *qrbuf, void *data) { +/* + * Sweep through one room looking for mailing list deliveries to do + */ +void listdeliver_sweep_room(char *roomname) { char *netconfig = NULL; + char *newnetconfig = NULL; long lastsent = 0; char buf[SIZ]; int config_lines; @@ -103,12 +129,12 @@ void listdeliver_sweep_room(struct ctdlroom *qrbuf, void *data) { int number_of_recipients = 0; struct lddata ld; - if (CtdlGetRoom(&CC->room, qrbuf->QRname)) { - syslog(LOG_DEBUG, "listdeliver: no room <%s>", qrbuf->QRname); + if (CtdlGetRoom(&CC->room, roomname)) { + syslog(LOG_DEBUG, "listdeliver: no room <%s>", roomname); return; } - netconfig = LoadRoomNetConfigFile(qrbuf->QRnumber); + netconfig = LoadRoomNetConfigFile(CC->room.QRnumber); if (!netconfig) { return; // no netconfig, no processing, no problem } @@ -126,32 +152,58 @@ void listdeliver_sweep_room(struct ctdlroom *qrbuf, void *data) { } if (number_of_recipients > 0) { - syslog(LOG_DEBUG, "listdeliver: processing new messages in <%s> for <%d> recipients", qrbuf->QRname, number_of_recipients); + 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); - // FIXME write lastsent back to netconfig - syslog(LOG_DEBUG, "\033[31mBEFORE:<%s>\033[0m", netconfig); - syslog(LOG_DEBUG, "\033[32mAFTER:<%s>\033[0m", netconfig); - - + // Update this room's netconfig with the updated lastsent + netconfig = LoadRoomNetConfigFile(CC->room.QRnumber); + if (!netconfig) { + netconfig = strdup(""); + } + // The new netconfig begins with the new lastsent directive + newnetconfig = malloc(strlen(netconfig) + 1024); + sprintf(newnetconfig, "lastsent|%ld\n", ld.msgnum); + // And then we append all of the old netconfig, minus the old lastsent. Also omit blank lines. + config_lines = num_tokens(netconfig, '\n'); + for (i=0; iroom.QRnumber, newnetconfig); + 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 } +/* + * Callback for listdeliver_sweep() + * Adds one room to the queue + */ +void listdeliver_queue_room(struct ctdlroom *qrbuf, void *data) { + Array *roomlistarr = (Array *)data; + array_append(roomlistarr, qrbuf->QRname); +} + +/* + * Queue up the list of rooms so we can sweep them for mailing list delivery instructions + */ void listdeliver_sweep(void) { static time_t last_run = 0L; + int i = 0; /* * Run mailing list delivery no more frequently than once every 15 minutes (we should make this configurable) @@ -173,23 +225,27 @@ void listdeliver_sweep(void) { * Go through each room looking for mailing lists to process */ syslog(LOG_DEBUG, "listdeliver: sweep started"); - CtdlForEachRoom(listdeliver_sweep_room, NULL); + + Array *roomlistarr = array_new(ROOMNAMELEN); // we have to queue them + CtdlForEachRoom(listdeliver_queue_room, roomlistarr); // otherwise we get multiple cursors in progress + + for (i=0; i