#include <signal.h>
#include <pwd.h>
#include <errno.h>
+#include <sys/stat.h>
#include <sys/types.h>
#include <dirent.h>
#if TIME_WITH_SYS_TIME
* We build a map of network nodes during processing.
*/
struct NetMap *the_netmap = NULL;
+int netmap_changed = 0;
char *working_ignetcfg = NULL;
/*
}
free(serialized_map);
+ netmap_changed = 0;
}
char *serialized_map = NULL;
struct NetMap *nmptr;
- serialized_map = strdup("");
- if (the_netmap != NULL) {
- for (nmptr = the_netmap; nmptr != NULL; nmptr = nmptr->next) {
- serialized_map = realloc(serialized_map,
- (strlen(serialized_map)+SIZ) );
- if (strlen(nmptr->nodename) > 0) {
- snprintf(&serialized_map[strlen(serialized_map)],
- SIZ,
- "%s|%ld|%s\n",
- nmptr->nodename,
- (long)nmptr->lastcontact,
- nmptr->nexthop);
+ if (netmap_changed) {
+ serialized_map = strdup("");
+
+ if (the_netmap != NULL) {
+ for (nmptr = the_netmap; nmptr != NULL; nmptr = nmptr->next) {
+ serialized_map = realloc(serialized_map,
+ (strlen(serialized_map)+SIZ) );
+ if (strlen(nmptr->nodename) > 0) {
+ snprintf(&serialized_map[strlen(serialized_map)],
+ SIZ,
+ "%s|%ld|%s\n",
+ nmptr->nodename,
+ (long)nmptr->lastcontact,
+ nmptr->nexthop);
+ }
}
}
- }
- CtdlPutSysConfig(IGNETMAP, serialized_map);
- free(serialized_map);
+ CtdlPutSysConfig(IGNETMAP, serialized_map);
+ free(serialized_map);
+ }
/* Now free the list */
while (the_netmap != NULL) {
free(the_netmap);
the_netmap = nmptr;
}
+ netmap_changed = 0;
}
*/
void network_spool_msg(long msgnum, void *userdata) {
struct SpoolControl *sc;
- int err;
int i;
char *newpath = NULL;
- char *instr = NULL;
size_t instr_len = SIZ;
struct CtdlMessage *msg = NULL;
- struct CtdlMessage *imsg;
struct namelist *nptr;
struct maplist *mptr;
struct ser_ret sermsg;
int bang = 0;
int send = 1;
int delete_after_send = 0; /* Set to 1 to delete after spooling */
- long list_msgnum = 0L;
int ok_to_participate = 0;
+ struct recptypes *valid;
sc = (struct SpoolControl *)userdata;
*/
instr_len = SIZ;
if (sc->listrecps != NULL) {
-
- /* First, copy it to the spoolout room */
- err = CtdlSaveMsgPointerInRoom(SMTP_SPOOLOUT_ROOM, msgnum, 0);
- if (err != 0) return;
-
- /*
- * 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);
- }
-
- /*
- * 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);
+ /* Fetch the message. We're going to need to modify it
+ * for each recipient in order to satisfy foreign mailers, etc.
+ */
+ msg = CtdlFetchMessage(msgnum, 1);
+ if (msg != NULL) {
+
+ /* Prepend "[List name]" to the subject */
+ if (msg->cm_fields['U'] == NULL) {
+ msg->cm_fields['U'] = strdup("(no subject)");
+ }
+ snprintf(buf, sizeof buf, "[%s] %s", CC->room.QRname, msg->cm_fields['U']);
+ 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']);
+ }
+ msg->cm_fields['R'] = strdup(nptr->name);
+
+ valid = validate_recipients(nptr->name);
+ CtdlSubmitMsg(msg, valid, NULL, NULL, "");
+ free(valid);
+
+ }
+ CtdlFreeMessage(msg);
}
-
- /*
- * 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);
}
/*
* Process digest recipients
*/
if ((sc->digestrecps != NULL) && (sc->digestfp != NULL)) {
- fprintf(sc->digestfp, " -----------------------------------"
- "------------------------------------"
- "-------\n");
- CtdlRedirectOutput(sc->digestfp);
- CtdlOutputMsg(msgnum, MT_RFC822, HEADERS_ALL, 0, 0);
- CtdlRedirectOutput(NULL);
- sc->num_msgs_spooled += 1;
+ msg = CtdlFetchMessage(msgnum, 1);
+ if (msg != NULL) {
+ fprintf(sc->digestfp, " -----------------------------------"
+ "------------------------------------"
+ "-------\n");
+ fprintf(sc->digestfp, "From: ");
+ if (msg->cm_fields['A'] != NULL) {
+ fprintf(sc->digestfp, "%s ", msg->cm_fields['A']);
+ }
+ if (msg->cm_fields['F'] != NULL) {
+ fprintf(sc->digestfp, "<%s> ", msg->cm_fields['F']);
+ }
+ else if (msg->cm_fields['N'] != NULL) {
+ fprintf(sc->digestfp, "@%s ", msg->cm_fields['N']);
+ }
+ fprintf(sc->digestfp, "\n");
+ if (msg->cm_fields['U'] != NULL) {
+ fprintf(sc->digestfp, "Subject: %s\n", msg->cm_fields['U']);
+ }
+
+ CC->redirect_buffer = malloc(SIZ);
+ CC->redirect_len = 0;
+ CC->redirect_alloc = SIZ;
+
+ safestrncpy(CC->preferred_formats, "text/plain", sizeof CC->preferred_formats);
+ CtdlOutputPreLoadedMsg(msg, 0L, MT_CITADEL, HEADERS_NONE, 0, 0);
+
+ striplt(CC->redirect_buffer);
+ fprintf(sc->digestfp, "\n%s\n", CC->redirect_buffer);
+
+ free(CC->redirect_buffer);
+ CC->redirect_buffer = NULL;
+ CC->redirect_len = 0;
+ CC->redirect_alloc = 0;
+
+ sc->num_msgs_spooled += 1;
+ free(msg);
+ }
}
/*
}
}
- /* Now save it and generate delivery instructions */
- list_msgnum = CtdlSubmitMsg(msg, NULL, SMTP_SPOOLOUT_ROOM);
-
/*
* Figure out how big a buffer we need to allocate
*/
for (nptr = sc->participates; nptr != NULL; nptr = nptr->next) {
- instr_len = instr_len + strlen(nptr->name);
- }
-
- /*
- * allocate...
- */
- 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, list_msgnum, (long)time(NULL), config.c_fqdn );
-
- /* Generate delivery instructions for each recipient */
- for (nptr = sc->participates; nptr != NULL; nptr = nptr->next) {
- size_t tmp = strlen(instr);
- snprintf(&instr[tmp], instr_len - tmp,
- "remote|%s|0||\n", nptr->name);
+
+ if (msg->cm_fields['R'] == NULL) {
+ free(msg->cm_fields['R']);
+ }
+ msg->cm_fields['R'] = strdup(nptr->name);
+
+ valid = validate_recipients(nptr->name);
+ CtdlSubmitMsg(msg, valid, NULL, NULL, "");
+ free(valid);
}
- /*
- * 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);
}
CtdlFreeMessage(msg);
}
/* write it to the spool file */
snprintf(filename, sizeof filename,
- "./network/spoolout/%s",
- mptr->remote_nodename);
+#ifndef HAVE_SPOOL_DIR
+ "."
+#else
+ SPOOL_DIR
+#endif /* HAVE_SPOOL_DIR */
+ "/network/spoolout/%s",
+ mptr->remote_nodename);
+ lprintf(CTDL_DEBUG, "Appending to %s\n", filename);
fp = fopen(filename, "ab");
if (fp != NULL) {
fwrite(sermsg.ser,
sermsg.len, 1, fp);
fclose(fp);
}
+ else {
+ lprintf(CTDL_ERR, "%s: %s\n", filename, strerror(errno));
+ }
/* free the serialized version */
free(sermsg.ser);
/* Delete this message if delete-after-send is set */
if (delete_after_send) {
- CtdlDeleteMessages(CC->room.QRname, msgnum, "");
+ CtdlDeleteMessages(CC->room.QRname, msgnum, "", 0);
}
}
sprintf(buf, "%ld", time(NULL));
msg->cm_fields['T'] = strdup(buf);
msg->cm_fields['A'] = strdup(CC->room.QRname);
- msg->cm_fields['U'] = 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]='_';
fclose(sc->digestfp);
sc->digestfp = NULL;
- msgnum = CtdlSubmitMsg(msg, NULL, SMTP_SPOOLOUT_ROOM);
+ msgnum = CtdlSubmitMsg(msg, NULL, NULL, NULL, SMTP_SPOOLOUT_ROOM);
CtdlFreeMessage(msg);
/* Now generate the delivery instructions */
imsg->cm_fields['M'] = instr;
/* Save delivery instructions in spoolout room */
- CtdlSubmitMsg(imsg, NULL, SMTP_SPOOLOUT_ROOM);
+ CtdlSubmitMsg(imsg, NULL, NULL, NULL, SMTP_SPOOLOUT_ROOM);
CtdlFreeMessage(imsg);
}
if (!strcasecmp(nmptr->nodename, node)) {
extract_token(nmptr->nexthop, path, 0, '!', sizeof nmptr->nexthop);
nmptr->lastcontact = time(NULL);
+ ++netmap_changed;
return;
}
}
extract_token(nmptr->nexthop, path, 0, '!', sizeof nmptr->nexthop);
nmptr->next = the_netmap;
the_netmap = nmptr;
+ ++netmap_changed;
}
free(msg->cm_fields['N']);
}
+ if (msg->cm_fields['U'] == NULL) {
+ free(msg->cm_fields['U']);
+ }
+
msg->cm_fields['A'] = strdup(BOUNCESOURCE);
msg->cm_fields['N'] = strdup(config.c_nodename);
-
+ msg->cm_fields['U'] = strdup("Delivery Status Notification (Failure)");
/* prepend our node to the path */
if (msg->cm_fields['P'] != NULL) {
if ( (valid == NULL) && (strlen(force_room) == 0) ) {
strcpy(force_room, config.c_aideroom);
}
- CtdlSubmitMsg(msg, valid, force_room);
+ CtdlSubmitMsg(msg, valid, NULL, NULL, force_room);
/* Clean up */
if (valid != NULL) free(valid);
strcpy(target_room, TWITROOM);
/* Load the message into memory */
- msg = (struct CtdlMessage *) malloc(sizeof(struct CtdlMessage));
- memset(msg, 0, sizeof(struct CtdlMessage));
- msg->cm_magic = CTDLMESSAGE_MAGIC;
- msg->cm_anon_type = buffer[1];
- msg->cm_format_type = buffer[2];
+ msg = (struct CtdlMessage *) malloc(sizeof(struct CtdlMessage));
+ memset(msg, 0, sizeof(struct CtdlMessage));
+ msg->cm_magic = CTDLMESSAGE_MAGIC;
+ msg->cm_anon_type = buffer[1];
+ msg->cm_format_type = buffer[2];
for (pos = 3; pos < size; ++pos) {
field = buffer[pos];
strcpy(nexthop, msg->cm_fields['D']);
}
snprintf(filename, sizeof filename,
- "./network/spoolout/%s", nexthop);
+#ifndef HAVE_SPOOL_DIR
+ "."
+#else
+ SPOOL_DIR
+#endif /* HAVE_SPOOL_DIR */
+ "/network/spoolout/%s", nexthop);
+ lprintf(CTDL_DEBUG, "Appending to %s\n", filename);
fp = fopen(filename, "ab");
if (fp != NULL) {
fwrite(sermsg.ser,
sermsg.len, 1, fp);
fclose(fp);
}
+ else {
+ lprintf(CTDL_ERR, "%s: %s\n", filename, strerror(errno));
+ }
free(sermsg.ser);
CtdlFreeMessage(msg);
return;
msg = NULL;
free(recp);
return;
- }
+ }
strcpy(target_room, ""); /* no target room if mail */
}
/* save the message into a room */
if (PerformNetprocHooks(msg, target_room) == 0) {
msg->cm_flags = CM_SKIP_HOOKS;
- CtdlSubmitMsg(msg, recp, target_room);
+ CtdlSubmitMsg(msg, recp, NULL, NULL, target_room);
}
CtdlFreeMessage(msg);
free(recp);
void network_do_spoolin(void) {
DIR *dp;
struct dirent *d;
- char filename[SIZ];
+ char filename[256];
- dp = opendir("./network/spoolin");
+ dp = opendir(
+#ifndef HAVE_SPOOL_DIR
+ "."
+#else
+ SPOOL_DIR
+#endif /* HAVE_SPOOL_DIR */
+ "/network/spoolin");
if (dp == NULL) return;
while (d = readdir(dp), d != NULL) {
- snprintf(filename, sizeof filename,
- "./network/spoolin/%s", d->d_name);
- network_process_file(filename);
+ 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);
+ network_process_file(filename);
+ }
}
-
closedir(dp);
}
-
/*
* Delete any files in the outbound queue that were intended
* to be sent to nodes which no longer exist.
void network_purge_spoolout(void) {
DIR *dp;
struct dirent *d;
- char filename[SIZ];
- char nexthop[SIZ];
+ char filename[256];
+ char nexthop[256];
int i;
- dp = opendir("./network/spoolout");
+ dp = opendir(
+#ifndef HAVE_SPOOL_DIR
+ "."
+#else
+ SPOOL_DIR
+#endif /* HAVE_SPOOL_DIR */
+ "/network/spoolout");
if (dp == NULL) return;
while (d = readdir(dp), d != NULL) {
if (!strcmp(d->d_name, ".") || !strcmp(d->d_name, ".."))
continue;
snprintf(filename, sizeof filename,
- "./network/spoolout/%s", d->d_name);
+#ifndef HAVE_SPOOL_DIR
+ "."
+#else
+ SPOOL_DIR
+#endif /* HAVE_SPOOL_DIR */
+ "/network/spoolout/%s", d->d_name);
strcpy(nexthop, "");
i = is_valid_node(nexthop, NULL, d->d_name);
}
-
/*
* receive network spool from the remote system
*/
lprintf(CTDL_NOTICE, "Received %ld octets from <%s>",
download_len, remote_nodename);
lprintf(CTDL_DEBUG, "%s", buf);
- snprintf(buf, sizeof buf, "mv %s ./network/spoolin/%s.%ld",
- tempfilename, remote_nodename, (long) getpid());
+ /* 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());
system(buf);
}
return;
}
- snprintf(sfname, sizeof sfname, "./network/spoolout/%s", remote_nodename);
+ snprintf(sfname, sizeof sfname,
+#ifndef HAVE_SPOOL_DIR
+ "."
+#else
+ SPOOL_DIR
+#endif /* HAVE_SPOOL_DIR */
+ "/network/spoolout/%s", remote_nodename);
fd = open(sfname, O_RDONLY);
if (fd < 0) {
if (errno != ENOENT) {
close(fd);
if (sock_puts(sock, "UCLS 1") < 0) return;
if (sock_gets(sock, buf) < 0) return;
- lprintf(CTDL_NOTICE, "Sent %ld octets to <%s>",
+ lprintf(CTDL_NOTICE, "Sent %ld octets to <%s>\n",
bytes_written, remote_nodename);
lprintf(CTDL_DEBUG, "<%s\n", buf);
if (buf[0] == '2') {
+ lprintf(CTDL_DEBUG, "Removing <%s>\n", sfname);
unlink(sfname);
}
}
poll = full_poll;
if (poll == 0) {
snprintf(spoolfile, sizeof spoolfile,
- "./network/spoolout/%s", node);
+#ifndef HAVE_SPOOL_DIR
+ "."
+#else
+ SPOOL_DIR
+#endif
+ "/network/spoolout/%s", 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);
+ mkdir("./network/systems", 0700);
+ mkdir("./network/spoolin", 0700);
+ mkdir("./network/spoolout", 0700);
+#else
+ mkdir(SPOOL_DIR "/network", 0700);
+ mkdir(SPOOL_DIR "/network/systems", 0700);
+ mkdir(SPOOL_DIR "/network/spoolin", 0700);
+ mkdir(SPOOL_DIR "/network/spoolout", 0700);
+#endif /* HAVE_SPOOL_DIR */
+}
+
+
full_processing = 0;
}
+ create_spool_dirs();
+
/*
* This is a simple concurrency check to make sure only one queue run
* is done at a time. We could do this with a mutex, but since we
/*
* cmd_netp() - authenticate to the server as another Citadel node polling
- * for network traffic
+ * for network traffic
*/
void cmd_netp(char *cmdbuf)
{
v = is_valid_node(nexthop, secret, node);
if (v != 0) {
- lprintf(CTDL_WARNING, "Unknown node <%s>", node);
+ lprintf(CTDL_WARNING, "Unknown node <%s>\n", node);
cprintf("%d authentication failed\n",
ERROR + PASSWORD_REQUIRED);
return;
CC->net_node);
}
-
-
/*
* Module entry point
*/
char *serv_network_init(void)
{
+ create_spool_dirs();
CtdlRegisterProtoHook(cmd_gnet, "GNET", "Get network config");
CtdlRegisterProtoHook(cmd_snet, "SNET", "Set network config");
CtdlRegisterProtoHook(cmd_netp, "NETP", "Identify as network poller");
projects / citadel.git / blobdiff