Changeover to new room structure. See ChangeLog for details.

[citadel.git] / citadel / citserver.c

diff --git a/citadel/citserver.c b/citadel/citserver.c
index bcb1a92547aa7f668c034ec94cfde7c8e54bbb66..68011009c586b2777cb5266c5cbd7ad5ffa55cc1 100644 (file)
--- a/citadel/citserver.c
+++ b/citadel/citserver.c
@@ -7,6 +7,7 @@
 #include <ctype.h>
 #include <string.h>
 #include <errno.h>
+#include <limits.h>
 #include <pthread.h>
 #include <syslog.h>
 #include <dlfcn.h>
@@ -38,14 +39,18 @@ 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);
        }
 
 /*
  * Cleanup routine to be called when the server is shutting down.
  */
 void master_cleanup(void) {
-       struct FunctionHook *fcn;
+       struct CleanupFunctionHook *fcn;
 
        /* Cancel all running sessions */
        lprintf(7, "Cancelling running sessions...\n");
@@ -54,10 +59,8 @@ void master_cleanup(void) {
                }
 
        /* Run any cleanup routines registered by loadable modules */
-       for (fcn = HookTable; fcn != NULL; fcn = fcn->next) {
-               if (fcn->h_type == HOOK_CLEANUP) {
-                       (*fcn->h_function_pointer)();
-                       }
+       for (fcn = CleanupHookTable; fcn != NULL; fcn = fcn->next) {
+               (*fcn->h_function_pointer)();
                }
 
        /* Close databases */
@@ -92,7 +95,10 @@ void cleanup_stuff(void *arg)
        rec_log(CL_TERMINATE,CC->curr_user);
        unlink(CC->temp);
        lprintf(3, "citserver[%3d]: ended.\n",CC->cs_pid);
-       /* hook_end_session(CC->cs_pid); FIX */
+       
+       /* Run any cleanup routines registered by loadable modules */
+       PerformSessionHooks(EVT_STOP);
+
        syslog(LOG_NOTICE,"session %d ended", CC->cs_pid);
        
        /* Deallocate any unsent express messages */
@@ -123,10 +129,12 @@ 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,ROOMNAMELEN-1);
+       CC->cs_room[ROOMNAMELEN-1] = 0;
        time(&CC->cs_lastupdt);
-       /* hook_room_name(CC->cs_pid, CC->cs_room); FIX */
+
+       /* Run any routines registered by loadable modules */
+       PerformSessionHooks(EVT_NEWROOM);
        }
 
 
@@ -153,8 +161,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';
@@ -623,61 +631,6 @@ void cmd_scdn(char *argbuf)
        }
 
 
-/*
- * Run a server extension (FIX FIX FIX initial hack; polish this up)
- */
-void cmd_extn(char *argbuf) {
-       char ExtensionName[256];
-       int is_ipgm;
-       int pid;
-       char portstr[16];
-       char ipgm[32];
-       char sess[16];
-
-
-       extract(ExtensionName, argbuf, 0);
-       is_ipgm = extract_int(argbuf, 1);
-       
-       pid = fork();
-       lprintf(9, "fork() returned %d\n", pid);
-       if (pid < 0) {
-               cprintf("%d fork failed: %s\n",
-                       ERROR + INTERNAL_ERROR,
-                       strerror(errno));
-               return;
-               }
-       else if (pid == 0) {
-
-               sprintf(portstr, "%d", config.c_port_number);
-
-               if (is_ipgm)
-                       sprintf(ipgm, "%d", config.c_ipgm_secret);
-               else
-                       strcpy(ipgm, "");
-
-               sprintf(sess, "%d", CC->cs_pid);
-
-               execlp(ExtensionName, ExtensionName,
-                       "localhost",                    /* server address */
-                       portstr,                        /* port number */
-                       ipgm,                           /* ipgm secret */
-                       CC->usersupp.fullname,          /* user name */
-                       CC->usersupp.password,          /* password */
-                       CC->quickroom.QRname,           /* current room */
-                       sess,                           /* assoc session id */
-                       NULL);
-       
-               lprintf(9, "exec() failed: %s\n", strerror(errno));
-               exit(1);
-               }
-       else {
-               cprintf("%d Ok\n", OK);
-               }
-       }
-
-
-
-
 /*
  * main context loop
  */
@@ -694,7 +647,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;
@@ -732,7 +684,10 @@ void *context_loop(struct CitContext *con)
                }
 
        lprintf(3, "citserver[%3d]: started.\n", CC->cs_pid);
-       /* hook_start_session(CC->cs_pid); FIX */
+
+       /* Run any session startup routines registered by loadable modules */
+       PerformSessionHooks(EVT_START);
+
        rec_log(CL_CONNECT, "");
 
        do {
@@ -1089,10 +1044,6 @@ void *context_loop(struct CitContext *con)
                        cmd_rchg(&cmdbuf[5]);
                        }
 
-               else if (!strncasecmp(cmdbuf, "EXTN", 4)) {
-                       cmd_extn(&cmdbuf[5]);
-                       }
-
                else if (!strncasecmp(cmdbuf, "AGUP", 4)) {
                        cmd_agup(&cmdbuf[5]);
                        }