#include "serv_network.h"
#include "clientsocket.h"
#include "file_ops.h"
+#include "citadel_dirs.h"
#ifndef HAVE_SNPRINTF
#include "snprintf.h"
FILE *fp;
if (CtdlAccessCheck(ac_room_aide)) return;
- assoc_file_name(filename, sizeof filename, &CC->room, "netconfigs");
+ assoc_file_name(filename, sizeof filename, &CC->room, ctdl_netcfg_dir);
cprintf("%d Network settings for room #%ld <%s>\n",
LISTING_FOLLOWS,
CC->room.QRnumber, CC->room.QRname);
unbuffer_output();
if (CtdlAccessCheck(ac_room_aide)) return;
- safestrncpy(tempfilename, tmpnam(NULL), sizeof tempfilename);
- assoc_file_name(filename, sizeof filename, &CC->room, "netconfigs");
+ CtdlMakeTempFileName(tempfilename, sizeof tempfilename);
+ assoc_file_name(filename, sizeof filename, &CC->room, ctdl_netcfg_dir);
fp = fopen(tempfilename, "w");
if (fp == NULL) {
}
+/*
+ * 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 = malloc(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'] = strdup(buf);
+ msg->cm_fields['A'] = strdup(CC->room.QRname);
+ snprintf(buf, sizeof buf, "[%s]", CC->room.QRname);
+ msg->cm_fields['U'] = strdup(buf);
+ sprintf(buf, "room_%s@%s", CC->room.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'] = strdup(buf);
+ msg->cm_fields['R'] = strdup(buf);
+
+ /*
+ * Go fetch the contents of the digest
+ */
+ fseek(sc->digestfp, 0L, SEEK_END);
+ msglen = ftell(sc->digestfp);
+
+ msg->cm_fields['M'] = malloc(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) + 2;
+ }
+
+ /*
+ * allocate...
+ */
+ lprintf(CTDL_DEBUG, "Generating delivery instructions\n");
+ instr = malloc(instr_len);
+ if (instr == NULL) {
+ lprintf(CTDL_EMERG, "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 = malloc(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'] = strdup("Citadel");
+ imsg->cm_fields['M'] = instr;
+
+ /* Save delivery instructions in spoolout room */
+ CtdlSubmitMsg(imsg, NULL, SMTP_SPOOLOUT_ROOM);
+ CtdlFreeMessage(imsg);
+}
+
+
+/*
+ * Deliver list messages to everyone on the list ... efficiently
+ */
+void network_deliver_list(struct CtdlMessage *msg, struct SpoolControl *sc) {
+ long msgnum;
+ char *instr = NULL;
+ size_t instr_len = SIZ;
+ struct CtdlMessage *imsg;
+ struct namelist *nptr;
+
+ /* Don't do this if there were no recipients! */
+ if (sc->listrecps == NULL) return;
+
+ /* Save the message to disk... */
+ msgnum = CtdlSubmitMsg(msg, NULL, SMTP_SPOOLOUT_ROOM);
+
+ /* Now generate the delivery instructions */
+
+ /*
+ * Figure out how big a buffer we need to allocate
+ */
+ for (nptr = sc->listrecps; nptr != NULL; nptr = nptr->next) {
+ instr_len = instr_len + strlen(nptr->name) + 2;
+ }
+
+ /*
+ * allocate...
+ */
+ lprintf(CTDL_DEBUG, "Generating delivery instructions\n");
+ instr = malloc(instr_len);
+ if (instr == NULL) {
+ lprintf(CTDL_EMERG, "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->listrecps; 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 = malloc(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'] = strdup("Citadel");
+ imsg->cm_fields['M'] = instr;
+
+ /* Save delivery instructions in spoolout room */
+ CtdlSubmitMsg(imsg, NULL, SMTP_SPOOLOUT_ROOM);
+ CtdlFreeMessage(imsg);
+}
+
+
+
+
/*
* Spools out one message from the list.
*/
instr_len = SIZ;
if (sc->listrecps != NULL) {
/* Fetch the message. We're going to need to modify it
- * for each recipient in order to satisfy foreign mailers, etc.
+ * in order to insert the [list name] in it, etc.
*/
msg = CtdlFetchMessage(msgnum, 1);
if (msg != NULL) {
free(msg->cm_fields['U']);
msg->cm_fields['U'] = strdup(buf);
- /* For each recipient... */
- for (nptr = sc->listrecps; nptr != NULL; nptr = nptr->next) {
-
- if (msg->cm_fields['R'] == NULL) {
- free(msg->cm_fields['R']);
+ /* Set the recipient of the list message to the
+ * email address of the room itself.
+ * FIXME ... I want to be able to pick any address
+ */
+ if (msg->cm_fields['R'] != NULL) {
+ free(msg->cm_fields['R']);
+ }
+ msg->cm_fields['R'] = malloc(256);
+ snprintf(msg->cm_fields['R'], 256,
+ "room_%s@%s", CC->room.QRname,
+ config.c_fqdn);
+ for (i=0; i<strlen(msg->cm_fields['R']); ++i) {
+ if (isspace(msg->cm_fields['R'][i])) {
+ msg->cm_fields['R'][i] = '_';
}
- msg->cm_fields['R'] = strdup(nptr->name);
-
- valid = validate_recipients(nptr->name);
- CtdlSubmitMsg(msg, valid, "");
- free(valid);
-
}
+
+ /* Handle delivery */
+ network_deliver_list(msg, sc);
CtdlFreeMessage(msg);
}
}
CC->redirect_alloc = SIZ;
safestrncpy(CC->preferred_formats, "text/plain", sizeof CC->preferred_formats);
- CtdlOutputPreLoadedMsg(msg, 0L, MT_CITADEL, HEADERS_NONE, 0, 0);
+ CtdlOutputPreLoadedMsg(msg, MT_CITADEL, HEADERS_NONE, 0, 0);
striplt(CC->redirect_buffer);
fprintf(sc->digestfp, "\n%s\n", CC->redirect_buffer);
serialize_message(&sermsg, msg);
/* write it to the spool file */
- snprintf(filename, sizeof filename,
-#ifndef HAVE_SPOOL_DIR
- "."
-#else
- SPOOL_DIR
-#endif /* HAVE_SPOOL_DIR */
- "/network/spoolout/%s",
+ snprintf(filename, sizeof filename,"%s/%s",
+ ctdl_netout_dir,
mptr->remote_nodename);
lprintf(CTDL_DEBUG, "Appending to %s\n", filename);
fp = fopen(filename, "ab");
}
-/*
- * 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 = malloc(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'] = strdup(buf);
- msg->cm_fields['A'] = strdup(CC->room.QRname);
- snprintf(buf, sizeof buf, "[%s]", CC->room.QRname);
- msg->cm_fields['U'] = strdup(buf);
- sprintf(buf, "room_%s@%s", CC->room.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'] = strdup(buf);
-
- fseek(sc->digestfp, 0L, SEEK_END);
- msglen = ftell(sc->digestfp);
-
- msg->cm_fields['M'] = malloc(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(CTDL_DEBUG, "Generating delivery instructions\n");
- instr = malloc(instr_len);
- if (instr == NULL) {
- lprintf(CTDL_EMERG, "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 = malloc(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'] = strdup("Citadel");
- imsg->cm_fields['M'] = instr;
-
- /* Save delivery instructions in spoolout room */
- CtdlSubmitMsg(imsg, NULL, SMTP_SPOOLOUT_ROOM);
- CtdlFreeMessage(imsg);
-}
-
-
/*
* Batch up and send all outbound traffic from the current room
*/
}
memset(&sc, 0, sizeof(struct SpoolControl));
- assoc_file_name(filename, sizeof filename, &CC->room, "netconfigs");
+ assoc_file_name(filename, sizeof filename, &CC->room, ctdl_netcfg_dir);
begin_critical_section(S_NETCONFIGS);
FILE *fp;
/* Grab the configuration line we're looking for */
- assoc_file_name(filename, sizeof filename, &CC->room, "netconfigs");
+ assoc_file_name(filename, sizeof filename, &CC->room, ctdl_netcfg_dir);
begin_critical_section(S_NETCONFIGS);
fp = fopen(filename, "r");
if (fp == NULL) {
if (strlen(nexthop) == 0) {
strcpy(nexthop, msg->cm_fields['D']);
}
- snprintf(filename, sizeof filename,
-#ifndef HAVE_SPOOL_DIR
- "."
-#else
- SPOOL_DIR
-#endif /* HAVE_SPOOL_DIR */
- "/network/spoolout/%s", nexthop);
+ snprintf(filename,
+ sizeof filename,
+ "%s/%s",
+ ctdl_netout_dir,
+ nexthop);
lprintf(CTDL_DEBUG, "Appending to %s\n", filename);
fp = fopen(filename, "ab");
if (fp != NULL) {
struct stat statbuf;
char filename[256];
static time_t last_spoolin_mtime = 0L;
- const char *spoolin_dirname =
-#ifndef HAVE_SPOOL_DIR
- "."
-#else
- SPOOL_DIR
-#endif /* HAVE_SPOOL_DIR */
- "/network/spoolin";
/*
* Check the spoolin directory's modification time. If it hasn't
* been touched, we don't need to scan it.
*/
- if (stat(spoolin_dirname, &statbuf)) return;
+ if (stat(ctdl_netin_dir, &statbuf)) return;
if (statbuf.st_mtime == last_spoolin_mtime) {
lprintf(CTDL_DEBUG, "network: nothing in inbound queue\n");
return;
/*
* Ok, there's something interesting in there, so scan it.
*/
- dp = opendir(spoolin_dirname);
+ dp = opendir(ctdl_netin_dir);
if (dp == NULL) return;
while (d = readdir(dp), d != NULL) {
if ((strcmp(d->d_name, ".")) && (strcmp(d->d_name, ".."))) {
- snprintf(filename, sizeof filename,
-#ifndef HAVE_SPOOL_DIR
- "."
-#else
- SPOOL_DIR
-#endif /* HAVE_SPOOL_DIR */
- "/network/spoolin/%s", d->d_name);
+ snprintf(filename,
+ sizeof filename,
+ "%s/%s",
+ ctdl_netin_dir,
+ d->d_name);
network_process_file(filename);
}
}
char nexthop[256];
int i;
- dp = opendir(
-#ifndef HAVE_SPOOL_DIR
- "."
-#else
- SPOOL_DIR
-#endif /* HAVE_SPOOL_DIR */
- "/network/spoolout");
+ dp = opendir(ctdl_netout_dir);
if (dp == NULL) return;
while (d = readdir(dp), d != NULL) {
if (!strcmp(d->d_name, ".") || !strcmp(d->d_name, ".."))
continue;
- snprintf(filename, sizeof filename,
-#ifndef HAVE_SPOOL_DIR
- "."
-#else
- SPOOL_DIR
-#endif /* HAVE_SPOOL_DIR */
- "/network/spoolout/%s", d->d_name);
+ snprintf(filename,
+ sizeof filename,
+ "%s/%s",
+ ctdl_netout_dir,
+ d->d_name);
strcpy(nexthop, "");
i = is_valid_node(nexthop, NULL, d->d_name);
long plen;
FILE *fp;
- strcpy(tempfilename, tmpnam(NULL));
+ CtdlMakeTempFileName(tempfilename, sizeof tempfilename);
if (sock_puts(sock, "NDOP") < 0) return;
if (sock_gets(sock, buf) < 0) return;
lprintf(CTDL_DEBUG, "<%s\n", buf);
download_len, remote_nodename);
lprintf(CTDL_DEBUG, "%s", buf);
/* TODO: make move inline. forking is verry expensive. */
- snprintf(buf, sizeof buf, "mv %s "
-#ifndef HAVE_SPOOL_DIR
- "."
-#else
- SPOOL_DIR
-#endif /* HAVE_SPOOL_DIR */
- "/network/spoolin/%s.%ld",
- tempfilename, remote_nodename, (long) getpid());
+ snprintf(buf,
+ sizeof buf,
+ "mv %s %s/%s.%ld",
+ tempfilename,
+ ctdl_netin_dir,
+ remote_nodename,
+ (long) getpid());
system(buf);
}
}
snprintf(sfname, sizeof sfname,
-#ifndef HAVE_SPOOL_DIR
- "."
-#else
- SPOOL_DIR
-#endif /* HAVE_SPOOL_DIR */
- "/network/spoolout/%s", remote_nodename);
+ "%s/%s",
+ ctdl_netout_dir,
+ remote_nodename);
fd = open(sfname, O_RDONLY);
if (fd < 0) {
if (errno != ENOENT) {
&& (strlen(host) > 0) && strlen(port) > 0) {
poll = full_poll;
if (poll == 0) {
- snprintf(spoolfile, sizeof spoolfile,
-#ifndef HAVE_SPOOL_DIR
- "."
-#else
- SPOOL_DIR
-#endif
- "/network/spoolout/%s", node);
+ snprintf(spoolfile,
+ sizeof spoolfile,
+ "%s/%s",
+ ctdl_netout_dir,
+ node);
if (access(spoolfile, R_OK) == 0) {
poll = 1;
}
* It's ok if these directories already exist. Just fail silently.
*/
void create_spool_dirs(void) {
-#ifndef HAVE_SPOOL_DIR
- mkdir("./network", 0700);
- chown("./network", CTDLUID, (-1));
- mkdir("./network/spoolin", 0700);
- chown("./network/spoolin", CTDLUID, (-1));
- mkdir("./network/spoolout", 0700);
- chown("./network/spoolout", CTDLUID, (-1));
-#else
- mkdir(SPOOL_DIR "/network", 0700);
- chown(SPOOL_DIR "./network", CTDLUID, (-1));
- mkdir(SPOOL_DIR "/network/spoolin", 0700);
- chown(SPOOL_DIR "./network/spoolin", CTDLUID, (-1));
- mkdir(SPOOL_DIR "/network/spoolout", 0700);
- chown(SPOOL_DIR "./network/spoolout", CTDLUID, (-1));
-#endif /* HAVE_SPOOL_DIR */
+ mkdir(ctdl_spool_dir, 0700);
+ chown(ctdl_spool_dir, CTDLUID, (-1));
+ mkdir(ctdl_netin_dir, 0700);
+ chown(ctdl_netin_dir, CTDLUID, (-1));
+ mkdir(ctdl_netout_dir, 0700);
+ chown(ctdl_netout_dir, CTDLUID, (-1));
}
projects / citadel.git / blobdiff