Chop networker into handy bits; related functions now live in their own file.
[citadel.git] / citadel / modules / network / serv_network.c
index 7955f5a2eb935ebe4b16336c2f0d51a9653a9a36..2b3d8fbcaece4abbfd90b2725837026040335a13 100644 (file)
@@ -87,7 +87,8 @@
 #endif
 
 #include "context.h"
-
+#include "netconfig.h"
+#include "netmail.h"
 #include "ctdl_module.h"
 
 
  */
 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);
-}
 
 
 
@@ -230,1075 +156,11 @@ int network_usetable(struct CtdlMessage *msg) {
 }
 
 
-/* 
- * Read the network map from its configuration file into memory.
- */
-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;
-       }
-
-       free(serialized_map);
-       netmap_changed = 0;
-}
-
-
-/*
- * Write the network map from memory back to the configuration file.
- */
-void write_network_map(void) {
-       char *serialized_map = NULL;
-       NetMap *nmptr;
-
-
-       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);
-                               }
-                       }
-               }
-
-               CtdlPutSysConfig(IGNETMAP, serialized_map);
-               free(serialized_map);
-       }
-
-       /* Now free the list */
-       while (the_netmap != NULL) {
-               nmptr = the_netmap->next;
-               free(the_netmap);
-               the_netmap = nmptr;
-       }
-       netmap_changed = 0;
-}
-
-
-
-/* 
- * 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.
- */
-int is_valid_node(char *nexthop, char *secret, char *node) {
-       int i;
-       char linebuf[SIZ];
-       char buf[SIZ];
-       int retval;
-       NetMap *nmptr;
-
-       if (node == NULL) {
-               return(-1);
-       }
-
-       /*
-        * First try the neighbor nodes
-        */
-       if (working_ignetcfg == NULL) {
-               syslog(LOG_ERR, "working_ignetcfg is NULL!\n");
-               if (nexthop != NULL) {
-                       strcpy(nexthop, "");
-               }
-               return(-1);
-       }
-
-       retval = (-1);
-       if (nexthop != NULL) {
-               strcpy(nexthop, "");
-       }
-
-       /* 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;
-               }
-       }
-
-       if (retval == 0) {
-               return(retval);         /* yup, it's a direct neighbor */
-       }
-
-       /*      
-        * 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);
-                       }
-               }
-       }
-
-       /*
-        * If we get to this point, the supplied node name is bogus.
-        */
-       syslog(LOG_ERR, "Invalid node name <%s>\n", node);
-       return(-1);
-}
-
-
-
-
-
-void cmd_gnet(char *argbuf) {
-       char filename[PATH_MAX];
-       char buf[SIZ];
-       FILE *fp;
-
-       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);
-       }
-
-       cprintf("000\n");
-}
-
-
-void cmd_snet(char *argbuf) {
-       char tempfilename[PATH_MAX];
-       char filename[PATH_MAX];
-       int TmpFD;
-       StrBuf *Line;
-       struct stat StatBuf;
-       long len;
-       int rc;
-
-       unbuffer_output();
-
-       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;
-
-       len = assoc_file_name(filename, sizeof filename, &CC->room, ctdl_netcfg_dir);
-       memcpy(tempfilename, filename, len + 1);
-
-       memset(&StatBuf, 0, sizeof(struct stat));
-       if ((stat(filename, &StatBuf)  == -1) || (StatBuf.st_size == 0))
-               StatBuf.st_size = 80; /* Not there or empty? guess 80 chars line. */
-
-       sprintf(tempfilename + len, ".%d", CC->cs_pid);
-       errno = 0;
-       TmpFD = open(tempfilename, O_CREAT|O_EXCL|O_RDWR, S_IRUSR|S_IWUSR);
-
-       if ((TmpFD > 0) && (errno == 0))
-       {
-               char *tmp = malloc(StatBuf.st_size * 2);
-               memset(tmp, ' ', StatBuf.st_size * 2);
-               rc = write(TmpFD, tmp, StatBuf.st_size * 2);
-               free(tmp);
-               if ((rc <= 0) || (rc != StatBuf.st_size * 2))
-               {
-                       close(TmpFD);
-                       cprintf("%d Unable to allocate the space required for %s: %s\n",
-                               ERROR + INTERNAL_ERROR,
-                               tempfilename,
-                               strerror(errno));
-                       unlink(tempfilename);
-                       return;
-               }       
-               lseek(TmpFD, SEEK_SET, 0);
-       }
-       else {
-               cprintf("%d Unable to allocate the space required for %s: %s\n",
-                       ERROR + INTERNAL_ERROR,
-                       tempfilename,
-                       strerror(errno));
-               unlink(tempfilename);
-               return;
-       }
-       Line = NewStrBuf();
-
-       cprintf("%d %s\n", SEND_LISTING, tempfilename);
-
-       len = 0;
-       while (rc = CtdlClientGetLine(Line), 
-              (rc >= 0))
-       {
-               if ((rc == 3) && (strcmp(ChrPtr(Line), "000") == 0))
-                       break;
-               StrBufAppendBufPlain(Line, HKEY("\n"), 0);
-               write(TmpFD, ChrPtr(Line), StrLength(Line));
-               len += StrLength(Line);
-       }
-       FreeStrBuf(&Line);
-       ftruncate(TmpFD, len);
-       close(TmpFD);
-
-       /* 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);
-       rename(tempfilename, filename);
-       end_critical_section(S_NETCONFIGS);
-}
-
-
-/*
- * Deliver digest messages
- */
-void network_deliver_digest(SpoolControl *sc) {
-       char buf[SIZ];
-       int i;
-       struct CtdlMessage *msg = NULL;
-       long msglen;
-       char *recps = NULL;
-       size_t recps_len = SIZ;
-       struct recptypes *valid;
-       namelist *nptr;
-       char bounce_to[256];
-
-       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; 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
-       );
-
-       /*
-        * 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;
-
-       /* Now generate the delivery instructions */
-
-       /* 
-        * Figure out how big a buffer we need to allocate
-        */
-       for (nptr = sc->digestrecps; nptr != NULL; nptr = nptr->next) {
-               recps_len = recps_len + strlen(nptr->name) + 2;
-       }
-       
-       recps = malloc(recps_len);
-
-       if (recps == NULL) {
-               syslog(LOG_EMERG, "Cannot allocate %ld bytes for recps...\n", (long)recps_len);
-               abort();
-       }
-
-       strcpy(recps, "");
-
-       /* Each recipient */
-       for (nptr = sc->digestrecps; nptr != NULL; nptr = nptr->next) {
-               if (nptr != sc->digestrecps) {
-                       strcat(recps, ",");
-               }
-               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);
-       }
-       CtdlFreeMessage(msg);
-       free_recipients(valid);
-}
-
-
-/*
- * Deliver list messages to everyone on the list ... efficiently
- */
-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];
-
-       /* Don't do this if there were no recipients! */
-       if (sc->listrecps == NULL) return;
-
-       /* Now generate the delivery instructions */
-
-       /* 
-        * Figure out how big a buffer we need to allocate
-        */
-       for (nptr = sc->listrecps; nptr != NULL; nptr = nptr->next) {
-               recps_len = recps_len + strlen(nptr->name) + 2;
-       }
-       
-       recps = malloc(recps_len);
-
-       if (recps == NULL) {
-               syslog(LOG_EMERG, "Cannot allocate %ld bytes for recps...\n", (long)recps_len);
-               abort();
-       }
-
-       strcpy(recps, "");
-
-       /* Each recipient */
-       for (nptr = sc->listrecps; nptr != NULL; nptr = nptr->next) {
-               if (nptr != sc->listrecps) {
-                       strcat(recps, ",");
-               }
-               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);
-       }
-       /* Do not call CtdlFreeMessage(msg) here; the caller will free it. */
-}
-
-
-
-
-/*
- * Spools out one message from the list.
- */
-void network_spool_msg(long msgnum, void *userdata) {
-       SpoolControl *sc;
-       int i;
-       char *newpath = NULL;
-       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;
-
-       sc = (SpoolControl *)userdata;
-
-       /*
-        * Process mailing list recipients
-        */
-       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) {
-                       int rlen;
-                       char *pCh;
-                       StrBuf *Subject, *FlatSubject;
-
-                       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) {
-                               Subject = NewStrBufPlain(HKEY("(no subject)"));
-                       }
-                       else {
-                               Subject = NewStrBufPlain(msg->cm_fields['U'], -1);
-                       }
-                       FlatSubject = NewStrBufPlain(NULL, StrLength(Subject));
-                       StrBuf_RFC822_to_Utf8(FlatSubject, Subject, NULL, NULL);
-
-                       rlen = strlen(CC->room.QRname);
-                       pCh  = strstr(ChrPtr(FlatSubject), CC->room.QRname);
-                       if ((pCh == NULL) ||
-                           (*(pCh + rlen) != ']') ||
-                           (pCh == ChrPtr(FlatSubject)) ||
-                           (*(pCh - 1) != '[')
-                               )
-                       {
-                               StrBuf *tmp;
-                               StrBufPlain(Subject, HKEY("["));
-                               StrBufAppendBufPlain(Subject, CC->room.QRname, rlen, 0);
-                               StrBufAppendBufPlain(Subject, HKEY("] "), 0);
-                               StrBufAppendBuf(Subject, FlatSubject, 0);
-                               tmp = Subject;  Subject = FlatSubject;  FlatSubject = tmp; /* so we can free the right one... */
-                               StrBufRFC2047encode(&Subject, FlatSubject);
-                       }
-                       
-                       if (msg->cm_fields['U'] != NULL)
-                               free (msg->cm_fields['U']);
-                       msg->cm_fields['U'] = SmashStrBuf(&Subject);
-
-                       FreeStrBuf(&FlatSubject);
-
-                       /* else we won't modify the buffer, since the roomname is already here. */
-
-                       /* 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
-        */
-       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) {
-                               syslog(LOG_ERR, "Invalid node <%s>\n", mptr->remote_nodename);
-                               send = 0;
-                       }
-
-                       /* Check for split horizon */
-                       syslog(LOG_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);
-                               syslog(LOG_DEBUG, "Compare <%s> to <%s>\n",
-                                       buf, mptr->remote_nodename) ;
-                               if (!strcasecmp(buf, mptr->remote_nodename)) {
-                                       send = 0;
-                                       syslog(LOG_DEBUG, "Not sending to %s\n",
-                                               mptr->remote_nodename);
-                               }
-                               else {
-                                       syslog(LOG_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()
-                                       );
-                                       syslog(LOG_DEBUG, "Appending to %s\n", filename);
-                                       fp = fopen(filename, "ab");
-                                       if (fp != NULL) {
-                                               fwrite(sermsg.ser,
-                                                       sermsg.len, 1, fp);
-                                               fclose(fp);
-                                       }
-                                       else {
-                                               syslog(LOG_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)
-{
-       char tempfilename[PATH_MAX];
-       int TmpFD;
-       SpoolControl *sc;
-       namelist *nptr = NULL;
-       maplist *mptr = NULL;
-       long len;
-       time_t unixtime;
-       struct timeval tv;
-       long reltid; /* if we don't have SYS_gettid, use "random" value */
-       StrBuf *Cfg;
-       int rc;
-
-       len = strlen(filename);
-       memcpy(tempfilename, filename, len + 1);
-
-
-#if defined(HAVE_SYSCALL_H) && defined (SYS_gettid)
-       reltid = syscall(SYS_gettid);
-#endif
-       gettimeofday(&tv, NULL);
-       /* Promote to time_t; types differ on some OSes (like darwin) */
-       unixtime = tv.tv_sec;
-
-       sprintf(tempfilename + len, ".%ld-%ld", reltid, unixtime);
-       sc = *scc;
-       errno = 0;
-       TmpFD = open(tempfilename, O_CREAT|O_EXCL|O_RDWR, S_IRUSR|S_IWUSR);
-       Cfg = NewStrBuf();
-       if ((TmpFD < 0) || (errno != 0)) {
-               syslog(LOG_CRIT, "ERROR: cannot open %s: %s\n",
-                       filename, strerror(errno));
-               free_spoolcontrol_struct(scc);
-               unlink(tempfilename);
-       }
-       else {
-               fchown(TmpFD, config.c_ctdluid, 0);
-               StrBufAppendPrintf(Cfg, "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) {
-                   StrBufAppendPrintf(Cfg, "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) {
-                       StrBufAppendPrintf(Cfg, "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) {
-                       StrBufAppendPrintf(Cfg, "participate|%s\n", sc->participates->name);
-                       nptr = sc->participates->next;
-                       free(sc->participates);
-                       sc->participates = nptr;
-               }
-               while (sc->ignet_push_shares != NULL) {
-                       StrBufAppendPrintf(Cfg, "ignet_push_share|%s", sc->ignet_push_shares->remote_nodename);
-                       if (!IsEmptyStr(sc->ignet_push_shares->remote_roomname)) {
-                               StrBufAppendPrintf(Cfg, "|%s", sc->ignet_push_shares->remote_roomname);
-                       }
-                       StrBufAppendPrintf(Cfg, "\n");
-                       mptr = sc->ignet_push_shares->next;
-                       free(sc->ignet_push_shares);
-                       sc->ignet_push_shares = mptr;
-               }
-               if (sc->misc != NULL) {
-                       StrBufAppendBufPlain(Cfg, sc->misc, -1, 0);
-               }
-               free(sc->misc);
-
-               rc = write(TmpFD, ChrPtr(Cfg), StrLength(Cfg));
-               if ((rc >=0 ) && (rc == StrLength(Cfg))) 
-               {
-                       close(TmpFD);
-                       rename(tempfilename, filename);
-               }
-               else {
-                       syslog(LOG_EMERG, 
-                                     "unable to write %s; [%s]; not enough space on the disk?\n", 
-                                     tempfilename, 
-                                     strerror(errno));
-                       close(TmpFD);
-                       unlink(tempfilename);
-               }
-               FreeStrBuf(&Cfg);
-               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) {
-               syslog(LOG_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;
-       }
-       syslog(LOG_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);
-}
 
 
 
@@ -1434,35 +296,6 @@ void destroy_network_queue_room(void)
 }
 
 
-/*
- * 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;
-}
-
 
 
 
@@ -1574,742 +407,6 @@ void network_bounce(struct CtdlMessage *msg, char *reason) {
 
 
 
-/*
- * 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;
-
-       syslog(LOG_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) ) {
-               syslog(LOG_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()
-                               );
-                               syslog(LOG_DEBUG, "Appending to %s\n", filename);
-                               fp = fopen(filename, "ab");
-                               if (fp != NULL) {
-                                       fwrite(sermsg.ser, sermsg.len, 1, fp);
-                                       fclose(fp);
-                               }
-                               else {
-                                       syslog(LOG_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);
-       }
-
-       /* 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);
-                       syslog(LOG_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;
-       }
-
-       /* 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);
-}
-
-
-/*
- * 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);
-       }
-
-       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) {
-               syslog(LOG_CRIT, "Error opening %s: %s\n", filename, strerror(errno));
-               return;
-       }
-
-       fseek(fp, 0L, SEEK_END);
-       syslog(LOG_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) {
-               syslog(LOG_DEBUG, "network: nothing in inbound queue\n");
-               return;
-       }
-       last_spoolin_mtime = statbuf.st_mtime;
-       syslog(LOG_DEBUG, "network: processing inbound queue\n");
-
-       /*
-        * Ok, there's something interesting in there, so scan it.
-        */
-       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
-                       );
-       
-                       syslog(LOG_DEBUG, "Consolidate %s to %s\n", filename, nexthop);
-                       if (network_talking_to(nexthop, NTT_CHECK)) {
-                               syslog(LOG_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);
-               }
-       }
-
-
-       closedir(dp);
-}
-
-
-/*
- * receive network spool from the remote system
- */
-void receive_spool(int *sock, char *remote_nodename) {
-       int download_len = 0L;
-       int bytes_received = 0L;
-       char buf[SIZ];
-       char tempfilename[PATH_MAX];
-       char permfilename[PATH_MAX];
-       int 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;
-       syslog(LOG_DEBUG, "<%s\n", buf);
-       if (buf[0] != '2') {
-               return;
-       }
-
-       download_len = extract_long(&buf[4], 0);
-       if (download_len <= 0) {
-               return;
-       }
-
-       bytes_received = 0L;
-       fp = fopen(tempfilename, "w");
-       if (fp == NULL) {
-               syslog(LOG_CRIT, "Cannot create %s: %s\n", tempfilename, strerror(errno));
-               return;
-       }
-
-       syslog(LOG_DEBUG, "Expecting to transfer %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 (server_shutting_down)
-               {
-                       fclose(fp);
-                       unlink(tempfilename);
-                       return;
-               }
-               snprintf(buf, sizeof buf, "READ %d|%d",
-                        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_int(&buf[4], 0);
-                       StrBuf *pbuf = NewStrBuf();
-                       if (socket_read_blob(sock, pbuf, plen, CLIENT_TIMEOUT) != plen) {
-                               syslog(LOG_INFO, "Short read from peer; aborting.\n");
-                               fclose(fp);
-                               unlink(tempfilename);
-                               FreeStrBuf(&pbuf);
-                               return;
-                       }
-                       fwrite(ChrPtr(pbuf), plen, 1, fp);
-                       bytes_received += plen;
-                       FreeStrBuf(&pbuf);
-               }
-       }
-
-       fclose(fp);
-
-       /* Last chance for shutdown exit */
-       if (server_shutting_down)
-       {
-               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;
-       }
-
-       syslog(LOG_DEBUG, "%s\n", buf);
-
-       /*
-        * Now move the temp file to its permanent location.
-        */
-       if (link(tempfilename, permfilename) != 0) {
-               syslog(LOG_ALERT, "Could not link %s to %s: %s\n",
-                       tempfilename, permfilename, strerror(errno)
-               );
-       }
-       
-       unlink(tempfilename);
-}
-
-
-
-/*
- * transmit network spool to the remote system
- */
-void transmit_spool(int *sock, char *remote_nodename)
-{
-       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;
-       syslog(LOG_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) {
-                       syslog(LOG_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 (server_shutting_down)
-                       {
-                               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(server_shutting_down)
-               return;
-               
-       if (sock_puts(sock, "UCLS 1") < 0) return;
-
-       /*
-        * From here on we must complete or messages will get lost
-        */
-       if (sock_getln(sock, buf, sizeof buf) < 0) return;
-       syslog(LOG_NOTICE, "Sent %ld octets to <%s>\n", bytes_written, remote_nodename);
-       syslog(LOG_DEBUG, "<%s\n", buf);
-       if (buf[0] == '2') {
-               syslog(LOG_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);
-       syslog(LOG_DEBUG, "network: polling <%s>\n", node);
-       syslog(LOG_NOTICE, "Connecting to <%s> at %s:%s\n", node, host, port);
-
-       sock = sock_connect(host, port);
-       if (sock < 0) {
-               syslog(LOG_ERR, "Could not connect: %s\n", strerror(errno));
-               network_talking_to(node, NTT_REMOVE);
-               return;
-       }
-       
-       syslog(LOG_DEBUG, "Connected!\n");
-       CCC->SBuf.Buf = NewStrBuf();
-       CCC->sMigrateBuf = NewStrBuf();
-       CCC->SBuf.ReadWritePointer = NULL;
-
-       /* Read the server greeting */
-       if (sock_getln(&sock, buf, sizeof buf) < 0) goto bail;
-       syslog(LOG_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))
-       {
-               snprintf(err_buf, sizeof(err_buf),
-                       "Connected to node \"%s\" but I was expecting to connect to node \"%s\".",
-                       connected_to, node
-               );
-               syslog(LOG_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);
-               syslog(LOG_DEBUG, "<%s\n", buf);
-               if (sock_puts(&sock, buf) <0) goto bail;
-               if (sock_getln(&sock, buf, sizeof buf) < 0) goto bail;
-               syslog(LOG_DEBUG, ">%s\n", buf);
-               if (buf[0] != '2') {
-                       goto bail;
-               }
-       
-               /* At this point we are authenticated. */
-               if (!server_shutting_down)
-                       receive_spool(&sock, node);
-               if (!server_shutting_down)
-                       transmit_spool(&sock, node);
-       }
-
-       sock_puts(&sock, "QUIT");
-bail:  
-       FreeStrBuf(&CCC->SBuf.Buf);
-       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) {
-               syslog(LOG_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(server_shutting_down)
-                       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))
-               syslog(LOG_EMERG, "unable to create directory [%s]: %s", ctdl_spool_dir, strerror(errno));
-       if (chown(ctdl_spool_dir, CTDLUID, (-1)) != 0)
-               syslog(LOG_EMERG, "unable to set the access rights for [%s]: %s", ctdl_spool_dir, strerror(errno));
-       if ((mkdir(ctdl_netin_dir, 0700) != 0) && (errno != EEXIST))
-               syslog(LOG_EMERG, "unable to create directory [%s]: %s", ctdl_netin_dir, strerror(errno));
-       if (chown(ctdl_netin_dir, CTDLUID, (-1)) != 0)
-               syslog(LOG_EMERG, "unable to set the access rights for [%s]: %s", ctdl_netin_dir, strerror(errno));
-       if ((mkdir(ctdl_nettmp_dir, 0700) != 0) && (errno != EEXIST))
-               syslog(LOG_EMERG, "unable to create directory [%s]: %s", ctdl_nettmp_dir, strerror(errno));
-       if (chown(ctdl_nettmp_dir, CTDLUID, (-1)) != 0)
-               syslog(LOG_EMERG, "unable to set the access rights for [%s]: %s", ctdl_nettmp_dir, strerror(errno));
-       if ((mkdir(ctdl_netout_dir, 0700) != 0) && (errno != EEXIST))
-               syslog(LOG_EMERG, "unable to create directory [%s]: %s", ctdl_netout_dir, strerror(errno));
-       if (chown(ctdl_netout_dir, CTDLUID, (-1)) != 0)
-               syslog(LOG_EMERG, "unable to set the access rights for [%s]: %s", ctdl_netout_dir, strerror(errno));
-}
-
-
 
 
 
@@ -2349,12 +446,6 @@ void network_do_queue(void) {
        /* 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.
@@ -2420,63 +511,6 @@ void network_do_queue(void) {
 }
 
 
-/*
- * cmd_netp() - authenticate to the server as another Citadel node polling
- *           for network traffic
- */
-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
-               );
-               syslog(LOG_WARNING, "%s", 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
-               );
-               syslog(LOG_WARNING, "%s", err_buf);
-               cprintf("%d authentication failed\n", ERROR + PASSWORD_REQUIRED);
-               CtdlAideMessage(err_buf, "IGNet Networking.");
-               return;
-       }
-
-       if (network_talking_to(node, NTT_CHECK)) {
-               syslog(LOG_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);
-       syslog(LOG_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)
@@ -2493,10 +527,6 @@ 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");
                CtdlRegisterProtoHook(cmd_nsyn, "NSYN", "Synchronize room to node");
                CtdlRegisterRoomHook(network_room_handler);
                CtdlRegisterCleanupHook(destroy_network_queue_room);