X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fcontext.h;h=585b5b1c7c8a7fe4c5f7a9ce3de7679fd9550645;hb=e329db30593524cc2d8851a4500bac41f2340354;hp=903195c37ccbee9f3a7f400ff885b3dcf9b5062b;hpb=00514372bc3bd09268a8f6764fe5d7b50fce0c41;p=citadel.git

diff --git a/citadel/context.h b/citadel/context.h
index 903195c37..585b5b1c7 100644
--- a/citadel/context.h
+++ b/citadel/context.h
@@ -28,21 +28,31 @@ 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.
  *
  * This structure keeps track of all information relating to a running 
- * session on the server.  We keep one of these for each session thread.
+ * session on the server.  We keep one of these for each session.
  *
  */
 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 */
-	double created;      /* time of birth */
+	double created;		/* time of birth */
 	time_t lastcmd;		/* time of last command executed */
 	time_t lastidle;	/* For computing idle time */
 	CCState state;		/* thread state (see CON_ values below) */
@@ -70,9 +80,7 @@ struct CitContext {
 	int internal_pgm;	/* authenticated as internal program */
 	int nologin;		/* not allowed to log in */
 	int curr_view;		/* The view type for the current user/room */
-	int is_master;		/* Is this session logged in using the master user? */
 
-	char net_node[32]	;/* Is the client another Citadel server? */
 	time_t previous_login;	/* Date/time of previous login */
 	char lastcmdname[5];	/* name of last command executed */
 	unsigned cs_flags;	/* miscellaneous flags */
@@ -105,8 +113,6 @@ struct CitContext {
 	char upl_comment[256];
 	char upl_filedir[PATH_MAX];
 	char upl_mimetype[64];
-	char dl_is_net;
-	char upload_type;
 
 	struct ctdluser user;	/* Database record buffers */
 	struct ctdlroom room;
@@ -126,7 +132,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,14 +146,14 @@ struct CitContext {
 
 	long *cached_msglist;			/* results of the previous CtdlForEachMessage() */
 	int cached_num_msgs;
-};
 
-typedef struct CitContext CitContext;
+	char vcard_updated_by_ldap;		/* !0 iff ldap changed the vcard, treat as aide update */
 
+	//AsyncIO *IO;				/* if this session has AsyncIO going on... */
+};
 
 #define CC MyContext()
 
-
 extern pthread_key_t MyConKey;			/* TSD key for MyContext() */
 extern int num_sessions;
 extern CitContext masterCC;
@@ -196,18 +202,5 @@ static INLINE void become_session(CitContext *which_con) {
 
 
 
-/* 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 CONM_syslog(LEVEL, FORMAT)			\
-	CONDBGLOG(LEVEL) syslog(LEVEL,			\
-				"Context: " FORMAT);
-
 
 #endif /* CONTEXT_H */