X-Git-Url: https://code.citadel.org/?p=citadel.git;a=blobdiff_plain;f=citadel%2Fmodules%2Fnetwork%2Fserv_netmail.c;h=b4c5f713b8f9f6da65d7694b247e27b37564fa29;hp=d9cd510930065c9d315bd80822239605d3fece97;hb=5ac2920028e92a453c686c799327d7a66b3e7b49;hpb=cccc01dc3c5b9f774156b199bc1fe11f6aa9d319

diff --git a/citadel/modules/network/serv_netmail.c b/citadel/modules/network/serv_netmail.c
index d9cd51093..b4c5f713b 100644
--- a/citadel/modules/network/serv_netmail.c
+++ b/citadel/modules/network/serv_netmail.c
@@ -1,16 +1,15 @@
 /*
- * This module handles shared rooms, inter-Citadel mail, and outbound
- * mailing list processing.
+ * This module handles network mail and 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, version 3.
+ * 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.
+ * 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
@@ -72,7 +71,6 @@
 #include "internet_addressing.h"
 #include "serv_network.h"
 #include "clientsocket.h"
-#include "file_ops.h"
 #include "citadel_dirs.h"
 #include "threads.h"
 #include "context.h"
@@ -82,11 +80,11 @@
 
 void network_deliver_list(struct CtdlMessage *msg, SpoolControl *sc, const char *RoomName);
 
-void aggregate_recipients(StrBuf **recps, RoomNetCfg Which, OneRoomNetCfg *OneRNCfg)
+void aggregate_recipients(StrBuf **recps, RoomNetCfg Which, OneRoomNetCfg *OneRNCfg, long nSegments)
 {
+	int i;
 	size_t recps_len = 0;
 	RoomNetCfgLine *nptr;
-	struct CitContext *CCC = CC;
 
 	*recps = NULL;
 	/*
@@ -103,19 +101,67 @@ void aggregate_recipients(StrBuf **recps, RoomNetCfg Which, OneRoomNetCfg *OneRN
 	*recps = NewStrBufPlain(NULL, recps_len);
 
 	if (*recps == NULL) {
-		QN_syslog(LOG_EMERG,
-			  "Cannot allocate %ld bytes for recps...\n",
-			  (long)recps_len);
+		syslog(LOG_ERR, "netmail: cannot allocate %ld bytes for recps", (long)recps_len);
 		abort();
 	}
 
 	/* Each recipient */
 	for (nptr = OneRNCfg->NetConfigs[Which]; nptr != NULL; nptr = nptr->next) {
 		if (nptr != OneRNCfg->NetConfigs[Which]) {
-			StrBufAppendBufPlain(*recps, HKEY(","), 0);
+			for (i = 0; i < nSegments; i++)
+				StrBufAppendBufPlain(*recps, HKEY(","), i);
 		}
 		StrBufAppendBuf(*recps, nptr->Value[0], 0);
+		if (Which == ignet_push_share)
+		{
+			StrBufAppendBufPlain(*recps, HKEY(","), 0);
+			StrBufAppendBuf(*recps, nptr->Value[1], 0);
+
+		}
+	}
+}
+
+static void ListCalculateSubject(struct CtdlMessage *msg)
+{
+	struct CitContext *CCC = CC;
+	StrBuf *Subject, *FlatSubject;
+	int rlen;
+	char *pCh;
+
+	if (CM_IsEmpty(msg, eMsgSubject)) {
+		Subject = NewStrBufPlain(HKEY("(no subject)"));
+	}
+	else {
+		Subject = NewStrBufPlain(CM_KEY(msg, eMsgSubject));
+	}
+	FlatSubject = NewStrBufPlain(NULL, StrLength(Subject));
+	StrBuf_RFC822_to_Utf8(FlatSubject, Subject, NULL, NULL);
+
+	rlen = strlen(CCC->room.QRname);
+	pCh  = strstr(ChrPtr(FlatSubject), CCC->room.QRname);
+	if ((pCh == NULL) ||
+	    (*(pCh + rlen) != ']') ||
+	    (pCh == ChrPtr(FlatSubject)) ||
+	    (*(pCh - 1) != '[')
+		)
+	{
+		StrBuf *tmp;
+		StrBufPlain(Subject, HKEY("["));
+		StrBufAppendBufPlain(Subject,
+				     CCC->room.QRname,
+				     rlen, 0);
+		StrBufAppendBufPlain(Subject, HKEY("] "), 0);
+		StrBufAppendBuf(Subject, FlatSubject, 0);
+		/* so we can free the right one swap them */
+		tmp = Subject;
+		Subject = FlatSubject;
+		FlatSubject = tmp;
+		StrBufRFC2047encode(&Subject, FlatSubject);
 	}
+
+	CM_SetAsFieldSB(msg, eMsgSubject, &Subject);
+
+	FreeStrBuf(&FlatSubject);
 }
 
 /*
@@ -123,20 +169,17 @@ void aggregate_recipients(StrBuf **recps, RoomNetCfg Which, OneRoomNetCfg *OneRN
  */
 void network_deliver_digest(SpoolControl *sc)
 {
+	struct CitContext *CCC = CC;
+	long len;
 	char buf[SIZ];
-	int i;
+	char *pbuf;
 	struct CtdlMessage *msg = NULL;
 	long msglen;
-	StrBuf *recps = NULL;
-	char *precps;
-	struct recptypes *valid;
+	recptypes *valid;
 	char bounce_to[256];
 
-	if (sc->num_msgs_spooled < 1) {
-		fclose(sc->digestfp);
-		sc->digestfp = NULL;
+	if (sc->Users[digestrecp] == NULL)
 		return;
-	}
 
 	msg = malloc(sizeof(struct CtdlMessage));
 	memset(msg, 0, sizeof(struct CtdlMessage));
@@ -144,27 +187,16 @@ void network_deliver_digest(SpoolControl *sc)
 	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);
+	CM_SetFieldLONG(msg, eTimestamp, time(NULL));
+	CM_SetField(msg, eAuthor, CCC->room.QRname, strlen(CCC->room.QRname));
+	len = snprintf(buf, sizeof buf, "[%s]", CCC->room.QRname);
+	CM_SetField(msg, eMsgSubject, buf, len);
+
+	CM_SetField(msg, erFc822Addr, SKEY(sc->Users[roommailalias]));
+	CM_SetField(msg, eRecipient, SKEY(sc->Users[roommailalias]));
 
 	/* 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
-		);
+	CM_SetField(msg, eListID, SKEY(sc->ListID));
 
 	/*
 	 * Go fetch the contents of the digest
@@ -172,31 +204,26 @@ void network_deliver_digest(SpoolControl *sc)
 	fseek(sc->digestfp, 0L, SEEK_END);
 	msglen = ftell(sc->digestfp);
 
-	msg->cm_fields['M'] = malloc(msglen + 1);
+	pbuf = 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;
+	fread(pbuf, (size_t)msglen, 1, sc->digestfp);
+	pbuf[msglen] = '\0';
+	CM_SetAsField(msg, eMesageText, &pbuf, msglen);
 
 	/* Now generate the delivery instructions */
-	aggregate_recipients(&recps, digestrecp, sc->RNCfg);
 
 	/* 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);
+	 * Surely not the list members! */
+	snprintf(bounce_to, sizeof bounce_to, "room_aide@%s", CtdlGetConfigStr("c_fqdn"));
 
 	/* Now submit the message */
-	precps = SmashStrBuf(&recps);
-	valid = validate_recipients(precps, NULL, 0);
-	free(precps);
+	valid = validate_recipients(ChrPtr(sc->Users[digestrecp]), NULL, 0);
 	if (valid != NULL) {
 		valid->bounce_to = strdup(bounce_to);
 		valid->envelope_from = strdup(bounce_to);
 		CtdlSubmitMsg(msg, valid, NULL, 0);
 	}
-	CtdlFreeMessage(msg);
+	CM_Free(msg);
 	free_recipients(valid);
 }
 
@@ -206,40 +233,47 @@ void network_process_digest(SpoolControl *sc, struct CtdlMessage *omsg, long *de
 
 	struct CtdlMessage *msg = NULL;
 
-	/*
-	 * Process digest recipients
-	 */
-	if ((sc->RNCfg->NetConfigs[digestrecp] == NULL) || 
-	    (sc->digestfp == NULL))
+	if (sc->Users[digestrecp] == NULL)
 		return;
 
-	msg = CtdlDuplicateMessage(omsg);
+	/* If there are digest recipients, we have to build a digest */
+	if (sc->digestfp == NULL) {
+		
+		sc->digestfp = create_digest_file(&sc->room, 1);
+
+		if (sc->digestfp == NULL)
+			return;
+
+		sc->haveDigest = ftell(sc->digestfp) > 0;
+		if (!sc->haveDigest) {
+			fprintf(sc->digestfp, "Content-type: text/plain\n\n");
+		}
+		sc->haveDigest = 1;
+	}
+
+	msg = CM_Duplicate(omsg);
 	if (msg != NULL) {
+		sc->haveDigest = 1;
 		fprintf(sc->digestfp,
 			" -----------------------------------"
 			"------------------------------------"
 			"-------\n");
 		fprintf(sc->digestfp, "From: ");
-		if (msg->cm_fields['A'] != NULL) {
+		if (!CM_IsEmpty(msg, eAuthor)) {
 			fprintf(sc->digestfp,
 				"%s ",
-				msg->cm_fields['A']);
+				msg->cm_fields[eAuthor]);
 		}
-		if (msg->cm_fields['F'] != NULL) {
+		if (!CM_IsEmpty(msg, erFc822Addr)) {
 			fprintf(sc->digestfp,
 				"<%s> ",
-				msg->cm_fields['F']);
-		}
-		else if (msg->cm_fields['N'] != NULL) {
-			fprintf(sc->digestfp,
-				"@%s ",
-				msg->cm_fields['N']);
+				msg->cm_fields[erFc822Addr]);
 		}
 		fprintf(sc->digestfp, "\n");
-		if (msg->cm_fields['U'] != NULL) {
+		if (!CM_IsEmpty(msg, eMsgSubject)) {
 			fprintf(sc->digestfp,
 				"Subject: %s\n",
-				msg->cm_fields['U']);
+				msg->cm_fields[eMsgSubject]);
 		}
 
 		CC->redirect_buffer = NewStrBufPlain(NULL, SIZ);
@@ -261,23 +295,19 @@ void network_process_digest(SpoolControl *sc, struct CtdlMessage *omsg, long *de
 		FreeStrBuf(&CC->redirect_buffer);
 
 		sc->num_msgs_spooled += 1;
-		CtdlFreeMessage(msg);
+		CM_Free(msg);
 	}
 }
 
 
 void network_process_list(SpoolControl *sc, struct CtdlMessage *omsg, long *delete_after_send)
 {
-	int rlen;
-	char *pCh;
-	StrBuf *Subject, *FlatSubject;
 	struct CtdlMessage *msg = NULL;
-	int i;
 
 	/*
 	 * Process mailing list recipients
 	 */
-	if (sc->RNCfg->NetConfigs[listrecp] == NULL) 
+	if (sc->Users[listrecp] == NULL)
 		return;
 
 	/* create our own copy of the message.
@@ -285,105 +315,30 @@ void network_process_list(SpoolControl *sc, struct CtdlMessage *omsg, long *dele
 	 * in order to insert the [list name] in it, etc.
 	 */
 
-	msg = CtdlDuplicateMessage(omsg);
-
-	if (msg->cm_fields['K'] != NULL)
-		free(msg->cm_fields['K']);
-	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
-		);
+	msg = CM_Duplicate(omsg);
 
-	/* 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);
-		/* so we can free the right one swap them */
-		tmp = Subject;
-		Subject = FlatSubject;
-		FlatSubject = tmp;
-		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.
-	 */
+	CM_SetField(msg, eReplyTo, SKEY(sc->Users[roommailalias]));
 
 	/* if there is no other recipient, Set the recipient
 	 * of the list message to the email address of the
 	 * room itself.
 	 */
-	if ((msg->cm_fields['R'] == NULL) ||
-	    IsEmptyStr(msg->cm_fields['R']))
+	if (CM_IsEmpty(msg, eRecipient))
 	{
-		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] = '_';
-			}
-		}
+		CM_SetField(msg, eRecipient, SKEY(sc->Users[roommailalias]));
 	}
 
+	/* Set the 'List-ID' header */
+	CM_SetField(msg, eListID, SKEY(sc->ListID));
+
+
+	/* Prepend "[List name]" to the subject */
+	ListCalculateSubject(msg);
+
 	/* Handle delivery */
 	network_deliver_list(msg, sc, CC->room.QRname);
-	CtdlFreeMessage(msg);
+	CM_Free(msg);
 }
 
 /*
@@ -391,29 +346,21 @@ void network_process_list(SpoolControl *sc, struct CtdlMessage *omsg, long *dele
  */
 void network_deliver_list(struct CtdlMessage *msg, SpoolControl *sc, const char *RoomName)
 {
-	StrBuf *recps = NULL;
-	char *precps = NULL;
-	struct recptypes *valid;
+	recptypes *valid;
 	char bounce_to[256];
 
 	/* Don't do this if there were no recipients! */
-	if (sc->RNCfg->NetConfigs[listrecp] == NULL) return;
+	if (sc->Users[listrecp] == NULL)
+		return;
 
 	/* Now generate the delivery instructions */
 
-	/*
-	 * Figure out how big a buffer we need to allocate
-	 */
-	aggregate_recipients(&recps, listrecp, sc->RNCfg);
-
 	/* 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);
+	snprintf(bounce_to, sizeof bounce_to, "room_aide@%s", CtdlGetConfigStr("c_fqdn"));
 
 	/* Now submit the message */
-	precps = SmashStrBuf(&recps);
-	valid = validate_recipients(precps, NULL, 0);
-	free(precps);
+	valid = validate_recipients(ChrPtr(sc->Users[listrecp]), NULL, 0);
 	if (valid != NULL) {
 		valid->bounce_to = strdup(bounce_to);
 		valid->envelope_from = strdup(bounce_to);
@@ -421,25 +368,23 @@ void network_deliver_list(struct CtdlMessage *msg, SpoolControl *sc, const char
 		CtdlSubmitMsg(msg, valid, NULL, 0);
 		free_recipients(valid);
 	}
-	/* Do not call CtdlFreeMessage(msg) here; the caller will free it. */
+	/* Do not call CM_Free(msg) here; the caller will free it. */
 }
 
 
 void network_process_participate(SpoolControl *sc, struct CtdlMessage *omsg, long *delete_after_send)
 {
 	struct CtdlMessage *msg = NULL;
-	int i;
 	int ok_to_participate = 0;
-	StrBuf *Buf = NULL;
-	struct recptypes *valid;
+	recptypes *valid;
 
 	/*
 	 * Process client-side list participations for this room
 	 */
-	if (sc->RNCfg->NetConfigs[participate] == NULL)
+	if (sc->Users[participate] == NULL)
 		return;
 
-	msg = CtdlDuplicateMessage(omsg);
+	msg = CM_Duplicate(omsg);
 
 	/* Only send messages which originated on our own
 	 * Citadel network, otherwise we'll end up sending the
@@ -447,236 +392,52 @@ void network_process_participate(SpoolControl *sc, struct CtdlMessage *omsg, lon
 	 * 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;
-		}
-		
-		Buf = NewStrBufPlain(msg->cm_fields['N'], -1);
-		if (CtdlIsValidNode(NULL,
-				    NULL,
-				    Buf,
-				    sc->working_ignetcfg,
-				    sc->the_netmap) == 0)
-		{
-			ok_to_participate = 1;
-		}
-	}
+
+	// FIXME -- After we removed CitaNet/IGnet support , we now need a new heuristic to determine
+	// whether a message originated locally.  This means the "participate" mode no longer works.
+	// We'll definitely need to refactor this when we do other federated stuff later.
+
 	if (ok_to_participate)
 	{
-		StrBuf *recps = NULL;
-		char *precps;
-
-		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] = '_';
-			}
-		}
+		CM_SetField(msg, erFc822Addr, SKEY(sc->Users[roommailalias]));
 
-		aggregate_recipients(&recps, participate, sc->RNCfg);
-		precps = SmashStrBuf(&recps);
-		valid = validate_recipients(precps, NULL, 0);
-
-		if (msg->cm_fields['R'] != NULL) {
-			free(msg->cm_fields['R']);
-		}/* TODO: check whether 'R' is set appropriate later. */
+		valid = validate_recipients(ChrPtr(sc->Users[participate]) , NULL, 0);
 
+		CM_SetField(msg, eRecipient, SKEY(sc->Users[roommailalias]));
 		CtdlSubmitMsg(msg, valid, "", 0);
 		free_recipients(valid);
 	}
-	FreeStrBuf(&Buf);
-	CtdlFreeMessage(msg);
-}
-
-void network_process_ignetpush(SpoolControl *sc, struct CtdlMessage *omsg, long *delete_after_send)
-{
-	struct CtdlMessage *msg = NULL;
-	struct CitContext *CCC = CC;
-	struct ser_ret sermsg;
-	char buf[SIZ];
-	char filename[PATH_MAX];
-	FILE *fp;
-	size_t newpath_len;
-	char *newpath = NULL;
-	RoomNetCfgLine* mptr;
-	StrBuf *Buf = NULL;
-	int i;
-	int bang = 0;
-	int send = 1;
-
-	if (sc->RNCfg->NetConfigs[ignet_push_share] == NULL)
-		return;
-	/*
-	 * Process IGnet push shares
-	 */
-	msg = CtdlDuplicateMessage(omsg);
-
-	/* 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 */
-	for (mptr = sc->RNCfg->NetConfigs[ignet_push_share];
-	     mptr != NULL;
-	     mptr = mptr->next)
-	{
-		send = 1;
-		NewStrBufDupAppendFlush(&Buf, mptr->Value[0], NULL, 1);
-			
-		/* Check for valid node name */
-		if (CtdlIsValidNode(NULL,
-				    NULL,
-				    Buf,
-				    sc->working_ignetcfg,
-				    sc->the_netmap) != 0)
-		{
-			QN_syslog(LOG_ERR,
-				  "Invalid node <%s>\n",
-				  ChrPtr(mptr->Value[0]));
-			
-			send = 0;
-		}
-		
-		/* Check for split horizon */
-		QN_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);
-
-				QN_syslog(LOG_DEBUG, "Compare <%s> to <%s>\n",
-					  buf, ChrPtr(mptr->Value[0])) ;
-				if (!strcasecmp(buf, ChrPtr(mptr->Value[0]))) {
-					send = 0;
-					break;
-				}
-			}
-			
-			QN_syslog(LOG_INFO,
-				  "%sSending to %s\n",
-				  (send)?"":"Not ",
-				  ChrPtr(mptr->Value[0]));
-		}
-		
-		/* 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 (StrLength(mptr->Value[0]) > 0) {
-				msg->cm_fields['C'] =
-					strdup(ChrPtr(mptr->Value[0]));
-			}
-			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,
-					 ChrPtr(mptr->Value[0]),
-					 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 the serialized version */
-				free(sermsg.ser);
-			}
-		}
-	}
-	FreeStrBuf(&Buf);
-	CtdlFreeMessage(msg);
+	CM_Free(msg);
 }
 
 
 /*
  * Spools out one message from the list.
  */
-void network_spool_msg(long msgnum,
-		       void *userdata)
+void network_spool_msg(long msgnum, void *userdata)
 {
 	struct CtdlMessage *msg = NULL;
 	long delete_after_send = 0;	/* Set to 1 to delete after spooling */
 	SpoolControl *sc;
 
 	sc = (SpoolControl *)userdata;
+	msg = CtdlFetchMessage(msgnum, 1, 1);
 
-	msg = CtdlFetchMessage(msgnum, 1);
-
+	if (msg == NULL)
+	{
+		syslog(LOG_ERR, "netmail: failed to load Message <%ld> from disk", msgnum);
+		return;
+	}
 	network_process_list(sc, msg, &delete_after_send);
 	network_process_digest(sc, msg, &delete_after_send);
 	network_process_participate(sc, msg, &delete_after_send);
-	network_process_ignetpush(sc, msg, &delete_after_send);
 	
-	CtdlFreeMessage(msg);
+	CM_Free(msg);
 
 	/* update lastsent */
 	sc->lastsent = msgnum;