X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fmodules%2Fnetwork%2Fserv_netmail.c;h=c488388f9090735c0910c22cb5e07d40b7f11970;hb=55013f95f08eafe1b375df4241e8defe387c6cdc;hp=dac000efc8527477b2cc6b0185f1ccd2c75f70b3;hpb=f7754d28818ab3ea8a2831f6b1ebfd94ab69c09a;p=citadel.git

diff --git a/citadel/modules/network/serv_netmail.c b/citadel/modules/network/serv_netmail.c
index dac000efc..c488388f9 100644
--- a/citadel/modules/network/serv_netmail.c
+++ b/citadel/modules/network/serv_netmail.c
@@ -72,7 +72,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"
@@ -117,6 +116,12 @@ void aggregate_recipients(StrBuf **recps, RoomNetCfg Which, OneRoomNetCfg *OneRN
 				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);
+
+		}
 	}
 }
 
@@ -127,12 +132,11 @@ static void ListCalculateSubject(struct CtdlMessage *msg)
 	int rlen;
 	char *pCh;
 
-	if (msg->cm_fields['U'] == NULL) {
+	if (CM_IsEmpty(msg, eMsgSubject)) {
 		Subject = NewStrBufPlain(HKEY("(no subject)"));
 	}
 	else {
-		Subject = NewStrBufPlain(
-			msg->cm_fields['U'], -1);
+		Subject = NewStrBufPlain(CM_KEY(msg, eMsgSubject));
 	}
 	FlatSubject = NewStrBufPlain(NULL, StrLength(Subject));
 	StrBuf_RFC822_to_Utf8(FlatSubject, Subject, NULL, NULL);
@@ -159,9 +163,7 @@ static void ListCalculateSubject(struct CtdlMessage *msg)
 		StrBufRFC2047encode(&Subject, FlatSubject);
 	}
 
-	if (msg->cm_fields['U'] != NULL)
-		free (msg->cm_fields['U']);
-	msg->cm_fields['U'] = SmashStrBuf(&Subject);
+	CM_SetAsFieldSB(msg, eMsgSubject, &Subject);
 
 	FreeStrBuf(&FlatSubject);
 }
@@ -171,10 +173,13 @@ static void ListCalculateSubject(struct CtdlMessage *msg)
  */
 void network_deliver_digest(SpoolControl *sc)
 {
+	struct CitContext *CCC = CC;
+	long len;
 	char buf[SIZ];
+	char *pbuf;
 	struct CtdlMessage *msg = NULL;
 	long msglen;
-	struct recptypes *valid;
+	recptypes *valid;
 	char bounce_to[256];
 
 	if (sc->Users[listrecp] == NULL)
@@ -192,17 +197,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);
+	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);
 
-	CtdlMsgSetCM_Fields(msg, 'F', SKEY(sc->Users[roommailalias]));
-	CtdlMsgSetCM_Fields(msg, 'R', SKEY(sc->Users[roommailalias]));
+	CM_SetField(msg, erFc822Addr, SKEY(sc->Users[roommailalias]));
+	CM_SetField(msg, eRecipient, SKEY(sc->Users[roommailalias]));
 
 	/* Set the 'List-ID' header */
-	CtdlMsgSetCM_Fields(msg, 'L', SKEY(sc->ListID));
+	CM_SetField(msg, eListID, SKEY(sc->ListID));
 
 	/*
 	 * Go fetch the contents of the digest
@@ -210,11 +214,11 @@ 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';
-
+	fread(pbuf, (size_t)msglen, 1, sc->digestfp);
+	pbuf[msglen] = '\0';
+	CM_SetAsField(msg, eMesageText, &pbuf, msglen);
 	fclose(sc->digestfp);
 	sc->digestfp = NULL;
 
@@ -233,7 +237,7 @@ void network_deliver_digest(SpoolControl *sc)
 		valid->envelope_from = strdup(bounce_to);
 		CtdlSubmitMsg(msg, valid, NULL, 0);
 	}
-	CtdlFreeMessage(msg);
+	CM_Free(msg);
 	free_recipients(valid);
 }
 
@@ -250,33 +254,33 @@ void network_process_digest(SpoolControl *sc, struct CtdlMessage *omsg, long *de
 	    (sc->digestfp == NULL))
 		return;
 
-	msg = CtdlDuplicateMessage(omsg);
+	msg = CM_Duplicate(omsg);
 	if (msg != NULL) {
 		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']);
+				msg->cm_fields[erFc822Addr]);
 		}
-		else if (msg->cm_fields['N'] != NULL) {
+		else if (!CM_IsEmpty(msg, eNodeName)) {
 			fprintf(sc->digestfp,
 				"@%s ",
-				msg->cm_fields['N']);
+				msg->cm_fields[eNodeName]);
 		}
 		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);
@@ -298,7 +302,7 @@ 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);
 	}
 }
 
@@ -318,41 +322,22 @@ 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']);
-	}
+	msg = CM_Duplicate(omsg);
+
 
-	CtdlMsgSetCM_Fields(msg, 'F', SKEY(sc->Users[roommailalias]));
+	CM_SetField(msg, eListID, 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))
 	{
-		CtdlMsgSetCM_Fields(msg, 'R', SKEY(sc->Users[roommailalias]));
+		CM_SetField(msg, eRecipient, SKEY(sc->Users[roommailalias]));
 	}
 
 	/* Set the 'List-ID' header */
-	CtdlMsgSetCM_Fields(msg, 'L', SKEY(sc->ListID));
+	CM_SetField(msg, eListID, SKEY(sc->ListID));
 
 
 	/* Prepend "[List name]" to the subject */
@@ -360,7 +345,7 @@ void network_process_list(SpoolControl *sc, struct CtdlMessage *omsg, long *dele
 
 	/* Handle delivery */
 	network_deliver_list(msg, sc, CC->room.QRname);
-	CtdlFreeMessage(msg);
+	CM_Free(msg);
 }
 
 /*
@@ -368,7 +353,7 @@ void network_process_list(SpoolControl *sc, struct CtdlMessage *omsg, long *dele
  */
 void network_deliver_list(struct CtdlMessage *msg, SpoolControl *sc, const char *RoomName)
 {
-	struct recptypes *valid;
+	recptypes *valid;
 	char bounce_to[256];
 
 	/* Don't do this if there were no recipients! */
@@ -390,7 +375,7 @@ 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. */
 }
 
 
@@ -399,7 +384,7 @@ void network_process_participate(SpoolControl *sc, struct CtdlMessage *omsg, lon
 	struct CtdlMessage *msg = NULL;
 	int ok_to_participate = 0;
 	StrBuf *Buf = NULL;
-	struct recptypes *valid;
+	recptypes *valid;
 
 	/*
 	 * Process client-side list participations for this room
@@ -407,7 +392,7 @@ void network_process_participate(SpoolControl *sc, struct CtdlMessage *omsg, lon
 	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
@@ -415,13 +400,13 @@ 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'],
+	if (!CM_IsEmpty(msg, eNodeName)) {
+		if (!strcasecmp(msg->cm_fields[eNodeName],
 				config.c_nodename)) {
 			ok_to_participate = 1;
 		}
 		
-		Buf = NewStrBufPlain(msg->cm_fields['N'], -1);
+		Buf = NewStrBufPlain(CM_KEY(msg, eNodeName));
 		if (CtdlIsValidNode(NULL,
 				    NULL,
 				    Buf,
@@ -438,16 +423,16 @@ void network_process_participate(SpoolControl *sc, struct CtdlMessage *omsg, lon
 		 * room itself, so the remote listserv doesn't
 		 * reject us.
 		 */
-		CtdlMsgSetCM_Fields(msg, 'F', SKEY(sc->Users[roommailalias]));
+		CM_SetField(msg, erFc822Addr, SKEY(sc->Users[roommailalias]));
 
 		valid = validate_recipients(ChrPtr(sc->Users[participate]) , NULL, 0);
 
-		CtdlMsgSetCM_Fields(msg, 'R', SKEY(sc->Users[roommailalias]));
+		CM_SetField(msg, eRecipient, SKEY(sc->Users[roommailalias]));
 		CtdlSubmitMsg(msg, valid, "", 0);
 		free_recipients(valid);
 	}
 	FreeStrBuf(&Buf);
-	CtdlFreeMessage(msg);
+	CM_Free(msg);
 }
 
 void network_process_ignetpush(SpoolControl *sc, struct CtdlMessage *omsg, long *delete_after_send)
@@ -461,8 +446,6 @@ void network_process_ignetpush(SpoolControl *sc, struct CtdlMessage *omsg, long
 	char buf[SIZ];
 	char filename[PATH_MAX];
 	FILE *fp;
-	size_t newpath_len;
-	char *newpath = NULL;
 	StrBuf *Buf = NULL;
 	int i;
 	int bang = 0;
@@ -474,29 +457,19 @@ void network_process_ignetpush(SpoolControl *sc, struct CtdlMessage *omsg, long
 	/*
 	 * Process IGnet push shares
 	 */
-	msg = CtdlDuplicateMessage(omsg);
+	msg = CM_Duplicate(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;
-	
+	Netmap_AddMe(msg, HKEY("username"));
+
 	/*
 	 * 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")) {
+	if (!CM_IsEmpty(msg, eSpecialField)) {
+		if (!strcasecmp(msg->cm_fields[eSpecialField], "CANCEL")) {
 			*delete_after_send = 1;
 		}
 	}
@@ -526,12 +499,12 @@ void network_process_ignetpush(SpoolControl *sc, struct CtdlMessage *omsg, long
 		}
 		
 		/* Check for split horizon */
-		QN_syslog(LOG_DEBUG, "Path is %s\n", msg->cm_fields['P']);
-		bang = num_tokens(msg->cm_fields['P'], '!');
+		QN_syslog(LOG_DEBUG, "Path is %s\n", msg->cm_fields[eMessagePath]);
+		bang = num_tokens(msg->cm_fields[eMessagePath], '!');
 		if (bang > 1) {
 			for (i=0; i<(bang-1); ++i) {
 				extract_token(buf,
-					      msg->cm_fields['P'],
+					      msg->cm_fields[eMessagePath],
 					      i, '!',
 					      sizeof buf);
 
@@ -544,7 +517,7 @@ void network_process_ignetpush(SpoolControl *sc, struct CtdlMessage *omsg, long
 			}
 			
 			QN_syslog(LOG_INFO,
-				  "%sSending to %s\n",
+				  " %sSending to %s\n",
 				  (send)?"":"Not ",
 				  ChrPtr(Recipient));
 		}
@@ -557,20 +530,15 @@ void network_process_ignetpush(SpoolControl *sc, struct CtdlMessage *omsg, long
 			 * room on the far end by setting the C field
 			 * correctly
 			 */
-			if (msg->cm_fields['C'] != NULL) {
-				free(msg->cm_fields['C']);
-			}
 			if (StrLength(RemoteRoom) > 0) {
-				msg->cm_fields['C'] =
-					strdup(ChrPtr(RemoteRoom));
+				CM_SetField(msg, eRemoteRoom, SKEY(RemoteRoom));
 			}
 			else {
-				msg->cm_fields['C'] =
-					strdup(CC->room.QRname);
+				CM_SetField(msg, eRemoteRoom, CCC->room.QRname, strlen(CCC->room.QRname));
 			}
 			
 			/* serialize it for transmission */
-			serialize_message(&sermsg, msg);
+			CtdlSerializeMessage(&sermsg, msg);
 			if (sermsg.len > 0) {
 				
 				/* write it to a spool file */
@@ -608,7 +576,7 @@ void network_process_ignetpush(SpoolControl *sc, struct CtdlMessage *omsg, long
 	FreeStrBuf(&Buf);
 	FreeStrBuf(&Recipient);
 	FreeStrBuf(&RemoteRoom);
-	CtdlFreeMessage(msg);
+	CM_Free(msg);
 }
 
 
@@ -618,6 +586,7 @@ void network_process_ignetpush(SpoolControl *sc, struct CtdlMessage *omsg, long
 void network_spool_msg(long msgnum,
 		       void *userdata)
 {
+	struct CitContext *CCC = CC;
 	struct CtdlMessage *msg = NULL;
 	long delete_after_send = 0;	/* Set to 1 to delete after spooling */
 	SpoolControl *sc;
@@ -626,12 +595,19 @@ void network_spool_msg(long msgnum,
 
 	msg = CtdlFetchMessage(msgnum, 1);
 
+	if (msg == NULL)
+	{
+		QN_syslog(LOG_ERR,
+			  "failed to load Message <%ld> from disk\n",
+			  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;