#define INLINE
#endif
-#ifdef __CYGWIN__
-
-#ifdef IN_LIBCIT
-#define DLEXP __declspec(dllexport)
-#else
-#define DLEXP __declspec(dllimport)
-#endif
-
-#else
-#define DLEXP
-
-#endif /* __CYGWIN__ */
-
#include "citadel.h"
#ifdef HAVE_OPENSSL
#include <openssl/ssl.h>
struct CitContext {
struct CitContext *next; /* Link to next session in the list */
- struct usersupp usersupp; /* Database record buffers */
- struct quickroom quickroom;
+ struct user user; /* Database record buffers */
+ struct room room;
int state; /* thread state (see CON_ values below) */
int kill_me; /* Set to nonzero to flag for termination */
char curr_user[USERNAME_SIZE]; /* name of current user */
int logged_in; /* logged in */
int internal_pgm; /* authenticated as internal program */
- char temp[32]; /* temp file name */
+ char temp[PATH_MAX]; /* temp file name */
int nologin; /* not allowed to log in */
int is_local_socket; /* set to 1 if client is on unix domain sock */
- char net_node[32]; /* Is the client another Citadel server? */
+ char net_node[PATH_MAX];/* Is the client another Citadel server? */
int client_socket;
int cs_pid; /* session ID */
- time_t cs_lastupdt; /* time of last update */
time_t lastcmd; /* time of last command executed */
time_t lastidle; /* For computing idle time */
+ time_t previous_login; /* Date/time of previous login */
char lastcmdname[5]; /* name of last command executed */
unsigned cs_flags; /* miscellaneous flags */
void (*h_command_function) (void) ; /* service command function */
char cs_host[64]; /* host logged in from */
/* The Internet type of thing */
- char *cs_inet_email; /* Return address of outbound Internet mail */
+ char cs_inet_email[SIZ];/* Return address of outbound Internet mail */
FILE *download_fp; /* Fields relating to file transfer */
FILE *upload_fp;
- char upl_file[SIZ];
- char upl_path[SIZ];
+ char upl_file[PATH_MAX];
+ char upl_path[PATH_MAX];
char upl_comment[SIZ];
- char upl_filedir[SIZ];
+ char upl_filedir[PATH_MAX];
char dl_is_net;
char upload_type;
char fake_hostname[64]; /* Fake hostname <bc> */
char fake_roomname[ROOMNAMELEN]; /* Fake roomname <bc> */
- struct CtdlMessage *cached_msg;
- long cached_msgnum;
char preferred_formats[SIZ]; /* Preferred MIME formats */
/* Dynamically allocated session data */
#define CS_POSTING 4 /* Posting */
struct CitContext *MyContext(void);
-#define CC ((struct CitContext *)MyContext())
+#define CC MyContext()
-extern DLEXP struct CitContext *ContextList;
-extern DLEXP int ScheduledShutdown;
-extern DLEXP struct CitControl CitControl;
+extern struct CitContext *ContextList;
+extern int ScheduledShutdown;
+extern struct CitControl CitControl;
struct ExpressMessage {
* Various things we need to lock and unlock
*/
enum {
- S_USERSUPP,
- S_QUICKROOM,
+ S_USERS,
+ S_ROOMS,
S_SESSION_TABLE,
S_FLOORTAB,
S_CHATQUEUE,
S_HOUSEKEEPING,
S_NTTLIST,
S_DIRECTORY,
+ S_NETCONFIGS,
MAX_SEMAPHORES
};
*/
enum {
CDB_MSGMAIN, /* message base */
- CDB_USERSUPP, /* user file */
- CDB_QUICKROOM, /* room index */
+ CDB_USERS, /* user file */
+ CDB_ROOMS, /* room index */
CDB_FLOORTAB, /* floor index */
CDB_MSGLISTS, /* room message lists */
CDB_VISIT, /* user/room relationships */
int loglevel;
void (*h_function_pointer) (char *);
};
-extern DLEXP struct LogFunctionHook *LogHookTable;
+extern struct LogFunctionHook *LogHookTable;
struct CleanupFunctionHook {
struct CleanupFunctionHook *next;
void (*h_function_pointer) (void);
};
-extern DLEXP struct CleanupFunctionHook *CleanupHookTable;
+extern struct CleanupFunctionHook *CleanupHookTable;
void (*h_function_pointer) (void);
int eventtype;
};
-extern DLEXP struct SessionFunctionHook *SessionHookTable;
+extern struct SessionFunctionHook *SessionHookTable;
/*
* Event types can't be enum'ed, because they must remain consistent between
void (*h_function_pointer) (char *username, long usernum);
int eventtype;
};
-extern DLEXP struct UserFunctionHook *UserHookTable;
+extern struct UserFunctionHook *UserHookTable;
#define EVT_PURGEUSER 100 /* Deleting a user */
#define EVT_OUTPUTMSG 101 /* Outputting a message */
int (*h_function_pointer) (struct CtdlMessage *msg);
int eventtype;
};
-extern DLEXP struct MessageFunctionHook *MessageHookTable;
+extern struct MessageFunctionHook *MessageHookTable;
#define EVT_BEFOREREAD 200
#define EVT_BEFORESAVE 201
struct NetprocFunctionHook *next;
int (*h_function_pointer) (struct CtdlMessage *msg, char *target_room);
};
-extern DLEXP struct NetprocFunctionHook *NetprocHookTable;
+extern struct NetprocFunctionHook *NetprocHookTable;
/*
struct DeleteFunctionHook *next;
void (*h_function_pointer) (char *target_room, long msgnum);
};
-extern DLEXP struct DeleteFunctionHook *DeleteHookTable;
+extern struct DeleteFunctionHook *DeleteHookTable;
/*
int (*h_function_pointer) (char *, char *, char *);
int order;
};
-extern DLEXP struct XmsgFunctionHook *XmsgHookTable;
+extern struct XmsgFunctionHook *XmsgHookTable;
/* Priority levels for paging functions (lower is better) */
enum {
void (*h_command_function) (void) ;
int msock;
};
-extern DLEXP struct ServiceFunctionHook *ServiceHookTable;
+extern struct ServiceFunctionHook *ServiceHookTable;
#define V_LOCKOUT 2 /* User is locked out of this room */
#define V_ACCESS 4 /* Access is granted to this room */
-#define UA_KNOWN 2
-#define UA_GOTOALLOWED 4
-#define UA_HASNEWMSGS 8
-#define UA_ZAPPED 16
-
/* Supplementary data for a message on disk
* (These are kept separately from the message itself because they are
void *h_ptr;
};
-extern DLEXP struct TheHeap *heap;
+extern struct TheHeap *heap;
#else
/* ********** Important fields */
/* *************** Semi-important fields */
/* * Message text (MUST be last) */
-#define FORDER "IPTAFONHRDBCEGJKLQSUVWXYZM"
+#define FORDER "IPTAFONHRDBCEGJKLQSVWXYZUM"
#endif /* SERVER_H */
projects / citadel.git / blobdiff