]> code.citadel.org Git - citadel.git/blobdiff - citadel/citserver.c
* We now have a housekeeping thread and a housekeeping queue.
[citadel.git] / citadel / citserver.c
index e625d761cc4f1dcb988b5087d3c01d3a2056131c..195b42637de6052050b0c939813742fddc84a542 100644 (file)
@@ -1,3 +1,5 @@
+/* $Id$ */
+#include "sysdep.h"
 #include <stdlib.h>
 #include <unistd.h>
 #include <stdio.h>
@@ -7,9 +9,16 @@
 #include <ctype.h>
 #include <string.h>
 #include <errno.h>
+#include <limits.h>
+#ifdef HAVE_PTHREAD_H
 #include <pthread.h>
+#endif
 #include <syslog.h>
 #include <dlfcn.h>
+#include <netdb.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
 #include "citadel.h"
 #include "server.h"
 #include "sysdep_decls.h"
 #include "config.h"
 #include "database.h"
 #include "housekeeping.h"
-#include "hooks.h"
 #include "user_ops.h"
 #include "logging.h"
-#include "support.h"
 #include "msgbase.h"
+#include "support.h"
 #include "locate_host.h"
 #include "room_ops.h"
 #include "file_ops.h"
 #include "dynloader.h"
+#include "policy.h"
+#include "control.h"
+#include "tools.h"
 
 struct CitContext *ContextList = NULL;
 int ScheduledShutdown = 0;
+int do_defrag = 0;
 
 /*
  * Various things that need to be initialized at startup
@@ -37,15 +49,23 @@ void master_startup(void) {
        lprintf(7, "Opening databases\n");
        open_databases();
 
+       if (do_defrag)
+               defrag_databases();
+
        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 CleanupFunctionHook *fcn;
 
        /* Cancel all running sessions */
        lprintf(7, "Cancelling running sessions...\n");
@@ -53,6 +73,11 @@ void master_cleanup(void) {
                kill_session(ContextList->cs_pid);
                }
 
+       /* 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");
        close_databases();
@@ -61,12 +86,35 @@ void master_cleanup(void) {
        sysdep_master_cleanup();
 
        /* Now go away. */
-       hook_cleanup();
        lprintf(3, "citserver: exiting.\n");
+       fflush(stdout); fflush(stderr);
        exit(0);
        }
 
 
+/*
+ * Free any per-session data allocated by modules or whatever
+ */
+void deallocate_user_data(struct CitContext *con)
+{
+       struct CtdlSessData *ptr;
+
+       begin_critical_section(S_SESSION_TABLE);
+       while (con->FirstSessData != NULL) {
+               lprintf(9, "Deallocating user data symbol %ld\n",
+                       con->FirstSessData->sym_id);
+               if (con->FirstSessData->sym_data != NULL)
+                       phree(con->FirstSessData->sym_data);
+               ptr = con->FirstSessData->next;
+               phree(con->FirstSessData);
+               con->FirstSessData = ptr;
+       }
+       end_critical_section(S_SESSION_TABLE);
+}
+
+
+
+
 /*
  * Gracefully terminate the session and thread.
  * (This is called as a cleanup handler by the thread library.)
@@ -76,7 +124,6 @@ void master_cleanup(void) {
  */
 void cleanup_stuff(void *arg)
 {
-       struct ExpressMessage *emptr;
 
        lprintf(9, "cleanup_stuff() called\n");
 
@@ -86,44 +133,121 @@ 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);
-       syslog(LOG_NOTICE,"session %d ended", CC->cs_pid);
        
-       /* Deallocate any unsent express messages */
-       begin_critical_section(S_SESSION_TABLE);
-       while (CC->FirstExpressMessage != NULL) {
-               emptr = CC->FirstExpressMessage;
-               CC->FirstExpressMessage = CC->FirstExpressMessage->next;
-               free(emptr);
-               }
-       end_critical_section(S_SESSION_TABLE);
+       /* Run any cleanup routines registered by loadable modules */
+       PerformSessionHooks(EVT_STOP);
 
-       /* Deallocate any message list we might have in memory */
-       if (CC->msglist != NULL) free(CC->msglist);
+       syslog(LOG_NOTICE,"session %d ended", CC->cs_pid);
+       
+       /* Deallocate any user-data attached to this session */
+       deallocate_user_data(CC);
 
        /* 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,
-        * take the opportunity to do some housekeeping before exiting.
-        */
-       do_housekeeping();
+       /* Wake up the housekeeping thread */
+       enter_housekeeping_cmd("SCHED_SHUTDOWN");
        }
 
 
+/*
+ * Get a dynamic symbol number for per-session user data.
+ * This API call should be made only ONCE per symbol per citserver run.
+ */
+int CtdlGetDynamicSymbol() 
+{
+       static unsigned int next_symbol = SYM_MAX;
+       return ++next_symbol;
+}
+
+
+
+/*
+ * Return a pointer to some generic per-session user data.
+ * (This function returns NULL if the requested symbol is not allocated.)
+ *
+ * NOTE: we use critical sections for allocating and de-allocating these,
+ *       but not for locating one.
+ */
+void *CtdlGetUserData(unsigned long requested_sym) 
+{
+       struct CtdlSessData *ptr;
+
+       for (ptr = CC->FirstSessData; ptr != NULL; ptr = ptr->next)
+               if (ptr->sym_id == requested_sym)
+                       return(ptr->sym_data);
+
+       lprintf(2, "ERROR! CtdlGetUserData(%ld) symbol not allocated\n",
+               requested_sym);
+       return NULL;
+}
+
+
+/*
+ * Allocate some generic per-session user data.
+ */
+void CtdlAllocUserData(unsigned long requested_sym, size_t num_bytes)
+{
+       struct CtdlSessData *ptr;
+
+       lprintf(9, "CtdlAllocUserData(%ld) called\n", requested_sym);
+
+       /* Fail silently if the symbol is already registered. */
+       for (ptr = CC->FirstSessData; ptr != NULL; ptr = ptr->next)  {
+               if (ptr->sym_id == requested_sym) {
+                       return;
+               }
+       }
+
+       /* Grab us some memory!  Dem's good eatin' !!  */
+       ptr = mallok(sizeof(struct CtdlSessData));
+       ptr->sym_id = requested_sym;
+       ptr->sym_data = mallok(num_bytes);
+
+       begin_critical_section(S_SESSION_TABLE);
+       ptr->next = CC->FirstSessData;
+       CC->FirstSessData = ptr;
+       end_critical_section(S_SESSION_TABLE);
+
+       lprintf(9, "CtdlAllocUserData(%ld) finished\n", requested_sym);
+}
+
+
+
+
+
 /*
  * set_wtmpsupp()  -  alter the session listing
  */
 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);
-       hook_room_name(CC->cs_pid, CC->cs_room);
+
+       /* Run any routines registered by loadable modules */
+       PerformSessionHooks(EVT_NEWROOM);
+       }
+
+
+/*
+ * call set_wtmpsupp() with the name of the current room, modified a bit...
+ */
+void set_wtmpsupp_to_current_room() {
+       if (CC->quickroom.QRflags & QR_PRIVATE) {
+               set_wtmpsupp("<private room>");
+               }
+       else if (CC->quickroom.QRflags & QR_MAILBOX) {
+               set_wtmpsupp(&CC->quickroom.QRname[11]);
+               }
+       else {
+               set_wtmpsupp(CC->quickroom.QRname);
+               }
        }
 
 
+
 /*
  * cmd_info()  -  tell the client about this server
  */
@@ -140,31 +264,36 @@ void cmd_info(void) {
        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("000\n");
        }
 
-void cmd_rchg(char *newroomname)
+void cmd_rchg(char *argbuf)
 {
-   if ((newroomname) && (newroomname[0]))
-   {
-      bzero(CC->fake_roomname, 20);
-      strncpy(CC->fake_roomname, newroomname, 19);
-   }
-   else
-      CC->fake_roomname[0] = '\0';
-   cprintf("%d\n",OK);
+       char newroomname[256]; /* set to 256 to prevent buffer overruns <dme>*/
+
+       extract(newroomname, argbuf, 0);
+       newroomname[ROOMNAMELEN] = 0;
+       if (strlen(newroomname) > 0) {
+               strncpy(CC->fake_roomname, newroomname, ROOMNAMELEN);
+               CC->fake_roomname[ROOMNAMELEN - 1] = 0;
+               }
+       else {
+               strcpy(CC->fake_roomname, "");
+               }
+       cprintf("%d OK\n", OK);
 }
 
 void cmd_hchg(char *newhostname)
 {
    if ((newhostname) && (newhostname[0]))
    {
-      bzero(CC->fake_hostname, 25);
+      memset(CC->fake_hostname, 0, 25);
       strncpy(CC->fake_hostname, newhostname, 24);
    }
    else
-      CC->fake_hostname[0] = '\0';
-   cprintf("%d\n",OK);
+      strcpy(CC->fake_hostname, "");
+   cprintf("%d OK\n",OK);
 }
 
 void cmd_uchg(char *newusername)
@@ -178,7 +307,7 @@ void cmd_uchg(char *newusername)
    if ((newusername) && (newusername[0]))
    {
       CC->cs_flags &= ~CS_STEALTH;
-      bzero(CC->fake_username, 32);
+      memset(CC->fake_username, 0, 32);
       if (strncasecmp(newusername, CC->curr_user, strlen(CC->curr_user)))
          strncpy(CC->fake_username, newusername, 31);
    }
@@ -212,6 +341,35 @@ void cmd_time(void)
    cprintf("%d %ld\n", OK, tv);
 }
 
+/*
+ * Check whether two hostnames match.
+ * "Realname" should be an actual name of a client that is trying to connect;
+ * "testname" should be the value we are comparing it with. The idea is that we
+ * want to compare with both the abbreviated and fully-qualified versions of
+ * "testname;" some people define "localhost" as "localhost.foo.com," etc.
+ */
+static int hostnames_match(const char *realname, const char *testname) {
+       struct hostent *he;
+       int retval = 0;
+
+       if (!strcasecmp(realname, testname))
+               return 1;
+
+#ifdef HAVE_NONREENTRANT_NETDB
+       begin_critical_section(S_NETDB);
+#endif
+
+       if ((he = gethostbyname(testname)) != NULL)
+               if (!strcasecmp(realname, he->h_name))
+                       retval = 1;
+
+#ifdef HAVE_NONREENTRANT_NETDB
+       end_critical_section(S_NETDB);
+#endif
+
+       return retval;
+       }
+
 /*
  * check a hostname against the public_clients file
  */
@@ -220,8 +378,8 @@ int is_public_client(char *where)
        char buf[256];
        FILE *fp;
 
-       if (!strcasecmp(where,"localhost")) return(1);
-       if (!strcasecmp(where,config.c_fqdn)) return(1);
+       if (hostnames_match(where,"localhost")) return(1);
+       if (hostnames_match(where,config.c_fqdn)) return(1);
 
        fp = fopen("public_clients","r");
        if (fp == NULL) return(0);
@@ -229,7 +387,7 @@ int is_public_client(char *where)
        while (fgets(buf,256,fp)!=NULL) {
                while (isspace((buf[strlen(buf)-1]))) 
                        buf[strlen(buf)-1] = 0;
-               if (!strcasecmp(buf,where)) {
+               if (hostnames_match(where,buf)) {
                        fclose(fp);
                        return(1);
                        }
@@ -250,6 +408,7 @@ void cmd_iden(char *argbuf)
        int rev_level;
        char desc[256];
        char from_host[256];
+       struct in_addr addr;
 
        if (num_parms(argbuf)<4) {
                cprintf("%d usage error\n",ERROR);
@@ -261,7 +420,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;
@@ -270,12 +430,19 @@ void cmd_iden(char *argbuf)
        strncpy(CC->cs_clientname,desc,31);
        CC->cs_clientname[31] = 0;
 
+       lprintf(9, "Looking up hostname\n");
        if ((strlen(from_host)>0) && 
           (is_public_client(CC->cs_host))) {
-               strncpy(CC->cs_host,from_host,24);
-               CC->cs_host[24] = 0;
+               if (inet_aton(from_host, &addr))
+                       locate_host(CC->cs_host, &addr);
+               else {
+                       strncpy(CC->cs_host,from_host,24);
+                       CC->cs_host[24] = 0;
+                       }
                }
-       set_wtmpsupp(CC->quickroom.QRname);
+
+       lprintf(9, "Setting wtmpsupp\n");
+       set_wtmpsupp_to_current_room();
 
        syslog(LOG_NOTICE,"client %d/%d/%01d.%02d (%s)\n",
                dev_code,
@@ -317,7 +484,7 @@ void cmd_stel(char *cmdbuf)
                        CC->cs_flags = CC->cs_flags|CS_STEALTH;
                }
 
-       set_wtmpsupp(CC->quickroom.QRname);
+       set_wtmpsupp_to_current_room();
        cprintf("%d Ok\n",OK);
        }
 
@@ -337,13 +504,13 @@ void cmd_mesg(char *mname)
        extract(buf,mname,0);
 
 
-       dirs[0]=malloc(64);
-       dirs[1]=malloc(64);
+       dirs[0]=mallok(64);
+       dirs[1]=mallok(64);
        strcpy(dirs[0],"messages");
        strcpy(dirs[1],"help");
        mesg_locate(targ,buf,2,dirs);
-       free(dirs[0]);
-       free(dirs[1]);
+       phree(dirs[0]);
+       phree(dirs[1]);
 
 
        if (strlen(targ)==0) {
@@ -392,16 +559,16 @@ void cmd_emsg(char *mname)
                if (buf[a] == '/') buf[a] = '.';
                }
 
-       dirs[0]=malloc(64);
-       dirs[1]=malloc(64);
+       dirs[0]=mallok(64);
+       dirs[1]=mallok(64);
        strcpy(dirs[0],"messages");
        strcpy(dirs[1],"help");
        mesg_locate(targ,buf,2,dirs);
-       free(dirs[0]);
-       free(dirs[1]);
+       phree(dirs[0]);
+       phree(dirs[1]);
 
        if (strlen(targ)==0) {
-               sprintf(targ, "./help/%s", buf);
+               snprintf(targ, sizeof targ, "./help/%s", buf);
                }
 
        mfp = fopen(targ,"w");
@@ -430,7 +597,7 @@ void cmd_rwho(void) {
        char un[40], room[40], host[40], flags[5];
        
        aide = CC->usersupp.axlevel >= 6;
-       cprintf("%d\n",LISTING_FOLLOWS);
+       cprintf("%d%c \n", LISTING_FOLLOWS, check_express() );
        
        for (cptr = ContextList; cptr != NULL; cptr = cptr->next) 
        {
@@ -491,6 +658,12 @@ void cmd_rwho(void) {
                
                }
        }
+
+       /* Now it's magic time.  Before we finish, call any EVT_RWHO hooks
+        * so that external paging modules such as serv_icq can add more
+        * content to the Wholist.
+        */
+       PerformSessionHooks(EVT_RWHO);
        cprintf("000\n");
        }
 
@@ -502,6 +675,7 @@ void cmd_term(char *cmdbuf)
 {
        int session_num;
        struct CitContext *ccptr;
+       int session_to_kill = 0;
 
        if (!CC->logged_in) {
                cprintf("%d Not logged in.\n",ERROR+NOT_LOGGED_IN);
@@ -520,15 +694,24 @@ void cmd_term(char *cmdbuf)
                return;
                }
 
+       lprintf(9, "Locating session to kill\n");
+       begin_critical_section(S_SESSION_TABLE);
        for (ccptr = ContextList; ccptr != NULL; ccptr = ccptr->next) {
                if (session_num == ccptr->cs_pid) {
-                       kill_session(ccptr->cs_pid);
-                       cprintf("%d Session terminated.\n", OK);
-                       return;
+                       session_to_kill = ccptr->cs_pid;
                        }
                }
+       end_critical_section(S_SESSION_TABLE);
+       lprintf(9, "session_to_kill == %d\n", session_to_kill);
 
-       cprintf("%d No such session.\n", ERROR);
+       if (session_to_kill > 0) {
+               lprintf(9, "calling kill_session()\n");
+               kill_session(session_to_kill);
+               cprintf("%d Session terminated.\n", OK);
+               }
+       else {
+               cprintf("%d No such session.\n", ERROR);
+               }
        }
 
 
@@ -568,6 +751,7 @@ void cmd_ipgm(char *argbuf)
                }
        else {
                cprintf("%d Authentication failed.\n",ERROR);
+               lprintf(3, "Warning: ipgm authentication failed.\n");
                }
        }
 
@@ -577,7 +761,7 @@ void cmd_ipgm(char *argbuf)
  */
 void cmd_down(void) {
        if (!CC->logged_in) {
-               cprintf("%d Not logged in.\n",ERROR+NOT_LOGGED_IN);
+               cprintf("%d Not logged in.\n", ERROR+NOT_LOGGED_IN);
                return;
                }
 
@@ -617,68 +801,14 @@ 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
  */
 void *context_loop(struct CitContext *con)
 {
        char cmdbuf[256];
-       int session_num;
+       int num_sessions, len;
+       struct sockaddr_in sin;
 
        /*
         * Wedge our way into the context table.
@@ -688,32 +818,33 @@ 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;
        CC->upload_fp = NULL;
        CC->cs_pid = con->client_socket;        /* not necessarily portable */
        CC->FirstExpressMessage = NULL;
-       CC->msglist = NULL;
-       CC->num_msgs = 0;
        time(&CC->lastcmd);
        time(&CC->lastidle);
        strcpy(CC->lastcmdname, "    ");
        strcpy(CC->cs_clientname, "(unknown)");
-       strcpy(CC->curr_user,"");
+       strcpy(CC->curr_user,"(not logged in)");
        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);
-       locate_host(CC->cs_host);
+       snprintf(CC->temp, sizeof CC->temp, tmpnam(NULL));
+       strcpy(CC->cs_room, "(no room)");
+       strncpy(CC->cs_host, config.c_fqdn, sizeof CC->cs_host);
+       CC->cs_host[sizeof CC->cs_host - 1] = 0;
+       len = sizeof sin;
+       if (!getpeername(CC->client_socket, (struct sockaddr *) &sin, &len))
+               locate_host(CC->cs_host, &sin.sin_addr);
        CC->cs_flags = 0;
        CC->upload_type = UPL_FILE;
        CC->dl_is_net = 0;
+       CC->FirstSessData = NULL;
 
-       session_num = session_count();
+       num_sessions = session_count();
        CC->nologin = 0;
-       if ((config.c_maxsessions > 0)&&(session_num >= config.c_maxsessions))
+       if ((config.c_maxsessions > 0)&&(num_sessions > config.c_maxsessions))
                CC->nologin = 1;
 
        if (CC->nologin==1) {
@@ -726,20 +857,25 @@ void *context_loop(struct CitContext *con)
                }
 
        lprintf(3, "citserver[%3d]: started.\n", CC->cs_pid);
-       hook_start_session(CC->cs_pid);
+
+       /* Run any session startup routines registered by loadable modules */
+       PerformSessionHooks(EVT_START);
+
        rec_log(CL_CONNECT, "");
 
        do {
                time(&CC->lastcmd);
+               memset(cmdbuf, 0, 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);
 
                /*
-                * Let other clients see the last command we executed, but
-                * exclude NOOP because that would be boring.
+                * Let other clients see the last command we executed, and
+                * update the idle time, but not NOOP, PEXP, or GEXP.
                 */
-               if (strncasecmp(cmdbuf, "NOOP", 4)) {
+               if ( (strncasecmp(cmdbuf, "NOOP", 4))
+                  && (strncasecmp(cmdbuf, "PEXP", 4))
+                  && (strncasecmp(cmdbuf, "GEXP", 4)) ) {
                        strcpy(CC->lastcmdname, "    ");
                        strncpy(CC->lastcmdname, cmdbuf, 4);
                        time(&CC->lastidle);
@@ -839,6 +975,14 @@ void *context_loop(struct CitContext *con)
                        cmd_msg3(&cmdbuf[5]);
                        }
 
+               else if (!strncasecmp(cmdbuf,"MSG4",4)) {
+                       cmd_msg4(&cmdbuf[5]);
+                       }
+
+               else if (!strncasecmp(cmdbuf,"OPNA",4)) {
+                       cmd_opna(&cmdbuf[5]);
+                       }
+
                else if (!strncasecmp(cmdbuf,"INFO",4)) {
                        cmd_info();
                        }
@@ -915,10 +1059,6 @@ void *context_loop(struct CitContext *con)
                        cmd_gnur();
                        }
 
-               else if (!strncasecmp(cmdbuf,"GREG",4)) {
-                       cmd_greg(&cmdbuf[5]);
-                       }
-
                else if (!strncasecmp(cmdbuf,"VALI",4)) {
                        cmd_vali(&cmdbuf[5]);
                        }
@@ -931,10 +1071,6 @@ void *context_loop(struct CitContext *con)
                        cmd_list();
                        }
 
-               else if (!strncasecmp(cmdbuf,"REGI",4)) {
-                       cmd_regi();
-                       }
-
                else if (!strncasecmp(cmdbuf,"CHEK",4)) {
                        cmd_chek();
                        }
@@ -1083,10 +1219,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]);
                        }
@@ -1095,12 +1227,33 @@ 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]);
+                       }
+
+#ifdef DEBUG_MEMORY_LEAKS
+               else if (!strncasecmp(cmdbuf, "LEAK", 4)) {
+                       dump_tracked();
+                       }
+#endif
+
                else if (!DLoader_Exec_Cmd(cmdbuf))
                        {
                           cprintf("%d Unrecognized or unsupported command.\n",
                                    ERROR);
                        }
 
+               /* Run any after-each-command outines registered by modules */
+               PerformSessionHooks(EVT_CMD);
+
                } while(strncasecmp(cmdbuf, "QUIT", 4));
 
        cleanup(EXIT_NORMAL);