- port to Cygwin (DLL support, etc.)

[citadel.git] / citadel / server.h

diff --git a/citadel/server.h b/citadel/server.h
index 1e44a2e439505b2159052e4efba19b5cf3e6c78e..1163899cfca03e0e8ca5d2ab7f22c360b2b5baf4 100644 (file)
--- a/citadel/server.h
+++ b/citadel/server.h
@@ -8,6 +8,25 @@
 /*
  * New format for a message in memory
  */
+
+#ifndef SERVER_H
+#define SERVER_H
+
+#ifdef __CYGWIN__
+
+#ifdef IN_LIBCIT
+#define DLEXP __declspec(dllexport)
+#else
+#define DLEXP __declspec(dllimport)
+#endif
+
+#else
+#define DLEXP
+
+#endif /* __CYGWIN__ */
+
+#include "citadel.h"
+
 #define        CTDLMESSAGE_MAGIC               0x159d
 struct CtdlMessage {
        int cm_magic;                   /* Self-check */
@@ -74,6 +93,7 @@ struct CitContext {
        char lastcmdname[5];    /* name of last command executed */
        unsigned cs_flags;      /* miscellaneous flags */
        void (*h_command_function) (void) ;     /* service command function */
+       int is_async;           /* Nonzero if client accepts async msgs */
 
        /* feeping creaturisms... */
        int cs_clientdev;       /* client developer ID */
@@ -83,14 +103,14 @@ struct CitContext {
        char cs_host[26];       /* host logged in from */
 
        /* Beginning of cryptography - session nonce */
-       char cs_nonce[NONCE_SIZE];              /* The nonce for this session's next auth transaction */
+       char cs_nonce[NONCE_SIZE];      /* The nonce for this session's next auth transaction */
 
        FILE *download_fp;      /* Fields relating to file transfer */
        FILE *upload_fp;
-       char upl_file[256];
-       char upl_path[256];
-       char upl_comment[256];
-       char upl_filedir[256];
+       char upl_file[SIZ];
+       char upl_path[SIZ];
+       char upl_comment[SIZ];
+       char upl_filedir[SIZ];
        char dl_is_net;
        char upload_type;
 
@@ -103,11 +123,10 @@ struct CitContext {
        int disable_exp;        /* Set to 1 to disable incoming pages */
 
        /* Masquerade... */
-       char fake_username[USERNAME_SIZE];      /* Fake username <bc>                */
-       char fake_postname[USERNAME_SIZE];      /* Fake postname <bc>                */
-       char fake_hostname[25]; /* Name of the fake hostname <bc>    */
-       char fake_roomname[ROOMNAMELEN];        /* Name of the fake room <bc> */
-       
+       char fake_username[USERNAME_SIZE];      /* Fake username <bc> */ 
+       char fake_postname[USERNAME_SIZE];      /* Fake postname <bc> */
+       char fake_hostname[25];                 /* Fake hostname <bc> */
+       char fake_roomname[ROOMNAMELEN];        /* Fake roomname <bc> */
 
        /* Dynamically allocated session data */
        struct CtdlSessData *FirstSessData;
@@ -129,9 +148,9 @@ enum {
 struct CitContext *MyContext(void);
 #define CC ((struct CitContext *)MyContext())
 
-extern struct CitContext *ContextList;
-extern int ScheduledShutdown;
-extern struct CitControl CitControl;
+extern DLEXP struct CitContext *ContextList;
+extern DLEXP int ScheduledShutdown;
+extern DLEXP struct CitControl CitControl;
 
 
 struct ExpressMessage {
@@ -150,7 +169,7 @@ struct ChatLine {
        struct ChatLine *next;
        int chat_seq;
        time_t chat_time;
-       char chat_text[256];
+       char chat_text[SIZ];
        char chat_username[USERNAME_SIZE];
        char chat_room[ROOMNAMELEN];
 };
@@ -160,20 +179,18 @@ struct ChatLine {
  */
 enum {
        S_USERSUPP,
-       S_USER_TRANS,
        S_QUICKROOM,
-       S_MSGMAIN,
-       S_CALLLOG,
        S_SESSION_TABLE,
        S_FLOORTAB,
        S_CHATQUEUE,
        S_CONTROL,
-       S_HOUSEKEEPING,
        S_DATABASE,
        S_NETDB,
        S_SUPPMSGMAIN,
        S_I_WANNA_SELECT,
        S_CONFIG,
+       S_WORKER_LIST,
+       S_HOUSEKEEPING,
        MAX_SEMAPHORES
 };
 
@@ -231,13 +248,13 @@ struct LogFunctionHook {
        int loglevel;
        void (*h_function_pointer) (char *);
 };
-extern struct LogFunctionHook *LogHookTable;
+extern DLEXP struct LogFunctionHook *LogHookTable;
 
 struct CleanupFunctionHook {
        struct CleanupFunctionHook *next;
        void (*h_function_pointer) (void);
 };
-extern struct CleanupFunctionHook *CleanupHookTable;
+extern DLEXP struct CleanupFunctionHook *CleanupHookTable;
 
 
 
@@ -253,7 +270,7 @@ struct SessionFunctionHook {
        void (*h_function_pointer) (void);
        int eventtype;
 };
-extern struct SessionFunctionHook *SessionHookTable;
+extern DLEXP struct SessionFunctionHook *SessionHookTable;
 
 /* 
  * Event types can't be enum'ed, because they must remain consistent between
@@ -268,7 +285,6 @@ extern struct SessionFunctionHook *SessionHookTable;
 #define EVT_CMD                6       /* Called after each server command */
 #define EVT_RWHO       7       /* An RWHO command is being executed */
 
-
 #define EVT_TIMER      50      /* Timer events are called once per minute
                                   and are not tied to any session */
 
@@ -282,12 +298,11 @@ struct UserFunctionHook {
        void (*h_function_pointer) (char *username, long usernum);
        int eventtype;
 };
-extern struct UserFunctionHook *UserHookTable;
+extern DLEXP struct UserFunctionHook *UserHookTable;
 
 #define EVT_PURGEUSER  100     /* Deleting a user */
 #define EVT_OUTPUTMSG  101     /* Outputting a message */
 
-
 /*
  * MessageFunctionHook extensions are used for hooks which implement handlers
  * for various types of message operations (save, read, etc.)
@@ -297,7 +312,7 @@ struct MessageFunctionHook {
        int (*h_function_pointer) (struct CtdlMessage *msg);
        int eventtype;
 };
-extern struct MessageFunctionHook *MessageHookTable;
+extern DLEXP struct MessageFunctionHook *MessageHookTable;
 
 #define EVT_BEFOREREAD 200
 #define EVT_BEFORESAVE 201
@@ -315,7 +330,7 @@ struct XmsgFunctionHook {
        int (*h_function_pointer) (char *, char *, char *);
        int order;
 };
-extern struct XmsgFunctionHook *XmsgHookTable;
+extern DLEXP struct XmsgFunctionHook *XmsgHookTable;
 
 /* Priority levels for paging functions (lower is better) */
 enum {
@@ -339,7 +354,7 @@ struct ServiceFunctionHook {
        void (*h_command_function) (void) ;
        int msock;
 };
-extern struct ServiceFunctionHook *ServiceHookTable;
+extern DLEXP struct ServiceFunctionHook *ServiceHookTable;
 
 
 
@@ -350,6 +365,7 @@ struct visit {
        long v_usernum;
        long v_lastseen;
        unsigned int v_flags;
+       char v_seen[SIZ];
 };
 
 #define V_FORGET       1       /* User has zapped this room        */
@@ -397,7 +413,7 @@ struct TheHeap {
        void *h_ptr;
 };
 
-extern struct TheHeap *heap;
+extern DLEXP struct TheHeap *heap;
 
 #else
 
@@ -424,3 +440,5 @@ struct ser_ret {
 /*                         ***************     Semi-important fields */
 /*                                        *    Message text (MUST be last) */
 #define FORDER "IPTAFONHRDBCEGJKLQSUVWXYZM"
+
+#endif /* SERVER_H */