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 */
+ 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) */
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;
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 */
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;
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 */
-};
-typedef struct CitContext 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 */
-#define CC MyContext()
+ //AsyncIO *IO; /* if this session has AsyncIO going on... */
+};
+#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;
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));
/*
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,
}
+
+
#endif /* CONTEXT_H */