X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fcontext.h;h=37ce184061791cad5179b058cda0e97209dab51e;hb=50ff39d933b7178377b3a67f8edc31ffa42ffd28;hp=76d2a91911a4d6e70b498ba68b6a8c6c78787884;hpb=5c39ca8a3c875df98163fed8923c258f21bb3f66;p=citadel.git

diff --git a/citadel/context.h b/citadel/context.h
index 76d2a9191..37ce18406 100644
--- a/citadel/context.h
+++ b/citadel/context.h
@@ -28,23 +28,14 @@ typedef enum __CCState {
 	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 {
 	CitContext *prev;	/* Link to previous session in list */
@@ -52,18 +43,18 @@ 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 */
+	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 kill_me;		/* Set to nonzero to flag for termination */
 
-	IOBuffer SendBuf, /* Our write Buffer */
-		RecvBuf, /* Our block buffered read buffer */
-		SBuf; /* Our block buffered read buffer for clients */
+	IOBuffer SendBuf,	/* Our write Buffer */
+		RecvBuf,	/* Our block buffered read buffer */
+		SBuf;		/* Our block buffered read buffer for clients */
 
-	StrBuf *MigrateBuf;        /* Our block buffered read buffer */
-	StrBuf *sMigrateBuf;        /* Our block buffered read buffer */
+	StrBuf *MigrateBuf;	/* 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 */
@@ -76,13 +67,11 @@ struct CitContext {
 #endif
 
 	char curr_user[USERNAME_SIZE];	/* name of current user */
-	int logged_in;		/* logged in */
-	int internal_pgm;	/* authenticated as internal program */
+	int logged_in;		/* logged in? */
+	int internal_pgm;	/* authenticated as internal program? */
 	int nologin;		/* not allowed to log in */
 	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 */
@@ -115,8 +104,6 @@ struct CitContext {
 	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;
@@ -152,8 +139,6 @@ struct CitContext {
 	int cached_num_msgs;
 
 	char vcard_updated_by_ldap;		/* !0 iff ldap changed the vcard, treat as aide update */
-
-	//AsyncIO *IO;				/* if this session has AsyncIO going on... */
 };
 
 #define CC MyContext()
@@ -192,19 +177,7 @@ int CtdlTerminateOtherSession (int session_num);
  * Bind a thread to a context.  (It's inline merely to speed things up.)
  */
 static INLINE void become_session(CitContext *which_con) {
-/*
-	pid_t tid = syscall(SYS_gettid);
-*/
 	pthread_setspecific(MyConKey, (void *)which_con );
-/*
-	syslog(LOG_DEBUG, "[%d]: Now doing %s\n", 
-		      (int) tid, 
-		      ((which_con != NULL) && (which_con->ServiceName != NULL)) ? 
-		      which_con->ServiceName:"");
-*/
 }
 
-
-
-
 #endif /* CONTEXT_H */