* citadel.h (and related files): removed defunct parameters,

[citadel.git] / citadel / citserver.c

diff --git a/citadel/citserver.c b/citadel/citserver.c
index 31aaa68bf9527dced353115e812c8dd7d7dba0b1..ca34147a783011f0667dd4c200f311716041d418 100644 (file)
--- a/citadel/citserver.c
+++ b/citadel/citserver.c
@@ -1,3 +1,4 @@
+/* $Id$ */
 #include <stdlib.h>
 #include <unistd.h>
 #include <stdio.h>
@@ -26,6 +27,8 @@
 #include "room_ops.h"
 #include "file_ops.h"
 #include "dynloader.h"
+#include "policy.h"
+#include "control.h"
 
 struct CitContext *ContextList = NULL;
 int ScheduledShutdown = 0;
@@ -39,6 +42,11 @@ void master_startup(void) {
 
        lprintf(7, "Checking floor reference counts\n");
        check_ref_counts();
+
+       lprintf(7, "Creating base rooms (if necessary)\n");
+       create_room(BASEROOM, 0, "", 0);
+       create_room(AIDEROOM, 4, "", 0);
+       create_room(config.c_twitroom, 0, "", 0);
        }
 
 /*
@@ -108,8 +116,11 @@ void cleanup_stuff(void *arg)
        /* Deallocate any message list we might have in memory */
        if (CC->msglist != NULL) free(CC->msglist);
 
+       /* Purge any stale user/room relationships */
+       PurgeStaleRelationships();
+
        /* Now get rid of the session and context */
-       lprintf(7, "cleanup_stuff() is calling RemoveContext(%d)\n", CC->cs_pid);
+       lprintf(7, "cleanup_stuff() calling RemoveContext(%d)\n", CC->cs_pid);
        RemoveContext(CC);
 
        /* While we still have an extra thread with no user attached to it,
@@ -124,8 +135,8 @@ void cleanup_stuff(void *arg)
  */
 void set_wtmpsupp(char *newtext)
 {
-       strncpy(CC->cs_room,newtext,19);
-       CC->cs_room[19] = 0;
+       strncpy(CC->cs_room,newtext,sizeof CC->cs_room);
+       CC->cs_room[sizeof CC->cs_room - 1] = 0;
        time(&CC->cs_lastupdt);
 
        /* Run any routines registered by loadable modules */
@@ -156,8 +167,8 @@ void cmd_rchg(char *newroomname)
 {
    if ((newroomname) && (newroomname[0]))
    {
-      bzero(CC->fake_roomname, 20);
-      strncpy(CC->fake_roomname, newroomname, 19);
+      bzero(CC->fake_roomname, ROOMNAMELEN);
+      strncpy(CC->fake_roomname, newroomname, ROOMNAMELEN-1);
    }
    else
       CC->fake_roomname[0] = '\0';
@@ -270,7 +281,8 @@ void cmd_iden(char *argbuf)
        rev_level = extract_int(argbuf,2);
        extract(desc,argbuf,3);
 
-       strcpy(from_host,config.c_fqdn);
+       strncpy(from_host,config.c_fqdn,sizeof from_host);
+       from_host[sizeof from_host - 1] = 0;
        if (num_parms(argbuf)>=5) extract(from_host,argbuf,4);
 
        CC->cs_clientdev = dev_code;
@@ -642,7 +654,6 @@ void *context_loop(struct CitContext *con)
        /* 
         * Initialize some variables specific to our context.
         */
-       CC->curr_rm = (-1);
        CC->logged_in = 0;
        CC->internal_pgm = 0;
        CC->download_fp = NULL;
@@ -659,7 +670,8 @@ void *context_loop(struct CitContext *con)
        strcpy(CC->net_node,"");
        sprintf(CC->temp,"/tmp/CitServer.%d.%d", getpid(), CC->cs_pid);
        strcpy(CC->cs_room, "");
-       strcpy(CC->cs_host, config.c_fqdn);
+       strncpy(CC->cs_host, config.c_fqdn, sizeof CC->cs_host);
+       CC->cs_host[sizeof CC->cs_host - 1] = 0;
        locate_host(CC->cs_host);
        CC->cs_flags = 0;
        CC->upload_type = UPL_FILE;
@@ -688,9 +700,9 @@ void *context_loop(struct CitContext *con)
 
        do {
                time(&CC->lastcmd);
+               bzero(cmdbuf, sizeof cmdbuf); /* Clear it, just in case */
                if (client_gets(cmdbuf) < 1) cleanup(EXIT_NULL);
                lprintf(5, "citserver[%3d]: %s\n", CC->cs_pid, cmdbuf);
-               /* hook_command_received(CC->cs_pid, cmdbuf); FIX */
 
                /*
                 * Let other clients see the last command we executed, but
@@ -1048,6 +1060,18 @@ void *context_loop(struct CitContext *con)
                        cmd_asup(&cmdbuf[5]);
                        }
 
+               else if (!strncasecmp(cmdbuf, "GPEX", 4)) {
+                       cmd_gpex(&cmdbuf[5]);
+                       }
+
+               else if (!strncasecmp(cmdbuf, "SPEX", 4)) {
+                       cmd_spex(&cmdbuf[5]);
+                       }
+
+               else if (!strncasecmp(cmdbuf, "CONF", 4)) {
+                       cmd_conf(&cmdbuf[5]);
+                       }
+
                else if (!DLoader_Exec_Cmd(cmdbuf))
                        {
                           cprintf("%d Unrecognized or unsupported command.\n",