* Finished removing all the "dynamic session data" stuff in order to

[citadel.git] / citadel / server.h

diff --git a/citadel/server.h b/citadel/server.h
index 6de5716d740ed14ea3209b3b46be3e85803d5854..32362acf7f166d88e96a3c086565d8b3a24cdcef 100644 (file)
--- a/citadel/server.h
+++ b/citadel/server.h
@@ -12,6 +12,7 @@
 
 #include "citadel.h"
 #ifdef HAVE_OPENSSL
+#define OPENSSL_NO_KRB5                /* work around redhat b0rken ssl headers */
 #include <openssl/ssl.h>
 #endif
 
@@ -30,33 +31,6 @@ struct CtdlMessage {
 #define        CM_SKIP_HOOKS   0x01            /* Don't run server-side handlers */
 
 
-/*
- * Generic per-session variable or data structure storage
- */
-struct CtdlSessData {
-       struct CtdlSessData *next;
-       unsigned long sym_id;
-       void *sym_data;
-};
-
-/*
- * Static user data symbol types.  Server extensions can ask for dynamic
- * extensions to per-session data, but the symbol ID has to be listed here.
- */
-enum {
-       SYM_DESIRED_SECTION,            /* Used by the MIME parser */
-       SYM_MA_INFO,                    /* Handles multipart/alternative */
-       SYM_CIT_ICAL,                   /* Used by the calendar service */
-       SYM_IMAP,                       /* Used by the IMAP service */
-       SYM_POP3,                       /* Used by the POP3 service */
-       SYM_SMTP,                       /* Used by the SMTP service */
-       SYM_SMTP_RECPS,
-       SYM_SMTP_ROOMS,
-       SYM_VCARD,                      /* vCard handling requires this */
-       SYM_MAX
-};
-
-
 /*
  * Here's the big one... the Citadel context structure.
  *
@@ -67,7 +41,7 @@ enum {
  * modification in a linked list.
  */
 struct CitContext {
-       struct CitContext *prev;
+       struct CitContext *prev;        /* Link to previous session in list */
        struct CitContext *next;        /* Link to next session in the list */
 
        struct ctdluser user;   /* Database record buffers */
@@ -110,6 +84,7 @@ struct CitContext {
        char cs_inet_email[SIZ];/* Return address of outbound Internet mail */
 
        FILE *download_fp;      /* Fields relating to file transfer */
+       char download_desired_section[128];
        FILE *upload_fp;
        char upl_file[PATH_MAX];
        char upl_path[PATH_MAX];
@@ -122,8 +97,7 @@ struct CitContext {
        char cs_nonce[NONCE_SIZE];      /* The nonce for this session's next auth transaction */
 
        /* Redirect this session's output to somewhere else? */
-       FILE *redirect_fp;
-       int redirect_sock;
+       FILE *redirect_fp;              /* a file instead (will go away) */
        char *redirect_buffer;          /* the buffer */
        size_t redirect_len;            /* length of data in buffer */
        size_t redirect_alloc;          /* length of allocated buffer */
@@ -150,7 +124,13 @@ struct CitContext {
        char preferred_formats[SIZ];            /* Preferred MIME formats */
 
        /* Dynamically allocated session data */
-       struct CtdlSessData *FirstSessData;
+       struct citimap *IMAP;
+       struct citpop3 *POP3;
+       struct citsmtp *SMTP;
+       char *SMTP_RECPS;
+       char *SMTP_ROOMS;
+       struct cit_ical *CIT_ICAL;              /* calendaring data */
+       struct ma_info *ma;                     /* multipart/alternative data */
 };
 
 typedef struct CitContext t_context;