more work on removing masqueraded user/room/host names

[citadel.git] / citadel / context.h

diff --git a/citadel/context.h b/citadel/context.h
index 5e9d998acb9d8a9e4798da2e6a4fc9df15ae9636..65c7515f4f184265e8bb443f6b2ca747bfe9add6 100644 (file)
--- a/citadel/context.h
+++ b/citadel/context.h
@@ -28,31 +28,33 @@ typedef enum __CCState {
        CON_SYS                 /* This is a system context and mustn't be purged */
 } CCState;
 
+#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 */
+       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 */
@@ -65,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 */
@@ -104,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;
@@ -115,20 +113,16 @@ struct CitContext {
        int disable_exp;        /* Set to 1 to disable incoming pages */
        int newmail;            /* Other sessions increment this */
 
-       /* Masqueraded values in the 'who is online' list */
-       char fake_username[USERNAME_SIZE];
-       char fake_hostname[64];
-       char fake_roomname[ROOMNAMELEN];
-
        /* Preferred MIME formats */
        char preferred_formats[256];
        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 */
 
@@ -138,14 +132,12 @@ struct CitContext {
 
        long *cached_msglist;                   /* results of the previous CtdlForEachMessage() */
        int cached_num_msgs;
-};
-
-typedef struct CitContext CitContext;
 
+       char vcard_updated_by_ldap;             /* !0 iff ldap changed the vcard, treat as aide update */
+};
 
 #define CC MyContext()
 
-
 extern pthread_key_t MyConKey;                 /* TSD key for MyContext() */
 extern int num_sessions;
 extern CitContext masterCC;
@@ -180,17 +172,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 */