* The size constant "256" which shows up everywhere as a buffer size has now

[citadel.git] / citadel / citserver.c

diff --git a/citadel/citserver.c b/citadel/citserver.c
index 89f65d295c86c3f3a2f7d1adcd4c07438cdd792a..e4d76c02b50c2f68379413d5ca332941fa7d2c52 100644 (file)
--- a/citadel/citserver.c
+++ b/citadel/citserver.c
@@ -17,10 +17,11 @@
 #include <errno.h>
 #include <limits.h>
 #include <syslog.h>
-#include <dlfcn.h>
+/* #include <dlfcn.h> */
 #include <netdb.h>
 #include <sys/types.h>
 #include <sys/socket.h>
+#include <sys/time.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #include "citadel.h"
@@ -51,13 +52,16 @@ int do_defrag = 0;
  * Various things that need to be initialized at startup
  */
 void master_startup(void) {
+       struct timeval tv;
+       
+       lprintf(9, "master_startup() started\n");
        lprintf(7, "Opening databases\n");
        open_databases();
 
-       if (do_defrag)
+       if (do_defrag) {
                defrag_databases();
+       }
 
-       lprintf(7, "Checking floor reference counts\n");
        check_ref_counts();
 
        lprintf(7, "Creating base rooms (if necessary)\n");
@@ -65,7 +69,14 @@ void master_startup(void) {
        create_room(AIDEROOM,           3, "", 0);
        create_room(SYSCONFIGROOM,      3, "", 0);
        create_room(config.c_twitroom,  0, "", 0);
-       }
+
+       lprintf(7, "Seeding the pseudo-random number generator...\n");
+       gettimeofday(&tv, NULL);
+       srand(tv.tv_usec);
+       lprintf(9, "master_startup() finished\n");
+}
+
+
 
 /*
  * Cleanup routine to be called when the server is shutting down.
@@ -84,7 +95,7 @@ void master_cleanup(void) {
        /* Run any cleanup routines registered by loadable modules */
        for (fcn = CleanupHookTable; fcn != NULL; fcn = fcn->next) {
                (*fcn->h_function_pointer)();
-               }
+       }
 
        /* Close databases */
        lprintf(7, "Closing databases\n");
@@ -97,7 +108,7 @@ void master_cleanup(void) {
        lprintf(3, "citserver: exiting.\n");
        fflush(stdout); fflush(stderr);
        exit(0);
-       }
+}
 
 
 /*
@@ -183,7 +194,7 @@ void RemoveContext (struct CitContext *con)
        lprintf(3, "citserver[%3d]: ended.\n", con->cs_pid);
        
 
-       syslog(LOG_NOTICE,"session %d ended", con->cs_pid);
+       syslog(LOG_NOTICE,"session %d: ended", con->cs_pid);
        
        /* Deallocate any user-data attached to this session */
        deallocate_user_data(con);
@@ -192,10 +203,7 @@ void RemoveContext (struct CitContext *con)
        lprintf(7, "Closing socket %d\n", con->client_socket);
        close(con->client_socket);
 
-        /* Tell the housekeeping thread to check to see if this is the time
-         * to initiate a scheduled shutdown event.
-         */
-        enter_housekeeping_cmd("SCHED_SHUTDOWN");
+       /* This is where we used to check for scheduled shutdowns. */
 
        /* Free up the memory used by this context */
        phree(con);
@@ -296,21 +304,22 @@ void CtdlReallocUserData(unsigned long requested_sym, size_t num_bytes)
  * cmd_info()  -  tell the client about this server
  */
 void cmd_info(void) {
-       cprintf("%d Server info:\n",LISTING_FOLLOWS);
-       cprintf("%d\n",CC->cs_pid);
-       cprintf("%s\n",config.c_nodename);
-       cprintf("%s\n",config.c_humannode);
-       cprintf("%s\n",config.c_fqdn);
-       cprintf("%s\n",CITADEL);
-       cprintf("%d\n",REV_LEVEL);
-       cprintf("%s\n",config.c_bbs_city);
-       cprintf("%s\n",config.c_sysadm);
-       cprintf("%d\n",SERVER_TYPE);
-       cprintf("%s\n",config.c_moreprompt);
+       cprintf("%d Server info:\n", LISTING_FOLLOWS);
+       cprintf("%d\n", CC->cs_pid);
+       cprintf("%s\n", config.c_nodename);
+       cprintf("%s\n", config.c_humannode);
+       cprintf("%s\n", config.c_fqdn);
+       cprintf("%s\n", CITADEL);
+       cprintf("%d\n", REV_LEVEL);
+       cprintf("%s\n", config.c_bbs_city);
+       cprintf("%s\n", config.c_sysadm);
+       cprintf("%d\n", SERVER_TYPE);
+       cprintf("%s\n", config.c_moreprompt);
        cprintf("1\n"); /* 1 = yes, this system supports floors */
        cprintf("1\n"); /* 1 = we support the extended paging options */
+       cprintf("%s\n", CC->cs_nonce);
        cprintf("000\n");
-       }
+}
 
 
 /*
@@ -369,7 +378,7 @@ static int hostnames_match(const char *realname, const char *testname) {
  */
 int is_public_client(char *where)
 {
-       char buf[256];
+       char buf[SIZ];
        FILE *fp;
 
        lprintf(9, "Checking whether %s is a public client\n", where);
@@ -380,7 +389,7 @@ int is_public_client(char *where)
        fp = fopen("public_clients","r");
        if (fp == NULL) return(0);
 
-       while (fgets(buf,256,fp)!=NULL) {
+       while (fgets(buf, sizeof buf, fp)!=NULL) {
                while (isspace((buf[strlen(buf)-1]))) 
                        buf[strlen(buf)-1] = 0;
                if (hostnames_match(where,buf)) {
@@ -402,8 +411,8 @@ void cmd_iden(char *argbuf)
        int dev_code;
        int cli_code;
        int rev_level;
-       char desc[256];
-       char from_host[256];
+       char desc[SIZ];
+       char from_host[SIZ];
        struct in_addr addr;
        int do_lookup = 0;
 
@@ -450,12 +459,14 @@ void cmd_iden(char *argbuf)
                (rev_level % 100),
                desc);
 
-       syslog(LOG_NOTICE,"client %d/%d/%01d.%02d (%s)\n",
+       syslog(LOG_NOTICE,"session %d: client %d/%d/%01d.%02d (%s) from %s\n",
+               CC->cs_pid,
                dev_code,
                cli_code,
                (rev_level / 100),
                (rev_level % 100),
-               desc);
+               desc,
+               CC->cs_host);
        cprintf("%d Ok\n",OK);
 }
 
@@ -466,8 +477,8 @@ void cmd_iden(char *argbuf)
 void cmd_mesg(char *mname)
 {
        FILE *mfp;
-       char targ[256];
-       char buf[256];
+       char targ[SIZ];
+       char buf[SIZ];
        char *dirs[2];
 
        extract(buf,mname,0);
@@ -512,8 +523,8 @@ void cmd_mesg(char *mname)
 void cmd_emsg(char *mname)
 {
        FILE *mfp;
-       char targ[256];
-       char buf[256];
+       char targ[SIZ];
+       char buf[SIZ];
        char *dirs[2];
        int a;
 
@@ -722,6 +733,25 @@ void cmd_scdn(char *argbuf)
        }
 
 
+/*
+ * Generate a "nonce" for APOP-style authentication.
+ *
+ * RFC 1725 et al specify a PID to be placed in front of the nonce.
+ * Quoth BTX: That would be stupid.
+ */
+void generate_nonce(struct CitContext *con) {
+       struct timeval tv;
+
+       memset(con->cs_nonce, NONCE_SIZE, 0);
+       gettimeofday(&tv, NULL);
+       memset(con->cs_nonce, NONCE_SIZE, 0);
+       snprintf(con->cs_nonce, NONCE_SIZE, "<%d%ld@%s>",
+               rand(), tv.tv_usec, config.c_fqdn);
+}
+
+
+
+
 /*
  * Back-end function for starting a session
  */
@@ -744,6 +774,11 @@ void begin_session(struct CitContext *con)
        strcpy(con->cs_clientname, "(unknown)");
        strcpy(con->curr_user, NLI);
        strcpy(con->net_node,"");
+       strcpy(con->fake_username, "");
+       strcpy(con->fake_postname, "");
+       strcpy(con->fake_hostname, "");
+       strcpy(con->fake_roomname, "");
+       generate_nonce(con);
        snprintf(con->temp, sizeof con->temp, tmpnam(NULL));
        safestrncpy(con->cs_host, config.c_fqdn, sizeof con->cs_host);
        con->cs_host[sizeof con->cs_host - 1] = 0;
@@ -794,7 +829,7 @@ void citproto_begin_session() {
  * This loop recognizes all server commands.
  */
 void do_command_loop(void) {
-       char cmdbuf[256];
+       char cmdbuf[SIZ];
 
        time(&CC->lastcmd);
        memset(cmdbuf, 0, sizeof cmdbuf); /* Clear it, just in case */