* more merges

[citadel.git] / citadel / server.h

diff --git a/citadel/server.h b/citadel/server.h
index 9f9e10fb0bdd64799b779b0098ad9fdd6dd8a3b7..bfb95ccba49bfb391d78ba3f48efa87786df422e 100644 (file)
--- a/citadel/server.h
+++ b/citadel/server.h
@@ -58,7 +58,7 @@ struct CitContext {
        int state;              /* thread state (see CON_ values below) */
        int kill_me;            /* Set to nonzero to flag for termination */
 
-       char curr_user[32];     /* name of current user */
+       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 */
@@ -82,12 +82,15 @@ struct CitContext {
        char cs_clientname[32]; /* name of client software */
        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 */
+
        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;
 
@@ -100,10 +103,11 @@ struct CitContext {
        int disable_exp;        /* Set to 1 to disable incoming pages */
 
        /* Masquerade... */
-       char fake_username[32]; /* Fake username <bc>                */
-       char fake_postname[32]; /* Fake postname <bc>                */
+       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> */
+       
 
        /* Dynamically allocated session data */
        struct CtdlSessData *FirstSessData;
@@ -146,8 +150,8 @@ struct ChatLine {
        struct ChatLine *next;
        int chat_seq;
        time_t chat_time;
-       char chat_text[256];
-       char chat_username[32];
+       char chat_text[SIZ];
+       char chat_username[USERNAME_SIZE];
        char chat_room[ROOMNAMELEN];
 };
 
@@ -170,6 +174,7 @@ enum {
        S_SUPPMSGMAIN,
        S_I_WANNA_SELECT,
        S_CONFIG,
+       S_WORKER_LIST,
        MAX_SEMAPHORES
 };