* Killed off CtdlGetDynamicSymbol() and just put all the symbols in server.h

[citadel.git] / citadel / server.h

diff --git a/citadel/server.h b/citadel/server.h
index 575640ec8cd9bfdc83a95e1bbe63e3d76e941319..e8cebf98d80f921339f2607abac63f380fb18112 100644 (file)
--- a/citadel/server.h
+++ b/citadel/server.h
@@ -5,9 +5,6 @@
  */
 /* #define DEBUG_MEMORY_LEAKS */
 
-/*
- * New format for a message in memory
- */
 
 #ifndef SERVER_H
 #define SERVER_H
@@ -23,15 +20,18 @@
 #include <openssl/ssl.h>
 #endif
 
-#define        CTDLMESSAGE_MAGIC               0x159d
+/*
+ * New format for a message in memory
+ */
 struct CtdlMessage {
-       int cm_magic;                   /* Self-check */
+       int cm_magic;                   /* Self-check (NOT SAVED TO DISK) */
        char cm_anon_type;              /* Anonymous or author-visible */
        char cm_format_type;            /* Format type */
        char *cm_fields[256];           /* Data fields */
        unsigned int cm_flags;          /* How to handle (NOT SAVED TO DISK) */
 };
 
+#define        CTDLMESSAGE_MAGIC               0x159d
 #define        CM_SKIP_HOOKS   0x01            /* Don't run server-side handlers */
 
 
@@ -45,12 +45,20 @@ struct CtdlSessData {
 };
 
 /*
- * Static user data symbol types
+ * 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_REPL,                       /* Used for replication checking */
+       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
 };
 
@@ -97,6 +105,7 @@ struct CitContext {
        int cs_clientver;       /* client version number */
        char cs_clientname[32]; /* name of client software */
        char cs_host[64];       /* host logged in from */
+       char cs_addr[64];       /* address logged in from */
 
        /* The Internet type of thing */
        char cs_inet_email[SIZ];/* Return address of outbound Internet mail */
@@ -200,6 +209,7 @@ enum {
        S_NTTLIST,
        S_DIRECTORY,
        S_NETCONFIGS,
+       S_PUBLIC_CLIENTS,
        MAX_SEMAPHORES
 };