Added the OPNA command for downloading attachments

[citadel.git] / citadel / citserver.c

diff --git a/citadel/citserver.c b/citadel/citserver.c
index 1ab8a0f58256f097846627e4e27ded547a697867..70fa577fd06eca78357d95369ca57d9b491e77b9 100644 (file)
--- a/citadel/citserver.c
+++ b/citadel/citserver.c
@@ -90,7 +90,6 @@ void master_cleanup(void) {
  */
 void cleanup_stuff(void *arg)
 {
-       struct ExpressMessage *emptr;
 
        lprintf(9, "cleanup_stuff() called\n");
 
@@ -108,11 +107,7 @@ void cleanup_stuff(void *arg)
        
        /* Deallocate any unsent express messages */
        begin_critical_section(S_SESSION_TABLE);
-       while (CC->FirstExpressMessage != NULL) {
-               emptr = CC->FirstExpressMessage;
-               CC->FirstExpressMessage = CC->FirstExpressMessage->next;
-               phree(emptr);
-               }
+       if (CC->ExpressMessages != NULL) phree(CC->ExpressMessages);
        end_critical_section(S_SESSION_TABLE);
 
        /* Deallocate any message list we might have in memory */
@@ -176,14 +171,16 @@ 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 *argbuf)
 {
-       char newroomname[ROOMNAMELEN];
+       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;
@@ -198,7 +195,7 @@ 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
@@ -217,7 +214,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);
    }
@@ -234,7 +231,7 @@ void cmd_uchg(char *newusername)
  * space otherwise.
  */
 char check_express(void) {
-       if (CC->FirstExpressMessage == NULL) {
+       if (CC->ExpressMessages == NULL) {
                return(' ');
                }
        else {
@@ -688,7 +685,7 @@ void *context_loop(struct CitContext *con)
        CC->download_fp = NULL;
        CC->upload_fp = NULL;
        CC->cs_pid = con->client_socket;        /* not necessarily portable */
-       CC->FirstExpressMessage = NULL;
+       CC->ExpressMessages = NULL;
        CC->msglist = NULL;
        CC->num_msgs = 0;
        time(&CC->lastcmd);
@@ -729,7 +726,7 @@ void *context_loop(struct CitContext *con)
 
        do {
                time(&CC->lastcmd);
-               bzero(cmdbuf, sizeof cmdbuf); /* Clear it, just in case */
+               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);
 
@@ -837,6 +834,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();
                        }