Fixes for Cygwin (see ChangeLog)

[citadel.git] / citadel / citserver.c

diff --git a/citadel/citserver.c b/citadel/citserver.c
index 846fb071215974d4be07e55542b1c477a28df0a3..99aa31e1a969c9600fdda5feeee222d7e9962c49 100644 (file)
--- a/citadel/citserver.c
+++ b/citadel/citserver.c
@@ -1,4 +1,5 @@
 /* $Id$ */
+#include "sysdep.h"
 #include <stdlib.h>
 #include <unistd.h>
 #include <stdio.h>
@@ -9,7 +10,9 @@
 #include <string.h>
 #include <errno.h>
 #include <limits.h>
+#ifdef HAVE_PTHREAD_H
 #include <pthread.h>
+#endif
 #include <syslog.h>
 #include <dlfcn.h>
 #include "citadel.h"
@@ -90,7 +93,6 @@ void master_cleanup(void) {
  */
 void cleanup_stuff(void *arg)
 {
-       struct ExpressMessage *emptr;
 
        lprintf(9, "cleanup_stuff() called\n");
 
@@ -106,17 +108,8 @@ void cleanup_stuff(void *arg)
 
        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);
-
        /* Deallocate any message list we might have in memory */
-       if (CC->msglist != NULL) free(CC->msglist);
+       if (CC->msglist != NULL) phree(CC->msglist);
 
        /* Now get rid of the session and context */
        lprintf(7, "cleanup_stuff() calling RemoveContext(%d)\n", CC->cs_pid);
@@ -176,14 +169,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 +193,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 +212,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);
    }
@@ -377,13 +372,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) {
@@ -432,13 +427,13 @@ 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) {
                snprintf(targ, sizeof targ, "./help/%s", buf);
@@ -561,6 +556,7 @@ 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) {
@@ -568,9 +564,11 @@ void cmd_term(char *cmdbuf)
                        }
                }
        end_critical_section(S_SESSION_TABLE);
+       lprintf(9, "session_to_kill == %d\n", session_to_kill);
 
        if (session_to_kill > 0) {
-               kill_session(ccptr->cs_pid);
+               lprintf(9, "calling kill_session()\n");
+               kill_session(session_to_kill);
                cprintf("%d Session terminated.\n", OK);
                }
        else {
@@ -726,7 +724,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);
 
@@ -834,6 +832,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();
                        }
@@ -1098,6 +1104,12 @@ void *context_loop(struct CitContext *con)
                        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",