X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fmsgbase.h;h=f74c64b734590c51bea2d4c9ce2733c6b20ada2b;hb=d2fbe9d0eeadfaa1054e959031d6859164dfa78e;hp=37a94c63d16e8a3f564a5aa0c6a6b57bda538ab5;hpb=87adb75f05be524428f1563ab28a60b1795f4612;p=citadel.git

diff --git a/citadel/msgbase.h b/citadel/msgbase.h
index 37a94c63d..f74c64b73 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
@@ -258,6 +260,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 */