* Added cs_addr field to struct CitContext -- holds a dotted quad string

[citadel.git] / citadel / server.h

diff --git a/citadel/server.h b/citadel/server.h
index e2e889330097758d55e50a5a0e1de48320002fb8..e25d5dda3c627561d539247a0d8b1bf29af3f741 100644 (file)
--- a/citadel/server.h
+++ b/citadel/server.h
@@ -67,8 +67,8 @@ enum {
 struct CitContext {
        struct CitContext *next;        /* Link to next session in the list */
 
-       struct usersupp usersupp;       /* Database record buffers */
-       struct quickroom quickroom;
+       struct ctdluser user;   /* Database record buffers */
+       struct ctdlroom room;
 
        int state;              /* thread state (see CON_ values below) */
        int kill_me;            /* Set to nonzero to flag for termination */
@@ -83,9 +83,9 @@ struct CitContext {
        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 */
@@ -97,6 +97,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 */
@@ -152,7 +153,7 @@ enum {
 #define CS_POSTING     4       /* Posting */
 
 struct CitContext *MyContext(void);
-#define CC ((struct CitContext *)MyContext())
+#define CC MyContext()
 
 extern struct CitContext *ContextList;
 extern int ScheduledShutdown;
@@ -184,8 +185,8 @@ struct ChatLine {
  * Various things we need to lock and unlock
  */
 enum {
-       S_USERSUPP,
-       S_QUICKROOM,
+       S_USERS,
+       S_ROOMS,
        S_SESSION_TABLE,
        S_FLOORTAB,
        S_CHATQUEUE,
@@ -235,8 +236,8 @@ enum {
  */
 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       */
@@ -408,11 +409,6 @@ struct visit {
 #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
@@ -474,6 +470,6 @@ struct ser_ret {
 /*               **********                    Important fields */
 /*                         ***************     Semi-important fields */
 /*                                        *    Message text (MUST be last) */
-#define FORDER "IPTAFONHRDBCEGJKLQSUVWXYZM"
+#define FORDER "IPTAFONHRDBCEGJKLQSVWXYZUM"
 
 #endif /* SERVER_H */