]> code.citadel.org Git - citadel.git/blobdiff - citadel/sysdep.c
* Replaced all "Citadel/UX" references with "Citadel"
[citadel.git] / citadel / sysdep.c
index 333319b9cfcec0c262cee6bd957ccd1027276761..9c97ef21df290107394eef25b319dd3c2d80684d 100644 (file)
@@ -1,16 +1,20 @@
 /*
- * Citadel/UX "system dependent" stuff.
- * See copyright.txt for copyright information.
- *
  * $Id$
  *
- * Here's where we (hopefully) have all the parts of the Citadel server that
+ * Citadel "system dependent" stuff.
+ * See copyright.txt for copyright information.
+ *
+ * Here's where we (hopefully) have most parts of the Citadel server that
  * would need to be altered to run the server in a non-POSIX environment.
  * 
- * Eventually we'll try porting to a different platform and either have
- * multiple variants of this file or simply load it up with #ifdefs.
+ * If we ever port to a different platform and either have multiple
+ * variants of this file or simply load it up with #ifdefs.
+ *
  */
 
+#ifdef DLL_EXPORT
+#define IN_LIBCIT
+#endif
 
 #include "sysdep.h"
 #include <stdlib.h>
 #include <ctype.h>
 #include <signal.h>
 #include <sys/types.h>
+#include <sys/stat.h>
 #include <sys/wait.h>
 #include <sys/socket.h>
-#include <sys/time.h>
+#include <sys/syslog.h>
+
+#if TIME_WITH_SYS_TIME
+# include <sys/time.h>
+# include <time.h>
+#else
+# if HAVE_SYS_TIME_H
+#  include <sys/time.h>
+# else
+#  include <time.h>
+# endif
+#endif
+
 #include <limits.h>
 #include <netinet/in.h>
 #include <netdb.h>
+#include <sys/un.h>
 #include <string.h>
 #include <pwd.h>
 #include <errno.h>
 #include <stdarg.h>
-#include <syslog.h>
 #include <grp.h>
-#ifdef __GNUC__
-#include <malloc.h>
-#endif
 #ifdef HAVE_PTHREAD_H
 #include <pthread.h>
 #endif
 #include "citadel.h"
 #include "server.h"
+#include "serv_extensions.h"
 #include "sysdep_decls.h"
 #include "citserver.h"
 #include "support.h"
 #include "config.h"
 #include "database.h"
 #include "housekeeping.h"
-#include "dynloader.h"
 #include "tools.h"
+#include "serv_crypto.h"
 
 #ifdef HAVE_SYS_SELECT_H
 #include <sys/select.h>
 #include "snprintf.h"
 #endif
 
+
 #ifdef DEBUG_MEMORY_LEAKS
-struct TheHeap *heap = NULL;
+struct igheap {
+       struct igheap *next;
+       char file[32];
+       int line;
+       void *block;
+};
+
+struct igheap *igheap = NULL;
 #endif
 
+
 pthread_mutex_t Critters[MAX_SEMAPHORES];      /* Things needing locking */
 pthread_key_t MyConKey;                                /* TSD key for MyContext() */
 
-int msock;                                     /* master listening socket */
 int verbosity = DEFAULT_VERBOSITY;             /* Logging level */
 
 struct CitContext masterCC;
-int rescan[2];                                 /* The Rescan Pipe */
 time_t last_purge = 0;                         /* Last dead session purge */
+static int num_threads = 0;                    /* Current number of threads */
+int num_sessions = 0;                          /* Current number of sessions */
 
-/*
- * lprintf()  ...   Write logging information
- */
-void lprintf(int loglevel, const char *format, ...) {   
-        va_list arg_ptr;
-       char buf[512];
-  
-        va_start(arg_ptr, format);   
-        vsprintf(buf, format, arg_ptr);   
-        va_end(arg_ptr);   
-
-       if (loglevel <= verbosity) { 
-               fprintf(stderr, "%s", buf);
-               fflush(stderr);
-               }
+pthread_t initial_thread;              /* tid for main() thread */
 
-       PerformLogHooks(loglevel, buf);
-       }   
+int syslog_facility = (-1);
 
 
-
-#ifdef DEBUG_MEMORY_LEAKS
-void *tracked_malloc(size_t tsize, char *tfile, int tline) {
-       void *ptr;
-       struct TheHeap *hptr;
-
-       ptr = malloc(tsize);
-       if (ptr == NULL) {
-               lprintf(3, "DANGER!  mallok(%d) at %s:%d failed!\n",
-                       tsize, tfile, tline);
-               return(NULL);
-       }
-
-       hptr = (struct TheHeap *) malloc(sizeof(struct TheHeap));
-       strcpy(hptr->h_file, tfile);
-       hptr->h_line = tline;
-       hptr->next = heap;
-       hptr->h_ptr = ptr;
-       heap = hptr;
-       return ptr;
-       }
-
-char *tracked_strdup(const char *orig, char *tfile, int tline) {
-       char *s;
-
-       s = tracked_malloc( (strlen(orig)+1), tfile, tline);
-       if (s == NULL) return NULL;
-
-       strcpy(s, orig);
-       return s;
-}
-
-void tracked_free(void *ptr) {
-       struct TheHeap *hptr, *freeme;
-
-       if (heap->h_ptr == ptr) {
-               hptr = heap->next;
-               free(heap);
-               heap = hptr;
-               }
-       else {
-               for (hptr=heap; hptr->next!=NULL; hptr=hptr->next) {
-                       if (hptr->next->h_ptr == ptr) {
-                               freeme = hptr->next;
-                               hptr->next = hptr->next->next;
-                               free(freeme);
-                               }
+/*
+ * lprintf()  ...   Write logging information
+ * 
+ * Note: the variable "buf" below needs to be large enough to handle any
+ * log data sent through this function.  BE CAREFUL!
+ */
+void lprintf(enum LogLevel loglevel, const char *format, ...) {   
+       va_list arg_ptr;
+       char buf[SIZ];
+       va_start(arg_ptr, format);   
+       vsnprintf(buf, sizeof(buf), format, arg_ptr);   
+       va_end(arg_ptr);   
+
+       if (syslog_facility >= 0) {
+               if (loglevel <= verbosity) {
+                       /* Hackery -IO */
+                       if (CC && CC->cs_pid) {
+                               memmove(buf + 6, buf, sizeof(buf) - 6);
+                               snprintf(buf, 6, "[%3d]", CC->cs_pid);
+                               buf[5] = ' ';
                        }
+                       syslog(loglevel, buf);
                }
-
-       free(ptr);
        }
-
-void *tracked_realloc(void *ptr, size_t size) {
-       void *newptr;
-       struct TheHeap *hptr;
-       
-       newptr = realloc(ptr, size);
-
-       for (hptr=heap; hptr!=NULL; hptr=hptr->next) {
-               if (hptr->h_ptr == ptr) hptr->h_ptr = newptr;
+       else if (loglevel <= verbosity) { 
+               struct timeval tv;
+               struct tm *tim;
+               time_t unixtime;
+
+               gettimeofday(&tv, NULL);
+               /* Promote to time_t; types differ on some OSes (like darwin) */
+               unixtime = tv.tv_sec;
+               tim = localtime(&unixtime);
+               /*
+                * Log provides millisecond accuracy.  If you need
+                * microsecond accuracy and your OS supports it, change
+                * %03ld to %06ld and remove " / 1000" after tv.tv_usec.
+                */
+               if (CC && CC->cs_pid) {
+#if 0
+                       /* Millisecond display */
+                       fprintf(stderr,
+                               "%04d/%02d/%02d %2d:%02d:%02d.%03ld [%3d] %s",
+                               tim->tm_year + 1900, tim->tm_mon + 1,
+                               tim->tm_mday, tim->tm_hour, tim->tm_min,
+                               tim->tm_sec, (long)tv.tv_usec / 1000,
+                               CC->cs_pid, buf);
+#endif
+                       /* Microsecond display */
+                       fprintf(stderr,
+                               "%04d/%02d/%02d %2d:%02d:%02d.%06ld [%3d] %s",
+                               tim->tm_year + 1900, tim->tm_mon + 1,
+                               tim->tm_mday, tim->tm_hour, tim->tm_min,
+                               tim->tm_sec, (long)tv.tv_usec,
+                               CC->cs_pid, buf);
+               } else {
+#if 0
+                       /* Millisecond display */
+                       fprintf(stderr,
+                               "%04d/%02d/%02d %2d:%02d:%02d.%03ld %s",
+                               tim->tm_year + 1900, tim->tm_mon + 1,
+                               tim->tm_mday, tim->tm_hour, tim->tm_min,
+                               tim->tm_sec, (long)tv.tv_usec / 1000, buf);
+#endif
+                       /* Microsecond display */
+                       fprintf(stderr,
+                               "%04d/%02d/%02d %2d:%02d:%02d.%06ld %s",
+                               tim->tm_year + 1900, tim->tm_mon + 1,
+                               tim->tm_mday, tim->tm_hour, tim->tm_min,
+                               tim->tm_sec, (long)tv.tv_usec, buf);
                }
-
-       return newptr;
+               fflush(stderr);
        }
 
+       PerformLogHooks(loglevel, buf);
+}   
 
-void dump_tracked() {
-       struct TheHeap *hptr;
-
-       cprintf("%d Here's what's allocated...\n", LISTING_FOLLOWS);    
-       for (hptr=heap; hptr!=NULL; hptr=hptr->next) {
-               cprintf("%20s %5d\n",
-                       hptr->h_file, hptr->h_line);
-               }
-#ifdef __GNUC__
-        malloc_stats();
-#endif
-
-       cprintf("000\n");
-       }
-#endif
 
 
 /*
- * we used to use master_cleanup() as a signal handler to shut down the server.
+ * We used to use master_cleanup() as a signal handler to shut down the server.
  * however, master_cleanup() and the functions it calls do some things that
  * aren't such a good idea to do from a signal handler: acquiring mutexes,
  * playing with signal masks on BSDI systems, etc. so instead we install the
@@ -184,7 +189,7 @@ void dump_tracked() {
  * that it's time to call master_cleanup() and exit.
  */
 
-static volatile int time_to_die = 0;
+volatile int time_to_die = 0;
 
 static RETSIGTYPE signal_cleanup(int signum) {
        time_to_die = 1;
@@ -197,6 +202,10 @@ static RETSIGTYPE signal_cleanup(int signum) {
 void init_sysdep(void) {
        int a;
 
+#ifdef HAVE_OPENSSL
+       init_ssl();
+#endif
+
        /* Set up a bunch of semaphores to be used for critical sections */
        for (a=0; a<MAX_SEMAPHORES; ++a) {
                pthread_mutex_init(&Critters[a], NULL);
@@ -205,10 +214,11 @@ void init_sysdep(void) {
        /*
         * Set up a place to put thread-specific data.
         * We only need a single pointer per thread - it points to the
-        * thread's CitContext structure in the ContextList linked list.
+        * CitContext structure (in the ContextList linked list) of the
+        * session to which the calling thread is currently bound.
         */
        if (pthread_key_create(&MyConKey, NULL) != 0) {
-               lprintf(1, "Can't create TSD key!!  %s\n", strerror(errno));
+               lprintf(CTDL_CRIT, "Can't create TSD key!!  %s\n", strerror(errno));
        }
 
        /*
@@ -234,6 +244,19 @@ void init_sysdep(void) {
  */
 void begin_critical_section(int which_one)
 {
+       /* lprintf(CTDL_DEBUG, "begin_critical_section(%d)\n", which_one); */
+
+       /* For all types of critical sections except those listed here,
+        * ensure nobody ever tries to do a critical section within a
+        * transaction; this could lead to deadlock.
+        */
+       if (    (which_one != S_FLOORCACHE)
+#ifdef DEBUG_MEMORY_LEAKS
+               && (which_one != S_DEBUGMEMLEAKS)
+#endif
+       ) {
+               cdb_check_handles();
+       }
        pthread_mutex_lock(&Critters[which_one]);
 }
 
@@ -250,45 +273,103 @@ void end_critical_section(int which_one)
 /*
  * This is a generic function to set up a master socket for listening on
  * a TCP port.  The server shuts down if the bind fails.
+ *
  */
-int ig_tcp_server(int port_number, int queue_len)
+int ig_tcp_server(char *ip_addr, int port_number, int queue_len)
 {
        struct sockaddr_in sin;
        int s, i;
+       int actual_queue_len;
+
+       actual_queue_len = queue_len;
+       if (actual_queue_len < 5) actual_queue_len = 5;
 
        memset(&sin, 0, sizeof(sin));
        sin.sin_family = AF_INET;
-       sin.sin_addr.s_addr = INADDR_ANY;
-
-       if (port_number == 0) {
-               lprintf(1,
-                       "citserver: No port number specified.  Run setup.\n");
-               exit(1);
-       }
-       
        sin.sin_port = htons((u_short)port_number);
+       if (ip_addr == NULL) {
+               sin.sin_addr.s_addr = INADDR_ANY;
+       }
+       else {
+               sin.sin_addr.s_addr = inet_addr(ip_addr);
+       }
+                                                                               
+       if (sin.sin_addr.s_addr == INADDR_NONE) {
+               sin.sin_addr.s_addr = INADDR_ANY;
+       }
+
+       s = socket(PF_INET, SOCK_STREAM, IPPROTO_TCP);
 
-       s = socket(PF_INET, SOCK_STREAM, (getprotobyname("tcp")->p_proto));
        if (s < 0) {
-               lprintf(1, "citserver: Can't create a socket: %s\n",
+               lprintf(CTDL_EMERG, "citserver: Can't create a socket: %s\n",
                        strerror(errno));
-               exit(errno);
+               return(-1);
        }
 
-       /* Set the SO_REUSEADDR socket option, because it makes sense. */
        i = 1;
        setsockopt(s, SOL_SOCKET, SO_REUSEADDR, &i, sizeof(i));
 
        if (bind(s, (struct sockaddr *)&sin, sizeof(sin)) < 0) {
-               lprintf(1, "citserver: Can't bind: %s\n", strerror(errno));
-               exit(errno);
+               lprintf(CTDL_EMERG, "citserver: Can't bind: %s\n",
+                       strerror(errno));
+               close(s);
+               return(-1);
+       }
+
+       if (listen(s, actual_queue_len) < 0) {
+               lprintf(CTDL_EMERG, "citserver: Can't listen: %s\n", strerror(errno));
+               close(s);
+               return(-1);
+       }
+
+       return(s);
+}
+
+
+
+/*
+ * Create a Unix domain socket and listen on it
+ */
+int ig_uds_server(char *sockpath, int queue_len)
+{
+       struct sockaddr_un addr;
+       int s;
+       int i;
+       int actual_queue_len;
+
+       actual_queue_len = queue_len;
+       if (actual_queue_len < 5) actual_queue_len = 5;
+
+       i = unlink(sockpath);
+       if (i != 0) if (errno != ENOENT) {
+               lprintf(CTDL_EMERG, "citserver: can't unlink %s: %s\n",
+                       sockpath, strerror(errno));
+               return(-1);
        }
 
-       if (listen(s, queue_len) < 0) {
-               lprintf(1, "citserver: Can't listen: %s\n", strerror(errno));
-               exit(errno);
+       memset(&addr, 0, sizeof(addr));
+       addr.sun_family = AF_UNIX;
+       safestrncpy(addr.sun_path, sockpath, sizeof addr.sun_path);
+
+       s = socket(AF_UNIX, SOCK_STREAM, 0);
+       if (s < 0) {
+               lprintf(CTDL_EMERG, "citserver: Can't create a socket: %s\n",
+                       strerror(errno));
+               return(-1);
        }
 
+       if (bind(s, (struct sockaddr *)&addr, sizeof(addr)) < 0) {
+               lprintf(CTDL_EMERG, "citserver: Can't bind: %s\n",
+                       strerror(errno));
+               return(-1);
+       }
+
+       if (listen(s, actual_queue_len) < 0) {
+               lprintf(CTDL_EMERG, "citserver: Can't listen: %s\n", strerror(errno));
+               return(-1);
+       }
+
+       chmod(sockpath, 0777);
        return(s);
 }
 
@@ -298,26 +379,30 @@ int ig_tcp_server(int port_number, int queue_len)
  * Return a pointer to the CitContext structure bound to the thread which
  * called this function.  If there's no such binding (for example, if it's
  * called by the housekeeper thread) then a generic 'master' CC is returned.
+ *
+ * It's inlined because it's used *VERY* frequently.
  */
-struct CitContext *MyContext(void) {
-       struct CitContext *retCC;
-       retCC = (struct CitContext *) pthread_getspecific(MyConKey);
-       if (retCC == NULL) retCC = &masterCC;
-       return(retCC);
+INLINE struct CitContext *MyContext(void) {
+       return ((pthread_getspecific(MyConKey) == NULL)
+               ? &masterCC
+               : (struct CitContext *) pthread_getspecific(MyConKey)
+       );
 }
 
 
 /*
- * Initialize a new context and place it in the list.
+ * Initialize a new context and place it in the list.  The session number
+ * used to be the PID (which is why it's called cs_pid), but that was when we
+ * had one process per session.  Now we just assign them sequentially, starting
+ * at 1 (don't change it to 0 because masterCC uses 0) and re-using them when
+ * sessions terminate.
  */
 struct CitContext *CreateNewContext(void) {
        struct CitContext *me, *ptr;
-       int num = 1;
-       int startover = 0;
 
-       me = (struct CitContext *) mallok(sizeof(struct CitContext));
+       me = (struct CitContext *) malloc(sizeof(struct CitContext));
        if (me == NULL) {
-               lprintf(1, "citserver: can't allocate memory!!\n");
+               lprintf(CTDL_ALERT, "citserver: can't allocate memory!!\n");
                return NULL;
        }
        memset(me, 0, sizeof(struct CitContext));
@@ -328,47 +413,75 @@ struct CitContext *CreateNewContext(void) {
         */
        me->state = CON_EXECUTING;
 
+
+       /*
+        * Generate a unique session number and insert this context into
+        * the list.
+        */
        begin_critical_section(S_SESSION_TABLE);
 
-       /* obtain a unique session number */
-       do {
-               startover = 0;
+       if (ContextList == NULL) {
+               ContextList = me;
+               me->cs_pid = 1;
+               me->next = NULL;
+       }
+
+       else if (ContextList->cs_pid > 1) {
+               me->next = ContextList;
+               ContextList = me;
+               me->cs_pid = 1;
+       }
+
+       else {
                for (ptr = ContextList; ptr != NULL; ptr = ptr->next) {
-                       if (ptr->cs_pid == num) {
-                               ++num;
-                               startover = 1;
+                       if (ptr->next == NULL) {
+                               ptr->next = me;
+                               me->cs_pid = ptr->cs_pid + 1;
+                               me->next = NULL;
+                               goto DONE;
+                       }
+                       else if (ptr->next->cs_pid > (ptr->cs_pid+1)) {
+                               me->next = ptr->next;
+                               ptr->next = me;
+                               me->cs_pid = ptr->cs_pid + 1;
+                               goto DONE;
                        }
                }
-       } while (startover == 1);
-
-       me->cs_pid = num;
-       me->next = ContextList;
-       ContextList = me;
+       }
 
+DONE:  ++num_sessions;
        end_critical_section(S_SESSION_TABLE);
        return(me);
 }
 
 
-
 /*
- * Return the number of sessions currently running.
- * (This should probably be moved out of sysdep.c)
+ * buffer_output() ... tell client_write to buffer all output until
+ *                  instructed to dump it all out later
  */
-int session_count(void) {
-       struct CitContext *ptr;
-       int TheCount = 0;
-
-       begin_critical_section(S_SESSION_TABLE);
-       for (ptr = ContextList; ptr != NULL; ptr = ptr->next) {
-               ++TheCount;
+void buffer_output(void) {
+       if (CC->buffering == 0) {
+               CC->buffering = 1;
+               CC->buffer_len = 0;
+               CC->output_buffer = malloc(SIZ);
        }
-       end_critical_section(S_SESSION_TABLE);
+}
 
-       return(TheCount);
+/*
+ * unbuffer_output()  ...  dump out all that output we've been buffering.
+ */
+void unbuffer_output(void) {
+       if (CC->buffering == 1) {
+               CC->buffering = 0;
+               client_write(CC->output_buffer, CC->buffer_len);
+               free(CC->output_buffer);
+               CC->output_buffer = NULL;
+               CC->buffer_len = 0;
+       }
 }
 
 
+
 /*
  * client_write()   ...    Send binary data to the client.
  */
@@ -376,13 +489,46 @@ void client_write(char *buf, int nbytes)
 {
        int bytes_written = 0;
        int retval;
+       int sock;
+       int old_buffer_len = 0;
+
+       if (CC->redirect_fp != NULL) {
+               fwrite(buf, nbytes, 1, CC->redirect_fp);
+               return;
+       }
+
+       if (CC->redirect_sock > 0) {
+               sock = CC->redirect_sock;       /* and continue below... */
+       }
+       else {
+               sock = CC->client_socket;
+       }
+
+       /* If we're buffering for later, do that now. */
+       if (CC->buffering) {
+               old_buffer_len = CC->buffer_len;
+               CC->buffer_len += nbytes;
+               CC->output_buffer = realloc(CC->output_buffer, CC->buffer_len);
+               memcpy(&CC->output_buffer[old_buffer_len], buf, nbytes);
+               return;
+       }
+
+       /* Ok, at this point we're not buffering.  Go ahead and write. */
+
+#ifdef HAVE_OPENSSL
+       if (CC->redirect_ssl) {
+               client_write_ssl(buf, nbytes);
+               return;
+       }
+#endif
+
        while (bytes_written < nbytes) {
-               retval = write(CC->client_socket, &buf[bytes_written],
+               retval = write(sock, &buf[bytes_written],
                        nbytes - bytes_written);
                if (retval < 1) {
-                       lprintf(2, "client_write() failed: %s\n",
+                       lprintf(CTDL_ERR, "client_write() failed: %s\n",
                                strerror(errno));
-                       CC->kill_me = 1;
+                       if (sock == CC->client_socket) CC->kill_me = 1;
                        return;
                }
                bytes_written = bytes_written + retval;
@@ -392,15 +538,15 @@ void client_write(char *buf, int nbytes)
 
 /*
  * cprintf()  ...   Send formatted printable data to the client.   It is
- *                  implemented in terms of client_write() but remains in
- *                  sysdep.c in case we port to somewhere without va_args...
+ *               implemented in terms of client_write() but remains in
+ *               sysdep.c in case we port to somewhere without va_args...
  */
 void cprintf(const char *format, ...) {   
-        va_list arg_ptr;   
-        char buf[256];   
+       va_list arg_ptr;   
+       char buf[SIZ];   
    
-        va_start(arg_ptr, format);   
-        if (vsnprintf(buf, sizeof buf, format, arg_ptr) == -1)
+       va_start(arg_ptr, format);   
+       if (vsnprintf(buf, sizeof buf, format, arg_ptr) == -1)
                buf[sizeof buf - 2] = '\n';
        client_write(buf, strlen(buf)); 
        va_end(arg_ptr);
@@ -412,7 +558,8 @@ void cprintf(const char *format, ...) {
  * Return values are:
  *     1       Requested number of bytes has been read.
  *     0       Request timed out.
- * If the socket breaks, the session is immediately terminated.
+ *     -1      The socket is broken.
+ * If the socket breaks, the session will be terminated.
  */
 int client_read_to(char *buf, int bytes, int timeout)
 {
@@ -421,6 +568,11 @@ int client_read_to(char *buf, int bytes, int timeout)
        struct timeval tv;
        int retval;
 
+#ifdef HAVE_OPENSSL
+       if (CC->redirect_ssl) {
+               return (client_read_ssl(buf, bytes, timeout));
+       }
+#endif
        len = 0;
        while(len<bytes) {
                FD_ZERO(&rfds);
@@ -437,7 +589,7 @@ int client_read_to(char *buf, int bytes, int timeout)
 
                rlen = read(CC->client_socket, &buf[len], bytes-len);
                if (rlen<1) {
-                       lprintf(2, "client_read() failed: %s\n",
+                       lprintf(CTDL_ERR, "client_read() failed: %s\n",
                                strerror(errno));
                        CC->kill_me = 1;
                        return(-1);
@@ -452,7 +604,7 @@ int client_read_to(char *buf, int bytes, int timeout)
  * (This is implemented in terms of client_read_to() and could be
  * justifiably moved out of sysdep.c)
  */
-int client_read(char *buf, int bytes)
+INLINE int client_read(char *buf, int bytes)
 {
        return(client_read_to(buf, bytes, config.c_sleeping));
 }
@@ -471,13 +623,13 @@ int client_gets(char *buf)
         */
        for (i = 0;;i++) {
                retval = client_read(&buf[i], 1);
-               if (retval != 1 || buf[i] == '\n' || i == 255)
+               if (retval != 1 || buf[i] == '\n' || i == (SIZ-1))
                        break;
        }
 
        /* If we got a long line, discard characters until the newline.
         */
-       if (i == 255)
+       if (i == (SIZ-1))
                while (buf[i] != '\n' && retval == 1)
                        retval = client_read(&buf[i], 1);
 
@@ -486,6 +638,7 @@ int client_gets(char *buf)
        buf[i] = 0;
        while ((strlen(buf)>0)&&(!isprint(buf[strlen(buf)-1])))
                buf[strlen(buf)-1] = 0;
+       if (retval < 0) strcpy(buf, "000");
        return(retval);
 }
 
@@ -495,8 +648,29 @@ int client_gets(char *buf)
  * The system-dependent part of master_cleanup() - close the master socket.
  */
 void sysdep_master_cleanup(void) {
-       lprintf(7, "Closing master socket %d\n", msock);
-       close(msock);
+       struct ServiceFunctionHook *serviceptr;
+
+       /*
+        * close all protocol master sockets
+        */
+       for (serviceptr = ServiceHookTable; serviceptr != NULL;
+           serviceptr = serviceptr->next ) {
+
+               if (serviceptr->tcp_port > 0)
+                       lprintf(CTDL_INFO, "Closing listener on port %d\n",
+                               serviceptr->tcp_port);
+
+               if (serviceptr->sockpath != NULL)
+                       lprintf(CTDL_INFO, "Closing listener on '%s'\n",
+                               serviceptr->sockpath);
+
+               close(serviceptr->msock);
+
+               /* If it's a Unix domain socket, remove the file. */
+               if (serviceptr->sockpath != NULL) {
+                       unlink(serviceptr->sockpath);
+               }
+       }
 }
 
 
@@ -537,73 +711,6 @@ void start_daemon(int do_close_stdio) {
 
 
 
-/*
- * Tie in to the 'netsetup' program.
- *
- * (We're going to hope that netsetup never feeds more than 4096 bytes back.)
- */
-void cmd_nset(char *cmdbuf)
-{
-       int retcode;
-       char fbuf[4096];
-       FILE *netsetup;
-       int ch;
-       int a, b;
-       char netsetup_args[3][256];
-
-       if (CC->usersupp.axlevel < 6) {
-               cprintf("%d Higher access required.\n", 
-                       ERROR + HIGHER_ACCESS_REQUIRED);
-               return;
-       }
-
-       for (a=1; a<=3; ++a) {
-               if (num_parms(cmdbuf) >= a) {
-                       extract(netsetup_args[a-1], cmdbuf, a-1);
-                       for (b=0; b<strlen(netsetup_args[a-1]); ++b) {
-                               if (netsetup_args[a-1][b] == 34) {
-                                       netsetup_args[a-1][b] = '_';
-                               }
-                       }
-               }
-               else {
-                       netsetup_args[a-1][0] = 0;
-               }
-       }
-
-       sprintf(fbuf, "./netsetup \"%s\" \"%s\" \"%s\" </dev/null 2>&1",
-               netsetup_args[0], netsetup_args[1], netsetup_args[2]);
-       netsetup = popen(fbuf, "r");
-       if (netsetup == NULL) {
-               cprintf("%d %s\n", ERROR, strerror(errno));
-               return;
-       }
-
-       fbuf[0] = 0;
-       while (ch = getc(netsetup), (ch > 0)) {
-               fbuf[strlen(fbuf)+1] = 0;
-               fbuf[strlen(fbuf)] = ch;
-       }
-
-       retcode = pclose(netsetup);
-
-       if (retcode != 0) {
-               for (a=0; a<strlen(fbuf); ++a) {
-                       if (fbuf[a] < 32) fbuf[a] = 32;
-               }
-               fbuf[245] = 0;
-               cprintf("%d %s\n", ERROR, fbuf);
-               return;
-       }
-
-       cprintf("%d Command succeeded.  Output follows:\n", LISTING_FOLLOWS);
-       cprintf("%s", fbuf);
-       if (fbuf[strlen(fbuf)-1] != 10) cprintf("\n");
-       cprintf("000\n");
-}
-
-
-
 /*
  * Generic routine to convert a login name to a full name (gecos)
  * Returns nonzero if a conversion took place
@@ -625,18 +732,71 @@ int convert_login(char NameToConvert[]) {
        }
 }
 
+struct worker_node *worker_list = NULL;
+
+
+/*
+ * create a worker thread. this function must always be called from within
+ * an S_WORKER_LIST critical section!
+ */
+void create_worker(void) {
+       int ret;
+       struct worker_node *n;
+       pthread_attr_t attr;
+
+       n = malloc(sizeof(struct worker_node));
+       if (n == NULL) {
+               lprintf(CTDL_EMERG, "can't allocate worker_node, exiting\n");
+               time_to_die = -1;
+               return;
+       }
+
+       if ((ret = pthread_attr_init(&attr))) {
+               lprintf(CTDL_EMERG, "pthread_attr_init: %s\n", strerror(ret));
+               time_to_die = -1;
+               return;
+       }
+
+       /* we seem to need something bigger than FreeBSD's default 64k stack */
+
+       if ((ret = pthread_attr_setstacksize(&attr, 128 * 1024))) {
+               lprintf(CTDL_EMERG, "pthread_attr_setstacksize: %s\n", strerror(ret));
+               time_to_die = -1;
+               return;
+       }
+
+       if ((ret = pthread_create(&n->tid, &attr, worker_thread, NULL) != 0))
+       {
+
+               lprintf(CTDL_ALERT, "Can't create worker thread: %s\n",
+                       strerror(ret));
+       }
+
+       n->next = worker_list;
+       worker_list = n;
+}
+
 
 
 /*
  * Purge all sessions which have the 'kill_me' flag set.
  * This function has code to prevent it from running more than once every
  * few seconds, because running it after every single unbind would waste a lot
- * of CPU time and keep the context list locked too much.
+ * of CPU time and keep the context list locked too much.  To force it to run
+ * anyway, set "force" to nonzero.
+ *
+ *
+ * After that's done, we raise the size of the worker thread pool
+ * if such an action is appropriate.
  */
-void dead_session_purge(void) {
+void dead_session_purge(int force) {
        struct CitContext *ptr, *rem;
 
-       if ( (time(NULL) - last_purge) < 5 ) return;    /* Too soon, go away */
+       if (force == 0) {
+               if ( (time(NULL) - last_purge) < 5 ) {
+                       return; /* Too soon, go away */
+               }
+       }
        time(&last_purge);
 
        do {
@@ -644,7 +804,7 @@ void dead_session_purge(void) {
                begin_critical_section(S_SESSION_TABLE);
                for (ptr = ContextList; ptr != NULL; ptr = ptr->next) {
                        if ( (ptr->state == CON_IDLE) && (ptr->kill_me) ) {
-                               rem = ptr;      
+                               rem = ptr;
                        }
                }
                end_critical_section(S_SESSION_TABLE);
@@ -653,224 +813,99 @@ void dead_session_purge(void) {
                 * section, so we have to do it like this.
                 */     
                if (rem != NULL) {
-                       lprintf(9, "Purging session %d\n", rem->cs_pid);
+                       lprintf(CTDL_DEBUG, "Purging session %d\n", rem->cs_pid);
                        RemoveContext(rem);
                }
 
        } while (rem != NULL);
-}
-
-
-       
-
-/*
- * Here's where it all begins.
- */
-int main(int argc, char **argv)
-{
-       pthread_t HousekeepingThread;   /* Thread descriptor */
-        pthread_attr_t attr;           /* Thread attributes */
-       char tracefile[128];            /* Name of file to log traces to */
-       int a, i;                       /* General-purpose variables */
-       struct passwd *pw;
-       int drop_root_perms = 1;
-       char *moddir;
-        
-       /* specify default port name and trace file */
-       strcpy(tracefile, "");
-
-       /* parse command-line arguments */
-       for (a=1; a<argc; ++a) {
-
-               /* -t specifies where to log trace messages to */
-               if (!strncmp(argv[a], "-t", 2)) {
-                       strcpy(tracefile, argv[a]);
-                       strcpy(tracefile, &tracefile[2]);
-                       freopen(tracefile, "r", stdin);
-                       freopen(tracefile, "w", stdout);
-                       freopen(tracefile, "w", stderr);
-               }
-
-               /* run in the background if -d was specified */
-               else if (!strcmp(argv[a], "-d")) {
-                       start_daemon( (strlen(tracefile) > 0) ? 0 : 1 ) ;
-               }
-
-               /* -x specifies the desired logging level */
-               else if (!strncmp(argv[a], "-x", 2)) {
-                       verbosity = atoi(&argv[a][2]);
-               }
-
-               else if (!strncmp(argv[a], "-h", 2)) {
-                       safestrncpy(bbs_home_directory, &argv[a][2],
-                                   sizeof bbs_home_directory);
-                       home_specified = 1;
-               }
 
-               else if (!strncmp(argv[a], "-f", 2)) {
-                       do_defrag = 1;
-               }
-
-               /* -r tells the server not to drop root permissions. don't use
-                * this unless you know what you're doing. this should be
-                * removed in the next release if it proves unnecessary. */
-               else if (!strcmp(argv[a], "-r"))
-                       drop_root_perms = 0;
-
-               /* any other parameter makes it crash and burn */
-               else {
-                       lprintf(1,      "citserver: usage: "
-                                       "citserver [-tTraceFile] [-d] [-f]"
-                                       " [-xLogLevel] [-hHomeDir]\n");
-                       exit(1);
-               }
+       /* Raise the size of the worker thread pool if necessary. */
 
+       if ( (num_sessions > num_threads)
+          && (num_threads < config.c_max_workers) ) {
+               begin_critical_section(S_WORKER_LIST);
+               create_worker();
+               end_critical_section(S_WORKER_LIST);
        }
+}
 
-       /* Tell 'em who's in da house */
-       lprintf(1,
-"\nMultithreaded message server for Citadel/UX\n"
-"Copyright (C) 1987-1999 by the Citadel/UX development team.\n"
-"Citadel/UX is free software, covered by the GNU General Public License, and\n"
-"you are welcome to change it and/or distribute copies of it under certain\n"
-"conditions.  There is absolutely no warranty for this software.  Please\n"
-"read the 'COPYING.txt' file for details.\n\n");
 
-       /* Initialize... */
-       init_sysdep();
-       openlog("citserver",LOG_PID,LOG_USER);
 
-       /* Load site-specific parameters */
-       lprintf(7, "Loading citadel.config\n");
-       get_config();
 
-       /*
-        * Bind the server to our favourite port.
-        * There is no need to check for errors, because ig_tcp_server()
-        * exits if it doesn't succeed.
-        */
-       lprintf(7, "Attempting to bind to port %d...\n", config.c_port_number);
-       msock = ig_tcp_server(config.c_port_number, 5);
-       lprintf(7, "Listening on socket %d\n", msock);
 
-       /*
-        * Now that we've bound the socket, change to the BBS user id and its
-        * corresponding group ids
-        */
-       if (drop_root_perms) {
-               if ((pw = getpwuid(BBSUID)) == NULL)
-                       lprintf(1, "WARNING: getpwuid(%d): %s\n"
-                                  "Group IDs will be incorrect.\n", BBSUID,
-                               strerror(errno));
-               else {
-                       initgroups(pw->pw_name, pw->pw_gid);
-                       if (setgid(pw->pw_gid))
-                               lprintf(3, "setgid(%d): %s\n", pw->pw_gid,
-                                       strerror(errno));
-               }
-               lprintf(7, "Changing uid to %d\n", BBSUID);
-               if (setuid(BBSUID) != 0) {
-                       lprintf(3, "setuid() failed: %s\n", strerror(errno));
-               }
-       }
+/*
+ * Redirect a session's output to a file or socket.
+ * This function may be called with a file handle *or* a socket (but not
+ * both).  Call with neither to return output to its normal client socket.
+ */
+void CtdlRedirectOutput(FILE *fp, int sock) {
 
-       /*
-        * Do non system dependent startup functions.
-        */
-       master_startup();
+       if (fp != NULL) CC->redirect_fp = fp;
+       else CC->redirect_fp = NULL;
 
-       /*
-        * Load any server-side modules (plugins) available here.
-        */
-       lprintf(7, "Initializing loadable modules\n");
-       if ((moddir = malloc(strlen(bbs_home_directory) + 9)) != NULL) {
-               sprintf(moddir, "%s/modules", bbs_home_directory);
-               DLoader_Init(moddir);
-               free(moddir);
-       }
-
-       lprintf(7, "Starting housekeeper thread\n");
-       pthread_attr_init(&attr);
-               pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED);
-       if (pthread_create(&HousekeepingThread, &attr,
-          (void* (*)(void*)) housekeeping_loop, NULL) != 0) {
-               lprintf(1, "Can't create housekeeping thead: %s\n",
-                       strerror(errno));
-       }
+       if (sock > 0) CC->redirect_sock = sock;
+       else CC->redirect_sock = (-1);
 
+}
 
-       /*
-        * The rescan pipe exists so that worker threads can be woken up and
-        * told to re-scan the context list for fd's to listen on.  This is
-        * necessary, for example, when a context is about to go idle and needs
-        * to get back on that list.
-        */
-       if (pipe(rescan)) {
-               lprintf(1, "Can't create rescan pipe!\n");
-               exit(errno);
-       }
 
-       /*
-        * Now create a bunch of worker threads.
-        */
-       for (i=0; i<(config.c_worker_threads-1); ++i) {
-               pthread_attr_init(&attr);
-                       pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED);
-               if (pthread_create(&HousekeepingThread, &attr,
-                  (void* (*)(void*)) worker_thread, NULL) != 0) {
-                       lprintf(1, "Can't create worker thead: %s\n",
-                       strerror(errno));
-               }
-       }
+/*
+ * masterCC is the context we use when not attached to a session.  This
+ * function initializes it.
+ */
+void InitializeMasterCC(void) {
+       memset(&masterCC, 0, sizeof(struct CitContext));
+       masterCC.internal_pgm = 1;
+       masterCC.cs_pid = 0;
+}
 
-       /* Now this thread can become a worker as well. */
-       worker_thread();
 
-       return(0);
-}
 
 
 
 
+/*
+ * Bind a thread to a context.  (It's inline merely to speed things up.)
+ */
+INLINE void become_session(struct CitContext *which_con) {
+       pthread_setspecific(MyConKey, (void *)which_con );
+}
 
 
 
 /* 
  * This loop just keeps going and going and going...
  */    
-void worker_thread(void) {
+void *worker_thread(void *arg) {
        int i;
-       char junk;
-       int numselect = 0;
        int highest;
        struct CitContext *ptr;
        struct CitContext *bind_me = NULL;
        fd_set readfds;
        int retval;
        struct CitContext *con= NULL;   /* Temporary context pointer */
-       struct sockaddr_in fsin;        /* Data for master socket */
-       int alen;                       /* Data for master socket */
+       struct ServiceFunctionHook *serviceptr;
        int ssock;                      /* Descriptor for client socket */
+       struct timeval tv;
+       int force_purge = 0;
+       int m;
+
+       num_threads++;
+
+       cdb_allocate_tsd();
 
        while (!time_to_die) {
 
-               /* 
-                * In a stupid environment, we would have all idle threads
-                * calling select() and then they'd all wake up at once.  We
-                * solve this problem by putting the select() in a critical
-                * section, so only one thread has the opportunity to wake
-                * up.  If we wake up on the master socket, create a new
-                * session context; otherwise, just bind the thread to the
-                * context we want and go on our merry way.
+               /* make doubly sure we're not holding any stale db handles
+                * which might cause a deadlock.
                 */
+               cdb_check_handles();
+do_select:     force_purge = 0;
+               bind_me = NULL;         /* Which session shall we handle? */
 
-               begin_critical_section(S_I_WANNA_SELECT);
-SETUP_FD:      FD_ZERO(&readfds);
-               FD_SET(msock, &readfds);
-               highest = msock;
-               FD_SET(rescan[0], &readfds);
-               if (rescan[0] > highest) highest = rescan[0];
-               numselect = 2;
+               /* Initialize the fdset. */
+               FD_ZERO(&readfds);
+               highest = 0;
 
                begin_critical_section(S_SESSION_TABLE);
                for (ptr = ContextList; ptr != NULL; ptr = ptr->next) {
@@ -878,112 +913,313 @@ SETUP_FD:       FD_ZERO(&readfds);
                                FD_SET(ptr->client_socket, &readfds);
                                if (ptr->client_socket > highest)
                                        highest = ptr->client_socket;
-                               ++numselect;
+                       }
+                       if ((bind_me == NULL) && (ptr->state == CON_READY)) {
+                               bind_me = ptr;
+                               ptr->state = CON_EXECUTING;
                        }
                }
                end_critical_section(S_SESSION_TABLE);
 
-               retval = select(highest + 1, &readfds, NULL, NULL, NULL);
+               if (bind_me) goto SKIP_SELECT;
+
+               /* If we got this far, it means that there are no sessions
+                * which a previous thread marked for attention, so we go
+                * ahead and get ready to select().
+                */
+
+               /* First, add the various master sockets to the fdset. */
+               for (serviceptr = ServiceHookTable; serviceptr != NULL;
+               serviceptr = serviceptr->next ) {
+                       m = serviceptr->msock;
+                       FD_SET(m, &readfds);
+                       if (m > highest) {
+                               highest = m;
+                       }
+               }
+
+               if (!time_to_die) {
+                       tv.tv_sec = 1;          /* wake up every second if no input */
+                       tv.tv_usec = 0;
+                       retval = select(highest + 1, &readfds, NULL, NULL, &tv);
+               }
+               else {
+                       break;
+               }
 
                /* Now figure out who made this select() unblock.
                 * First, check for an error or exit condition.
                 */
                if (retval < 0) {
-                       end_critical_section(S_I_WANNA_SELECT);
-                       lprintf(9, "Exiting (%s)\n", strerror(errno));
-                       time_to_die = 1;
+                       if (errno == EBADF) {
+                               lprintf(CTDL_NOTICE, "select() failed: (%s)\n",
+                                       strerror(errno));
+                               goto do_select;
+                       }
+                       if (errno != EINTR) {
+                               lprintf(CTDL_EMERG, "Exiting (%s)\n", strerror(errno));
+                               time_to_die = 1;
+                       } else if (!time_to_die)
+                               goto do_select;
                }
 
                /* Next, check to see if it's a new client connecting
-                * on the master socket.
+                * on a master socket.
                 */
-               else if (FD_ISSET(msock, &readfds)) {
-                       alen = sizeof fsin;
-                       ssock = accept(msock, (struct sockaddr *)&fsin, &alen);
-                       if (ssock < 0) {
-                               lprintf(2, "citserver: accept() failed: %s\n",
-                                       strerror(errno));
-                       }
-                       else {
-                               lprintf(7, "citserver: New client socket %d\n",
-                                       ssock);
-
-                               /* New context will be created already set up
-                                * in the CON_EXECUTING state.
-                                */
-                               con = CreateNewContext();
-
-                               /* Assign our new socket number to it. */
-                               con->client_socket = ssock;
+               else for (serviceptr = ServiceHookTable; serviceptr != NULL;
+                    serviceptr = serviceptr->next ) {
+
+                       if (FD_ISSET(serviceptr->msock, &readfds)) {
+                               ssock = accept(serviceptr->msock, NULL, 0);
+                               if (ssock < 0) {
+                                       lprintf(CTDL_CRIT,
+                                               "citserver: accept(): %s\n",
+                                               strerror(errno));
+                               }
+                               else {
+                                       lprintf(CTDL_NOTICE,
+                                               "New client socket %d\n",
+                                               ssock);
+
+                                       /* New context will be created already
+                                       * set up in the CON_EXECUTING state.
+                                       */
+                                       con = CreateNewContext();
+
+                                       /* Assign new socket number to it. */
+                                       con->client_socket = ssock;
+                                       con->h_command_function =
+                                               serviceptr->h_command_function;
+                                       con->h_async_function =
+                                               serviceptr->h_async_function;
+
+                                       /* Determine whether local socket */
+                                       if (serviceptr->sockpath != NULL)
+                                               con->is_local_socket = 1;
        
-                               /* Set the SO_REUSEADDR socket option */
-                               i = 1;
-                               setsockopt(ssock, SOL_SOCKET, SO_REUSEADDR,
-                                       &i, sizeof(i));
-
-                               pthread_setspecific(MyConKey, (void *)con);
-                               begin_session(con);
-                               /* do_command_loop(); */
-                               pthread_setspecific(MyConKey, (void *)NULL);
-                               con->state = CON_IDLE;
-                               goto SETUP_FD;
+                                       /* Set the SO_REUSEADDR socket option */
+                                       i = 1;
+                                       setsockopt(ssock, SOL_SOCKET,
+                                               SO_REUSEADDR,
+                                               &i, sizeof(i));
+
+                                       become_session(con);
+                                       begin_session(con);
+                                       serviceptr->h_greeting_function();
+                                       become_session(NULL);
+                                       con->state = CON_IDLE;
+                                       goto do_select;
+                               }
                        }
                }
 
-               /* If the rescan pipe went active, someone is telling this
-                * thread that the &readfds needs to be refreshed with more
-                * current data.
-                */
-               else if (FD_ISSET(rescan[0], &readfds)) {
-                       read(rescan[0], &junk, 1);
-                       goto SETUP_FD;
+               if (time_to_die) {
+                       break;
                }
 
                /* It must be a client socket.  Find a context that has data
-                * waiting on its socket *and* is in the CON_IDLE state.
+                * waiting on its socket *and* is in the CON_IDLE state.  Any
+                * active sockets other than our chosen one are marked as
+                * CON_READY so the next thread that comes around can just bind
+                * to one without having to select() again.
                 */
-               else {
-                       bind_me = NULL;
-                       begin_critical_section(S_SESSION_TABLE);
-                       for (ptr = ContextList;
-                           ( (ptr != NULL) && (bind_me == NULL) );
-                           ptr = ptr->next) {
-                               if ( (FD_ISSET(ptr->client_socket, &readfds))
-                                  && (ptr->state == CON_IDLE) ) {
-                                       bind_me = ptr;
+               begin_critical_section(S_SESSION_TABLE);
+               for (ptr = ContextList; ptr != NULL; ptr = ptr->next) {
+                       if ( (FD_ISSET(ptr->client_socket, &readfds))
+                          && (ptr->state != CON_EXECUTING) ) {
+                               ptr->input_waiting = 1;
+                               if (!bind_me) {
+                                       bind_me = ptr;  /* I choose you! */
+                                       bind_me->state = CON_EXECUTING;
+                               }
+                               else {
+                                       ptr->state = CON_READY;
                                }
                        }
-                       if (bind_me != NULL) {
-                               /* Found one.  Stake a claim to it before
-                                * letting anyone else touch the context list.
-                                */
-                               bind_me->state = CON_EXECUTING;
-                       }
+               }
+               end_critical_section(S_SESSION_TABLE);
 
-                       end_critical_section(S_SESSION_TABLE);
-                       end_critical_section(S_I_WANNA_SELECT);
-
-                       /* We're bound to a session, now do *one* command */
-                       if (bind_me != NULL) {
-                               pthread_setspecific(MyConKey, (void *)bind_me);
-                               do_command_loop();
-                               pthread_setspecific(MyConKey, (void *)NULL);
-                               bind_me->state = CON_IDLE;
-                               if (bind_me->kill_me == 1) {
-                                       RemoveContext(bind_me);
-                               } 
-                               write(rescan[1], &junk, 1);
-                       }
-                       else {
-                               lprintf(9, "Thread found nothing to do!\n");
+SKIP_SELECT:
+               /* We're bound to a session */
+               if (bind_me != NULL) {
+                       become_session(bind_me);
+
+                       /* If the client has sent a command, execute it. */
+                       if (CC->input_waiting) {
+                               CC->h_command_function();
+                               CC->input_waiting = 0;
                        }
 
+                       /* If there are asynchronous messages waiting and the
+                        * client supports it, do those now */
+                       if ((CC->is_async) && (CC->async_waiting)
+                          && (CC->h_async_function != NULL)) {
+                               CC->h_async_function();
+                               CC->async_waiting = 0;
+                       }
+                       
+                       force_purge = CC->kill_me;
+                       become_session(NULL);
+                       bind_me->state = CON_IDLE;
                }
-               dead_session_purge();
+
+               dead_session_purge(force_purge);
+               do_housekeeping();
+               check_sched_shutdown();
        }
 
        /* If control reaches this point, the server is shutting down */        
-       master_cleanup();
-       pthread_exit(NULL);
+       --num_threads;
+       return NULL;
+}
+
+
+
+
+/*
+ * SyslogFacility()
+ * Translate text facility name to syslog.h defined value.
+ */
+int SyslogFacility(char *name)
+{
+       int i;
+       struct
+       {
+               int facility;
+               char *name;
+       }   facTbl[] =
+       {
+               {   LOG_KERN,   "kern"          },
+               {   LOG_USER,   "user"          },
+               {   LOG_MAIL,   "mail"          },
+               {   LOG_DAEMON, "daemon"        },
+               {   LOG_AUTH,   "auth"          },
+               {   LOG_SYSLOG, "syslog"        },
+               {   LOG_LPR,    "lpr"           },
+               {   LOG_NEWS,   "news"          },
+               {   LOG_UUCP,   "uucp"          },
+               {   LOG_LOCAL0, "local0"        },
+               {   LOG_LOCAL1, "local1"        },
+               {   LOG_LOCAL2, "local2"        },
+               {   LOG_LOCAL3, "local3"        },
+               {   LOG_LOCAL4, "local4"        },
+               {   LOG_LOCAL5, "local5"        },
+               {   LOG_LOCAL6, "local6"        },
+               {   LOG_LOCAL7, "local7"        },
+               {   0,            NULL          }
+       };
+       for(i = 0; facTbl[i].name != NULL; i++) {
+               if(!strcasecmp(name, facTbl[i].name))
+                       return facTbl[i].facility;
+       }
+       return -1;
+}
+
+
+/********** MEM CHEQQER ***********/
+
+#ifdef DEBUG_MEMORY_LEAKS
+
+#undef malloc
+#undef realloc
+#undef strdup
+#undef free
+
+void *tracked_malloc(size_t size, char *file, int line) {
+       struct igheap *thisheap;
+       void *block;
+
+       block = malloc(size);
+       if (block == NULL) return(block);
+
+       thisheap = malloc(sizeof(struct igheap));
+       if (thisheap == NULL) {
+               free(block);
+               return(NULL);
+       }
+
+       thisheap->block = block;
+       strcpy(thisheap->file, file);
+       thisheap->line = line;
+       
+       begin_critical_section(S_DEBUGMEMLEAKS);
+       thisheap->next = igheap;
+       igheap = thisheap;
+       end_critical_section(S_DEBUGMEMLEAKS);
+
+       return(block);
+}
+
+
+void *tracked_realloc(void *ptr, size_t size, char *file, int line) {
+       struct igheap *thisheap;
+       void *block;
+
+       block = realloc(ptr, size);
+       if (block == NULL) return(block);
+
+       thisheap = malloc(sizeof(struct igheap));
+       if (thisheap == NULL) {
+               free(block);
+               return(NULL);
+       }
+
+       thisheap->block = block;
+       strcpy(thisheap->file, file);
+       thisheap->line = line;
+       
+       begin_critical_section(S_DEBUGMEMLEAKS);
+       thisheap->next = igheap;
+       igheap = thisheap;
+       end_critical_section(S_DEBUGMEMLEAKS);
+
+       return(block);
+}
+
+
+
+void tracked_free(void *ptr) {
+       struct igheap *thisheap;
+       struct igheap *trash;
+
+       free(ptr);
+
+       if (igheap == NULL) return;
+       begin_critical_section(S_DEBUGMEMLEAKS);
+       for (thisheap = igheap; thisheap != NULL; thisheap = thisheap->next) {
+               if (thisheap->next != NULL) {
+                       if (thisheap->next->block == ptr) {
+                               trash = thisheap->next;
+                               thisheap->next = thisheap->next->next;
+                               free(trash);
+                       }
+               }
+       }
+       if (igheap->block == ptr) {
+               trash = igheap;
+               igheap = igheap->next;
+               free(trash);
+       }
+       end_critical_section(S_DEBUGMEMLEAKS);
+}
+
+char *tracked_strdup(const char *s, char *file, int line) {
+       char *ptr;
+
+       if (s == NULL) return(NULL);
+       ptr = tracked_malloc(strlen(s) + 1, file, line);
+       if (ptr == NULL) return(NULL);
+       strncpy(ptr, s, strlen(s));
+       return(ptr);
+}
+
+void dump_heap(void) {
+       struct igheap *thisheap;
+
+       for (thisheap = igheap; thisheap != NULL; thisheap = thisheap->next) {
+               lprintf(CTDL_CRIT, "UNFREED: %30s : %d\n",
+                       thisheap->file, thisheap->line);
+       }
 }
 
+#endif /*  DEBUG_MEMORY_LEAKS */