Removed duplicate typedef of CtdlDbgFunction

[citadel.git] / citadel / context.h

diff --git a/citadel/context.h b/citadel/context.h
index cb7d92f0293f3b451ad85b0930429a6b1dbf92de..903195c37ccbee9f3a7f400ff885b3dcf9b5062b 100644 (file)
--- a/citadel/context.h
+++ b/citadel/context.h
@@ -41,7 +41,8 @@ struct CitContext {
        struct 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 +59,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;
@@ -109,10 +111,6 @@ struct CitContext {
        struct ctdluser user;   /* Database record buffers */
        struct ctdlroom room;
 
-       /* Beginning of cryptography - session nonce */
-       char cs_nonce[NONCE_SIZE];      /* The nonce for this session's next auth transaction */
-
-
        /* A linked list of all instant messages sent to us. */
        struct ExpressMessage *FirstExpressMessage;
        int disable_exp;        /* Set to 1 to disable incoming pages */
@@ -132,13 +130,16 @@ struct CitContext {
        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;
 };
 
 typedef struct CitContext CitContext;
@@ -147,7 +148,7 @@ 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;
@@ -164,7 +165,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));
@@ -184,9 +185,9 @@ 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 );
 /*
-       CtdlLogPrintf(CTDL_DEBUG, "[%d]: Now doing %s\n", 
+       syslog(LOG_DEBUG, "[%d]: Now doing %s\n", 
                      (int) tid, 
                      ((which_con != NULL) && (which_con->ServiceName != NULL)) ? 
                      which_con->ServiceName:"");
@@ -194,4 +195,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 */