X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fmodules%2Fnetwork%2Fserv_netmail.c;h=fd1de7abe71aac452a024a0fa21567395c38be56;hb=e82805b6522aa9d870e4fdf8c6bceee1b712aa1f;hp=287436bbfa0bc535745352b27e2fbf358b9d1708;hpb=e6219cc9b27e56e3b41170f864da30fa7b13ee01;p=citadel.git

diff --git a/citadel/modules/network/serv_netmail.c b/citadel/modules/network/serv_netmail.c
index 287436bbf..fd1de7abe 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"
@@ -137,8 +136,7 @@ static void ListCalculateSubject(struct CtdlMessage *msg)
 		Subject = NewStrBufPlain(HKEY("(no subject)"));
 	}
 	else {
-		Subject = NewStrBufPlain(
-			msg->cm_fields[eMsgSubject], -1);
+		Subject = NewStrBufPlain(CM_KEY(msg, eMsgSubject));
 	}
 	FlatSubject = NewStrBufPlain(NULL, StrLength(Subject));
 	StrBuf_RFC822_to_Utf8(FlatSubject, Subject, NULL, NULL);
@@ -181,7 +179,7 @@ void network_deliver_digest(SpoolControl *sc)
 	char *pbuf;
 	struct CtdlMessage *msg = NULL;
 	long msglen;
-	struct recptypes *valid;
+	recptypes *valid;
 	char bounce_to[256];
 
 	if (sc->Users[listrecp] == NULL)
@@ -239,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);
 }
 
@@ -256,7 +254,7 @@ 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,
 			" -----------------------------------"
@@ -304,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);
 	}
 }
 
@@ -324,10 +322,10 @@ void network_process_list(SpoolControl *sc, struct CtdlMessage *omsg, long *dele
 	 * in order to insert the [list name] in it, etc.
 	 */
 
-	msg = CtdlDuplicateMessage(omsg);
+	msg = CM_Duplicate(omsg);
 
 
-	CM_SetField(msg, eListID, SKEY(sc->Users[roommailalias]));
+	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
@@ -347,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);
 }
 
 /*
@@ -355,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! */
@@ -377,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. */
 }
 
 
@@ -386,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
@@ -394,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
@@ -408,7 +406,7 @@ void network_process_participate(SpoolControl *sc, struct CtdlMessage *omsg, lon
 			ok_to_participate = 1;
 		}
 		
-		Buf = NewStrBufPlain(msg->cm_fields[eNodeName], -1);
+		Buf = NewStrBufPlain(CM_KEY(msg, eNodeName));
 		if (CtdlIsValidNode(NULL,
 				    NULL,
 				    Buf,
@@ -434,7 +432,7 @@ void network_process_participate(SpoolControl *sc, struct CtdlMessage *omsg, lon
 		free_recipients(valid);
 	}
 	FreeStrBuf(&Buf);
-	CtdlFreeMessage(msg);
+	CM_Free(msg);
 }
 
 void network_process_ignetpush(SpoolControl *sc, struct CtdlMessage *omsg, long *delete_after_send)
@@ -459,7 +457,7 @@ 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
@@ -540,7 +538,7 @@ void network_process_ignetpush(SpoolControl *sc, struct CtdlMessage *omsg, long
 			}
 			
 			/* serialize it for transmission */
-			serialize_message(&sermsg, msg);
+			CtdlSerializeMessage(&sermsg, msg);
 			if (sermsg.len > 0) {
 				
 				/* write it to a spool file */
@@ -578,7 +576,7 @@ void network_process_ignetpush(SpoolControl *sc, struct CtdlMessage *omsg, long
 	FreeStrBuf(&Buf);
 	FreeStrBuf(&Recipient);
 	FreeStrBuf(&RemoteRoom);
-	CtdlFreeMessage(msg);
+	CM_Free(msg);
 }
 
 
@@ -609,7 +607,7 @@ void network_spool_msg(long msgnum,
 	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;