* Debugged all possible ways for a session to terminate; do them cleanly.

[citadel.git] / citadel / server.h

diff --git a/citadel/server.h b/citadel/server.h
index b693c275dd87d478aac870043574e6f876ab4fd9..61228feea1a988e6765a1c3ac6c1f0b4570ae763 100644 (file)
--- a/citadel/server.h
+++ b/citadel/server.h
@@ -1,5 +1,4 @@
 /* $Id$ */
-typedef pthread_t THREAD;
 
 /* Uncomment this if you want to track memory leaks.
  * This incurs some overhead, so don't use it unless you're debugging the code!
@@ -57,6 +56,7 @@ struct CitContext {
        struct quickroom quickroom;
 
        int state;              /* thread state (see CON_ values below) */
+       int kill_me;            /* Set to nonzero to flag for termination */
 
        char curr_user[32];     /* name of current user */
        int logged_in;          /* logged in */
@@ -106,8 +106,7 @@ typedef struct CitContext t_context;
 /* Values for CitContext.state */
 enum {
        CON_IDLE,               /* This context is doing nothing */
-       CON_EXECUTING,          /* This context is bound to a thread */
-       CON_DYING               /* This context is being terminated */
+       CON_EXECUTING           /* This context is bound to a thread */
 };