The new server API no longer uses upload_type. Removed it from CitContext.

[citadel.git] / citadel / context.h

diff --git a/citadel/context.h b/citadel/context.h
index 9243d5148230270912919694e908ee9b68a81dea..fd486caa34a53e24b383633aa334cb6478f8a06d 100644 (file)
--- a/citadel/context.h
+++ b/citadel/context.h
@@ -28,14 +28,22 @@ typedef enum __CCState {
        CON_SYS                 /* This is a system context and mustn't be purged */
 } CCState;
 
-typedef struct AsyncIO AsyncIO; /* forward declaration for event_client.h */
+//#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 {
@@ -44,7 +52,7 @@ 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) */
@@ -74,7 +82,6 @@ struct CitContext {
        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 */
@@ -107,8 +114,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;
@@ -128,7 +133,7 @@ struct CitContext {
        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 */
@@ -143,14 +148,13 @@ struct CitContext {
        long *cached_msglist;                   /* results of the previous CtdlForEachMessage() */
        int cached_num_msgs;
 
-       AsyncIO *IO;                            /* if this session has AsyncIO going on... */
-};
-
+       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()
 
-
 extern pthread_key_t MyConKey;                 /* TSD key for MyContext() */
 extern int num_sessions;
 extern CitContext masterCC;
@@ -199,18 +203,5 @@ static INLINE void become_session(CitContext *which_con) {
 
 
 
-/* typedef void (*CtdlDbgFunction) (const int); */
-
-extern int DebugSession;
-#define CONDBGLOG(LEVEL) if ((LEVEL != LOG_DEBUG) || (DebugSession != 0))
-
-#define CON_syslog(LEVEL, FORMAT, ...)                         \
-       CONDBGLOG(LEVEL) syslog(LEVEL,                          \
-                               "Context: " FORMAT, __VA_ARGS__)
-
-#define CONM_syslog(LEVEL, FORMAT)                     \
-       CONDBGLOG(LEVEL) syslog(LEVEL,                  \
-                               "Context: " FORMAT);
-
 
 #endif /* CONTEXT_H */