X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fmodules%2Fnetwork%2Fserv_netspool.c;h=5055eabfa0bd9230a4bad7355dac7426c03b1b74;hb=aca7dd04d80f04b9cd61f740549ce370e76bc332;hp=1aeb10ffc1537421996d66b255c214ee7f4e9f2d;hpb=50a7f9b7c2183eb912b5c22d8f70b82a8310a6c6;p=citadel.git

diff --git a/citadel/modules/network/serv_netspool.c b/citadel/modules/network/serv_netspool.c
index 1aeb10ffc..5055eabfa 100644
--- a/citadel/modules/network/serv_netspool.c
+++ b/citadel/modules/network/serv_netspool.c
@@ -2,21 +2,15 @@
  * This module handles shared rooms, inter-Citadel mail, and outbound
  * mailing list processing.
  *
- * Copyright (c) 2000-2012 by the citadel.org team
+ * Copyright (c) 2000-2020 by the citadel.org team
  *
- *  This program is open source 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
+ * 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.
  *
  * ** NOTE **   A word on the S_NETCONFIGS semaphore:
  * This is a fairly high-level type of critical section.  It ensures that no
@@ -66,6 +60,7 @@
 #include <sys/wait.h>
 #include <string.h>
 #include <limits.h>
+#include <assert.h>
 #include <libcitadel.h>
 #include "citadel.h"
 #include "server.h"
@@ -78,917 +73,325 @@
 #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 "netconfig.h"
+#include "ctdl_module.h"
 #include "netspool.h"
 #include "netmail.h"
-#include "ctdl_module.h"
-
 
-	
 
-int read_spoolcontrol_file(SpoolControl **scc, char *filename)
+void ParseLastSent(const CfgLineType *ThisOne, StrBuf *Line, const char *LinePos, OneRoomNetCfg *OneRNCFG)
 {
-	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;
+	RoomNetCfgLine *nptr;
+	nptr = (RoomNetCfgLine *) malloc(sizeof(RoomNetCfgLine));
+	memset(nptr, 0, sizeof(RoomNetCfgLine));
+	OneRNCFG->lastsent = extract_long(LinePos, 0);
+	OneRNCFG->NetConfigs[ThisOne->C] = nptr;
+}
 
-	fp = fopen(filename, "r");
-	if (fp == NULL) {
-		return 0;
+void ParseRoomAlias(const CfgLineType *ThisOne, StrBuf *Line, const char *LinePos, OneRoomNetCfg *rncfg)
+{
+	if (rncfg->Sender != NULL) {
+		return;
 	}
-	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;
-			}
-		}
+	ParseGeneric(ThisOne, Line, LinePos, rncfg);
+	rncfg->Sender = NewStrBufDup(rncfg->NetConfigs[roommailalias]->Value[0]);
+}
 
+void ParseSubPendingLine(const CfgLineType *ThisOne, StrBuf *Line, const char *LinePos, OneRoomNetCfg *OneRNCFG)
+{
+	if (time(NULL) - extract_long(LinePos, 3) > EXP) 
+		return; /* expired subscription... */
 
-	}
-	fclose(fp);
-	return 1;
+	ParseGeneric(ThisOne, Line, LinePos, OneRNCFG);
 }
-
-void free_spoolcontrol_struct(SpoolControl **scc)
+void ParseUnSubPendingLine(const CfgLineType *ThisOne, StrBuf *Line, const char *LinePos, OneRoomNetCfg *OneRNCFG)
 {
-	SpoolControl *sc;
-	namelist *nptr = NULL;
-	maplist *mptr = NULL;
+	if (time(NULL) - extract_long(LinePos, 2) > EXP)
+		return; /* expired subscription... */
 
-	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;
+	ParseGeneric(ThisOne, Line, LinePos, OneRNCFG);
 }
 
-int writenfree_spoolcontrol_file(SpoolControl **scc, char *filename)
+
+void SerializeLastSent(const CfgLineType *ThisOne, StrBuf *OutputBuffer, OneRoomNetCfg *RNCfg, RoomNetCfgLine *data)
 {
-	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;
+	StrBufAppendBufPlain(OutputBuffer, CKEY(ThisOne->Str), 0);
+	StrBufAppendPrintf(OutputBuffer, "|%ld\n", RNCfg->lastsent);
+}
 
-	len = strlen(filename);
-	memcpy(tempfilename, filename, len + 1);
+void DeleteLastSent(const CfgLineType *ThisOne, RoomNetCfgLine **data)
+{
+	free(*data);
+	*data = NULL;
+}
 
+static const RoomNetCfg SpoolCfgs [4] = {
+	listrecp,
+	digestrecp,
+	participate,
+};
 
-#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;
+static const long SpoolCfgsCopyN [4] = {
+	1, 1, 1, 2
+};
 
-	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)
+int HaveSpoolConfig(OneRoomNetCfg* RNCfg)
 {
-	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;
+	int i;
+	int interested = 0;
+	for (i=0; i < 4; i++) if (RNCfg->NetConfigs[SpoolCfgs[i]] == NULL) interested = 1;
+	return interested;
 }
 
 
-/*
- * Batch up and send all outbound traffic from the current room
- */
-void network_spoolout_room(RoomProcList *room_to_spool, 		       
-			   HashList *working_ignetcfg,
-			   HashList *the_netmap)
-{
-	char buf[SIZ];
-	char filename[PATH_MAX];
+void InspectQueuedRoom(SpoolControl **pSC,
+		       RoomProcList *room_to_spool,     
+		       HashList *working_ignetcfg,
+		       HashList *the_netmap
+) {
 	SpoolControl *sc;
-	int i;
+	int i = 0;
+
+	syslog(LOG_INFO, "netspool: InspectQueuedRoom(%s)", room_to_spool->name);
+
+	sc = (SpoolControl*)malloc(sizeof(SpoolControl));
+	memset(sc, 0, sizeof(SpoolControl));
+	sc->working_ignetcfg = working_ignetcfg;
+	sc->the_netmap = the_netmap;
 
 	/*
 	 * 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->name) != 0) {
-		syslog(LOG_CRIT, "ERROR: cannot load <%s>\n", room_to_spool->name);
+	if (CtdlGetRoom(&sc->room, room_to_spool->name) != 0) {
+		syslog(LOG_INFO, "netspool: ERROR; cannot load <%s>", room_to_spool->name);
+		free(sc);
 		return;
 	}
 
-	assoc_file_name(filename, sizeof filename, &CC->room, ctdl_netcfg_dir);
-	begin_critical_section(S_NETCONFIGS);
+	assert(sc->RNCfg == NULL);	// checking to make sure we cleared it from last time
+
+	sc->RNCfg = CtdlGetNetCfgForRoom(sc->room.QRnumber);
 
-	/* Only do net processing for rooms that have netconfigs */
-	if (!read_spoolcontrol_file(&sc, filename))
+	syslog(LOG_DEBUG, "netspool: room <%s> highest=%ld lastsent=%ld", room_to_spool->name, sc->room.QRhighest, sc->RNCfg->lastsent);
+	if ( (!HaveSpoolConfig(sc->RNCfg)) || (sc->room.QRhighest <= sc->RNCfg->lastsent) ) 
 	{
-		end_critical_section(S_NETCONFIGS);
+		// There is nothing to send from this room.
+		syslog(LOG_DEBUG, "netspool: nothing to do for <%s>", room_to_spool->name);
+		FreeRoomNetworkStruct(&sc->RNCfg);
+		sc->RNCfg = NULL;
+		free(sc);
 		return;
 	}
-	syslog(LOG_INFO, "Networking started for <%s>\n", CC->room.QRname);
 
-	sc->working_ignetcfg = working_ignetcfg;
-	sc->the_netmap = the_netmap;
+	sc->lastsent = sc->RNCfg->lastsent;
+	room_to_spool->lastsent = sc->lastsent;
 
-	/* 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");
-	}
+	/* Now lets remember whats needed for the actual work... */
 
-	/* 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] = '_';
+	for (i=0; i < 4; i++)
+	{
+		aggregate_recipients(&sc->Users[SpoolCfgs[i]], SpoolCfgs[i], sc->RNCfg, SpoolCfgsCopyN[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 */
+	
+	if (StrLength(sc->RNCfg->Sender) > 0) {
+		sc->Users[roommailalias] = NewStrBufDup(sc->RNCfg->Sender);
 	}
 
-	/* Now rewrite the config file */
-	writenfree_spoolcontrol_file(&sc, filename);
-	end_critical_section(S_NETCONFIGS);
+	sc->next = *pSC;
+	*pSC = sc;
+
+	FreeRoomNetworkStruct(&sc->RNCfg);	// done with this for now, we'll grab it again next time
+	sc->RNCfg = NULL;
 }
 
-/*
- * Process a buffer containing a single message from a single file
- * from the inbound queue 
- */
-void network_process_buffer(char *buffer, long size, HashList *working_ignetcfg, HashList *the_netmap, int *netmap_changed)
+
+void CalcListID(SpoolControl *sc)
 {
+	StrBuf *RoomName;
 	struct CitContext *CCC = CC;
-	StrBuf *Buf = NULL;
-	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;
-	const StrBuf *nexthop = NULL;
-	unsigned char firstbyte;
-	unsigned char lastbyte;
-
-	QN_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) ) {
-		QN_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 */
-			Buf = NewStrBufPlain(msg->cm_fields['D'], -1);
-			if (is_valid_node(&nexthop, 
-					  NULL, 
-					  Buf, 
-					  working_ignetcfg, 
-					  the_netmap) == 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 (StrLength(nexthop) == 0) {
-					nexthop = Buf;
-				}
-				snprintf(filename,
-					 sizeof filename,
-					 "%s/%s@%lx%x",
-					 ctdl_netout_dir,
-					 ChrPtr(nexthop),
-					 time(NULL),
-					 rand()
-				);
-				QN_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 {
-					QN_syslog(LOG_ERR, "%s: %s\n", filename, strerror(errno));
-				}
-				free(sermsg.ser);
-				CtdlFreeMessage(msg);
-				FreeStrBuf(&Buf);
-				return;
-			}
-			
-			else {	/* invalid destination node name */
-				FreeStrBuf(&Buf);
-
-				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'], 
-				       the_netmap, 
-				       netmap_changed);
+#define MAX_LISTIDLENGTH 150
+
+	// Load the room banner as the list description
+	struct CtdlMessage *msg = CtdlFetchMessage(sc->room.msgnum_info, 1);
+        if (msg != NULL) {
+		CC->redirect_buffer = NewStrBufPlain(NULL, SIZ);
+                CtdlOutputPreLoadedMsg(msg, MT_CITADEL, HEADERS_NONE, 0, 0, 0);
+                CM_Free(msg);
+		sc->RoomInfo = CC->redirect_buffer;
+		CC->redirect_buffer = NULL;
+        }
+	else {
+		sc->RoomInfo = NewStrBufPlain(NULL, SIZ);
 	}
 
-	/* 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);
-	}
+	// Calculate the List ID
+	sc->ListID = NewStrBufPlain(NULL, 1024);
+	if (StrLength(sc->RoomInfo) > 0)
+	{
+		const char *Pos = NULL;
+		StrBufSipLine(sc->ListID, sc->RoomInfo, &Pos);
 
-	/* 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);
-			QNM_syslog(LOG_DEBUG, "Bouncing message due to invalid recipient address.\n");
-			return;
+		if (StrLength(sc->ListID) > MAX_LISTIDLENGTH)
+		{
+			StrBufCutAt(sc->ListID, MAX_LISTIDLENGTH, NULL);
+			StrBufAppendBufPlain(sc->ListID, HKEY("..."), 0);
 		}
-		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;
+		StrBufAsciify(sc->ListID, ' ');
 	}
-	if (msg->cm_fields['C'] != NULL) {
-		free(msg->cm_fields['C']);
-		msg->cm_fields['C'] = NULL;
+	else
+	{
+		StrBufAppendBufPlain(sc->ListID, CCC->room.QRname, -1, 0);
 	}
 
-	/* 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);
-}
+	StrBufAppendBufPlain(sc->ListID, HKEY("<"), 0);
+	RoomName = NewStrBufPlain (sc->room.QRname, -1);
+	StrBufAsciify(RoomName, '_');
+	StrBufReplaceChars(RoomName, ' ', '_');
 
+	if (StrLength(sc->Users[roommailalias]) > 0)
+	{
+		long Pos;
+		const char *AtPos;
 
-/*
- * Process a single message from a single file from the inbound queue 
- */
-void network_process_message(FILE *fp, 
-			     long msgstart, 
-			     long msgend,
-			     HashList *working_ignetcfg,
-			     HashList *the_netmap, 
-			     int *netmap_changed)
-{
-	long hold_pos;
-	long size;
-	char *buffer;
+		Pos = StrLength(sc->ListID);
+		StrBufAppendBuf(sc->ListID, sc->Users[roommailalias], 0);
+		AtPos = strchr(ChrPtr(sc->ListID) + Pos, '@');
 
-	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, 
-					       working_ignetcfg, 
-					       the_netmap, 
-					       netmap_changed);
+		if (AtPos != NULL)
+		{
+			StrBufPeek(sc->ListID, AtPos, 0, '.');
 		}
-		free(buffer);
 	}
-
-	fseek(fp, hold_pos, SEEK_SET);
-}
-
-
-/*
- * Process a single file from the inbound queue 
- */
-void network_process_file(char *filename,
-			  HashList *working_ignetcfg,
-			  HashList *the_netmap, 
-			  int *netmap_changed)
-{
-	struct CitContext *CCC = CC;
-	FILE *fp;
-	long msgstart = (-1L);
-	long msgend = (-1L);
-	long msgcur = 0L;
-	int ch;
-
-
-	fp = fopen(filename, "rb");
-	if (fp == NULL) {
-		QN_syslog(LOG_CRIT, "Error opening %s: %s\n", filename, strerror(errno));
-		return;
+	else
+	{
+		StrBufAppendBufPlain(sc->ListID, HKEY("room_"), 0);
+		StrBufAppendBuf(sc->ListID, RoomName, 0);
+		StrBufAppendBufPlain(sc->ListID, HKEY("."), 0);
+		StrBufAppendBufPlain(sc->ListID, CtdlGetConfigStr("c_fqdn"), -1, 0);
+		/*
+		 * this used to be:
+		 * roomname <Room-Number.list-id.fqdn>
+		 * according to rfc2919.txt it only has to be a unique identifier
+		 * under the domain of the system; 
+		 * in general MUAs use it to calculate the reply address nowadays.
+		 */
 	}
+	StrBufAppendBufPlain(sc->ListID, HKEY(">"), 0);
 
-	fseek(fp, 0L, SEEK_END);
-	QN_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,
-							working_ignetcfg,
-							the_netmap,
-							netmap_changed);
-			}
-			msgstart = msgcur;
-		}
-
-		++msgcur;
-	}
+	if (StrLength(sc->Users[roommailalias]) == 0)
+	{
+		sc->Users[roommailalias] = NewStrBuf();
+		
+		StrBufAppendBufPlain(sc->Users[roommailalias], HKEY("room_"), 0);
+		StrBufAppendBuf(sc->Users[roommailalias], RoomName, 0);
+		StrBufAppendBufPlain(sc->Users[roommailalias], HKEY("@"), 0);
+		StrBufAppendBufPlain(sc->Users[roommailalias], CtdlGetConfigStr("c_fqdn"), -1, 0);
 
-	msgend = msgcur - 1;
-	if (msgstart >= 0L) {
-		network_process_message(fp,
-					msgstart,
-					msgend,
-					working_ignetcfg,
-					the_netmap,
-					netmap_changed);
+		StrBufLowerCase(sc->Users[roommailalias]);
 	}
 
-	fclose(fp);
-	unlink(filename);
+	FreeStrBuf(&RoomName);
 }
 
 
 /*
- * Process anything in the inbound queue
+ * Batch up and send all outbound traffic from the current room (this is definitely used for mailing lists)
  */
-void network_do_spoolin(HashList *working_ignetcfg, HashList *the_netmap, int *netmap_changed)
+void network_spoolout_room(SpoolControl *sc)
 {
 	struct CitContext *CCC = CC;
-	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) {
-		QNM_syslog(LOG_DEBUG, "network: nothing in inbound queue\n");
-		return;
-	}
-	last_spoolin_mtime = statbuf.st_mtime;
-	QNM_syslog(LOG_DEBUG, "network: processing inbound queue\n");
+	char buf[SIZ];
+	int i;
+	long lastsent;
 
 	/*
-	 * Ok, there's something interesting in there, so scan it.
+	 * 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.
 	 */
-	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,
-					     working_ignetcfg,
-					     the_netmap,
-					     netmap_changed);
-		}
-	}
-
-	closedir(dp);
-}
+	memcpy (&CCC->room, &sc->room, sizeof(ctdlroom));
 
-/*
- * 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(HashList *working_ignetcfg, HashList *the_netmap)
-{
-	struct CitContext *CCC = CC;
-	IOBuffer IOB;
-	FDIOBuffer FDIO;
-        int d_namelen;
-	DIR *dp;
-	struct dirent *d;
-	struct dirent *filedir_entry;
-	const char *pch;
-	char spooloutfilename[PATH_MAX];
-	char filename[PATH_MAX];
-	const StrBuf *nexthop;
-	StrBuf *NextHop;
-	int i;
-	struct stat statbuf;
-	int nFailed = 0;
+	syslog(LOG_INFO, "netspool: network_spoolout_room(room=%s, lastsent=%ld)", CCC->room.QRname, sc->lastsent);
 
-	/* Step 1: consolidate files in the outbound queue into one file per neighbor node */
-	d = (struct dirent *)malloc(offsetof(struct dirent, d_name) + PATH_MAX + 1);
-	if (d == NULL) 	return;
+	CalcListID(sc);
 
-	dp = opendir(ctdl_netout_dir);
-	if (dp == NULL) {
-		free(d);
-		return;
-	}
+	/* remember where we started... */
+	lastsent = sc->lastsent;
 
-	NextHop = NewStrBuf();
-	memset(&IOB, 0, sizeof(IOBuffer));
-	memset(&FDIO, 0, sizeof(FDIOBuffer));
-	FDIO.IOB = &IOB;
+	/* Fetch the messages we ought to send & prepare them. */
+	CtdlForEachMessage(MSGS_GT, sc->lastsent, NULL, NULL, NULL, network_spool_msg, sc);
 
-	while ((readdir_r(dp, d, &filedir_entry) == 0) &&
-	       (filedir_entry != NULL))
+	if (StrLength(sc->Users[roommailalias]) > 0)
 	{
-#ifdef _DIRENT_HAVE_D_NAMELEN
-		d_namelen = filedir_entry->d_namelen;
-#else
-
-#ifndef DT_UNKNOWN
-#define DT_UNKNOWN     0
-#define DT_DIR         4
-#define DT_REG         8
-#define DT_LNK         10
-
-#define IFTODT(mode)   (((mode) & 0170000) >> 12)
-#define DTTOIF(dirtype)        ((dirtype) << 12)
-#endif
-		d_namelen = strlen(filedir_entry->d_name);
-#endif
-		if ((d_namelen > 1) && filedir_entry->d_name[d_namelen - 1] == '~')
-			continue; /* Ignore backup files... */
-
-		if ((d_namelen == 1) && 
-		    (filedir_entry->d_name[0] == '.'))
-			continue;
-
-		if ((d_namelen == 2) && 
-		    (filedir_entry->d_name[0] == '.') &&
-		    (filedir_entry->d_name[1] == '.'))
-			continue;
-
-		pch = strchr(filedir_entry->d_name, '@');
-		if (pch == NULL)
-			continue;
-
-		snprintf(filename, 
-			 sizeof filename,
-			 "%s/%s",
-			 ctdl_netout_dir,
-			 filedir_entry->d_name);
-
-		StrBufPlain(NextHop,
-			    filedir_entry->d_name,
-			    pch - filedir_entry->d_name);
-
-		snprintf(spooloutfilename,
-			 sizeof spooloutfilename,
-			 "%s/%s",
-			 ctdl_netout_dir,
-			 ChrPtr(NextHop));
-
-		QN_syslog(LOG_DEBUG, "Consolidate %s to %s\n", filename, ChrPtr(NextHop));
-		if (network_talking_to(SKEY(NextHop), NTT_CHECK)) {
-			nFailed++;
-			QN_syslog(LOG_DEBUG,
-				  "Currently online with %s - skipping for now\n",
-				  ChrPtr(NextHop)
-				);
-		}
-		else {
-			size_t dsize;
-			size_t fsize;
-			int infd, outfd;
-			const char *err = NULL;
-			network_talking_to(SKEY(NextHop), NTT_ADD);
-
-			infd = open(filename, O_RDONLY);
-			if (infd == -1) {
-				nFailed++;
-				QN_syslog(LOG_ERR,
-					  "failed to open %s for reading due to %s; skipping.\n",
-					  filename, strerror(errno)
-					);
-				network_talking_to(SKEY(NextHop), NTT_REMOVE);
-				continue;				
-			}
-			
-			outfd = open(spooloutfilename,
-				  O_EXCL|O_CREAT|O_NONBLOCK|O_WRONLY, 
-				  S_IRUSR|S_IWUSR);
-			if (outfd == -1)
-			{
-				outfd = open(spooloutfilename,
-					     O_EXCL|O_NONBLOCK|O_WRONLY, 
-					     S_IRUSR | S_IWUSR);
-			}
-			if (outfd == -1) {
-				nFailed++;
-				QN_syslog(LOG_ERR,
-					  "failed to open %s for reading due to %s; skipping.\n",
-					  spooloutfilename, strerror(errno)
-					);
-				close(infd);
-				network_talking_to(SKEY(NextHop), NTT_REMOVE);
-				continue;
-			}
-
-			dsize = lseek(outfd, 0, SEEK_END);
-			lseek(outfd, -dsize, SEEK_SET);
-
-			fstat(infd, &statbuf);
-			fsize = statbuf.st_size;
-/*
-			fsize = lseek(infd, 0, SEEK_END);
-*/			
-			IOB.fd = infd;
-			FDIOBufferInit(&FDIO, &IOB, outfd, fsize + dsize);
-			FDIO.ChunkSendRemain = fsize;
-			FDIO.TotalSentAlready = dsize;
-			err = NULL;
-			errno = 0;
-			do {} while ((FileMoveChunked(&FDIO, &err) > 0) && (err == NULL));
-			if (err == NULL) {
-				unlink(filename);
-			}
-			else {
-				nFailed++;
-				QN_syslog(LOG_ERR,
-					  "failed to append to %s [%s]; rolling back..\n",
-					  spooloutfilename, strerror(errno)
-					);
-				/* whoops partial append?? truncate spooloutfilename again! */
-				ftruncate(outfd, dsize);
-			}
-			FDIOBufferDelete(&FDIO);
-			close(infd);
-			close(outfd);
-			network_talking_to(SKEY(NextHop), NTT_REMOVE);
-		}
+		long len;
+		len = StrLength(sc->Users[roommailalias]);
+		if (len + 1 > sizeof(buf))
+			len = sizeof(buf) - 1;
+		memcpy(buf, ChrPtr(sc->Users[roommailalias]), len);
+		buf[len] = '\0';
+	}
+	else
+	{
+		snprintf(buf, sizeof buf, "room_%s@%s", CCC->room.QRname, CtdlGetConfigStr("c_fqdn"));
 	}
-	closedir(dp);
-
-	if (nFailed > 0) {
-		FreeStrBuf(&NextHop);
-		QN_syslog(LOG_INFO,
-			  "skipping Spoolcleanup because of %d files unprocessed.\n",
-			  nFailed
-			);
 
-		return;
+	for (i=0; buf[i]; ++i) {
+		buf[i] = tolower(buf[i]);
+		if (isspace(buf[i])) buf[i] = '_';
 	}
 
-	/* 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) {
-		FreeStrBuf(&NextHop);
-		free(d);
-		return;
+	/* If we wrote a digest, deliver it and then close it */
+	if ( (sc->Users[digestrecp] != NULL) && (sc->digestfp != NULL) )
+	{
+		fprintf(sc->digestfp,
+			" ------------------------------------------------------------------------------\n"
+			"You are subscribed to the '%s' list.\n"
+			"To post to the list: %s\n",
+			CCC->room.QRname, buf
+		);
+		network_deliver_digest(sc);	/* deliver */
+		fclose(sc->digestfp);
+		sc->digestfp = NULL;
+		remove_digest_file(&sc->room);
 	}
 
-	while ((readdir_r(dp, d, &filedir_entry) == 0) &&
-	       (filedir_entry != NULL))
+	/* Now rewrite the netconfig */
+	syslog(LOG_DEBUG, "netspool: lastsent was %ld , now it is %ld", lastsent, sc->lastsent);
+	if (sc->lastsent != lastsent)
 	{
-#ifdef _DIRENT_HAVE_D_NAMELEN
-		d_namelen = filedir_entry->d_namelen;
-		d_type = filedir_entry->d_type;
-#else
-
-#ifndef DT_UNKNOWN
-#define DT_UNKNOWN     0
-#define DT_DIR         4
-#define DT_REG         8
-#define DT_LNK         10
-
-#define IFTODT(mode)   (((mode) & 0170000) >> 12)
-#define DTTOIF(dirtype)        ((dirtype) << 12)
-#endif
-		d_namelen = strlen(filedir_entry->d_name);
-#endif
-		if ((d_namelen == 1) && 
-		    (filedir_entry->d_name[0] == '.'))
-			continue;
-
-		if ((d_namelen == 2) && 
-		    (filedir_entry->d_name[0] == '.') &&
-		    (filedir_entry->d_name[1] == '.'))
-			continue;
+		OneRoomNetCfg *r;
 
-		pch = strchr(filedir_entry->d_name, '@');
-		if (pch == NULL) /* no @ in name? consolidated file. */
-			continue;
+		begin_critical_section(S_NETCONFIGS);
+		r = CtdlGetNetCfgForRoom(sc->room.QRnumber);
+		r->lastsent = sc->lastsent;
+		SaveRoomNetConfigFile(r, sc->room.QRnumber);
+		FreeRoomNetworkStruct(&r);
+		end_critical_section(S_NETCONFIGS);
+	}
+}
 
-		StrBufPlain(NextHop,
-			    filedir_entry->d_name,
-			    pch - filedir_entry->d_name);
 
-		snprintf(filename, 
-			sizeof filename,
-			"%s/%s",
-			ctdl_netout_dir,
-			filedir_entry->d_name
-		);
-
-		i = is_valid_node(&nexthop,
-				  NULL,
-				  NextHop,
-				  working_ignetcfg,
-				  the_netmap);
-	
-		if ( (i != 0) || (StrLength(nexthop) > 0) ) {
-			unlink(filename);
-		}
-	}
-	FreeStrBuf(&NextHop);
-	free(d);
-	closedir(dp);
+void free_spoolcontrol_struct(SpoolControl **sc)
+{
+	free_spoolcontrol_struct_members(*sc);
+	free(*sc);
+	*sc = NULL;
 }
 
 
+void free_spoolcontrol_struct_members(SpoolControl *sc)
+{
+	int i;
+	FreeStrBuf(&sc->RoomInfo);
+	FreeStrBuf(&sc->ListID);
+	for (i = 0; i < maxRoomNetCfg; i++)
+		FreeStrBuf(&sc->Users[i]);
+}
 
 
 /*
@@ -996,23 +399,16 @@ void network_consolidate_spoolout(HashList *working_ignetcfg, HashList *the_netm
  */
 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));
+		syslog(LOG_EMERG, "netspool: 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));
+		syslog(LOG_EMERG, "netspool: unable to set the access rights for [%s]: %s", ctdl_spool_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));
+		syslog(LOG_EMERG, "netspool: 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));
+		syslog(LOG_EMERG, "netspool: unable to set the access rights for [%s]: %s", ctdl_nettmp_dir, strerror(errno));
 }
 
+
 /*
  * Module entry point
  */
@@ -1020,8 +416,14 @@ CTDL_MODULE_INIT(network_spool)
 {
 	if (!threading)
 	{
+		CtdlREGISTERRoomCfgType(subpending,       ParseSubPendingLine,   0, 5, SerializeGeneric,  DeleteGenericCfgLine);
+		CtdlREGISTERRoomCfgType(unsubpending,     ParseUnSubPendingLine, 0, 4, SerializeGeneric,  DeleteGenericCfgLine);
+		CtdlREGISTERRoomCfgType(lastsent,         ParseLastSent,         1, 1, SerializeLastSent, DeleteLastSent);
+		CtdlREGISTERRoomCfgType(listrecp,         ParseGeneric,          0, 1, SerializeGeneric,  DeleteGenericCfgLine);
+		CtdlREGISTERRoomCfgType(digestrecp,       ParseGeneric,          0, 1, SerializeGeneric,  DeleteGenericCfgLine);
+		CtdlREGISTERRoomCfgType(participate,      ParseGeneric,          0, 1, SerializeGeneric,  DeleteGenericCfgLine);
+		CtdlREGISTERRoomCfgType(roommailalias,    ParseRoomAlias,        0, 1, SerializeGeneric,  DeleteGenericCfgLine);
 		create_spool_dirs();
-//////todo		CtdlRegisterCleanupHook(destroy_network_queue_room);
 	}
 	return "network_spool";
 }