X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fcontext.h;h=cde77f496f5b278c5f658a4a5aa60bd82da273aa;hb=1493fd8ff0de73d30336607b43b1c8113ffcffa2;hp=9d158f469e5ae27355fcb99e540d6499dbf25db7;hpb=92d82ca214f2f57d6311174a2231a8d031c2a77e;p=citadel.git

diff --git a/citadel/context.h b/citadel/context.h
index 9d158f469..cde77f496 100644
--- a/citadel/context.h
+++ b/citadel/context.h
@@ -28,6 +28,14 @@ typedef enum __CCState {
 	CON_SYS                 /* This is a system context and mustn't be purged */
 } CCState;
 
+#ifndef __ASYNCIO__
+#define __ASYNCIO__
+typedef struct AsyncIO AsyncIO; /* forward declaration for event_client.h */
+#endif
+#ifndef __CIT_CONTEXT__
+#define __CIT_CONTEXT__
+typedef struct CitContext CitContext;
+#endif
 
 /*
  * Here's the big one... the Citadel context structure.
@@ -37,8 +45,8 @@ typedef enum __CCState {
  *
  */
 struct CitContext {
-	struct CitContext *prev;	/* Link to previous session in list */
-	struct CitContext *next;	/* Link to next session in the list */
+	CitContext *prev;	/* Link to previous session in list */
+	CitContext *next;	/* Link to next session in the list */
 
 	int cs_pid;		/* session ID */
 	int dont_term;		/* for special activities like artv so we don't get killed */
@@ -126,7 +134,7 @@ struct CitContext {
 	int msg4_dont_decode;
 
 	/* Dynamically allocated session data */
-	char *session_specific_data;		/* Used by individual protocol modules */
+	void *session_specific_data;		/* Used by individual protocol modules */
 	struct cit_ical *CIT_ICAL;		/* calendaring data */
 	struct ma_info *ma;			/* multipart/alternative data */
 	const char *ServiceName;		/* readable purpose of this session */
@@ -140,9 +148,12 @@ struct CitContext {
 
 	long *cached_msglist;			/* results of the previous CtdlForEachMessage() */
 	int cached_num_msgs;
+
+	char vcard_updated_by_ldap;		/* !0 iff ldap changed the vcard, treat as aide update */
+
+	AsyncIO *IO;				/* if this session has AsyncIO going on... */
 };
 
-typedef struct CitContext CitContext;
 
 
 #define CC MyContext()
@@ -196,18 +207,18 @@ static INLINE void become_session(CitContext *which_con) {
 
 
 
-typedef void (*CtdlDbgFunction) (const int);
+/* typedef void (*CtdlDbgFunction) (const int); */
 
 extern int DebugSession;
 #define CONDBGLOG(LEVEL) if ((LEVEL != LOG_DEBUG) || (DebugSession != 0))
 
-#define CON_syslog(LEVEL, FORMAT, ...)				\
-	CONDBGLOG(LEVEL) syslog(LEVEL,				\
-				"Context: " FORMAT, __VA_ARGS__)
+#define CON_syslog(LEVEL, FORMAT, ...)					\
+	CONDBGLOG(LEVEL) syslog(LEVEL,					\
+				"%s Context: " FORMAT, IOSTR, __VA_ARGS__)
 
-#define CONM_syslog(LEVEL, FORMAT)			\
-	CONDBGLOG(LEVEL) syslog(LEVEL,			\
-				"Context: " FORMAT);
+#define CONM_syslog(LEVEL, FORMAT)				\
+	CONDBGLOG(LEVEL) syslog(LEVEL,				\
+				"%s Context: " FORMAT, IOSTR);
 
 
 #endif /* CONTEXT_H */