Eventhandling: fix shutdownhandlers

[citadel.git] / citadel / context.h

diff --git a/citadel/context.h b/citadel/context.h
index e0cad917b5d0c375858307ec03c7317432e01ce1..903195c37ccbee9f3a7f400ff885b3dcf9b5062b 100644 (file)
--- a/citadel/context.h
+++ b/citadel/context.h
@@ -42,6 +42,7 @@ struct CitContext {
 
        int cs_pid;             /* session ID */
        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;
@@ -128,6 +130,7 @@ 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 */
 
@@ -192,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 */