X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fmsgbase.h;h=68894b52caf73b805fc210475ea52cdf6d462142;hb=6d69258f19307e1d889b4979d57ead0fa73e39c6;hp=3171fbd753754612019287b9b690f8911af07c30;hpb=064d34f72d3faff6967bb2aa0b0e7e664512761a;p=citadel.git

diff --git a/citadel/msgbase.h b/citadel/msgbase.h
index 3171fbd75..68894b52c 100644
--- a/citadel/msgbase.h
+++ b/citadel/msgbase.h
@@ -72,9 +72,11 @@ struct recptypes {
 	char *recp_internet;
 	char *recp_ignet;
 	char *recp_room;
+	char *recp_orgroom;
 	char *display_recp;
 	char *bounce_to;
 	char *envelope_from;
+	char *sending_room;
 };
 
 #define RECPTYPES_MAGIC 0xfeeb
@@ -140,8 +142,8 @@ void CtdlWriteObject(char *req_room,			/* Room to stuff it in */
 );
 struct CtdlMessage *CtdlFetchMessage(long msgnum, int with_body);
 void CtdlFreeMessage(struct CtdlMessage *msg);
+void CtdlFreeMessageContents(struct CtdlMessage *msg);
 void serialize_message(struct ser_ret *, struct CtdlMessage *);
-void dump_message(struct CtdlMessage *msg, long Siz);
 int is_valid_message(struct CtdlMessage *);
 void ReplicationChecks(struct CtdlMessage *);
 int CtdlSaveMsgPointersInRoom(char *roomname, long newmsgidlist[], int num_newmsgs,
@@ -163,7 +165,9 @@ int CtdlOutputMsg(long msg_num,		/* message number (local) to fetch */
 		  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? */
+		  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... */
 );
 
 /* Flags which may be passed to CtdlOutputMsg() and CtdlOutputPreLoadedMsg() */
@@ -230,14 +234,6 @@ struct CtdlMessage *CtdlMakeMessage(
 int CtdlCheckInternetMailPermission(struct ctdluser *who);
 int CtdlIsMe(char *addr, int addr_buf_len);
 
-/*
- * Use of aide_message is deprecated.
- * It has been replaced with CtdlAideMessage.
- * All parameters remain the same.
-*/
-void aide_message(char *text, char *subject) __attribute__ ((deprecated));
-
-
 /* 
  * loading messages async via an FD: 
  * add IO->ReadMsg = NewAsyncMsg(...)
@@ -257,6 +253,20 @@ ReadAsyncMsg *NewAsyncMsg(const char *terminator,	/* token signalling EOT */
 eReadState CtdlReadMessageBodyAsync(AsyncIO *IO);
 void DeleteAsyncMsg(ReadAsyncMsg **Msg);
 
+extern int MessageDebugEnabled;
+
+#define MSGDBGLOG(LEVEL) if ((LEVEL != LOG_DEBUG) || (MessageDebugEnabled != 0))
+#define CCCID CCC->cs_pid
+#define MSG_syslog(LEVEL, FORMAT, ...)			\
+	MSGDBGLOG(LEVEL) syslog(LEVEL,			\
+				"CC[%d]" FORMAT,	\
+				CCCID, __VA_ARGS__)
+
+#define MSGM_syslog(LEVEL, FORMAT)			\
+	MSGDBGLOG(LEVEL) syslog(LEVEL,			\
+				"CC[%d]" FORMAT,	\
+				CCCID)
+
 
 
 #endif /* MSGBASE_H */