New server command DLAT (DownLoad ATtachment) which

[citadel.git] / citadel / citserver.c

diff --git a/citadel/citserver.c b/citadel/citserver.c
index a4f488fc4487825cad9519a1853f0f17ebc934dd..95eab2fc673ceac0d2c6cf8a8d0b238effdedc88 100644 (file)
--- a/citadel/citserver.c
+++ b/citadel/citserver.c
@@ -31,7 +31,6 @@
 #include <dirent.h>
 #include <errno.h>
 #include <limits.h>
-/* #include <dlfcn.h> */
 #include <netdb.h>
 #include <sys/types.h>
 #include <sys/socket.h>
@@ -186,6 +185,15 @@ void master_cleanup(int exitcode) {
        dump_heap();
 #endif
 
+       /* If the operator requested a halt but not an exit, halt here. */
+       if (shutdown_and_halt) {
+               lprintf(CTDL_NOTICE, "citserver: Halting server without exiting.\n");
+               fflush(stdout); fflush(stderr);
+               while(1) {
+                       sleep(32767);
+               }
+       }
+
        /* Now go away. */
        lprintf(CTDL_NOTICE, "citserver: Exiting with status %d\n", exitcode);
        fflush(stdout); fflush(stderr);
@@ -265,6 +273,8 @@ void cmd_info(void) {
        cprintf("%d\n", config.c_disable_newu); /* otherwise, site defined */
 #endif
 
+       cprintf("%s\n", config.c_default_cal_zone);
+
        cprintf("000\n");
 }
 
@@ -466,7 +476,7 @@ void cmd_mesg(char *mname)
 
        /* If the client requested "?" then produce a listing */
        if (!strcmp(buf, "?")) {
-               cprintf("%d %s\n",LISTING_FOLLOWS,buf);
+               cprintf("%d %s\n", LISTING_FOLLOWS, buf);
                dp = opendir(dirs[1]);
                if (dp != NULL) {
                        while (d = readdir(dp), d != NULL) {
@@ -501,17 +511,22 @@ void cmd_mesg(char *mname)
        free(dirs[1]);
 
        if (strlen(targ)==0) {
-               cprintf("%d '%s' not found.\n",ERROR + FILE_NOT_FOUND, mname);
+               cprintf("%d '%s' not found.  (Searching in %s and %s)\n",
+                       ERROR + FILE_NOT_FOUND,
+                       mname,
+                       ctdl_message_dir,
+                       ctdl_hlp_dir
+               );
                return;
        }
 
-       mfp = fopen(targ,"r");
+       mfp = fopen(targ, "r");
        if (mfp==NULL) {
                cprintf("%d Cannot open '%s': %s\n",
                        ERROR + INTERNAL_ERROR, targ, strerror(errno));
                return;
        }
-       cprintf("%d %s\n",LISTING_FOLLOWS,buf);
+       cprintf("%d %s\n", LISTING_FOLLOWS,buf);
 
        while (fgets(buf, (sizeof buf - 1), mfp) != NULL) {
                buf[strlen(buf)-1] = 0;
@@ -761,6 +776,18 @@ void cmd_down(void) {
        time_to_die = 1;
 }
 
+/*
+ * Halt the server without exiting the server process.
+ */
+void cmd_halt(void) {
+
+       if (CtdlAccessCheck(ac_aide)) return;
+
+       cprintf("%d Halting server.  Goodbye.\n", CIT_OK);
+       time_to_die = 1;
+       shutdown_and_halt = 1;
+}
+
 /*
  * Schedule or cancel a server shutdown
  */
@@ -817,7 +844,7 @@ void generate_nonce(struct CitContext *con) {
  */
 void begin_session(struct CitContext *con)
 {
-       int len;
+       socklen_t len;
        struct sockaddr_in sin;
 
        /* 
@@ -844,11 +871,12 @@ void begin_session(struct CitContext *con)
        con->cs_host[sizeof con->cs_host - 1] = 0;
        len = sizeof sin;
        if (!CC->is_local_socket) {
-               if (!getpeername(con->client_socket,
-                  (struct sockaddr *) &sin, &len))     /* should be socklen_t but doesn't work on Macintosh */
+               if (!getpeername(con->client_socket, (struct sockaddr *) &sin, &len)) {
                        locate_host(con->cs_host, sizeof con->cs_host,
                                con->cs_addr, sizeof con->cs_addr,
-                               &sin.sin_addr);
+                               &sin.sin_addr
+                       );
+               }
        }
        else {
                strcpy(con->cs_host, "");
@@ -911,12 +939,14 @@ void do_command_loop(void) {
 
        /*
         * Let other clients see the last command we executed, and
-        * update the idle time, but not NOOP, QNOP, PEXP, or GEXP.
+        * update the idle time, but not NOOP, QNOP, PEXP, GEXP, RWHO, or TIME.
         */
        if ( (strncasecmp(cmdbuf, "NOOP", 4))
           && (strncasecmp(cmdbuf, "QNOP", 4))
           && (strncasecmp(cmdbuf, "PEXP", 4))
-          && (strncasecmp(cmdbuf, "GEXP", 4)) ) {
+          && (strncasecmp(cmdbuf, "GEXP", 4))
+          && (strncasecmp(cmdbuf, "RWHO", 4))
+          && (strncasecmp(cmdbuf, "TIME", 4)) ) {
                strcpy(CC->lastcmdname, "    ");
                safestrncpy(CC->lastcmdname, cmdbuf, sizeof(CC->lastcmdname));
                time(&CC->lastidle);
@@ -1047,6 +1077,10 @@ void do_command_loop(void) {
                cmd_opna(&cmdbuf[5]);
        }
 
+       else if (!strncasecmp(cmdbuf,"DLAT",4)) {
+               cmd_dlat(&cmdbuf[5]);
+       }
+
        else if (!strncasecmp(cmdbuf,"INFO",4)) {
                cmd_info();
        }
@@ -1227,6 +1261,10 @@ void do_command_loop(void) {
                cmd_down();
        }
 
+       else if (!strncasecmp(cmdbuf,"HALT",4)) {
+               cmd_halt();
+       }
+
        else if (!strncasecmp(cmdbuf,"SCDN",4)) {
                cmd_scdn(&cmdbuf[5]);
        }