TEXTCLIENT: getutline also belongs to the textclient. Tnx to Lightspeed for pointing...

[citadel.git] / citadel / msgbase.h

diff --git a/citadel/msgbase.h b/citadel/msgbase.h
index 084e5189b171cf5c1baeb1d7b8aedbf417b61f49..017942f8d600f52bd001ab7382ee7f6d8ba61fe6 100644 (file)
--- 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,
@@ -237,11 +239,6 @@ int CtdlIsMe(char *addr, int addr_buf_len);
 */
 void aide_message(char *text, char *subject) __attribute__ ((deprecated));
 
-void seenit_store(struct seenit **si, long msgnum);
-int seenit_isthere(struct seenit *si, long msgnum);
-void seenit_free(struct seenit **si);
-
-
 
 /* 
  * loading messages async via an FD: 
@@ -262,6 +259,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 */