X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fcontext.h;h=6d93249b93423e7fdbe6a7c2ddb672a314fb709b;hb=adccf08ddebcb920c4244cc62bc48f85575c2d88;hp=205cf4f1eefa9a00c5da43ba577fc38f49e5fc04;hpb=c37006aac2a4cc8a31643883b2e8d128441a5069;p=citadel.git

diff --git a/citadel/context.h b/citadel/context.h
index 205cf4f1e..6d93249b9 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,11 +45,12 @@ 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 */
+	int dont_term;		/* for special activities like artv so we don't get killed */
+	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) */
@@ -58,6 +67,7 @@ struct CitContext {
 	int is_local_socket;	/* set to 1 if client is on unix domain sock */
 	/* Redirect this session's output to a memory buffer? */
 	StrBuf *redirect_buffer;		/* the buffer */
+	StrBuf *StatusMessage;
 #ifdef HAVE_OPENSSL
 	SSL *ssl;
 	int redirect_ssl;
@@ -124,26 +134,30 @@ 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 */
+	long tcp_port;
 	void *openid_data;			/* Data stored by the OpenID module */
 	char *ldap_dn;				/* DN of user when using AUTHMODE_LDAP */
 
-
 	void (*h_command_function) (void) ;	/* service command function */
 	void (*h_async_function) (void) ;	/* do async msgs function */
 	void (*h_greeting_function) (void) ;	/* greeting function for session startup */
+
+	long *cached_msglist;			/* results of the previous CtdlForEachMessage() */
+	int cached_num_msgs;
+
+	AsyncIO *IO;				/* if this session has AsyncIO going on... */
 };
 
-typedef struct CitContext CitContext;
 
 
 #define CC MyContext()
 
 
-extern citthread_key_t MyConKey;			/* TSD key for MyContext() */
+extern pthread_key_t MyConKey;			/* TSD key for MyContext() */
 extern int num_sessions;
 extern CitContext masterCC;
 extern CitContext *ContextList;
@@ -160,7 +174,7 @@ void set_async_waiting(struct CitContext *ccptr);
 CitContext *CloneContext(CitContext *CloneMe);
 
 /* forcibly close and flush fd's on shutdown */
-void terminate_stuck_sessions(void);
+void terminate_all_sessions(void);
 
 /* Deprecated, user CtdlBumpNewMailCounter() instead */
 void BumpNewMailCounter(long) __attribute__ ((deprecated));
@@ -180,7 +194,7 @@ static INLINE void become_session(CitContext *which_con) {
 /*
 	pid_t tid = syscall(SYS_gettid);
 */
-	citthread_setspecific(MyConKey, (void *)which_con );
+	pthread_setspecific(MyConKey, (void *)which_con );
 /*
 	syslog(LOG_DEBUG, "[%d]: Now doing %s\n", 
 		      (int) tid, 
@@ -190,4 +204,19 @@ 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 */