* room_ops.c: increased the thread safety of cgetfloor()

[citadel.git] / citadel / server.h

diff --git a/citadel/server.h b/citadel/server.h
index e25d5dda3c627561d539247a0d8b1bf29af3f741..8c42ec21c95eb35fd08ac4710fde0fef9f53feb2 100644 (file)
--- a/citadel/server.h
+++ b/citadel/server.h
@@ -5,15 +5,12 @@
  */
 /* #define DEBUG_MEMORY_LEAKS */
 
-/*
- * New format for a message in memory
- */
 
 #ifndef SERVER_H
 #define SERVER_H
 
 #ifdef __GNUC__
-#define INLINE inline
+#define INLINE __inline__
 #else
 #define INLINE
 #endif
@@ -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
 };
 
@@ -122,6 +130,10 @@ struct CitContext {
        int redirect_ssl;
 #endif
 
+       int buffering;
+       char *output_buffer;    /* hold output for one big dump */
+       int buffer_len;
+
        /* A linked list of all express messages sent to us. */
        struct ExpressMessage *FirstExpressMessage;
        int disable_exp;        /* Set to 1 to disable incoming pages */
@@ -201,6 +213,9 @@ enum {
        S_NTTLIST,
        S_DIRECTORY,
        S_NETCONFIGS,
+       S_PUBLIC_CLIENTS,
+       S_LDAP,
+       S_FLOORCACHE,
        MAX_SEMAPHORES
 };
 
@@ -307,13 +322,13 @@ extern struct SessionFunctionHook *SessionHookTable;
  */
 struct UserFunctionHook {
        struct UserFunctionHook *next;
-       void (*h_function_pointer) (char *username, long usernum);
+       void (*h_function_pointer) (struct ctdluser *usbuf);
        int eventtype;
 };
 extern struct UserFunctionHook *UserHookTable;
 
 #define EVT_PURGEUSER  100     /* Deleting a user */
-#define EVT_OUTPUTMSG  101     /* Outputting a message */
+#define EVT_NEWUSER    102     /* Creating a user */
 
 /*
  * MessageFunctionHook extensions are used for hooks which implement handlers
@@ -402,6 +417,7 @@ struct visit {
        long v_lastseen;
        unsigned int v_flags;
        char v_seen[SIZ];
+       char v_answered[SIZ];
        int v_view;
 };