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;
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;
strcat(recipients, &buf[11]);
}
}
- syslog(LOG_DEBUG, "\033[33m%s\033[0m", recipients);
- free(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) {
+ valid->bounce_to = strdup(bounce_to);
+ valid->envelope_from = strdup(bounce_to);
+ CtdlSubmitMsg(TheMessage, valid, "");
+ free_recipients(valid);
+ }
}
CM_Free(TheMessage);
}
-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;
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
}
}
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
+ begin_critical_section(S_NETCONFIGS);
+ 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; i<config_lines; ++i) {
+ extract_token(buf, netconfig, i, '\n', sizeof buf);
+ if ( (!IsEmptyStr(buf)) && (strncasecmp(buf, "lastsent|", 9)) ) {
+ sprintf(&newnetconfig[strlen(newnetconfig)], "%s\n", buf);
+ }
+ }
+ // Write the new netconfig back to disk
+ SaveRoomNetConfigFile(CC->room.QRnumber, 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
}
+/*
+ * 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)
* 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<array_len(roomlistarr); ++i) {
+ listdeliver_sweep_room((char *)array_get_element_at(roomlistarr, i));
+ }
+
+ array_free(roomlistarr);
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);
}
projects / citadel.git / blobdiff