X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fmsgbase.h;h=6d5f726baafd6fe68cd73aa999829c6b3631cbb1;hb=5a307b0a88035de98ff16efc347994c82bdab8a9;hp=058c902e583d231f399fb6b094bd7b61b940f99d;hpb=158e8958500476d1115c7b70f6c81a87bb0ade47;p=citadel.git

diff --git a/citadel/msgbase.h b/citadel/msgbase.h
index 058c902e5..6d5f726ba 100644
--- a/citadel/msgbase.h
+++ b/citadel/msgbase.h
@@ -96,7 +96,7 @@ void flood_protect_quickie_message(const char *from,
 				   const char *subject,
 				   int nCriterions,
 				   const char **CritStr,
-				   long *CritStrLen,
+				   const long *CritStrLen,
 				   long ccid,
 				   long ioid,
 				   time_t NOW);
@@ -145,6 +145,10 @@ void CM_Free           (struct CtdlMessage *msg);
 void CM_FreeContents   (struct CtdlMessage *msg);
 int  CM_IsValidMsg     (struct CtdlMessage *msg);
 
+#define CM_KEY(Message, Which) Message->cm_fields[Which], Message->cm_lengths[Which]
+#define CM_RANGE(Message, Which) Message->cm_fields[Which], \
+		Message->cm_fields[Which] + Message->cm_lengths[Which]
+
 void CtdlSerializeMessage(struct ser_ret *, struct CtdlMessage *);
 void ReplicationChecks(struct CtdlMessage *);
 int CtdlSaveMsgPointersInRoom(char *roomname, long newmsgidlist[], int num_newmsgs,
@@ -161,14 +165,15 @@ StrBuf *CtdlReadMessageBodyBuf(char *terminator,	/* token signalling EOT */
 	);
 
 int CtdlOutputMsg(long msg_num,		/* message number (local) to fetch */
-		  int mode,		/* how would you like that message? */
-		  int headers_only,	/* eschew the message body? */
-		  int do_proto,		/* do Citadel protocol responses? */
-		  int crlf,		/* 0=LF, 1=CRLF */
-		  char *section,		/* output a message/rfc822 section */
-		  int flags,		/* should the bessage be exported clean? */
-		  char **Author,        /* if you want to know the author of the message... */
-		  char **Address        /* if you want to know the sender address of the message... */
+		int mode,		/* how would you like that message? */
+		int headers_only,	/* eschew the message body? */
+		int do_proto,		/* do Citadel protocol responses? */
+		int crlf,		/* 0=LF, 1=CRLF */
+		char *section,		/* output a message/rfc822 section */
+		int flags,		/* should the bessage be exported clean? */
+		char **Author,		/* if you want to know the author of the message... */
+		char **Address,		/* if you want to know the sender address of the message... */
+		char **MessageID	/* if you want to know the Message-ID of the message... */
 );
 
 /* Flags which may be passed to CtdlOutputMsg() and CtdlOutputPreLoadedMsg() */