* This module handles shared rooms, inter-Citadel mail, and outbound
* mailing list processing.
*
- * Copyright (c) 2000-2010 by the citadel.org team
+ * Copyright (c) 2000-2012 by the citadel.org team
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
+ * This program is open source software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 3.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- *
* ** 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
# include <time.h>
# endif
#endif
+#ifdef HAVE_SYSCALL_H
+# include <syscall.h>
+#else
+# if HAVE_SYS_SYSCALL_H
+# include <sys/syscall.h>
+# endif
+#endif
#include <sys/wait.h>
#include <string.h>
#include "internet_addressing.h"
#include "serv_network.h"
#include "clientsocket.h"
-#include "file_ops.h"
#include "citadel_dirs.h"
#include "threads.h"
-
-#ifndef HAVE_SNPRINTF
-#include "snprintf.h"
-#endif
-
#include "context.h"
-
#include "ctdl_module.h"
+#include "netspool.h"
+#include "netmail.h"
+int NetQDebugEnabled = 0;
+struct CitContext networker_spool_CC;
+/* comes from lookup3.c from libcitadel... */
+extern uint32_t hashlittle( const void *key, size_t length, uint32_t initval);
-/* Nonzero while we are doing network processing */
-static int doing_queue = 0;
-
+typedef struct __roomlists {
+ RoomProcList *rplist;
+}roomlists;
/*
* When we do network processing, it's accomplished in two passes; one to
* gather a list of rooms and one to actually do them. It's ok that rplist
*/
struct RoomProcList *rplist = NULL;
-/*
- * We build a map of network nodes during processing.
- */
-NetMap *the_netmap = NULL;
-int netmap_changed = 0;
-char *working_ignetcfg = NULL;
-
-/*
- * Load or refresh the Citadel network (IGnet) configuration for this node.
- */
-void load_working_ignetcfg(void) {
- char *cfg;
- char *oldcfg;
-
- cfg = CtdlGetSysConfig(IGNETCFG);
- if (cfg == NULL) {
- cfg = strdup("");
- }
-
- oldcfg = working_ignetcfg;
- working_ignetcfg = cfg;
- if (oldcfg != NULL) {
- free(oldcfg);
- }
-}
-
-
-
-
-
-/*
- * Keep track of what messages to reject
- */
-FilterList *load_filter_list(void) {
- char *serialized_list = NULL;
- int i;
- char buf[SIZ];
- FilterList *newlist = NULL;
- FilterList *nptr;
-
- serialized_list = CtdlGetSysConfig(FILTERLIST);
- if (serialized_list == NULL) return(NULL); /* if null, no entries */
-
- /* Use the string tokenizer to grab one line at a time */
- for (i=0; i<num_tokens(serialized_list, '\n'); ++i) {
- extract_token(buf, serialized_list, i, '\n', sizeof buf);
- nptr = (FilterList *) malloc(sizeof(FilterList));
- extract_token(nptr->fl_user, buf, 0, '|', sizeof nptr->fl_user);
- striplt(nptr->fl_user);
- extract_token(nptr->fl_room, buf, 1, '|', sizeof nptr->fl_room);
- striplt(nptr->fl_room);
- extract_token(nptr->fl_node, buf, 2, '|', sizeof nptr->fl_node);
- striplt(nptr->fl_node);
-
- /* Cowardly refuse to add an any/any/any entry that would
- * end up filtering every single message.
- */
- if (IsEmptyStr(nptr->fl_user) &&
- IsEmptyStr(nptr->fl_room) &&
- IsEmptyStr(nptr->fl_node)) {
- free(nptr);
- }
- else {
- nptr->next = newlist;
- newlist = nptr;
- }
- }
-
- free(serialized_list);
- return newlist;
-}
-
-
-void free_filter_list(FilterList *fl) {
- if (fl == NULL) return;
- free_filter_list(fl->next);
- free(fl);
-}
-
/*
* message from being entered into the database multiple times if it happens
* to arrive multiple times by accident.
*/
-int network_usetable(struct CtdlMessage *msg) {
-
- char msgid[SIZ];
- struct cdbdata *cdbut;
- struct UseTable ut;
+int network_usetable(struct CtdlMessage *msg)
+{
+ StrBuf *msgid;
+ struct CitContext *CCC = CC;
+ time_t now;
/* Bail out if we can't generate a message ID */
- if (msg == NULL) {
- return(0);
- }
- if (msg->cm_fields['I'] == NULL) {
- return(0);
- }
- if (IsEmptyStr(msg->cm_fields['I'])) {
+ if ((msg == NULL) || CM_IsEmpty(msg, emessageId))
+ {
return(0);
}
/* Generate the message ID */
- strcpy(msgid, msg->cm_fields['I']);
- if (haschar(msgid, '@') == 0) {
- strcat(msgid, "@");
- if (msg->cm_fields['N'] != NULL) {
- strcat(msgid, msg->cm_fields['N']);
+ msgid = NewStrBufPlain(CM_KEY(msg, emessageId));
+ if (haschar(ChrPtr(msgid), '@') == 0) {
+ StrBufAppendBufPlain(msgid, HKEY("@"), 0);
+ if (!CM_IsEmpty(msg, eNodeName)) {
+ StrBufAppendBufPlain(msgid, CM_KEY(msg, eNodeName), 0);
}
else {
+ FreeStrBuf(&msgid);
return(0);
}
}
-
- cdbut = cdb_fetch(CDB_USETABLE, msgid, strlen(msgid));
- if (cdbut != NULL) {
- cdb_free(cdbut);
- CtdlLogPrintf(CTDL_DEBUG, "network_usetable() : we already have %s\n", msgid);
+ now = time(NULL);
+ if (CheckIfAlreadySeen("Networker Import",
+ msgid,
+ now, 0,
+ eCheckUpdate,
+ CCC->cs_pid, 0) != 0)
+ {
+ FreeStrBuf(&msgid);
return(1);
}
+ FreeStrBuf(&msgid);
- /* If we got to this point, it's unique: add it. */
- strcpy(ut.ut_msgid, msgid);
- ut.ut_timestamp = time(NULL);
- cdb_store(CDB_USETABLE, msgid, strlen(msgid), &ut, sizeof(struct UseTable) );
return(0);
}
-/*
- * Read the network map from its configuration file into memory.
+
+/*
+ * Send the *entire* contents of the current room to one specific network node,
+ * ignoring anything we know about which messages have already undergone
+ * network processing. This can be used to bring a new node into sync.
*/
-void read_network_map(void) {
- char *serialized_map = NULL;
- int i;
- char buf[SIZ];
- NetMap *nmptr;
-
- serialized_map = CtdlGetSysConfig(IGNETMAP);
- if (serialized_map == NULL) return; /* if null, no entries */
-
- /* Use the string tokenizer to grab one line at a time */
- for (i=0; i<num_tokens(serialized_map, '\n'); ++i) {
- extract_token(buf, serialized_map, i, '\n', sizeof buf);
- nmptr = (NetMap *) malloc(sizeof(NetMap));
- extract_token(nmptr->nodename, buf, 0, '|', sizeof nmptr->nodename);
- nmptr->lastcontact = extract_long(buf, 1);
- extract_token(nmptr->nexthop, buf, 2, '|', sizeof nmptr->nexthop);
- nmptr->next = the_netmap;
- the_netmap = nmptr;
+int network_sync_to(char *target_node, long len)
+{
+ struct CitContext *CCC = CC;
+ OneRoomNetCfg OneRNCFG;
+ OneRoomNetCfg *pRNCFG;
+ const RoomNetCfgLine *pCfgLine;
+ SpoolControl sc;
+ int num_spooled = 0;
+
+ /* Grab the configuration line we're looking for */
+ begin_critical_section(S_NETCONFIGS);
+ pRNCFG = CtdlGetNetCfgForRoom(CCC->room.QRnumber);
+ if ((pRNCFG == NULL) ||
+ (pRNCFG->NetConfigs[ignet_push_share] == NULL))
+ {
+ return -1;
}
- free(serialized_map);
- netmap_changed = 0;
-}
+ pCfgLine = pRNCFG->NetConfigs[ignet_push_share];
+ while (pCfgLine != NULL)
+ {
+ if (!strcmp(ChrPtr(pCfgLine->Value[0]), target_node))
+ break;
+ pCfgLine = pCfgLine->next;
+ }
+ if (pCfgLine == NULL)
+ {
+ return -1;
+ }
+
+ memset(&sc, 0, sizeof(SpoolControl));
+ memset(&OneRNCFG, 0, sizeof(OneRoomNetCfg));
+ sc.RNCfg = &OneRNCFG;
+ sc.RNCfg->NetConfigs[ignet_push_share] = DuplicateOneGenericCfgLine(pCfgLine);
+ sc.Users[ignet_push_share] = NewStrBufPlain(NULL,
+ StrLength(pCfgLine->Value[0]) +
+ StrLength(pCfgLine->Value[1]) + 10);
+ StrBufAppendBuf(sc.Users[ignet_push_share],
+ pCfgLine->Value[0],
+ 0);
+ StrBufAppendBufPlain(sc.Users[ignet_push_share],
+ HKEY(","),
+ 0);
+
+ StrBufAppendBuf(sc.Users[ignet_push_share],
+ pCfgLine->Value[1],
+ 0);
+ CalcListID(&sc);
+ end_critical_section(S_NETCONFIGS);
-/*
- * Write the network map from memory back to the configuration file.
- */
-void write_network_map(void) {
- char *serialized_map = NULL;
- NetMap *nmptr;
+ sc.working_ignetcfg = CtdlLoadIgNetCfg();
+ sc.the_netmap = CtdlReadNetworkMap();
+ /* Send ALL messages */
+ num_spooled = CtdlForEachMessage(MSGS_ALL, 0L, NULL, NULL, NULL,
+ network_spool_msg, &sc);
- 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 (!IsEmptyStr(nmptr->nodename)) {
- snprintf(&serialized_map[strlen(serialized_map)],
- SIZ,
- "%s|%ld|%s\n",
- nmptr->nodename,
- (long)nmptr->lastcontact,
- nmptr->nexthop);
- }
- }
- }
+ /* Concise cleanup because we know there's only one node in the sc */
+ DeleteGenericCfgLine(NULL/*TODO*/, &sc.RNCfg->NetConfigs[ignet_push_share]);
- CtdlPutSysConfig(IGNETMAP, serialized_map);
- free(serialized_map);
- }
+ DeleteHash(&sc.working_ignetcfg);
+ DeleteHash(&sc.the_netmap);
+ free_spoolcontrol_struct_members(&sc);
- /* Now free the list */
- while (the_netmap != NULL) {
- nmptr = the_netmap->next;
- free(the_netmap);
- the_netmap = nmptr;
- }
- netmap_changed = 0;
+ QN_syslog(LOG_NOTICE, "Synchronized %d messages to <%s>\n",
+ num_spooled, target_node);
+ return(num_spooled);
}
-
-/*
- * Check the network map and determine whether the supplied node name is
- * valid. If it is not a neighbor node, supply the name of a neighbor node
- * which is the next hop. If it *is* a neighbor node, we also fill in the
- * shared secret.
+/*
+ * Implements the NSYN command
*/
-int is_valid_node(char *nexthop, char *secret, char *node) {
- int i;
- char linebuf[SIZ];
- char buf[SIZ];
- int retval;
- NetMap *nmptr;
+void cmd_nsyn(char *argbuf) {
+ int num_spooled;
+ long len;
+ char target_node[256];
- if (node == NULL) {
- return(-1);
- }
+ if (CtdlAccessCheck(ac_aide)) return;
- /*
- * First try the neighbor nodes
- */
- if (working_ignetcfg == NULL) {
- CtdlLogPrintf(CTDL_ERR, "working_ignetcfg is NULL!\n");
- if (nexthop != NULL) {
- strcpy(nexthop, "");
- }
- return(-1);
+ len = extract_token(target_node, argbuf, 0, '|', sizeof target_node);
+ num_spooled = network_sync_to(target_node, len);
+ if (num_spooled >= 0) {
+ cprintf("%d Spooled %d messages.\n", CIT_OK, num_spooled);
}
-
- retval = (-1);
- if (nexthop != NULL) {
- strcpy(nexthop, "");
+ else {
+ cprintf("%d No such room/node share exists.\n",
+ ERROR + ROOM_NOT_FOUND);
}
+}
- /* Use the string tokenizer to grab one line at a time */
- for (i=0; i<num_tokens(working_ignetcfg, '\n'); ++i) {
- extract_token(linebuf, working_ignetcfg, i, '\n', sizeof linebuf);
- extract_token(buf, linebuf, 0, '|', sizeof buf);
- if (!strcasecmp(buf, node)) {
- if (nexthop != NULL) {
- strcpy(nexthop, "");
- }
- if (secret != NULL) {
- extract_token(secret, linebuf, 1, '|', 256);
- }
- retval = 0;
- }
- }
+RoomProcList *CreateRoomProcListEntry(struct ctdlroom *qrbuf, OneRoomNetCfg *OneRNCFG)
+{
+ int i;
+ struct RoomProcList *ptr;
- if (retval == 0) {
- return(retval); /* yup, it's a direct neighbor */
- }
+ ptr = (struct RoomProcList *) malloc(sizeof (struct RoomProcList));
+ if (ptr == NULL) return NULL;
- /*
- * If we get to this point we have to see if we know the next hop
- */
- if (the_netmap != NULL) {
- for (nmptr = the_netmap; nmptr != NULL; nmptr = nmptr->next) {
- if (!strcasecmp(nmptr->nodename, node)) {
- if (nexthop != NULL) {
- strcpy(nexthop, nmptr->nexthop);
- }
- return(0);
- }
- }
- }
+ ptr->namelen = strlen(qrbuf->QRname);
+ if (ptr->namelen > ROOMNAMELEN)
+ ptr->namelen = ROOMNAMELEN - 1;
- /*
- * If we get to this point, the supplied node name is bogus.
- */
- CtdlLogPrintf(CTDL_ERR, "Invalid node name <%s>\n", node);
- return(-1);
-}
+ memcpy (ptr->name, qrbuf->QRname, ptr->namelen);
+ ptr->name[ptr->namelen] = '\0';
+ ptr->QRNum = qrbuf->QRnumber;
+ for (i = 0; i < ptr->namelen; i++)
+ {
+ ptr->lcname[i] = tolower(ptr->name[i]);
+ }
+ ptr->lcname[ptr->namelen] = '\0';
+ ptr->key = hashlittle(ptr->lcname, ptr->namelen, 9872345);
+ ptr->lastsent = OneRNCFG->lastsent;
+ ptr->OneRNCfg = OneRNCFG;
+ return ptr;
+}
+/*
+ * Batch up and send all outbound traffic from the current room
+ */
+void network_queue_interesting_rooms(struct ctdlroom *qrbuf, void *data, OneRoomNetCfg *OneRNCfg)
+{
+ struct RoomProcList *ptr;
+ roomlists *RP = (roomlists*) data;
+ if (!HaveSpoolConfig(OneRNCfg))
+ return;
-void cmd_gnet(char *argbuf) {
- char filename[PATH_MAX];
- char buf[SIZ];
- FILE *fp;
+ ptr = CreateRoomProcListEntry(qrbuf, OneRNCfg);
- if ( (CC->room.QRflags & QR_MAILBOX) && (CC->user.usernum == atol(CC->room.QRname)) ) {
- /* users can edit the netconfigs for their own mailbox rooms */
- }
- else if (CtdlAccessCheck(ac_room_aide)) return;
-
- 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);
-
- fp = fopen(filename, "r");
- if (fp != NULL) {
- while (fgets(buf, sizeof buf, fp) != NULL) {
- buf[strlen(buf)-1] = 0;
- cprintf("%s\n", buf);
- }
- fclose(fp);
+ if (ptr != NULL)
+ {
+ ptr->next = RP->rplist;
+ RP->rplist = ptr;
}
-
- cprintf("000\n");
}
+/*
+ * Batch up and send all outbound traffic from the current room
+ */
+int network_room_handler (struct ctdlroom *qrbuf)
+{
+ struct RoomProcList *ptr;
+ OneRoomNetCfg* RNCfg;
-void cmd_snet(char *argbuf) {
- char tempfilename[PATH_MAX];
- char filename[PATH_MAX];
- char buf[SIZ];
- FILE *fp, *newfp;
+ if (qrbuf->QRdefaultview == VIEW_QUEUE)
+ return 1;
- unbuffer_output();
+ RNCfg = CtdlGetNetCfgForRoom(qrbuf->QRnumber);
+ if (RNCfg == NULL)
+ return 1;
- if ( (CC->room.QRflags & QR_MAILBOX) && (CC->user.usernum == atol(CC->room.QRname)) ) {
- /* users can edit the netconfigs for their own mailbox rooms */
- }
- else if (CtdlAccessCheck(ac_room_aide)) return;
+ if (!HaveSpoolConfig(RNCfg))
+ return 1;
- CtdlMakeTempFileName(tempfilename, sizeof tempfilename);
- assoc_file_name(filename, sizeof filename, &CC->room, ctdl_netcfg_dir);
+ ptr = CreateRoomProcListEntry(qrbuf, RNCfg);
+ if (ptr == NULL)
+ return 1;
- fp = fopen(tempfilename, "w");
- if (fp == NULL) {
- cprintf("%d Cannot open %s: %s\n",
- ERROR + INTERNAL_ERROR,
- tempfilename,
- strerror(errno));
- }
+ ptr->OneRNCfg = NULL;
+ begin_critical_section(S_RPLIST);
+ ptr->next = rplist;
+ rplist = ptr;
+ end_critical_section(S_RPLIST);
+ return 1;
+}
- cprintf("%d %s\n", SEND_LISTING, tempfilename);
- while (client_getln(buf, sizeof buf) >= 0 && strcmp(buf, "000")) {
- fprintf(fp, "%s\n", buf);
- }
- fclose(fp);
+void destroy_network_queue_room(RoomProcList *rplist)
+{
+ struct RoomProcList *cur, *p;
- /* Now copy the temp file to its permanent location.
- * (We copy instead of link because they may be on different filesystems)
- */
- begin_critical_section(S_NETCONFIGS);
- fp = fopen(tempfilename, "r");
- if (fp != NULL) {
- newfp = fopen(filename, "w");
- if (newfp != NULL) {
- while (fgets(buf, sizeof buf, fp) != NULL) {
- fprintf(newfp, "%s", buf);
- }
- fclose(newfp);
- }
- fclose(fp);
+ cur = rplist;
+ while (cur != NULL)
+ {
+ p = cur->next;
+ free (cur);
+ cur = p;
}
- end_critical_section(S_NETCONFIGS);
- unlink(tempfilename);
+}
+
+void destroy_network_queue_room_locked (void)
+{
+ begin_critical_section(S_RPLIST);
+ destroy_network_queue_room(rplist);
+ end_critical_section(S_RPLIST);
}
+
/*
- * Deliver digest messages
+ * Bounce a message back to the sender
*/
-void network_deliver_digest(SpoolControl *sc) {
+void network_bounce(struct CtdlMessage *msg, char *reason)
+{
+ struct CitContext *CCC = CC;
char buf[SIZ];
- int i;
- struct CtdlMessage *msg = NULL;
- long msglen;
- char *recps = NULL;
- size_t recps_len = SIZ;
- size_t siz;
- struct recptypes *valid;
- namelist *nptr;
- char bounce_to[256];
-
- if (sc->num_msgs_spooled < 1) {
- fclose(sc->digestfp);
- sc->digestfp = NULL;
- return;
- }
+ char bouncesource[SIZ];
+ char recipient[SIZ];
+ recptypes *valid = NULL;
+ char force_room[ROOMNAMELEN];
+ static int serialnum = 0;
+ long len;
- 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; buf[i]; ++i) {
- if (isspace(buf[i])) buf[i]='_';
- buf[i] = tolower(buf[i]);
- }
- msg->cm_fields['F'] = strdup(buf);
- msg->cm_fields['R'] = strdup(buf);
-
- /* Set the 'List-ID' header */
- msg->cm_fields['L'] = malloc(1024);
- snprintf(msg->cm_fields['L'], 1024,
- "%s <%ld.list-id.%s>",
- CC->room.QRname,
- CC->room.QRnumber,
- config.c_fqdn
- );
+ QNM_syslog(LOG_DEBUG, "entering network_bounce()\n");
- /*
- * Go fetch the contents of the digest
- */
- fseek(sc->digestfp, 0L, SEEK_END);
- msglen = ftell(sc->digestfp);
+ if (msg == NULL) return;
- msg->cm_fields['M'] = malloc(msglen + 1);
- fseek(sc->digestfp, 0L, SEEK_SET);
- siz = fread(msg->cm_fields['M'], (size_t)msglen, 1, sc->digestfp);
- msg->cm_fields['M'][msglen] = '\0';
+ snprintf(bouncesource, sizeof bouncesource, "%s@%s", BOUNCESOURCE, config.c_nodename);
- fclose(sc->digestfp);
- sc->digestfp = NULL;
+ /*
+ * Give it a fresh message ID
+ */
+ len = snprintf(buf, sizeof(buf),
+ "%ld.%04lx.%04x@%s",
+ (long)time(NULL),
+ (long)getpid(),
+ ++serialnum,
+ config.c_fqdn);
- /* Now generate the delivery instructions */
+ CM_SetField(msg, emessageId, buf, len);
- /*
- * Figure out how big a buffer we need to allocate
+ /*
+ * FIXME ... right now we're just sending a bounce; we really want to
+ * include the text of the bounced message.
*/
- for (nptr = sc->digestrecps; nptr != NULL; nptr = nptr->next) {
- recps_len = recps_len + strlen(nptr->name) + 2;
- }
-
- recps = malloc(recps_len);
+ CM_SetField(msg, eMesageText, reason, strlen(reason));
+ msg->cm_format_type = 0;
- if (recps == NULL) {
- CtdlLogPrintf(CTDL_EMERG, "Cannot allocate %ld bytes for recps...\n", (long)recps_len);
- abort();
- }
+ /*
+ * Turn the message around
+ */
+ CM_FlushField(msg, eRecipient);
+ CM_FlushField(msg, eDestination);
- strcpy(recps, "");
+ len = snprintf(recipient, sizeof(recipient), "%s@%s",
+ msg->cm_fields[eAuthor],
+ msg->cm_fields[eNodeName]);
- /* Each recipient */
- for (nptr = sc->digestrecps; nptr != NULL; nptr = nptr->next) {
- if (nptr != sc->digestrecps) {
- strcat(recps, ",");
- }
- strcat(recps, nptr->name);
- }
+ CM_SetField(msg, eAuthor, HKEY(BOUNCESOURCE));
+ CM_SetField(msg, eNodeName, CFG_KEY(c_nodename));
+ CM_SetField(msg, eMsgSubject, HKEY("Delivery Status Notification (Failure)"));
- /* Where do we want bounces and other noise to be heard? Surely not the list members! */
- snprintf(bounce_to, sizeof bounce_to, "room_aide@%s", config.c_fqdn);
+ Netmap_AddMe(msg, HKEY("unknown_user"));
/* Now submit the message */
- valid = validate_recipients(recps, NULL, 0);
- free(recps);
- if (valid != NULL) {
- valid->bounce_to = strdup(bounce_to);
- valid->envelope_from = strdup(bounce_to);
- CtdlSubmitMsg(msg, valid, NULL, 0);
+ valid = validate_recipients(recipient, NULL, 0);
+ if (valid != NULL) if (valid->num_error != 0) {
+ free_recipients(valid);
+ valid = NULL;
+ }
+ if ( (valid == NULL) || (!strcasecmp(recipient, bouncesource)) ) {
+ strcpy(force_room, config.c_aideroom);
+ }
+ else {
+ strcpy(force_room, "");
+ }
+ if ( (valid == NULL) && IsEmptyStr(force_room) ) {
+ strcpy(force_room, config.c_aideroom);
}
- CtdlFreeMessage(msg);
- free_recipients(valid);
+ CtdlSubmitMsg(msg, valid, force_room, 0);
+
+ /* Clean up */
+ if (valid != NULL) free_recipients(valid);
+ CM_Free(msg);
+ QNM_syslog(LOG_DEBUG, "leaving network_bounce()\n");
}
+
/*
- * Deliver list messages to everyone on the list ... efficiently
+ * network_do_queue()
+ *
+ * Run through the rooms doing various types of network stuff.
*/
-void network_deliver_list(struct CtdlMessage *msg, SpoolControl *sc) {
- char *recps = NULL;
- size_t recps_len = SIZ;
- struct recptypes *valid;
- namelist *nptr;
- char bounce_to[256];
+void network_do_queue(void)
+{
+ struct CitContext *CCC = CC;
+ static time_t last_run = 0L;
+ int full_processing = 1;
+ HashList *working_ignetcfg;
+ HashList *the_netmap = NULL;
+ int netmap_changed = 0;
+ roomlists RL;
+ SpoolControl *sc = NULL;
+ SpoolControl *pSC;
+
+ /*
+ * Run the full set of processing tasks no more frequently
+ * than once every n seconds
+ */
+ if ( (time(NULL) - last_run) < config.c_net_freq ) {
+ full_processing = 0;
+ syslog(LOG_DEBUG, "Network full processing in %ld seconds.\n",
+ config.c_net_freq - (time(NULL)- last_run)
+ );
+ }
- /* Don't do this if there were no recipients! */
- if (sc->listrecps == NULL) return;
+ become_session(&networker_spool_CC);
+ begin_critical_section(S_RPLIST);
+ RL.rplist = rplist;
+ rplist = NULL;
+ end_critical_section(S_RPLIST);
+///TODO hm, check whether we have a config at all here?
+ /* Load the IGnet Configuration into memory */
+ working_ignetcfg = CtdlLoadIgNetCfg();
- /* Now generate the delivery instructions */
+ /*
+ * Load the network map and filter list into memory.
+ */
+ if (!server_shutting_down)
+ the_netmap = CtdlReadNetworkMap();
+#if 0
+ /* filterlist isn't supported anymore
+ if (!server_shutting_down)
+ load_network_filter_list();
+ */
+#endif
/*
- * Figure out how big a buffer we need to allocate
+ * Go ahead and run the queue
*/
- for (nptr = sc->listrecps; nptr != NULL; nptr = nptr->next) {
- recps_len = recps_len + strlen(nptr->name) + 2;
- }
-
- recps = malloc(recps_len);
-
- if (recps == NULL) {
- CtdlLogPrintf(CTDL_EMERG, "Cannot allocate %ld bytes for recps...\n", (long)recps_len);
- abort();
+ if (full_processing && !server_shutting_down) {
+ QNM_syslog(LOG_DEBUG, "network: loading outbound queue");
+ CtdlForEachNetCfgRoom(network_queue_interesting_rooms, &RL, maxRoomNetCfg);
}
- strcpy(recps, "");
+ if ((RL.rplist != NULL) && (!server_shutting_down)) {
+ RoomProcList *ptr, *cmp;
+ ptr = RL.rplist;
+ QNM_syslog(LOG_DEBUG, "network: running outbound queue");
+ while (ptr != NULL && !server_shutting_down) {
+
+ cmp = ptr->next;
+ /* filter duplicates from the list... */
+ while (cmp != NULL) {
+ if ((cmp->namelen > 0) &&
+ (cmp->key == ptr->key) &&
+ (cmp->namelen == ptr->namelen) &&
+ (strcmp(cmp->lcname, ptr->lcname) == 0))
+ {
+ cmp->namelen = 0;
+ }
+ cmp = cmp->next;
+ }
- /* Each recipient */
- for (nptr = sc->listrecps; nptr != NULL; nptr = nptr->next) {
- if (nptr != sc->listrecps) {
- strcat(recps, ",");
+ if (ptr->namelen > 0) {
+ InspectQueuedRoom(&sc,
+ ptr,
+ working_ignetcfg,
+ the_netmap);
+ }
+ ptr = ptr->next;
}
- strcat(recps, nptr->name);
}
- /* Where do we want bounces and other noise to be heard? Surely not the list members! */
- snprintf(bounce_to, sizeof bounce_to, "room_aide@%s", config.c_fqdn);
- /* Now submit the message */
- valid = validate_recipients(recps, NULL, 0);
- free(recps);
- if (valid != NULL) {
- valid->bounce_to = strdup(bounce_to);
- valid->envelope_from = strdup(bounce_to);
- CtdlSubmitMsg(msg, valid, NULL, 0);
- free_recipients(valid);
+ pSC = sc;
+ while (pSC != NULL)
+ {
+ network_spoolout_room(pSC);
+ pSC = pSC->next;
}
- /* Do not call CtdlFreeMessage(msg) here; the caller will free it. */
-}
+ pSC = sc;
+ while (pSC != NULL)
+ {
+ sc = pSC->next;
+ free_spoolcontrol_struct(&pSC);
+ pSC = sc;
+ }
+ /* If there is anything in the inbound queue, process it */
+ if (!server_shutting_down) {
+ network_do_spoolin(working_ignetcfg,
+ the_netmap,
+ &netmap_changed);
+ }
+ /* Free the filter list in memory */
+ free_netfilter_list();
+ /* Save the network map back to disk */
+ if (netmap_changed) {
+ StrBuf *MapStr = CtdlSerializeNetworkMap(the_netmap);
+ char *pMapStr = SmashStrBuf(&MapStr);
+ CtdlPutSysConfig(IGNETMAP, pMapStr);
+ free(pMapStr);
+ }
-/*
- * Spools out one message from the list.
- */
-void network_spool_msg(long msgnum, void *userdata) {
- SpoolControl *sc;
- int i;
- char *newpath = NULL;
- size_t instr_len = SIZ;
- struct CtdlMessage *msg = NULL;
- namelist *nptr;
- maplist *mptr;
- struct ser_ret sermsg;
- FILE *fp;
- char filename[PATH_MAX];
- char buf[SIZ];
- int bang = 0;
- int send = 1;
- int delete_after_send = 0; /* Set to 1 to delete after spooling */
- int ok_to_participate = 0;
- struct recptypes *valid;
+ /* combine singe message files into one spool entry per remote node. */
+ network_consolidate_spoolout(working_ignetcfg, the_netmap);
- sc = (SpoolControl *)userdata;
+ /* shut down. */
- /*
- * Process mailing list recipients
- */
- instr_len = SIZ;
- if (sc->listrecps != NULL) {
- /* Fetch the message. We're going to need to modify it
- * in order to insert the [list name] in it, etc.
- */
- msg = CtdlFetchMessage(msgnum, 1);
- if (msg != NULL) {
- if (msg->cm_fields['V'] == NULL){
- /* local message, no enVelope */
- StrBuf *Buf;
- Buf = NewStrBuf();
- StrBufAppendBufPlain(Buf, msg->cm_fields['O'], -1, 0);
- StrBufAppendBufPlain(Buf, HKEY("@"), 0);
- StrBufAppendBufPlain(Buf, config.c_fqdn, -1, 0);
-
- msg->cm_fields['K'] = SmashStrBuf(&Buf);
- }
- else {
- msg->cm_fields['K'] = strdup (msg->cm_fields['V']);
- }
- /* Set the 'List-ID' header */
- if (msg->cm_fields['L'] != NULL) {
- free(msg->cm_fields['L']);
- }
- msg->cm_fields['L'] = malloc(1024);
- snprintf(msg->cm_fields['L'], 1024,
- "%s <%ld.list-id.%s>",
- CC->room.QRname,
- CC->room.QRnumber,
- config.c_fqdn
- );
-
- /* 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);
-
- /* 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; msg->cm_fields['R'][i]; ++i) {
- if (isspace(msg->cm_fields['R'][i])) {
- msg->cm_fields['R'][i] = '_';
- }
- }
-
- /* Handle delivery */
- network_deliver_list(msg, sc);
- CtdlFreeMessage(msg);
- }
- }
-
- /*
- * Process digest recipients
- */
- if ((sc->digestrecps != NULL) && (sc->digestfp != NULL)) {
- 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 = NewStrBufPlain(NULL, SIZ);
-
- safestrncpy(CC->preferred_formats, "text/plain", sizeof CC->preferred_formats);
- CtdlOutputPreLoadedMsg(msg, MT_CITADEL, HEADERS_NONE, 0, 0, 0);
-
- StrBufTrim(CC->redirect_buffer);
- fwrite(HKEY("\n"), 1, sc->digestfp);
- fwrite(SKEY(CC->redirect_buffer), 1, sc->digestfp);
- fwrite(HKEY("\n"), 1, sc->digestfp);
-
- FreeStrBuf(&CC->redirect_buffer);
-
- sc->num_msgs_spooled += 1;
- free(msg);
- }
- }
-
- /*
- * Process client-side list participations for this room
- */
- instr_len = SIZ;
- if (sc->participates != NULL) {
- msg = CtdlFetchMessage(msgnum, 1);
- if (msg != NULL) {
-
- /* Only send messages which originated on our own Citadel
- * network, otherwise we'll end up sending the remote
- * mailing list's messages back to it, which is rude...
- */
- ok_to_participate = 0;
- if (msg->cm_fields['N'] != NULL) {
- if (!strcasecmp(msg->cm_fields['N'], config.c_nodename)) {
- ok_to_participate = 1;
- }
- if (is_valid_node(NULL, NULL, msg->cm_fields['N']) == 0) {
- ok_to_participate = 1;
- }
- }
- if (ok_to_participate) {
- if (msg->cm_fields['F'] != NULL) {
- free(msg->cm_fields['F']);
- }
- msg->cm_fields['F'] = malloc(SIZ);
- /* Replace the Internet email address of the actual
- * author with the email address of the room itself,
- * so the remote listserv doesn't reject us.
- * FIXME ... I want to be able to pick any address
- */
- snprintf(msg->cm_fields['F'], SIZ,
- "room_%s@%s", CC->room.QRname,
- config.c_fqdn);
- for (i=0; msg->cm_fields['F'][i]; ++i) {
- if (isspace(msg->cm_fields['F'][i])) {
- msg->cm_fields['F'][i] = '_';
- }
- }
-
- /*
- * Figure out how big a buffer we need to allocate
- */
- for (nptr = sc->participates; 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, NULL, 0);
- CtdlSubmitMsg(msg, valid, "", 0);
- free_recipients(valid);
- }
-
- }
- CtdlFreeMessage(msg);
- }
- }
-
- /*
- * Process IGnet push shares
- */
- msg = CtdlFetchMessage(msgnum, 1);
- if (msg != NULL) {
- size_t newpath_len;
-
- /* Prepend our node name to the Path field whenever
- * sending a message to another IGnet node
- */
- if (msg->cm_fields['P'] == NULL) {
- msg->cm_fields['P'] = strdup("username");
- }
- newpath_len = strlen(msg->cm_fields['P']) +
- strlen(config.c_nodename) + 2;
- newpath = malloc(newpath_len);
- snprintf(newpath, newpath_len, "%s!%s",
- config.c_nodename, msg->cm_fields['P']);
- free(msg->cm_fields['P']);
- msg->cm_fields['P'] = newpath;
-
- /*
- * Determine if this message is set to be deleted
- * after sending out on the network
- */
- if (msg->cm_fields['S'] != NULL) {
- if (!strcasecmp(msg->cm_fields['S'], "CANCEL")) {
- delete_after_send = 1;
- }
- }
-
- /* Now send it to every node */
- if (sc->ignet_push_shares != NULL)
- for (mptr = sc->ignet_push_shares; mptr != NULL;
- mptr = mptr->next) {
-
- send = 1;
-
- /* Check for valid node name */
- if (is_valid_node(NULL, NULL, mptr->remote_nodename) != 0) {
- CtdlLogPrintf(CTDL_ERR, "Invalid node <%s>\n", mptr->remote_nodename);
- send = 0;
- }
-
- /* Check for split horizon */
- CtdlLogPrintf(CTDL_DEBUG, "Path is %s\n", msg->cm_fields['P']);
- bang = num_tokens(msg->cm_fields['P'], '!');
- if (bang > 1) for (i=0; i<(bang-1); ++i) {
- extract_token(buf, msg->cm_fields['P'], i, '!', sizeof buf);
- CtdlLogPrintf(CTDL_DEBUG, "Compare <%s> to <%s>\n",
- buf, mptr->remote_nodename) ;
- if (!strcasecmp(buf, mptr->remote_nodename)) {
- send = 0;
- CtdlLogPrintf(CTDL_DEBUG, "Not sending to %s\n",
- mptr->remote_nodename);
- }
- else {
- CtdlLogPrintf(CTDL_DEBUG, "Sending to %s\n", mptr->remote_nodename);
- }
- }
-
- /* Send the message */
- if (send == 1) {
-
- /*
- * Force the message to appear in the correct room
- * on the far end by setting the C field correctly
- */
- if (msg->cm_fields['C'] != NULL) {
- free(msg->cm_fields['C']);
- }
- if (!IsEmptyStr(mptr->remote_roomname)) {
- msg->cm_fields['C'] = strdup(mptr->remote_roomname);
- }
- else {
- msg->cm_fields['C'] = strdup(CC->room.QRname);
- }
-
- /* serialize it for transmission */
- serialize_message(&sermsg, msg);
- if (sermsg.len > 0) {
-
- /* write it to a spool file */
- snprintf(filename, sizeof filename,"%s/%s@%lx%x",
- ctdl_netout_dir,
- mptr->remote_nodename,
- time(NULL),
- rand()
- );
- CtdlLogPrintf(CTDL_DEBUG, "Appending to %s\n", filename);
- fp = fopen(filename, "ab");
- if (fp != NULL) {
- fwrite(sermsg.ser,
- sermsg.len, 1, fp);
- fclose(fp);
- }
- else {
- CtdlLogPrintf(CTDL_ERR, "%s: %s\n", filename, strerror(errno));
- }
-
- /* free the serialized version */
- free(sermsg.ser);
- }
-
- }
- }
- CtdlFreeMessage(msg);
- }
-
- /* update lastsent */
- sc->lastsent = msgnum;
-
- /* Delete this message if delete-after-send is set */
- if (delete_after_send) {
- CtdlDeleteMessages(CC->room.QRname, &msgnum, 1, "");
- }
-
-}
-
-
-int read_spoolcontrol_file(SpoolControl **scc, char *filename)
-{
- FILE *fp;
- char instr[SIZ];
- char buf[SIZ];
- char nodename[256];
- char roomname[ROOMNAMELEN];
- size_t miscsize = 0;
- size_t linesize = 0;
- int skipthisline = 0;
- namelist *nptr = NULL;
- maplist *mptr = NULL;
- SpoolControl *sc;
-
- fp = fopen(filename, "r");
- if (fp == NULL) {
- return 0;
- }
- sc = malloc(sizeof(SpoolControl));
- memset(sc, 0, sizeof(SpoolControl));
- *scc = sc;
-
- while (fgets(buf, sizeof buf, fp) != NULL) {
- buf[strlen(buf)-1] = 0;
-
- extract_token(instr, buf, 0, '|', sizeof instr);
- if (!strcasecmp(instr, strof(lastsent))) {
- sc->lastsent = extract_long(buf, 1);
- }
- else if (!strcasecmp(instr, strof(listrecp))) {
- nptr = (namelist *)
- malloc(sizeof(namelist));
- nptr->next = sc->listrecps;
- extract_token(nptr->name, buf, 1, '|', sizeof nptr->name);
- sc->listrecps = nptr;
- }
- else if (!strcasecmp(instr, strof(participate))) {
- nptr = (namelist *)
- malloc(sizeof(namelist));
- nptr->next = sc->participates;
- extract_token(nptr->name, buf, 1, '|', sizeof nptr->name);
- sc->participates = nptr;
- }
- else if (!strcasecmp(instr, strof(digestrecp))) {
- nptr = (namelist *)
- malloc(sizeof(namelist));
- nptr->next = sc->digestrecps;
- extract_token(nptr->name, buf, 1, '|', sizeof nptr->name);
- sc->digestrecps = nptr;
- }
- else if (!strcasecmp(instr, strof(ignet_push_share))) {
- extract_token(nodename, buf, 1, '|', sizeof nodename);
- extract_token(roomname, buf, 2, '|', sizeof roomname);
- mptr = (maplist *) malloc(sizeof(maplist));
- mptr->next = sc->ignet_push_shares;
- strcpy(mptr->remote_nodename, nodename);
- strcpy(mptr->remote_roomname, roomname);
- sc->ignet_push_shares = mptr;
- }
- else {
- /* Preserve 'other' lines ... *unless* they happen to
- * be subscribe/unsubscribe pendings with expired
- * timestamps.
- */
- skipthisline = 0;
- if (!strncasecmp(buf, strof(subpending)"|", 11)) {
- if (time(NULL) - extract_long(buf, 4) > EXP) {
- skipthisline = 1;
- }
- }
- if (!strncasecmp(buf, strof(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);
- return 1;
-}
-
-void free_spoolcontrol_struct(SpoolControl **scc)
-{
- SpoolControl *sc;
- namelist *nptr = NULL;
- maplist *mptr = NULL;
-
- sc = *scc;
- while (sc->listrecps != NULL) {
- nptr = sc->listrecps->next;
- free(sc->listrecps);
- sc->listrecps = nptr;
- }
- /* Do the same for digestrecps */
- while (sc->digestrecps != NULL) {
- nptr = sc->digestrecps->next;
- free(sc->digestrecps);
- sc->digestrecps = nptr;
- }
- /* Do the same for participates */
- while (sc->participates != NULL) {
- nptr = sc->participates->next;
- free(sc->participates);
- sc->participates = nptr;
- }
- while (sc->ignet_push_shares != NULL) {
- mptr = sc->ignet_push_shares->next;
- free(sc->ignet_push_shares);
- sc->ignet_push_shares = mptr;
- }
- free(sc->misc);
- free(sc);
- *scc=NULL;
-}
-
-int writenfree_spoolcontrol_file(SpoolControl **scc, char *filename)
-{
- FILE *fp;
- SpoolControl *sc;
- namelist *nptr = NULL;
- maplist *mptr = NULL;
-
- sc = *scc;
- fp = fopen(filename, "w");
- if (fp == NULL) {
- CtdlLogPrintf(CTDL_CRIT, "ERROR: cannot open %s: %s\n",
- filename, strerror(errno));
- free_spoolcontrol_struct(scc);
- }
- else {
- fprintf(fp, "lastsent|%ld\n", sc->lastsent);
-
- /* Write out the listrecps while freeing from memory at the
- * same time. Am I clever or what? :)
- */
- while (sc->listrecps != NULL) {
- fprintf(fp, "listrecp|%s\n", sc->listrecps->name);
- nptr = sc->listrecps->next;
- free(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;
- free(sc->digestrecps);
- sc->digestrecps = nptr;
- }
- /* Do the same for participates */
- while (sc->participates != NULL) {
- fprintf(fp, "participate|%s\n", sc->participates->name);
- nptr = sc->participates->next;
- free(sc->participates);
- sc->participates = nptr;
- }
- while (sc->ignet_push_shares != NULL) {
- fprintf(fp, "ignet_push_share|%s", sc->ignet_push_shares->remote_nodename);
- if (!IsEmptyStr(sc->ignet_push_shares->remote_roomname)) {
- fprintf(fp, "|%s", sc->ignet_push_shares->remote_roomname);
- }
- fprintf(fp, "\n");
- mptr = sc->ignet_push_shares->next;
- free(sc->ignet_push_shares);
- sc->ignet_push_shares = mptr;
- }
- if (sc->misc != NULL) {
- fwrite(sc->misc, strlen(sc->misc), 1, fp);
- }
- free(sc->misc);
-
- fclose(fp);
- free(sc);
- *scc=NULL;
- }
- return 1;
-}
-int is_recipient(SpoolControl *sc, const char *Name)
-{
- namelist *nptr;
- size_t len;
-
- len = strlen(Name);
- nptr = sc->listrecps;
- while (nptr != NULL) {
- if (strncmp(Name, nptr->name, len)==0)
- return 1;
- nptr = nptr->next;
- }
- /* Do the same for digestrecps */
- nptr = sc->digestrecps;
- while (nptr != NULL) {
- if (strncmp(Name, nptr->name, len)==0)
- return 1;
- nptr = nptr->next;
- }
- /* Do the same for participates */
- nptr = sc->participates;
- while (nptr != NULL) {
- if (strncmp(Name, nptr->name, len)==0)
- return 1;
- nptr = nptr->next;
- }
- return 0;
-}
-
-
-/*
- * Batch up and send all outbound traffic from the current room
- */
-void network_spoolout_room(char *room_to_spool) {
- char buf[SIZ];
- char filename[PATH_MAX];
- SpoolControl *sc;
- int i;
-
- /*
- * If the room doesn't exist, don't try to perform its networking tasks.
- * Normally this should never happen, but once in a while maybe a room gets
- * queued for networking and then deleted before it can happen.
- */
- if (CtdlGetRoom(&CC->room, room_to_spool) != 0) {
- CtdlLogPrintf(CTDL_CRIT, "ERROR: cannot load <%s>\n", room_to_spool);
- return;
- }
-
- assoc_file_name(filename, sizeof filename, &CC->room, ctdl_netcfg_dir);
- begin_critical_section(S_NETCONFIGS);
-
- /* Only do net processing for rooms that have netconfigs */
- if (!read_spoolcontrol_file(&sc, filename))
- {
- end_critical_section(S_NETCONFIGS);
- return;
- }
- CtdlLogPrintf(CTDL_INFO, "Networking started for <%s>\n", CC->room.QRname);
-
- /* 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, NULL,
- network_spool_msg, sc);
-
- /* If we wrote a digest, deliver it and then close it */
- snprintf(buf, sizeof buf, "room_%s@%s",
- CC->room.QRname, config.c_fqdn);
- for (i=0; buf[i]; ++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->room.QRname, buf
- );
- network_deliver_digest(sc); /* deliver and close */
- }
-
- /* Now rewrite the config file */
- writenfree_spoolcontrol_file (&sc, filename);
- end_critical_section(S_NETCONFIGS);
-}
-
-
-
-/*
- * Send the *entire* contents of the current room to one specific network node,
- * ignoring anything we know about which messages have already undergone
- * network processing. This can be used to bring a new node into sync.
- */
-int network_sync_to(char *target_node) {
- SpoolControl sc;
- int num_spooled = 0;
- int found_node = 0;
- char buf[256];
- char sc_type[256];
- char sc_node[256];
- char sc_room[256];
- char filename[PATH_MAX];
- FILE *fp;
-
- /* Grab the configuration line we're looking for */
- assoc_file_name(filename, sizeof filename, &CC->room, ctdl_netcfg_dir);
- begin_critical_section(S_NETCONFIGS);
- fp = fopen(filename, "r");
- if (fp == NULL) {
- end_critical_section(S_NETCONFIGS);
- return(-1);
- }
- while (fgets(buf, sizeof buf, fp) != NULL) {
- buf[strlen(buf)-1] = 0;
- extract_token(sc_type, buf, 0, '|', sizeof sc_type);
- extract_token(sc_node, buf, 1, '|', sizeof sc_node);
- extract_token(sc_room, buf, 2, '|', sizeof sc_room);
- if ( (!strcasecmp(sc_type, "ignet_push_share"))
- && (!strcasecmp(sc_node, target_node)) ) {
- found_node = 1;
-
- /* Concise syntax because we don't need a full linked-list */
- memset(&sc, 0, sizeof(SpoolControl));
- sc.ignet_push_shares = (maplist *)
- malloc(sizeof(maplist));
- sc.ignet_push_shares->next = NULL;
- safestrncpy(sc.ignet_push_shares->remote_nodename,
- sc_node,
- sizeof sc.ignet_push_shares->remote_nodename);
- safestrncpy(sc.ignet_push_shares->remote_roomname,
- sc_room,
- sizeof sc.ignet_push_shares->remote_roomname);
- }
- }
- fclose(fp);
- end_critical_section(S_NETCONFIGS);
-
- if (!found_node) return(-1);
-
- /* Send ALL messages */
- num_spooled = CtdlForEachMessage(MSGS_ALL, 0L, NULL, NULL, NULL,
- network_spool_msg, &sc);
-
- /* Concise cleanup because we know there's only one node in the sc */
- free(sc.ignet_push_shares);
-
- CtdlLogPrintf(CTDL_NOTICE, "Synchronized %d messages to <%s>\n",
- num_spooled, target_node);
- return(num_spooled);
-}
-
-
-/*
- * Implements the NSYN command
- */
-void cmd_nsyn(char *argbuf) {
- int num_spooled;
- char target_node[256];
-
- if (CtdlAccessCheck(ac_aide)) return;
-
- extract_token(target_node, argbuf, 0, '|', sizeof target_node);
- num_spooled = network_sync_to(target_node);
- if (num_spooled >= 0) {
- cprintf("%d Spooled %d messages.\n", CIT_OK, num_spooled);
- }
- else {
- cprintf("%d No such room/node share exists.\n",
- ERROR + ROOM_NOT_FOUND);
- }
-}
-
-
-
-/*
- * Batch up and send all outbound traffic from the current room
- */
-void network_queue_room(struct ctdlroom *qrbuf, void *data) {
- struct RoomProcList *ptr;
-
- ptr = (struct RoomProcList *) malloc(sizeof (struct RoomProcList));
- if (ptr == NULL) return;
-
- safestrncpy(ptr->name, qrbuf->QRname, sizeof ptr->name);
- begin_critical_section(S_RPLIST);
- ptr->next = rplist;
- rplist = ptr;
- end_critical_section(S_RPLIST);
-}
-
-void destroy_network_queue_room(void)
-{
- struct RoomProcList *cur, *p;
- NetMap *nmcur, *nmp;
-
- cur = rplist;
- begin_critical_section(S_RPLIST);
- while (cur != NULL)
- {
- p = cur->next;
- free (cur);
- cur = p;
- }
- rplist = NULL;
- end_critical_section(S_RPLIST);
-
- nmcur = the_netmap;
- while (nmcur != NULL)
- {
- nmp = nmcur->next;
- free (nmcur);
- nmcur = nmp;
- }
- the_netmap = NULL;
- if (working_ignetcfg != NULL)
- free (working_ignetcfg);
- working_ignetcfg = NULL;
-}
-
-
-/*
- * Learn topology from path fields
- */
-void network_learn_topology(char *node, char *path) {
- char nexthop[256];
- NetMap *nmptr;
-
- strcpy(nexthop, "");
-
- if (num_tokens(path, '!') < 3) return;
- for (nmptr = the_netmap; nmptr != NULL; nmptr = nmptr->next) {
- if (!strcasecmp(nmptr->nodename, node)) {
- extract_token(nmptr->nexthop, path, 0, '!', sizeof nmptr->nexthop);
- nmptr->lastcontact = time(NULL);
- ++netmap_changed;
- return;
- }
- }
-
- /* If we got here then it's not in the map, so add it. */
- nmptr = (NetMap *) malloc(sizeof (NetMap));
- strcpy(nmptr->nodename, node);
- nmptr->lastcontact = time(NULL);
- extract_token(nmptr->nexthop, path, 0, '!', sizeof nmptr->nexthop);
- nmptr->next = the_netmap;
- the_netmap = nmptr;
- ++netmap_changed;
-}
-
-
-
-
-/*
- * Bounce a message back to the sender
- */
-void network_bounce(struct CtdlMessage *msg, char *reason) {
- char *oldpath = NULL;
- char buf[SIZ];
- char bouncesource[SIZ];
- char recipient[SIZ];
- struct recptypes *valid = NULL;
- char force_room[ROOMNAMELEN];
- static int serialnum = 0;
- size_t size;
-
- CtdlLogPrintf(CTDL_DEBUG, "entering network_bounce()\n");
-
- if (msg == NULL) return;
-
- snprintf(bouncesource, sizeof bouncesource, "%s@%s", BOUNCESOURCE, config.c_nodename);
-
- /*
- * Give it a fresh message ID
- */
- if (msg->cm_fields['I'] != NULL) {
- free(msg->cm_fields['I']);
- }
- snprintf(buf, sizeof buf, "%ld.%04lx.%04x@%s",
- (long)time(NULL), (long)getpid(), ++serialnum, config.c_fqdn);
- msg->cm_fields['I'] = strdup(buf);
-
- /*
- * FIXME ... right now we're just sending a bounce; we really want to
- * include the text of the bounced message.
- */
- if (msg->cm_fields['M'] != NULL) {
- free(msg->cm_fields['M']);
- }
- msg->cm_fields['M'] = strdup(reason);
- msg->cm_format_type = 0;
-
- /*
- * Turn the message around
- */
- if (msg->cm_fields['R'] == NULL) {
- free(msg->cm_fields['R']);
- }
-
- if (msg->cm_fields['D'] == NULL) {
- free(msg->cm_fields['D']);
- }
-
- snprintf(recipient, sizeof recipient, "%s@%s",
- msg->cm_fields['A'], msg->cm_fields['N']);
-
- if (msg->cm_fields['A'] == NULL) {
- free(msg->cm_fields['A']);
- }
-
- if (msg->cm_fields['N'] == NULL) {
- 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) {
- oldpath = msg->cm_fields['P'];
- msg->cm_fields['P'] = NULL;
- }
- else {
- oldpath = strdup("unknown_user");
- }
- size = strlen(oldpath) + SIZ;
- msg->cm_fields['P'] = malloc(size);
- snprintf(msg->cm_fields['P'], size, "%s!%s", config.c_nodename, oldpath);
- free(oldpath);
-
- /* Now submit the message */
- valid = validate_recipients(recipient, NULL, 0);
- if (valid != NULL) if (valid->num_error != 0) {
- free_recipients(valid);
- valid = NULL;
- }
- if ( (valid == NULL) || (!strcasecmp(recipient, bouncesource)) ) {
- strcpy(force_room, config.c_aideroom);
- }
- else {
- strcpy(force_room, "");
- }
- if ( (valid == NULL) && IsEmptyStr(force_room) ) {
- strcpy(force_room, config.c_aideroom);
- }
- CtdlSubmitMsg(msg, valid, force_room, 0);
-
- /* Clean up */
- if (valid != NULL) free_recipients(valid);
- CtdlFreeMessage(msg);
- CtdlLogPrintf(CTDL_DEBUG, "leaving network_bounce()\n");
-}
-
-
-
-
-/*
- * Process a buffer containing a single message from a single file
- * from the inbound queue
- */
-void network_process_buffer(char *buffer, long size) {
- struct CtdlMessage *msg = NULL;
- long pos;
- int field;
- struct recptypes *recp = NULL;
- char target_room[ROOMNAMELEN];
- struct ser_ret sermsg;
- char *oldpath = NULL;
- char filename[PATH_MAX];
- FILE *fp;
- char nexthop[SIZ];
- unsigned char firstbyte;
- unsigned char lastbyte;
-
- CtdlLogPrintf(CTDL_DEBUG, "network_process_buffer() processing %ld bytes\n", size);
-
- /* Validate just a little bit. First byte should be FF and * last byte should be 00. */
- firstbyte = buffer[0];
- lastbyte = buffer[size-1];
- if ( (firstbyte != 255) || (lastbyte != 0) ) {
- CtdlLogPrintf(CTDL_ERR, "Corrupt message ignored. Length=%ld, firstbyte = %d, lastbyte = %d\n",
- size, firstbyte, lastbyte);
- return;
- }
-
- /* Set default target room to trash */
- 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];
-
- for (pos = 3; pos < size; ++pos) {
- field = buffer[pos];
- msg->cm_fields[field] = strdup(&buffer[pos+1]);
- pos = pos + strlen(&buffer[(int)pos]);
- }
-
- /* Check for message routing */
- if (msg->cm_fields['D'] != NULL) {
- if (strcasecmp(msg->cm_fields['D'], config.c_nodename)) {
-
- /* route the message */
- strcpy(nexthop, "");
- if (is_valid_node(nexthop, NULL, msg->cm_fields['D']) == 0) {
- /* prepend our node to the path */
- if (msg->cm_fields['P'] != NULL) {
- oldpath = msg->cm_fields['P'];
- msg->cm_fields['P'] = NULL;
- }
- else {
- oldpath = strdup("unknown_user");
- }
- size = strlen(oldpath) + SIZ;
- msg->cm_fields['P'] = malloc(size);
- snprintf(msg->cm_fields['P'], size, "%s!%s",
- config.c_nodename, oldpath);
- free(oldpath);
-
- /* serialize the message */
- serialize_message(&sermsg, msg);
-
- /* now send it */
- if (IsEmptyStr(nexthop)) {
- strcpy(nexthop, msg->cm_fields['D']);
- }
- snprintf(filename,
- sizeof filename,
- "%s/%s@%lx%x",
- ctdl_netout_dir,
- nexthop,
- time(NULL),
- rand()
- );
- CtdlLogPrintf(CTDL_DEBUG, "Appending to %s\n", filename);
- fp = fopen(filename, "ab");
- if (fp != NULL) {
- fwrite(sermsg.ser, sermsg.len, 1, fp);
- fclose(fp);
- }
- else {
- CtdlLogPrintf(CTDL_ERR, "%s: %s\n", filename, strerror(errno));
- }
- free(sermsg.ser);
- CtdlFreeMessage(msg);
- return;
- }
-
- else { /* invalid destination node name */
-
- network_bounce(msg,
-"A message you sent could not be delivered due to an invalid destination node"
-" name. Please check the address and try sending the message again.\n");
- msg = NULL;
- return;
-
- }
- }
- }
-
- /*
- * Check to see if we already have a copy of this message, and
- * abort its processing if so. (We used to post a warning to Aide>
- * every time this happened, but the network is now so densely
- * connected that it's inevitable.)
- */
- if (network_usetable(msg) != 0) {
- CtdlFreeMessage(msg);
- return;
- }
-
- /* Learn network topology from the path */
- if ((msg->cm_fields['N'] != NULL) && (msg->cm_fields['P'] != NULL)) {
- network_learn_topology(msg->cm_fields['N'], msg->cm_fields['P']);
- }
-
- /* Is the sending node giving us a very persuasive suggestion about
- * which room this message should be saved in? If so, go with that.
- */
- if (msg->cm_fields['C'] != NULL) {
- safestrncpy(target_room, msg->cm_fields['C'], sizeof target_room);
- }
+ DeleteHash(&the_netmap);
- /* Otherwise, does it have a recipient? If so, validate it... */
- else if (msg->cm_fields['R'] != NULL) {
- recp = validate_recipients(msg->cm_fields['R'], NULL, 0);
- if (recp != NULL) if (recp->num_error != 0) {
- network_bounce(msg,
- "A message you sent could not be delivered due to an invalid address.\n"
- "Please check the address and try sending the message again.\n");
- msg = NULL;
- free_recipients(recp);
- CtdlLogPrintf(CTDL_DEBUG, "Bouncing message due to invalid recipient address.\n");
- return;
- }
- strcpy(target_room, ""); /* no target room if mail */
- }
-
- /* Our last shot at finding a home for this message is to see if
- * it has the O field (Originating room) set.
- */
- else if (msg->cm_fields['O'] != NULL) {
- safestrncpy(target_room, msg->cm_fields['O'], sizeof target_room);
- }
-
- /* Strip out fields that are only relevant during transit */
- if (msg->cm_fields['D'] != NULL) {
- free(msg->cm_fields['D']);
- msg->cm_fields['D'] = NULL;
- }
- if (msg->cm_fields['C'] != NULL) {
- free(msg->cm_fields['C']);
- msg->cm_fields['C'] = NULL;
- }
+ DeleteHash(&working_ignetcfg);
- /* save the message into a room */
- if (PerformNetprocHooks(msg, target_room) == 0) {
- msg->cm_flags = CM_SKIP_HOOKS;
- CtdlSubmitMsg(msg, recp, target_room, 0);
- }
- CtdlFreeMessage(msg);
- free_recipients(recp);
-}
+ QNM_syslog(LOG_DEBUG, "network: queue run completed");
-
-/*
- * Process a single message from a single file from the inbound queue
- */
-void network_process_message(FILE *fp, long msgstart, long msgend) {
- long hold_pos;
- long size;
- char *buffer;
-
- hold_pos = ftell(fp);
- size = msgend - msgstart + 1;
- buffer = malloc(size);
- if (buffer != NULL) {
- fseek(fp, msgstart, SEEK_SET);
- if (fread(buffer, size, 1, fp) > 0) {
- network_process_buffer(buffer, size);
- }
- free(buffer);
+ if (full_processing) {
+ last_run = time(NULL);
}
+ destroy_network_queue_room(RL.rplist);
+ SaveChangedConfigs();
- fseek(fp, hold_pos, SEEK_SET);
}
-/*
- * Process a single file from the inbound queue
- */
-void network_process_file(char *filename) {
- FILE *fp;
- long msgstart = (-1L);
- long msgend = (-1L);
- long msgcur = 0L;
- int ch;
-
-
- fp = fopen(filename, "rb");
- if (fp == NULL) {
- CtdlLogPrintf(CTDL_CRIT, "Error opening %s: %s\n", filename, strerror(errno));
- return;
- }
-
- fseek(fp, 0L, SEEK_END);
- CtdlLogPrintf(CTDL_INFO, "network: processing %ld bytes from %s\n", ftell(fp), filename);
- rewind(fp);
-
- /* Look for messages in the data stream and break them out */
- while (ch = getc(fp), ch >= 0) {
-
- if (ch == 255) {
- if (msgstart >= 0L) {
- msgend = msgcur - 1;
- network_process_message(fp, msgstart, msgend);
- }
- msgstart = msgcur;
- }
- ++msgcur;
- }
- msgend = msgcur - 1;
- if (msgstart >= 0L) {
- network_process_message(fp, msgstart, msgend);
- }
- fclose(fp);
- unlink(filename);
-}
-/*
- * Process anything in the inbound queue
- */
-void network_do_spoolin(void) {
- DIR *dp;
- struct dirent *d;
- struct stat statbuf;
- char filename[PATH_MAX];
- static time_t last_spoolin_mtime = 0L;
- /*
- * Check the spoolin directory's modification time. If it hasn't
- * been touched, we don't need to scan it.
- */
- if (stat(ctdl_netin_dir, &statbuf)) return;
- if (statbuf.st_mtime == last_spoolin_mtime) {
- CtdlLogPrintf(CTDL_DEBUG, "network: nothing in inbound queue\n");
- return;
- }
- last_spoolin_mtime = statbuf.st_mtime;
- CtdlLogPrintf(CTDL_DEBUG, "network: processing inbound queue\n");
+void network_logout_hook(void)
+{
+ CitContext *CCC = MyContext();
/*
- * Ok, there's something interesting in there, so scan it.
+ * If we were talking to a network node, we're not anymore...
*/
- 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,
- "%s/%s",
- ctdl_netin_dir,
- d->d_name
- );
- network_process_file(filename);
- }
- }
-
- closedir(dp);
-}
-
-/*
- * Step 1: consolidate files in the outbound queue into one file per neighbor node
- * Step 2: delete any files in the outbound queue that were for neighbors who no longer exist.
- */
-void network_consolidate_spoolout(void) {
- DIR *dp;
- struct dirent *d;
- char filename[PATH_MAX];
- char cmd[PATH_MAX];
- char nexthop[256];
- int i;
- char *ptr;
-
- /* Step 1: consolidate files in the outbound queue into one file per neighbor node */
- dp = opendir(ctdl_netout_dir);
- if (dp == NULL) return;
- while (d = readdir(dp), d != NULL) {
- if (
- (strcmp(d->d_name, "."))
- && (strcmp(d->d_name, ".."))
- && (strchr(d->d_name, '@') != NULL)
- ) {
- safestrncpy(nexthop, d->d_name, sizeof nexthop);
- ptr = strchr(nexthop, '@');
- if (ptr) *ptr = 0;
-
- snprintf(filename,
- sizeof filename,
- "%s/%s",
- ctdl_netout_dir,
- d->d_name
- );
-
- CtdlLogPrintf(CTDL_DEBUG, "Consolidate %s to %s\n", filename, nexthop);
- if (network_talking_to(nexthop, NTT_CHECK)) {
- CtdlLogPrintf(CTDL_DEBUG,
- "Currently online with %s - skipping for now\n",
- nexthop
- );
- }
- else {
- network_talking_to(nexthop, NTT_ADD);
- snprintf(cmd, sizeof cmd, "/bin/cat %s >>%s/%s && /bin/rm -f %s",
- filename,
- ctdl_netout_dir, nexthop,
- filename
- );
- system(cmd);
- network_talking_to(nexthop, NTT_REMOVE);
- }
- }
- }
- closedir(dp);
-
- /* Step 2: delete any files in the outbound queue that were for neighbors who no longer exist */
-
- 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;
- ptr = strchr(d->d_name, '@');
- if (d != NULL)
- continue;
- snprintf(filename,
- sizeof filename,
- "%s/%s",
- ctdl_netout_dir,
- d->d_name
- );
-
- strcpy(nexthop, "");
- i = is_valid_node(nexthop, NULL, d->d_name);
-
- if ( (i != 0) || !IsEmptyStr(nexthop) ) {
- unlink(filename);
- }
+ if (!IsEmptyStr(CCC->net_node)) {
+ CtdlNetworkTalkingTo(CCC->net_node, strlen(CCC->net_node), NTT_REMOVE);
+ CCC->net_node[0] = '\0';
}
-
-
- closedir(dp);
}
+void network_cleanup_function(void)
+{
+ struct CitContext *CCC = CC;
-
-/*
- * receive network spool from the remote system
- */
-void receive_spool(int *sock, char *remote_nodename) {
- long download_len = 0L;
- long bytes_received = 0L;
- char buf[SIZ];
- static char pbuf[IGNET_PACKET_SIZE];
- char tempfilename[PATH_MAX];
- char permfilename[PATH_MAX];
- long plen;
- FILE *fp;
-
- snprintf(tempfilename,
- sizeof tempfilename,
- "%s/%s.%lx%x",
- ctdl_nettmp_dir,
- remote_nodename,
- time(NULL),
- rand()
- );
-
- snprintf(permfilename,
- sizeof permfilename,
- "%s/%s.%lx%x",
- ctdl_netin_dir,
- remote_nodename,
- time(NULL),
- rand()
- );
-
- if (sock_puts(sock, "NDOP") < 0) return;
- if (sock_getln(sock, buf, sizeof buf) < 0) return;
- CtdlLogPrintf(CTDL_DEBUG, "<%s\n", buf);
- if (buf[0] != '2') {
- return;
- }
- download_len = extract_long(&buf[4], 0);
-
- if (download_len>0) {
- bytes_received = 0L;
- fp = fopen(tempfilename, "w");
- if (fp == NULL) {
- CtdlLogPrintf(CTDL_CRIT, "cannot open download file locally: %s\n",
- strerror(errno));
- return;
- }
-
- CtdlLogPrintf(CTDL_DEBUG, "For this download we are expecting %d bytes\n", download_len);
- while (bytes_received < download_len) {
- /*
- * If shutting down we can exit here and unlink the temp file.
- * this shouldn't loose us any messages.
- */
- if (CtdlThreadCheckStop())
- {
- fclose(fp);
- unlink(tempfilename);
- return;
- }
- snprintf(buf, sizeof buf, "READ %ld|%ld",
- bytes_received,
- ((download_len - bytes_received > IGNET_PACKET_SIZE)
- ? IGNET_PACKET_SIZE : (download_len - bytes_received)));
-
- if (sock_puts(sock, buf) < 0) {
- fclose(fp);
- unlink(tempfilename);
- return;
- }
- if (sock_getln(sock, buf, sizeof buf) < 0) {
- fclose(fp);
- unlink(tempfilename);
- return;
- }
-
- if (buf[0] == '6') {
- plen = extract_long(&buf[4], 0);
- if (sock_read(sock, pbuf, plen, 1) < 0) {
- fclose(fp);
- unlink(tempfilename);
- return;
- }
- fwrite((char *) pbuf, plen, 1, fp);
- bytes_received = bytes_received + plen;
- }
- }
-
- fclose(fp);
- }
- /* Last chance for shutdown exit */
- if (CtdlThreadCheckStop())
- {
- unlink(tempfilename);
- return;
- }
-
- if (sock_puts(sock, "CLOS") < 0) {
- unlink(tempfilename);
- return;
- }
-
- /*
- * From here on we must complete or messages will get lost
- */
- if (sock_getln(sock, buf, sizeof buf) < 0) {
- unlink(tempfilename);
- return;
- }
- if (download_len > 0) {
- CtdlLogPrintf(CTDL_NOTICE, "Received %ld octets from <%s>\n", download_len, remote_nodename);
- }
- CtdlLogPrintf(CTDL_DEBUG, "%s\n", buf);
-
- /* Now move the temp file to its permanent location.
- */
- if (link(tempfilename, permfilename) != 0) {
- CtdlLogPrintf(CTDL_ALERT, "Could not link %s to %s: %s\n",
- tempfilename, permfilename, strerror(errno)
- );
+ if (!IsEmptyStr(CCC->net_node)) {
+ CtdlNetworkTalkingTo(CCC->net_node, strlen(CCC->net_node), NTT_REMOVE);
+ CCC->net_node[0] = '\0';
}
- unlink(tempfilename);
}
-
-/*
- * transmit network spool to the remote system
- */
-void transmit_spool(int *sock, char *remote_nodename)
+int ignet_aftersave(struct CtdlMessage *msg,
+ recptypes *recps) /* recipients (if mail) */
{
- char buf[SIZ];
- char pbuf[4096];
- long plen;
- long bytes_to_write, thisblock, bytes_written;
- int fd;
- char sfname[128];
-
- if (sock_puts(sock, "NUOP") < 0) return;
- if (sock_getln(sock, buf, sizeof buf) < 0) return;
- CtdlLogPrintf(CTDL_DEBUG, "<%s\n", buf);
- if (buf[0] != '2') {
- return;
- }
-
- snprintf(sfname, sizeof sfname,
- "%s/%s",
- ctdl_netout_dir,
- remote_nodename
- );
- fd = open(sfname, O_RDONLY);
- if (fd < 0) {
- if (errno != ENOENT) {
- CtdlLogPrintf(CTDL_CRIT, "cannot open %s: %s\n", sfname, strerror(errno));
- }
- return;
- }
- bytes_written = 0;
- while (plen = (long) read(fd, pbuf, IGNET_PACKET_SIZE), plen > 0L) {
- bytes_to_write = plen;
- while (bytes_to_write > 0L) {
- /* Exit if shutting down */
- if (CtdlThreadCheckStop())
- {
- close(fd);
- return;
- }
-
- snprintf(buf, sizeof buf, "WRIT %ld", bytes_to_write);
- if (sock_puts(sock, buf) < 0) {
- close(fd);
- return;
- }
- if (sock_getln(sock, buf, sizeof buf) < 0) {
- close(fd);
- return;
- }
- thisblock = atol(&buf[4]);
- if (buf[0] == '7') {
- if (sock_write(sock, pbuf, (int) thisblock) < 0) {
- close(fd);
- return;
- }
- bytes_to_write -= thisblock;
- bytes_written += thisblock;
- } else {
- goto ABORTUPL;
- }
- }
- }
-
-ABORTUPL:
- close(fd);
-
- /* Last chance for shutdown exit */
- if(CtdlThreadCheckStop())
- return;
-
- if (sock_puts(sock, "UCLS 1") < 0) return;
-
- /*
- * From here on we must complete or messages will get lost
+ /* For IGnet mail, we have to save a new copy into the spooler for
+ * each recipient, with the R and D fields set to the recipient and
+ * destination-node. This has two ugly side effects: all other
+ * recipients end up being unlisted in this recipient's copy of the
+ * message, and it has to deliver multiple messages to the same
+ * node. We'll revisit this again in a year or so when everyone has
+ * a network spool receiver that can handle the new style messages.
*/
- if (sock_getln(sock, buf, sizeof buf) < 0) return;
- CtdlLogPrintf(CTDL_NOTICE, "Sent %ld octets to <%s>\n", bytes_written, remote_nodename);
- CtdlLogPrintf(CTDL_DEBUG, "<%s\n", buf);
- if (buf[0] == '2') {
- CtdlLogPrintf(CTDL_DEBUG, "Removing <%s>\n", sfname);
- unlink(sfname);
- }
-}
-
-
-
-/*
- * Poll one Citadel node (called by network_poll_other_citadel_nodes() below)
- */
-void network_poll_node(char *node, char *secret, char *host, char *port) {
- int sock;
- char buf[SIZ];
- char err_buf[SIZ];
- char connected_to[SIZ];
- CitContext *CCC=CC;
-
- if (network_talking_to(node, NTT_CHECK)) return;
- network_talking_to(node, NTT_ADD);
- CtdlLogPrintf(CTDL_DEBUG, "network: polling <%s>\n", node);
- CtdlLogPrintf(CTDL_NOTICE, "Connecting to <%s> at %s:%s\n", node, host, port);
-
- sock = sock_connect(host, port);
- if (sock < 0) {
- CtdlLogPrintf(CTDL_ERR, "Could not connect: %s\n", strerror(errno));
- network_talking_to(node, NTT_REMOVE);
- return;
- }
-
- CtdlLogPrintf(CTDL_DEBUG, "Connected!\n");
- CCC->sReadBuf = NewStrBuf();
- CCC->sMigrateBuf = NewStrBuf();
- CCC->sPos = NULL;
-
- /* Read the server greeting */
- if (sock_getln(&sock, buf, sizeof buf) < 0) goto bail;
- CtdlLogPrintf(CTDL_DEBUG, ">%s\n", buf);
-
- /* Check that the remote is who we think it is and warn the Aide if not */
- extract_token (connected_to, buf, 1, ' ', sizeof connected_to);
- if (strcmp(connected_to, node))
+ if ((recps != NULL) && (recps->num_ignet > 0))
{
- snprintf(err_buf, sizeof(err_buf),
- "Connected to node \"%s\" but I was expecting to connect to node \"%s\".",
- connected_to, node
- );
- CtdlLogPrintf(CTDL_ERR, "%s\n", err_buf);
- CtdlAideMessage(err_buf, "Network error");
- }
- else {
- /* We're talking to the correct node. Now identify ourselves. */
- snprintf(buf, sizeof buf, "NETP %s|%s", config.c_nodename, secret);
- CtdlLogPrintf(CTDL_DEBUG, "<%s\n", buf);
- if (sock_puts(&sock, buf) <0) goto bail;
- if (sock_getln(&sock, buf, sizeof buf) < 0) goto bail;
- CtdlLogPrintf(CTDL_DEBUG, ">%s\n", buf);
- if (buf[0] != '2') {
- goto bail;
- }
-
- /* At this point we are authenticated. */
- if (!CtdlThreadCheckStop())
- receive_spool(&sock, node);
- if (!CtdlThreadCheckStop())
- transmit_spool(&sock, node);
- }
-
- sock_puts(&sock, "QUIT");
-bail:
- FreeStrBuf(&CCC->sReadBuf);
- FreeStrBuf(&CCC->sMigrateBuf);
- if (sock != -1)
- sock_close(sock);
- network_talking_to(node, NTT_REMOVE);
-}
-
-
-
-/*
- * Poll other Citadel nodes and transfer inbound/outbound network data.
- * Set "full" to nonzero to force a poll of every node, or to zero to poll
- * only nodes to which we have data to send.
- */
-void network_poll_other_citadel_nodes(int full_poll) {
- int i;
- char linebuf[256];
- char node[SIZ];
- char host[256];
- char port[256];
- char secret[256];
- int poll = 0;
- char spoolfile[256];
-
- if (working_ignetcfg == NULL) {
- CtdlLogPrintf(CTDL_DEBUG, "network: no neighbor nodes are configured - not polling.\n");
- return;
- }
-
- /* Use the string tokenizer to grab one line at a time */
- for (i=0; i<num_tokens(working_ignetcfg, '\n'); ++i) {
- if(CtdlThreadCheckStop())
- return;
- extract_token(linebuf, working_ignetcfg, i, '\n', sizeof linebuf);
- extract_token(node, linebuf, 0, '|', sizeof node);
- extract_token(secret, linebuf, 1, '|', sizeof secret);
- extract_token(host, linebuf, 2, '|', sizeof host);
- extract_token(port, linebuf, 3, '|', sizeof port);
- if ( !IsEmptyStr(node) && !IsEmptyStr(secret)
- && !IsEmptyStr(host) && !IsEmptyStr(port)) {
- poll = full_poll;
- if (poll == 0) {
- snprintf(spoolfile,
- sizeof spoolfile,
- "%s/%s",
- ctdl_netout_dir,
- node
- );
- if (access(spoolfile, R_OK) == 0) {
- poll = 1;
- }
- }
- if (poll) {
- network_poll_node(node, secret, host, port);
- }
- }
- }
-
-}
-
-
-
-
-/*
- * It's ok if these directories already exist. Just fail silently.
- */
-void create_spool_dirs(void) {
- if ((mkdir(ctdl_spool_dir, 0700) != 0) && (errno != EEXIST))
- CtdlLogPrintf(CTDL_EMERG, "unable to create directory [%s]: %s", ctdl_spool_dir, strerror(errno));
- if (chown(ctdl_spool_dir, CTDLUID, (-1)) != 0)
- CtdlLogPrintf(CTDL_EMERG, "unable to set the access rights for [%s]: %s", ctdl_spool_dir, strerror(errno));
- if ((mkdir(ctdl_netin_dir, 0700) != 0) && (errno != EEXIST))
- CtdlLogPrintf(CTDL_EMERG, "unable to create directory [%s]: %s", ctdl_netin_dir, strerror(errno));
- if (chown(ctdl_netin_dir, CTDLUID, (-1)) != 0)
- CtdlLogPrintf(CTDL_EMERG, "unable to set the access rights for [%s]: %s", ctdl_netin_dir, strerror(errno));
- if ((mkdir(ctdl_nettmp_dir, 0700) != 0) && (errno != EEXIST))
- CtdlLogPrintf(CTDL_EMERG, "unable to create directory [%s]: %s", ctdl_nettmp_dir, strerror(errno));
- if (chown(ctdl_nettmp_dir, CTDLUID, (-1)) != 0)
- CtdlLogPrintf(CTDL_EMERG, "unable to set the access rights for [%s]: %s", ctdl_nettmp_dir, strerror(errno));
- if ((mkdir(ctdl_netout_dir, 0700) != 0) && (errno != EEXIST))
- CtdlLogPrintf(CTDL_EMERG, "unable to create directory [%s]: %s", ctdl_netout_dir, strerror(errno));
- if (chown(ctdl_netout_dir, CTDLUID, (-1)) != 0)
- CtdlLogPrintf(CTDL_EMERG, "unable to set the access rights for [%s]: %s", ctdl_netout_dir, strerror(errno));
-}
-
-
-
-
-
-/*
- * network_do_queue()
- *
- * Run through the rooms doing various types of network stuff.
- */
-void network_do_queue(void) {
- static time_t last_run = 0L;
- struct RoomProcList *ptr;
- int full_processing = 1;
-
- /*
- * Run the full set of processing tasks no more frequently
- * than once every n seconds
- */
- if ( (time(NULL) - last_run) < config.c_net_freq ) {
- full_processing = 0;
- CtdlLogPrintf(CTDL_DEBUG, "Network full processing in %ld seconds.\n",
- config.c_net_freq - (time(NULL)- last_run)
- );
- }
-
- /*
- * 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
- * don't really require extremely fine granularity here, we'll do it
- * with a static variable instead.
- */
- if (doing_queue) {
- return;
- }
- doing_queue = 1;
-
- /* Load the IGnet Configuration into memory */
- load_working_ignetcfg();
-
- /*
- * Poll other Citadel nodes. Maybe. If "full_processing" is set
- * then we poll everyone. Otherwise we only poll nodes we have stuff
- * to send to.
- */
- network_poll_other_citadel_nodes(full_processing);
-
- /*
- * Load the network map and filter list into memory.
- */
- read_network_map();
- filterlist = load_filter_list();
-
- /*
- * Go ahead and run the queue
- */
- if (full_processing && !CtdlThreadCheckStop()) {
- CtdlLogPrintf(CTDL_DEBUG, "network: loading outbound queue\n");
- CtdlForEachRoom(network_queue_room, NULL);
- }
-
- if (rplist != NULL) {
- CtdlLogPrintf(CTDL_DEBUG, "network: running outbound queue\n");
- while (rplist != NULL && !CtdlThreadCheckStop()) {
- char spoolroomname[ROOMNAMELEN];
- safestrncpy(spoolroomname, rplist->name, sizeof spoolroomname);
- begin_critical_section(S_RPLIST);
-
- /* pop this record off the list */
- ptr = rplist;
- rplist = rplist->next;
- free(ptr);
-
- /* invalidate any duplicate entries to prevent double processing */
- for (ptr=rplist; ptr!=NULL; ptr=ptr->next) {
- if (!strcasecmp(ptr->name, spoolroomname)) {
- ptr->name[0] = 0;
+ char *recipient;
+ int rv = 0;
+ struct ser_ret smr;
+ FILE *network_fp = NULL;
+ char submit_filename[128];
+ static int seqnum = 1;
+ int i;
+ char *hold_R, *hold_D, *RBuf, *DBuf;
+ long hrlen, hdlen, rblen, dblen, count, rlen;
+ CitContext *CCC = MyContext();
+
+ CM_GetAsField(msg, eRecipient, &hold_R, &hrlen);;
+ CM_GetAsField(msg, eDestination, &hold_D, &hdlen);;
+
+ count = num_tokens(recps->recp_ignet, '|');
+ rlen = strlen(recps->recp_ignet);
+ recipient = malloc(rlen + 1);
+ RBuf = malloc(rlen + 1);
+ DBuf = malloc(rlen + 1);
+ for (i=0; i<count; ++i) {
+ extract_token(recipient, recps->recp_ignet, i,
+ '|', rlen + 1);
+
+ rblen = extract_token(RBuf, recipient, 0, '@', rlen + 1);
+ dblen = extract_token(DBuf, recipient, 1, '@', rlen + 1);
+
+ CM_SetAsField(msg, eRecipient, &RBuf, rblen);;
+ CM_SetAsField(msg, eDestination, &DBuf, dblen);;
+ CtdlSerializeMessage(&smr, msg);
+ if (smr.len > 0) {
+ snprintf(submit_filename, sizeof submit_filename,
+ "%s/netmail.%04lx.%04x.%04x",
+ ctdl_netin_dir,
+ (long) getpid(),
+ CCC->cs_pid,
+ ++seqnum);
+
+ network_fp = fopen(submit_filename, "wb+");
+ if (network_fp != NULL) {
+ rv = fwrite(smr.ser, smr.len, 1, network_fp);
+ if (rv == -1) {
+ MSG_syslog(LOG_EMERG, "CtdlSubmitMsg(): Couldn't write network spool file: %s\n",
+ strerror(errno));
+ }
+ fclose(network_fp);
}
+ free(smr.ser);
}
-
- end_critical_section(S_RPLIST);
- if (spoolroomname[0] != 0) {
- network_spoolout_room(spoolroomname);
- }
+ CM_GetAsField(msg, eRecipient, &RBuf, &rblen);;
+ CM_GetAsField(msg, eDestination, &DBuf, &dblen);;
}
+ free(RBuf);
+ free(DBuf);
+ free(recipient);
+ CM_SetAsField(msg, eRecipient, &hold_R, hrlen);
+ CM_SetAsField(msg, eDestination, &hold_D, hdlen);
+ return 1;
}
-
- /* If there is anything in the inbound queue, process it */
- if (!CtdlThreadCheckStop()) {
- network_do_spoolin();
- }
-
- /* Save the network map back to disk */
- write_network_map();
-
- /* Free the filter list in memory */
- free_filter_list(filterlist);
- filterlist = NULL;
-
- network_consolidate_spoolout();
-
- CtdlLogPrintf(CTDL_DEBUG, "network: queue run completed\n");
-
- if (full_processing) {
- last_run = time(NULL);
- }
-
- doing_queue = 0;
+ return 0;
}
-
/*
- * cmd_netp() - authenticate to the server as another Citadel node polling
- * for network traffic
+ * Module entry point
*/
-void cmd_netp(char *cmdbuf)
-{
- char node[256];
- char pass[256];
- int v;
-
- char secret[256];
- char nexthop[256];
- char err_buf[SIZ];
-
- /* Authenticate */
- extract_token(node, cmdbuf, 0, '|', sizeof node);
- extract_token(pass, cmdbuf, 1, '|', sizeof pass);
-
- /* load the IGnet Configuration to check node validity */
- load_working_ignetcfg();
- v = is_valid_node(nexthop, secret, node);
-
- if (v != 0) {
- snprintf(err_buf, sizeof err_buf,
- "An unknown Citadel server called \"%s\" attempted to connect from %s [%s].\n",
- node, CC->cs_host, CC->cs_addr
- );
- CtdlLogPrintf(CTDL_WARNING, err_buf);
- cprintf("%d authentication failed\n", ERROR + PASSWORD_REQUIRED);
- CtdlAideMessage(err_buf, "IGNet Networking.");
- return;
- }
-
- if (strcasecmp(pass, secret)) {
- snprintf(err_buf, sizeof err_buf,
- "A Citadel server at %s [%s] failed to authenticate as network node \"%s\".\n",
- CC->cs_host, CC->cs_addr, node
- );
- CtdlLogPrintf(CTDL_WARNING, err_buf);
- cprintf("%d authentication failed\n", ERROR + PASSWORD_REQUIRED);
- CtdlAideMessage(err_buf, "IGNet Networking.");
- return;
- }
-
- if (network_talking_to(node, NTT_CHECK)) {
- CtdlLogPrintf(CTDL_WARNING, "Duplicate session for network node <%s>", node);
- cprintf("%d Already talking to %s right now\n", ERROR + RESOURCE_BUSY, node);
- return;
- }
-
- safestrncpy(CC->net_node, node, sizeof CC->net_node);
- network_talking_to(node, NTT_ADD);
- CtdlLogPrintf(CTDL_NOTICE, "Network node <%s> logged in from %s [%s]\n",
- CC->net_node, CC->cs_host, CC->cs_addr
- );
- cprintf("%d authenticated as network node '%s'\n", CIT_OK, CC->net_node);
-}
-
-int network_room_handler (struct ctdlroom *room)
+void SetNetQDebugEnabled(const int n)
{
- network_queue_room(room, NULL);
- return 0;
-}
-
-void *ignet_thread(void *arg) {
- struct CitContext ignet_thread_CC;
-
- CtdlLogPrintf(CTDL_DEBUG, "ignet_thread() initializing\n");
- CtdlFillSystemContext(&ignet_thread_CC, "IGnet Queue");
- citthread_setspecific(MyConKey, (void *)&ignet_thread_CC);
-
- while (!CtdlThreadCheckStop()) {
- network_do_queue();
- CtdlThreadSleep(60);
- }
-
- CtdlClearSystemContext();
- return(NULL);
+ NetQDebugEnabled = n;
}
-
-
-
-/*
- * Module entry point
- */
CTDL_MODULE_INIT(network)
{
if (!threading)
{
- 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");
+ CtdlRegisterMessageHook(ignet_aftersave, EVT_AFTERSAVE);
+
+ CtdlFillSystemContext(&networker_spool_CC, "CitNetSpool");
+ CtdlRegisterDebugFlagHook(HKEY("networkqueue"), SetNetQDebugEnabled, &NetQDebugEnabled);
+ CtdlRegisterSessionHook(network_cleanup_function, EVT_STOP, PRIO_STOP + 30);
+ CtdlRegisterSessionHook(network_logout_hook, EVT_LOGOUT, PRIO_LOGOUT + 10);
CtdlRegisterProtoHook(cmd_nsyn, "NSYN", "Synchronize room to node");
CtdlRegisterRoomHook(network_room_handler);
- CtdlRegisterCleanupHook(destroy_network_queue_room);
- CtdlThreadCreate("SMTP Send", CTDLTHREAD_BIGSTACK, ignet_thread, NULL);
+ CtdlRegisterCleanupHook(destroy_network_queue_room_locked);
+ CtdlRegisterSessionHook(network_do_queue, EVT_TIMER, PRIO_QUEUE + 10);
}
return "network";
}