* Copyright (C) 2000-2002 by Art Cancro and others.
* This code is released under the terms of the GNU General Public License.
*
+ * ** NOTE ** A word on the S_NETCONFIGS semaphore:
+ * This is a fairly high-level type of critical section. It ensures that no
+ * two threads work on the netconfigs files at the same time. Since we do
+ * so many things inside these, here are the rules:
+ * 1. begin_critical_section(S_NETCONFIGS) *before* begin_ any others.
+ * 2. Do *not* perform any I/O with the client during these sections.
+ *
*/
/*
* Don't allow polls during network processing
*/
+/*
+ * Duration of time (in seconds) after which pending list subscribe/unsubscribe
+ * requests that have not been confirmed will be deleted.
+ */
+#define EXP 259200 /* three days */
+
#include "sysdep.h"
#include <stdlib.h>
#include <unistd.h>
#include <stdio.h>
#include <fcntl.h>
+#include <ctype.h>
#include <signal.h>
#include <pwd.h>
#include <errno.h>
#include "citserver.h"
#include "support.h"
#include "config.h"
-#include "dynloader.h"
+#include "serv_extensions.h"
#include "room_ops.h"
#include "user_ops.h"
#include "policy.h"
*/
unlink(filename);
snprintf(buf, sizeof buf, "/bin/mv %s %s", tempfilename, filename);
+ begin_critical_section(S_NETCONFIGS);
system(buf);
+ end_critical_section(S_NETCONFIGS);
}
-
/*
* Spools out one message from the list.
*/
void network_spool_msg(long msgnum, void *userdata) {
struct SpoolControl *sc;
- struct namelist *nptr;
int err;
int i;
- char *instr = NULL;
char *newpath = NULL;
+ char *instr = NULL;
size_t instr_len = SIZ;
struct CtdlMessage *msg = NULL;
struct CtdlMessage *imsg;
+ struct namelist *nptr;
struct ser_ret sermsg;
FILE *fp;
char filename[SIZ];
CtdlSubmitMsg(imsg, NULL, SMTP_SPOOLOUT_ROOM);
CtdlFreeMessage(imsg);
}
+
+ /*
+ * Process digest recipients
+ */
+ if ((sc->digestrecps != NULL) && (sc->digestfp != NULL)) {
+ fprintf(sc->digestfp, " -----------------------------------"
+ "------------------------------------"
+ "-------\n");
+ CtdlRedirectOutput(sc->digestfp, -1);
+ CtdlOutputMsg(msgnum, MT_RFC822, HEADERS_ALL, 0, 0);
+ CtdlRedirectOutput(NULL, -1);
+ sc->num_msgs_spooled += 1;
+ }
/*
* Process IGnet push shares
}
+/*
+ * Deliver digest messages
+ */
+void network_deliver_digest(struct SpoolControl *sc) {
+ char buf[SIZ];
+ int i;
+ struct CtdlMessage *msg;
+ long msglen;
+ long msgnum;
+ char *instr = NULL;
+ size_t instr_len = SIZ;
+ struct CtdlMessage *imsg;
+ struct namelist *nptr;
+
+ if (sc->num_msgs_spooled < 1) {
+ fclose(sc->digestfp);
+ sc->digestfp = NULL;
+ return;
+ }
+
+ msg = mallok(sizeof(struct CtdlMessage));
+ memset(msg, 0, sizeof(struct CtdlMessage));
+ msg->cm_magic = CTDLMESSAGE_MAGIC;
+ msg->cm_format_type = FMT_RFC822;
+ msg->cm_anon_type = MES_NORMAL;
+
+ sprintf(buf, "%ld", time(NULL));
+ msg->cm_fields['T'] = strdoop(buf);
+ msg->cm_fields['A'] = strdoop(CC->quickroom.QRname);
+ msg->cm_fields['U'] = strdoop(CC->quickroom.QRname);
+ sprintf(buf, "room_%s@%s", CC->quickroom.QRname, config.c_fqdn);
+ for (i=0; i<strlen(buf); ++i) {
+ if (isspace(buf[i])) buf[i]='_';
+ buf[i] = tolower(buf[i]);
+ }
+ msg->cm_fields['F'] = strdoop(buf);
+
+ fseek(sc->digestfp, 0L, SEEK_END);
+ msglen = ftell(sc->digestfp);
+
+ msg->cm_fields['M'] = mallok(msglen + 1);
+ fseek(sc->digestfp, 0L, SEEK_SET);
+ fread(msg->cm_fields['M'], (size_t)msglen, 1, sc->digestfp);
+ msg->cm_fields['M'][msglen] = 0;
+
+ fclose(sc->digestfp);
+ sc->digestfp = NULL;
+
+ msgnum = CtdlSubmitMsg(msg, NULL, SMTP_SPOOLOUT_ROOM);
+ CtdlFreeMessage(msg);
+
+ /* Now generate the delivery instructions */
+
+ /*
+ * Figure out how big a buffer we need to allocate
+ */
+ for (nptr = sc->digestrecps; nptr != NULL; nptr = nptr->next) {
+ instr_len = instr_len + strlen(nptr->name);
+ }
+
+ /*
+ * allocate...
+ */
+ lprintf(9, "Generating delivery instructions\n");
+ instr = mallok(instr_len);
+ if (instr == NULL) {
+ lprintf(1, "Cannot allocate %ld bytes for instr...\n",
+ (long)instr_len);
+ abort();
+ }
+ snprintf(instr, instr_len,
+ "Content-type: %s\n\nmsgid|%ld\nsubmitted|%ld\n"
+ "bounceto|postmaster@%s\n" ,
+ SPOOLMIME, msgnum, (long)time(NULL), config.c_fqdn );
+
+ /* Generate delivery instructions for each recipient */
+ for (nptr = sc->digestrecps; nptr != NULL; nptr = nptr->next) {
+ size_t tmp = strlen(instr);
+ snprintf(&instr[tmp], instr_len - tmp,
+ "remote|%s|0||\n", nptr->name);
+ }
+
+ /*
+ * Generate a message from the instructions
+ */
+ imsg = mallok(sizeof(struct CtdlMessage));
+ memset(imsg, 0, sizeof(struct CtdlMessage));
+ imsg->cm_magic = CTDLMESSAGE_MAGIC;
+ imsg->cm_anon_type = MES_NORMAL;
+ imsg->cm_format_type = FMT_RFC822;
+ imsg->cm_fields['A'] = strdoop("Citadel");
+ imsg->cm_fields['M'] = instr;
+
+ /* Save delivery instructions in spoolout room */
+ CtdlSubmitMsg(imsg, NULL, SMTP_SPOOLOUT_ROOM);
+ CtdlFreeMessage(imsg);
+}
/*
char instr[SIZ];
FILE *fp;
struct SpoolControl sc;
- /* struct namelist *digestrecps = NULL; */
struct namelist *nptr;
+ size_t miscsize = 0;
+ size_t linesize = 0;
+ int skipthisline = 0;
+ int i;
lprintf(7, "Spooling <%s>\n", room_to_spool);
if (getroom(&CC->quickroom, room_to_spool) != 0) {
memset(&sc, 0, sizeof(struct SpoolControl));
assoc_file_name(filename, sizeof filename, &CC->quickroom, "netconfigs");
+ begin_critical_section(S_NETCONFIGS);
+ end_critical_section(S_NETCONFIGS);
+
fp = fopen(filename, "r");
if (fp == NULL) {
lprintf(7, "Outbound batch processing skipped for <%s>\n",
CC->quickroom.QRname);
+ end_critical_section(S_NETCONFIGS);
return;
}
extract(nptr->name, buf, 1);
sc.listrecps = nptr;
}
+ else if (!strcasecmp(instr, "digestrecp")) {
+ nptr = (struct namelist *)
+ mallok(sizeof(struct namelist));
+ nptr->next = sc.digestrecps;
+ extract(nptr->name, buf, 1);
+ sc.digestrecps = nptr;
+ }
else if (!strcasecmp(instr, "ignet_push_share")) {
nptr = (struct namelist *)
mallok(sizeof(struct namelist));
extract(nptr->name, buf, 1);
sc.ignet_push_shares = nptr;
}
+ else {
+ /* Preserve 'other' lines ... *unless* they happen to
+ * be subscribe/unsubscribe pendings with expired
+ * timestamps.
+ */
+ skipthisline = 0;
+ if (!strncasecmp(buf, "subpending|", 11)) {
+ if (time(NULL) - extract_long(buf, 4) > EXP) {
+ skipthisline = 1;
+ }
+ }
+ if (!strncasecmp(buf, "unsubpending|", 13)) {
+ if (time(NULL) - extract_long(buf, 3) > EXP) {
+ skipthisline = 1;
+ }
+ }
+
+ if (skipthisline == 0) {
+ linesize = strlen(buf);
+ sc.misc = realloc(sc.misc,
+ (miscsize + linesize + 2) );
+ sprintf(&sc.misc[miscsize], "%s\n", buf);
+ miscsize = miscsize + linesize + 1;
+ }
+ }
}
fclose(fp);
+ /* If there are digest recipients, we have to build a digest */
+ if (sc.digestrecps != NULL) {
+ sc.digestfp = tmpfile();
+ fprintf(sc.digestfp, "Content-type: text/plain\n\n");
+ }
/* Do something useful */
CtdlForEachMessage(MSGS_GT, sc.lastsent, NULL, NULL,
network_spool_msg, &sc);
+ /* If we wrote a digest, deliver it and then close it */
+ snprintf(buf, sizeof buf, "room_%s@%s",
+ CC->quickroom.QRname, config.c_fqdn);
+ for (i=0; i<strlen(buf); ++i) {
+ buf[i] = tolower(buf[i]);
+ if (isspace(buf[i])) buf[i] = '_';
+ }
+ if (sc.digestfp != NULL) {
+ fprintf(sc.digestfp, " -----------------------------------"
+ "------------------------------------"
+ "-------\n"
+ "You are subscribed to the '%s' "
+ "list.\n"
+ "To post to the list: %s\n",
+ CC->quickroom.QRname, buf
+ );
+ network_deliver_digest(&sc); /* deliver and close */
+ }
/* Now rewrite the config file */
fp = fopen(filename, "w");
phree(sc.listrecps);
sc.listrecps = nptr;
}
+ /* Do the same for digestrecps */
+ while (sc.digestrecps != NULL) {
+ fprintf(fp, "digestrecp|%s\n", sc.digestrecps->name);
+ nptr = sc.digestrecps->next;
+ phree(sc.digestrecps);
+ sc.digestrecps = nptr;
+ }
while (sc.ignet_push_shares != NULL) {
fprintf(fp, "ignet_push_share|%s\n",
sc.ignet_push_shares->name);
phree(sc.ignet_push_shares);
sc.ignet_push_shares = nptr;
}
+ if (sc.misc != NULL) {
+ fwrite(sc.misc, strlen(sc.misc), 1, fp);
+ }
+ phree(sc.misc);
fclose(fp);
}
+ end_critical_section(S_NETCONFIGS);
lprintf(5, "Outbound batch processing finished for <%s>\n",
CC->quickroom.QRname);
valid = NULL;
}
if ( (valid == NULL) || (!strcasecmp(recipient, bouncesource)) ) {
- strcpy(force_room, AIDEROOM);
+ strcpy(force_room, config.c_aideroom);
}
else {
strcpy(force_room, "");
}
if ( (valid == NULL) && (strlen(force_room) == 0) ) {
- strcpy(force_room, AIDEROOM);
+ strcpy(force_room, config.c_aideroom);
}
CtdlSubmitMsg(msg, valid, force_room);
/*
* Module entry point
*/
-char *Dynamic_Module_Init(void)
+char *serv_network_init(void)
{
CtdlRegisterProtoHook(cmd_gnet, "GNET", "Get network config");
CtdlRegisterProtoHook(cmd_snet, "SNET", "Set network config");
projects / citadel.git / blobdiff