X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fcontext.h;h=08de75bb336a3b8d4b18161727c06cccbcdda53d;hb=b1493ab199a2cf39b919cb8d0536263ae1d280aa;hp=322061e65471e47a135420c28beada3f4000d0b9;hpb=07ebf1e2e622321c65fc0222a982c8b80a8cb08f;p=citadel.git diff --git a/citadel/context.h b/citadel/context.h index 322061e65..08de75bb3 100644 --- a/citadel/context.h +++ b/citadel/context.h @@ -1,4 +1,3 @@ -/* $Id: sysdep_decls.h 7265 2009-03-25 23:18:46Z dothebart $ */ #ifndef CONTEXT_H #define CONTEXT_H @@ -10,6 +9,26 @@ #include "threads.h" +/* + * Values for CitContext.state + * + * A session that is doing nothing is in CON_IDLE state. When activity + * is detected on the socket, it goes to CON_READY, indicating that it + * needs to have a worker thread bound to it. When a thread binds to + * the session, it goes to CON_EXECUTING and does its thing. When the + * transaction is finished, the thread sets it back to CON_IDLE and lets + * it go. + */ +typedef enum __CCState { + CON_IDLE, /* This context is doing nothing */ + CON_GREETING, /* This context needs to output its greeting */ + CON_STARTING, /* This context is outputting its greeting */ + CON_READY, /* This context needs attention */ + CON_EXECUTING, /* This context is bound to a thread */ + CON_SYS /* This is a system context and mustn't be purged */ +} CCState; + + /* * Here's the big one... the Citadel context structure. * @@ -22,25 +41,25 @@ 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 */ - int state; /* thread state (see CON_ values below) */ + CCState state; /* thread state (see CON_ values below) */ int kill_me; /* Set to nonzero to flag for termination */ - StrBuf *lBuf; + IOBuffer SendBuf, /* Our write Buffer */ + RecvBuf, /* Our block buffered read buffer */ + SBuf; /* Our block buffered read buffer for clients */ - const char *Pos; /* Our read position inside of the ReadBuf */ - StrBuf *ReadBuf; /* Our block buffered read buffer */ StrBuf *MigrateBuf; /* Our block buffered read buffer */ - - const char *sPos; /* Our read position inside of the ReadBuf */ - StrBuf *sReadBuf; /* Our block buffered read buffer */ StrBuf *sMigrateBuf; /* Our block buffered read buffer */ + int client_socket; 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; @@ -66,6 +85,7 @@ struct CitContext { int cs_clientdev; /* client developer ID */ int cs_clienttyp; /* client type code */ int cs_clientver; /* client version number */ + char cs_clientinfo[256];/* if its a unix domain socket, some info for logging. */ uid_t cs_UDSclientUID; /* the uid of the client when talking via UDS */ char cs_clientname[32]; /* name of client software */ char cs_host[64]; /* host logged in from */ @@ -91,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 */ @@ -114,39 +130,25 @@ 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; -/* - * Values for CitContext.state - * - * A session that is doing nothing is in CON_IDLE state. When activity - * is detected on the socket, it goes to CON_READY, indicating that it - * needs to have a worker thread bound to it. When a thread binds to - * the session, it goes to CON_EXECUTING and does its thing. When the - * transaction is finished, the thread sets it back to CON_IDLE and lets - * it go. - */ -enum { - CON_IDLE, /* This context is doing nothing */ - CON_GREETING, /* This context needs to output its greeting */ - CON_STARTING, /* This context is outputting its greeting */ - CON_READY, /* This context needs attention */ - CON_EXECUTING /* This context is bound to a thread */ -}; #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,6 +162,11 @@ void InitializeMasterCC(void); void dead_session_purge(int force); void set_async_waiting(struct CitContext *ccptr); +CitContext *CloneContext(CitContext *CloneMe); + +/* forcibly close and flush fd's on shutdown */ +void terminate_all_sessions(void); + /* Deprecated, user CtdlBumpNewMailCounter() instead */ void BumpNewMailCounter(long) __attribute__ ((deprecated)); @@ -178,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:"");