]> code.citadel.org Git - citadel.git/blobdiff - citadel/citserver.c
* citadel.h (and related files): removed defunct parameters,
[citadel.git] / citadel / citserver.c
index ead5ddc5628709b7dbf43150f580f99cd07118d4..ca34147a783011f0667dd4c200f311716041d418 100644 (file)
@@ -1,3 +1,4 @@
+/* $Id$ */
 #include <stdlib.h>
 #include <unistd.h>
 #include <stdio.h>
@@ -7,33 +8,52 @@
 #include <ctype.h>
 #include <string.h>
 #include <errno.h>
+#include <limits.h>
 #include <pthread.h>
 #include <syslog.h>
+#include <dlfcn.h>
 #include "citadel.h"
 #include "server.h"
-#include "proto.h"
-
-struct config config;
+#include "sysdep_decls.h"
+#include "citserver.h"
+#include "config.h"
+#include "database.h"
+#include "housekeeping.h"
+#include "user_ops.h"
+#include "logging.h"
+#include "support.h"
+#include "msgbase.h"
+#include "locate_host.h"
+#include "room_ops.h"
+#include "file_ops.h"
+#include "dynloader.h"
+#include "policy.h"
+#include "control.h"
 
 struct CitContext *ContextList = NULL;
 int ScheduledShutdown = 0;
 
-       
 /*
  * Various things that need to be initialized at startup
  */
-void master_startup() {
+void master_startup(void) {
        lprintf(7, "Opening databases\n");
        open_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 master_cleanup(void) {
+       struct CleanupFunctionHook *fcn;
 
        /* Cancel all running sessions */
        lprintf(7, "Cancelling running sessions...\n");
@@ -41,6 +61,11 @@ void master_cleanup() {
                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();
@@ -49,7 +74,6 @@ void master_cleanup() {
        sysdep_master_cleanup();
 
        /* Now go away. */
-       hook_cleanup();
        lprintf(3, "citserver: exiting.\n");
        exit(0);
        }
@@ -58,8 +82,11 @@ void master_cleanup() {
 /*
  * Gracefully terminate the session and thread.
  * (This is called as a cleanup handler by the thread library.)
+ *
+ * All NON-system-dependent stuff is done in this function.
+ * System-dependent session/thread cleanup is in cleanup() in sysdep.c
  */
-void cleanup_stuff()
+void cleanup_stuff(void *arg)
 {
        struct ExpressMessage *emptr;
 
@@ -71,7 +98,10 @@ void cleanup_stuff()
        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);
+       
+       /* 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 */
@@ -83,8 +113,14 @@ void cleanup_stuff()
                }
        end_critical_section(S_SESSION_TABLE);
 
+       /* 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,
@@ -99,10 +135,12 @@ void cleanup_stuff()
  */
 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);
        }
 
 
@@ -129,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';
@@ -161,7 +199,7 @@ void cmd_uchg(char *newusername)
    {
       CC->cs_flags &= ~CS_STEALTH;
       bzero(CC->fake_username, 32);
-      if (struncmp(newusername, CC->curr_user, strlen(CC->curr_user)))
+      if (strncasecmp(newusername, CC->curr_user, strlen(CC->curr_user)))
          strncpy(CC->fake_username, newusername, 31);
    }
    else
@@ -172,13 +210,26 @@ void cmd_uchg(char *newusername)
    cprintf("%d\n",OK);
 }
 
-void cmd_time()
+/*
+ * returns an asterisk if there are any express messages waiting,
+ * space otherwise.
+ */
+char check_express(void) {
+       if (CC->FirstExpressMessage == NULL) {
+               return(' ');
+               }
+       else {
+               return('*');
+               }
+       }
+
+void cmd_time(void)
 {
    time_t tv;
    
    tv = time(NULL);
    
-   cprintf("%d|%ld\n", OK, tv);
+   cprintf("%d %ld\n", OK, tv);
 }
 
 /*
@@ -189,8 +240,8 @@ int is_public_client(char *where)
        char buf[256];
        FILE *fp;
 
-       if (!strucmp(where,"localhost")) return(1);
-       if (!strucmp(where,config.c_fqdn)) return(1);
+       if (!strcasecmp(where,"localhost")) return(1);
+       if (!strcasecmp(where,config.c_fqdn)) return(1);
 
        fp = fopen("public_clients","r");
        if (fp == NULL) return(0);
@@ -198,7 +249,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 (!strucmp(buf,where)) {
+               if (!strcasecmp(buf,where)) {
                        fclose(fp);
                        return(1);
                        }
@@ -230,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;
@@ -561,7 +613,7 @@ void cmd_down(void) {
        }
 
 /*
- * Shut down the server
+ * Schedule or cancel a server shutdown
  */
 void cmd_scdn(char *argbuf)
 {
@@ -585,6 +637,7 @@ void cmd_scdn(char *argbuf)
        cprintf("%d %d\n", OK, ScheduledShutdown);
        }
 
+
 /*
  * main context loop
  */
@@ -601,13 +654,14 @@ 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, "    ");
@@ -616,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;
@@ -637,26 +692,29 @@ 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);
+               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);
 
                /*
                 * Let other clients see the last command we executed, but
                 * exclude NOOP because that would be boring.
                 */
-               if (struncmp(cmdbuf, "NOOP", 4)) {
+               if (strncasecmp(cmdbuf, "NOOP", 4)) {
                        strcpy(CC->lastcmdname, "    ");
                        strncpy(CC->lastcmdname, cmdbuf, 4);
                        time(&CC->lastidle);
                        }
                        
-               if ((struncmp(cmdbuf, "ENT0", 4)) && (struncmp(cmdbuf, "MESG", 4)) && (struncmp(cmdbuf, "MSGS", 4)))
+               if ((strncasecmp(cmdbuf, "ENT0", 4)) && (strncasecmp(cmdbuf, "MESG", 4)) && (strncasecmp(cmdbuf, "MSGS", 4)))
                {
                   CC->cs_flags &= ~CS_POSTING;
                }
@@ -665,348 +723,362 @@ void *context_loop(struct CitContext *con)
  * This loop recognizes all server commands.
  */
 
-               if (!struncmp(cmdbuf,"NOOP",4)) {
+               if (!strncasecmp(cmdbuf,"NOOP",4)) {
                        cprintf("%d%cok\n",OK,check_express());
                        }
 
-               else if (!struncmp(cmdbuf,"QUIT",4)) {
+               else if (!strncasecmp(cmdbuf,"QUIT",4)) {
                        cprintf("%d Goodbye.\n",OK);
                        }
 
-               else if (!struncmp(cmdbuf,"LOUT",4)) {
+               else if (!strncasecmp(cmdbuf,"LOUT",4)) {
                        if (CC->logged_in) logout(CC);
                        cprintf("%d logged out.\n",OK);
                        }
 
-               else if (!struncmp(cmdbuf,"USER",4)) {
+               else if (!strncasecmp(cmdbuf,"USER",4)) {
                        cmd_user(&cmdbuf[5]);
                        }
 
-               else if (!struncmp(cmdbuf,"PASS",4)) {
+               else if (!strncasecmp(cmdbuf,"PASS",4)) {
                        cmd_pass(&cmdbuf[5]);
                        }
 
-               else if (!struncmp(cmdbuf,"NEWU",4)) {
+               else if (!strncasecmp(cmdbuf,"NEWU",4)) {
                        cmd_newu(&cmdbuf[5]);
                        }
 
-               else if (!struncmp(cmdbuf,"SETP",4)) {
+               else if (!strncasecmp(cmdbuf,"SETP",4)) {
                        cmd_setp(&cmdbuf[5]);
                        }
 
-               else if (!struncmp(cmdbuf,"LRMS",4)) {
+               else if (!strncasecmp(cmdbuf,"LRMS",4)) {
                        cmd_lrms(&cmdbuf[5]);
                        }
 
-               else if (!struncmp(cmdbuf,"LKRA",4)) {
+               else if (!strncasecmp(cmdbuf,"LKRA",4)) {
                        cmd_lkra(&cmdbuf[5]);
                        }
 
-               else if (!struncmp(cmdbuf,"LKRN",4)) {
+               else if (!strncasecmp(cmdbuf,"LKRN",4)) {
                        cmd_lkrn(&cmdbuf[5]);
                        }
 
-               else if (!struncmp(cmdbuf,"LKRO",4)) {
+               else if (!strncasecmp(cmdbuf,"LKRO",4)) {
                        cmd_lkro(&cmdbuf[5]);
                        }
 
-               else if (!struncmp(cmdbuf,"LZRM",4)) {
+               else if (!strncasecmp(cmdbuf,"LZRM",4)) {
                        cmd_lzrm(&cmdbuf[5]);
                        }
 
-               else if (!struncmp(cmdbuf,"GETU",4)) {
+               else if (!strncasecmp(cmdbuf,"GETU",4)) {
                        cmd_getu();
                        }
 
-               else if (!struncmp(cmdbuf,"SETU",4)) {
+               else if (!strncasecmp(cmdbuf,"SETU",4)) {
                        cmd_setu(&cmdbuf[5]);
                        }
 
-               else if (!struncmp(cmdbuf,"GOTO",4)) {
+               else if (!strncasecmp(cmdbuf,"GOTO",4)) {
                        cmd_goto(&cmdbuf[5]);
                        }
 
-               else if (!struncmp(cmdbuf,"MSGS",4)) {
+               else if (!strncasecmp(cmdbuf,"MSGS",4)) {
                        cmd_msgs(&cmdbuf[5]);
                        }
 
-               else if (!struncmp(cmdbuf,"WHOK",4)) {
+               else if (!strncasecmp(cmdbuf,"WHOK",4)) {
                        cmd_whok();
                        }
 
-               else if (!struncmp(cmdbuf,"RDIR",4)) {
+               else if (!strncasecmp(cmdbuf,"RDIR",4)) {
                        cmd_rdir();
                        }
 
-               else if (!struncmp(cmdbuf,"MSG0",4)) {
+               else if (!strncasecmp(cmdbuf,"MSG0",4)) {
                        cmd_msg0(&cmdbuf[5]);
                        }
 
-               else if (!struncmp(cmdbuf,"MSG2",4)) {
+               else if (!strncasecmp(cmdbuf,"MSG2",4)) {
                        cmd_msg2(&cmdbuf[5]);
                        }
 
-               else if (!struncmp(cmdbuf,"MSG3",4)) {
+               else if (!strncasecmp(cmdbuf,"MSG3",4)) {
                        cmd_msg3(&cmdbuf[5]);
                        }
 
-               else if (!struncmp(cmdbuf,"INFO",4)) {
+               else if (!strncasecmp(cmdbuf,"INFO",4)) {
                        cmd_info();
                        }
 
-               else if (!struncmp(cmdbuf,"SLRP",4)) {
+               else if (!strncasecmp(cmdbuf,"SLRP",4)) {
                        cmd_slrp(&cmdbuf[5]);
                        }
 
-               else if (!struncmp(cmdbuf,"INVT",4)) {
+               else if (!strncasecmp(cmdbuf,"INVT",4)) {
                        cmd_invt_kick(&cmdbuf[5],1);
                        }
 
-               else if (!struncmp(cmdbuf,"KICK",4)) {
+               else if (!strncasecmp(cmdbuf,"KICK",4)) {
                        cmd_invt_kick(&cmdbuf[5],0);
                        }
 
-               else if (!struncmp(cmdbuf,"GETR",4)) {
+               else if (!strncasecmp(cmdbuf,"GETR",4)) {
                        cmd_getr();
                        }
 
-               else if (!struncmp(cmdbuf,"SETR",4)) {
+               else if (!strncasecmp(cmdbuf,"SETR",4)) {
                        cmd_setr(&cmdbuf[5]);
                        }
 
-               else if (!struncmp(cmdbuf,"GETA",4)) {
+               else if (!strncasecmp(cmdbuf,"GETA",4)) {
                        cmd_geta();
                        }
 
-               else if (!struncmp(cmdbuf,"SETA",4)) {
+               else if (!strncasecmp(cmdbuf,"SETA",4)) {
                        cmd_seta(&cmdbuf[5]);
                        }
 
-               else if (!struncmp(cmdbuf,"ENT0",4)) {
+               else if (!strncasecmp(cmdbuf,"ENT0",4)) {
                        cmd_ent0(&cmdbuf[5]);
                        }
 
-               else if (!struncmp(cmdbuf,"ENT3",4)) {
+               else if (!strncasecmp(cmdbuf,"ENT3",4)) {
                        cmd_ent3(&cmdbuf[5]);
                        }
 
-               else if (!struncmp(cmdbuf,"RINF",4)) {
+               else if (!strncasecmp(cmdbuf,"RINF",4)) {
                        cmd_rinf();
                        }
 
-               else if (!struncmp(cmdbuf,"DELE",4)) {
+               else if (!strncasecmp(cmdbuf,"DELE",4)) {
                        cmd_dele(&cmdbuf[5]);
                        }
 
-               else if (!struncmp(cmdbuf,"KILL",4)) {
+               else if (!strncasecmp(cmdbuf,"KILL",4)) {
                        cmd_kill(&cmdbuf[5]);
                        }
 
-               else if (!struncmp(cmdbuf,"CRE8",4)) {
+               else if (!strncasecmp(cmdbuf,"CRE8",4)) {
                        cmd_cre8(&cmdbuf[5]);
                        }
 
-               else if (!struncmp(cmdbuf,"MOVE",4)) {
+               else if (!strncasecmp(cmdbuf,"MOVE",4)) {
                        cmd_move(&cmdbuf[5]);
                        }
 
-               else if (!struncmp(cmdbuf,"FORG",4)) {
+               else if (!strncasecmp(cmdbuf,"FORG",4)) {
                        cmd_forg();
                        }
 
-               else if (!struncmp(cmdbuf,"MESG",4)) {
+               else if (!strncasecmp(cmdbuf,"MESG",4)) {
                        cmd_mesg(&cmdbuf[5]);
                        }
 
-               else if (!struncmp(cmdbuf,"EMSG",4)) {
+               else if (!strncasecmp(cmdbuf,"EMSG",4)) {
                        cmd_emsg(&cmdbuf[5]);
                        }
 
-               else if (!struncmp(cmdbuf,"GNUR",4)) {
+               else if (!strncasecmp(cmdbuf,"GNUR",4)) {
                        cmd_gnur();
                        }
 
-               else if (!struncmp(cmdbuf,"GREG",4)) {
+               else if (!strncasecmp(cmdbuf,"GREG",4)) {
                        cmd_greg(&cmdbuf[5]);
                        }
 
-               else if (!struncmp(cmdbuf,"VALI",4)) {
+               else if (!strncasecmp(cmdbuf,"VALI",4)) {
                        cmd_vali(&cmdbuf[5]);
                        }
 
-               else if (!struncmp(cmdbuf,"EINF",4)) {
+               else if (!strncasecmp(cmdbuf,"EINF",4)) {
                        cmd_einf(&cmdbuf[5]);
                        }
 
-               else if (!struncmp(cmdbuf,"LIST",4)) {
+               else if (!strncasecmp(cmdbuf,"LIST",4)) {
                        cmd_list();
                        }
 
-               else if (!struncmp(cmdbuf,"REGI",4)) {
+               else if (!strncasecmp(cmdbuf,"REGI",4)) {
                        cmd_regi();
                        }
 
-               else if (!struncmp(cmdbuf,"CHEK",4)) {
+               else if (!strncasecmp(cmdbuf,"CHEK",4)) {
                        cmd_chek();
                        }
 
-               else if (!struncmp(cmdbuf,"DELF",4)) {
+               else if (!strncasecmp(cmdbuf,"DELF",4)) {
                        cmd_delf(&cmdbuf[5]);
                        }
 
-               else if (!struncmp(cmdbuf,"MOVF",4)) {
+               else if (!strncasecmp(cmdbuf,"MOVF",4)) {
                        cmd_movf(&cmdbuf[5]);
                        }
 
-               else if (!struncmp(cmdbuf,"NETF",4)) {
+               else if (!strncasecmp(cmdbuf,"NETF",4)) {
                        cmd_netf(&cmdbuf[5]);
                        }
 
-               else if (!struncmp(cmdbuf,"RWHO",4)) {
+               else if (!strncasecmp(cmdbuf,"RWHO",4)) {
                        cmd_rwho();
                        }
 
-               else if (!struncmp(cmdbuf,"OPEN",4)) {
+               else if (!strncasecmp(cmdbuf,"OPEN",4)) {
                        cmd_open(&cmdbuf[5]);
                        }
 
-               else if (!struncmp(cmdbuf,"CLOS",4)) {
+               else if (!strncasecmp(cmdbuf,"CLOS",4)) {
                        cmd_clos();
                        }
 
-               else if (!struncmp(cmdbuf,"UOPN",4)) {
+               else if (!strncasecmp(cmdbuf,"UOPN",4)) {
                        cmd_uopn(&cmdbuf[5]);
                        }
 
-               else if (!struncmp(cmdbuf,"UCLS",4)) {
+               else if (!strncasecmp(cmdbuf,"UCLS",4)) {
                        cmd_ucls(&cmdbuf[5]);
                        }
 
-               else if (!struncmp(cmdbuf,"READ",4)) {
+               else if (!strncasecmp(cmdbuf,"READ",4)) {
                        cmd_read(&cmdbuf[5]);
                        }
 
-               else if (!struncmp(cmdbuf,"WRIT",4)) {
+               else if (!strncasecmp(cmdbuf,"WRIT",4)) {
                        cmd_writ(&cmdbuf[5]);
                        }
 
-               else if (!struncmp(cmdbuf,"QUSR",4)) {
+               else if (!strncasecmp(cmdbuf,"QUSR",4)) {
                        cmd_qusr(&cmdbuf[5]);
                        }
 
-               else if (!struncmp(cmdbuf,"ECHO",4)) {
+               else if (!strncasecmp(cmdbuf,"ECHO",4)) {
                        cmd_echo(&cmdbuf[5]);
                        }
 
-               else if (!struncmp(cmdbuf,"OIMG",4)) {
+               else if (!strncasecmp(cmdbuf,"OIMG",4)) {
                        cmd_oimg(&cmdbuf[5]);
                        }
 
-               else if (!struncmp(cmdbuf,"MORE",4)) {
+               else if (!strncasecmp(cmdbuf,"MORE",4)) {
                        cmd_more();
                        }
 
-               else if (!struncmp(cmdbuf,"NETP",4)) {
+               else if (!strncasecmp(cmdbuf,"NETP",4)) {
                        cmd_netp(&cmdbuf[5]);
                        }
 
-               else if (!struncmp(cmdbuf,"NDOP",4)) {
+               else if (!strncasecmp(cmdbuf,"NDOP",4)) {
                        cmd_ndop(&cmdbuf[5]);
                        }
 
-               else if (!struncmp(cmdbuf,"NUOP",4)) {
+               else if (!strncasecmp(cmdbuf,"NUOP",4)) {
                        cmd_nuop(&cmdbuf[5]);
                        }
 
-               else if (!struncmp(cmdbuf,"LFLR",4)) {
+               else if (!strncasecmp(cmdbuf,"LFLR",4)) {
                        cmd_lflr();
                        }
 
-               else if (!struncmp(cmdbuf,"CFLR",4)) {
+               else if (!strncasecmp(cmdbuf,"CFLR",4)) {
                        cmd_cflr(&cmdbuf[5]);
                        }
 
-               else if (!struncmp(cmdbuf,"KFLR",4)) {
+               else if (!strncasecmp(cmdbuf,"KFLR",4)) {
                        cmd_kflr(&cmdbuf[5]);
                        }
 
-               else if (!struncmp(cmdbuf,"EFLR",4)) {
+               else if (!strncasecmp(cmdbuf,"EFLR",4)) {
                        cmd_eflr(&cmdbuf[5]);
                        }
 
-               else if (!struncmp(cmdbuf,"IDEN",4)) {
+               else if (!strncasecmp(cmdbuf,"IDEN",4)) {
                        cmd_iden(&cmdbuf[5]);
                        }
 
-               else if (!struncmp(cmdbuf,"IPGM",4)) {
+               else if (!strncasecmp(cmdbuf,"IPGM",4)) {
                        cmd_ipgm(&cmdbuf[5]);
                        }
 
-               else if (!struncmp(cmdbuf,"CHAT",4)) {
-                       cmd_chat(&cmdbuf[5]);
-                       }
-
-               else if (!struncmp(cmdbuf,"PEXP",4)) {
-                       cmd_pexp();
-                       }
-
-               else if (!struncmp(cmdbuf,"SEXP",4)) {
-                       cmd_sexp(&cmdbuf[5]);
-                       }
-
-               else if (!struncmp(cmdbuf,"EBIO",4)) {
+               else if (!strncasecmp(cmdbuf,"EBIO",4)) {
                        cmd_ebio();
                        }
 
-               else if (!struncmp(cmdbuf,"RBIO",4)) {
+               else if (!strncasecmp(cmdbuf,"RBIO",4)) {
                        cmd_rbio(&cmdbuf[5]);
                        }
 
-               else if (!struncmp(cmdbuf,"LBIO",4)) {
+               else if (!strncasecmp(cmdbuf,"LBIO",4)) {
                        cmd_lbio();
                        }
 
-               else if (!struncmp(cmdbuf,"STEL",4)) {
+               else if (!strncasecmp(cmdbuf,"STEL",4)) {
                        cmd_stel(&cmdbuf[5]);
                        }
 
-               else if (!struncmp(cmdbuf,"TERM",4)) {
+               else if (!strncasecmp(cmdbuf,"TERM",4)) {
                        cmd_term(&cmdbuf[5]);
                        }
 
-               else if (!struncmp(cmdbuf,"DOWN",4)) {
+               else if (!strncasecmp(cmdbuf,"DOWN",4)) {
                        cmd_down();
                        }
 
-               else if (!struncmp(cmdbuf,"SCDN",4)) {
+               else if (!strncasecmp(cmdbuf,"SCDN",4)) {
                        cmd_scdn(&cmdbuf[5]);
                        }
 
-               else if (!struncmp(cmdbuf, "NSET", 4)) {
+               else if (!strncasecmp(cmdbuf, "NSET", 4)) {
                        cmd_nset(&cmdbuf[5]);
                        }
 
-               else if (!struncmp(cmdbuf, "UIMG", 4)) {
+               else if (!strncasecmp(cmdbuf, "UIMG", 4)) {
                        cmd_uimg(&cmdbuf[5]);
                        }
-               else if (!struncmp(cmdbuf, "UCHG", 4)) {
+
+               else if (!strncasecmp(cmdbuf, "UCHG", 4)) {
                        cmd_uchg(&cmdbuf[5]);
                        }
-               else if (!struncmp(cmdbuf, "TIME", 4)) {
-                       cmd_time(&cmdbuf[5]);
+
+               else if (!strncasecmp(cmdbuf, "TIME", 4)) {
+                       cmd_time();
                        }
-               else if (!struncmp(cmdbuf, "HCHG", 4)) {
+
+               else if (!strncasecmp(cmdbuf, "HCHG", 4)) {
                        cmd_hchg(&cmdbuf[5]);
                        }
-               else if (!struncmp(cmdbuf, "RCHG", 4)) {
+
+               else if (!strncasecmp(cmdbuf, "RCHG", 4)) {
                        cmd_rchg(&cmdbuf[5]);
                        }
-               else {
-                       cprintf("%d Unrecognized or unsupported command.\n",
-                               ERROR);
+
+               else if (!strncasecmp(cmdbuf, "AGUP", 4)) {
+                       cmd_agup(&cmdbuf[5]);
+                       }
+
+               else if (!strncasecmp(cmdbuf, "ASUP", 4)) {
+                       cmd_asup(&cmdbuf[5]);
+                       }
+
+               else if (!strncasecmp(cmdbuf, "GPEX", 4)) {
+                       cmd_gpex(&cmdbuf[5]);
                        }
 
-               } while(struncmp(cmdbuf,"QUIT",4));
+               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",
+                                   ERROR);
+                       }
+
+               } while(strncasecmp(cmdbuf, "QUIT", 4));
 
        cleanup(EXIT_NORMAL);
        return(NULL);