ctdl_tcp_server and ctdl_uds_server improved handling of error
[citadel.git] / citadel / serv_extensions.c
index dee9b45499a5e46c5b4f77d928b9de7fd643e592..73a1b7911094dc48858a5cf95b5d2c824c1fcee5 100644 (file)
 /*
- * $Id$
+ * Citadel Extension Loader
+ * Originally written by Brian Costello <btx@calyx.net>
  *
- * Citadel Dynamic Loading Module
- * Written by Brian Costello <btx@calyx.net>
+ * Copyright (c) 1987-2019 by the citadel.org team
  *
+ * This program is open source software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  */
 
-#include "sysdep.h"
-#include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
-#include <sys/types.h>
-#include <dirent.h>
-#include <string.h>
-#include <limits.h>
-#include <ctype.h>
+#include <stdio.h>
+#include <sys/stat.h>
 #include <libcitadel.h>
-#include "citadel.h"
-#include "server.h"
-#include "serv_extensions.h"
 #include "sysdep_decls.h"
-#include "msgbase.h"
+#include "modules/crypto/serv_crypto.h"        /* Needed until a universal crypto startup hook is implimented for CtdlStartTLS */
+#include "serv_extensions.h"
+#include "ctdl_module.h"
 #include "config.h"
 
-#include "modules/crypto/serv_crypto.h"        /* Needed until a universal crypto startup hook is implimented for CtdlStartTLS */
 
-#include "ctdl_module.h"
+/*
+ * Structure defentitions for hook tables
+ */
+
+typedef struct FixedOutputHook FixedOutputHook;
+struct FixedOutputHook {
+       FixedOutputHook *next;
+       char content_type[64];
+       void (*h_function_pointer) (char *, int);
+};
+FixedOutputHook *FixedOutputTable = NULL;
+
+
+/*
+ * SessionFunctionHook extensions are used for any type of hook for which
+ * the context in which it's being called (which is determined by the event
+ * type) will make it obvious for the hook function to know where to look for
+ * pertinent data.
+ */
+typedef struct SessionFunctionHook SessionFunctionHook;
+struct SessionFunctionHook {
+       SessionFunctionHook *next;
+       int Priority;
+       void (*h_function_pointer) (void);
+       int eventtype;
+};
+SessionFunctionHook *SessionHookTable = NULL;
+
+
+/*
+ * UserFunctionHook extensions are used for any type of hook which implements
+ * an operation on a user or username (potentially) other than the one
+ * operating the current session.
+ */
+typedef struct UserFunctionHook UserFunctionHook;
+struct UserFunctionHook {
+       UserFunctionHook *next;
+       void (*h_function_pointer) (struct ctdluser *usbuf);
+       int eventtype;
+};
+UserFunctionHook *UserHookTable = NULL;
+
+
+/*
+ * MessageFunctionHook extensions are used for hooks which implement handlers
+ * for various types of message operations (save, read, etc.)
+ */
+typedef struct MessageFunctionHook MessageFunctionHook;
+struct MessageFunctionHook {
+       MessageFunctionHook *next;
+       int (*h_function_pointer) (struct CtdlMessage *msg, recptypes *recps);
+       int eventtype;
+};
+MessageFunctionHook *MessageHookTable = NULL;
+
+
+/*
+ * DeleteFunctionHook extensions are used for hooks which get called when a
+ * message is about to be deleted.
+ */
+typedef struct DeleteFunctionHook DeleteFunctionHook;
+struct DeleteFunctionHook {
+       DeleteFunctionHook *next;
+       void (*h_function_pointer) (char *target_room, long msgnum);
+};
+DeleteFunctionHook *DeleteHookTable = NULL;
+
+
+/*
+ * ExpressMessageFunctionHook extensions are used for hooks which implement
+ * the sending of an instant message through various channels.  Any function
+ * registered should return the number of recipients to whom the message was
+ * successfully transmitted.
+ */
+typedef struct XmsgFunctionHook XmsgFunctionHook;
+struct XmsgFunctionHook {
+       XmsgFunctionHook *next;
+       int (*h_function_pointer) (char *, char *, char *, char *);
+       int order;
+};
+XmsgFunctionHook *XmsgHookTable = NULL;
+
+
+/*
+ * RoomFunctionHook extensions are used for hooks which impliment room
+ * processing functions when new messages are added EG. SIEVE.
+ */
+typedef struct RoomFunctionHook RoomFunctionHook;
+struct RoomFunctionHook {
+       RoomFunctionHook *next;
+       int (*fcn_ptr) (struct ctdlroom *);
+};
+RoomFunctionHook *RoomHookTable = NULL;
 
-#ifndef HAVE_SNPRINTF
-#include <stdarg.h>
-#include "snprintf.h"
-#endif
 
-struct CleanupFunctionHook *CleanupHookTable = NULL;
-struct SessionFunctionHook *SessionHookTable = NULL;
-struct UserFunctionHook *UserHookTable = NULL;
-struct XmsgFunctionHook *XmsgHookTable = NULL;
-struct MessageFunctionHook *MessageHookTable = NULL;
-struct NetprocFunctionHook *NetprocHookTable = NULL;
-struct DeleteFunctionHook *DeleteHookTable = NULL;
-struct ServiceFunctionHook *ServiceHookTable = NULL;
-struct FixedOutputHook *FixedOutputTable = NULL;
-struct RoomFunctionHook *RoomHookTable = NULL;
-struct SearchFunctionHook *SearchFunctionHookTable = NULL;
+typedef struct SearchFunctionHook SearchFunctionHook;
+struct SearchFunctionHook {
+       SearchFunctionHook *next;
+       void (*fcn_ptr) (int *, long **, const char *);
+       char *name;
+};
+SearchFunctionHook *SearchFunctionHookTable = NULL;
+
+CleanupFunctionHook *CleanupHookTable = NULL;
+CleanupFunctionHook *EVCleanupHookTable = NULL;
+
+ServiceFunctionHook *ServiceHookTable = NULL;
 
+typedef struct ProtoFunctionHook ProtoFunctionHook;
 struct ProtoFunctionHook {
        void (*handler) (char *cmdbuf);
        const char *cmd;
@@ -56,168 +146,124 @@ HashList *ProtoHookList = NULL;
 #define ERR_PORT (1 << 1)
 
 
-static char *portlist = NULL;
-static size_t nSizPort = 0;
-
-static char *errormessages = NULL;
-size_t nSizErrmsg = 0;
+static StrBuf *portlist = NULL;
+static StrBuf *errormessages = NULL;
 
 
 long   DetailErrorFlags;
-
+ConstStr Empty = {HKEY("")};
 char *ErrSubject = "Startup Problems";
-char *ErrGeneral = "Citadel had trouble on starting up. %s This means, citadel won't be the service provider for a specific service you configured it to.\n\n"
-"If you don't want citadel to provide these services, turn them off in WebCit via %s%s\n\n%s\n\n"
-"To make both ways actualy take place restart the citserver with \"sendcommand down\"\n\n"
-"The errors returned by the system were:\n%s\n"
-"You can recheck the above if you follow this faq item:\n"
-"http://www.citadel.org/doku.php/faq:mastering_your_os:net#netstat";
-
+ConstStr ErrGeneral[] = {
+       {HKEY("Citadel had trouble on starting up. ")},
+       {HKEY(" This means, Citadel won't be the service provider for a specific service you configured it to.\n\n"
+             "If you don't want Citadel to provide these services, turn them off in WebCit via: ")},
+       {HKEY("To make both ways actualy take place restart the citserver with \"sendcommand down\"\n\n"
+             "The errors returned by the system were:\n")},
+       {HKEY("You can recheck the above if you follow this faq item:\n"
+             "http://www.citadel.org/doku.php?id=faq:mastering_your_os:net#netstat")}
+};
 
-char *ErrPortShort = "We couldn't bind all ports you configured to be provided by citadel server.";
-char *ErrPortWhere = "Admin->System Preferences->Network.\n\nThe failed ports and sockets are: ";
-char *ErrPortHint = "If you want citadel to provide you with that functionality, "
-"check the output of \"netstat -lnp\" on linux Servers or \"netstat -na\" on *BSD"
-" and stop the programm, that binds these ports.\n You should eventually remove "
-" their initscripts in /etc/init.d so that you won't get this trouble once more.\n"
-" After that goto Administration -> Shutdown Citadel to make Citadel retry to bind this port.\n";
+ConstStr ErrPortShort = { HKEY("We couldn't bind all ports you configured to be provided by Citadel Server.\n")};
+ConstStr ErrPortWhere = { HKEY("\"Admin->System Preferences->Network\".\n\nThe failed ports and sockets are: ")};
+ConstStr ErrPortHint  = { HKEY("If you want Citadel to provide you with that functionality, "
+                              "check the output of \"netstat -lnp\" on Linux, or \"netstat -na\" on BSD"
+                              " and disable the program that binds these ports.\n")};
 
 
 void LogPrintMessages(long err)
 {
-       char *List, *DetailList, *Short, *Where, *Hint, *Message; 
-       int n = nSizPort + nSizErrmsg + 5;
+       StrBuf *Message;
+       StrBuf *List, *DetailList;
+       ConstStr *Short, *Where, *Hint; 
 
-       Message = (char*) malloc(n * SIZ);
+       
+       Message = NewStrBufPlain(NULL, StrLength(portlist) + StrLength(errormessages));
        
        DetailErrorFlags = DetailErrorFlags & ~err;
 
        switch (err)
        {
        case ERR_PORT:
-               Short = ErrPortShort;
-               Where = ErrPortWhere;
-               Hint  = ErrPortHint;
+               Short = &ErrPortShort;
+               Where = &ErrPortWhere;
+               Hint  = &ErrPortHint;
                List  = portlist;
                DetailList = errormessages;
                break;
        default:
-               Short = "";
-               Where = "";
-               Hint  = "";
-               List  = "";
-               DetailList = "";
+               Short = &Empty;
+               Where = &Empty;
+               Hint  = &Empty;
+               List  = NULL;
+               DetailList = NULL;
        }
 
-
-       snprintf(Message, n * SIZ, ErrGeneral, Short, Where, List, Hint, DetailList);
-
-       CtdlLogPrintf(0,Message);
-       CtdlLogPrintf(0,ErrSubject);
-       quickie_message("Citadel", NULL, NULL, AIDEROOM, Message, FMT_FIXED, ErrSubject);
-       if (errormessages!=NULL) free (errormessages);
-       errormessages = NULL;
-       if (portlist!=NULL) free (portlist);
-       portlist = NULL;
-       free(Message);
+       StrBufAppendBufPlain(Message, CKEY(ErrGeneral[0]), 0);
+       StrBufAppendBufPlain(Message, CKEY(*Short), 0); 
+       StrBufAppendBufPlain(Message, CKEY(ErrGeneral[1]), 0);
+       StrBufAppendBufPlain(Message, CKEY(*Where), 0);
+       StrBufAppendBuf(Message, List, 0);
+       StrBufAppendBufPlain(Message, HKEY("\n\n"), 0);
+       StrBufAppendBufPlain(Message, CKEY(*Hint), 0);
+       StrBufAppendBufPlain(Message, HKEY("\n\n"), 0);
+       StrBufAppendBufPlain(Message, CKEY(ErrGeneral[2]), 0);
+       StrBufAppendBuf(Message, DetailList, 0);
+       StrBufAppendBufPlain(Message, HKEY("\n\n"), 0);
+       StrBufAppendBufPlain(Message, CKEY(ErrGeneral[3]), 0);
+
+       syslog(LOG_EMERG, "extensions: %s", ChrPtr(Message));
+       syslog(LOG_EMERG, "extensions: %s", ErrSubject);
+       quickie_message("Citadel", NULL, NULL, AIDEROOM, ChrPtr(Message), FMT_FIXED, ErrSubject);
+
+       FreeStrBuf(&Message);
+       FreeStrBuf(&List);
+       FreeStrBuf(&DetailList);
 }
 
 
-
-void AppendString(char **target, char *append, size_t *len, size_t rate)
-{
-       size_t oLen = 0;
-       long AddLen;
-       long RelPtr = 0;
-
-       AddLen = strlen(append);
-
-       if (*len == 0)
-       {
-               *len = rate;
-
-               *target = (char*)malloc (*len * SIZ);
-       }
-       else 
-       {
-               oLen = strlen(*target);
-               RelPtr = strlen(*target);
-               if (oLen + AddLen + 2 > *len * SIZ)
-               {
-                       char *Buff = *target;
-                       size_t NewSiz = *len + 10;
-                       *target = malloc (NewSiz * SIZ);
-                       memcpy (*target, Buff, NewSiz * SIZ);
-                       *len = NewSiz;
-               }
-       }
-       memcpy (*target + oLen, append, AddLen);
-       (*target)[oLen + AddLen + 1] = '\n';
-       (*target)[oLen + AddLen + 2] = '\0';
-}
-
 void AddPortError(char *Port, char *ErrorMessage)
 {
-       char *pos;
        long len;
 
        DetailErrorFlags |= ERR_PORT;
 
-       AppendString(&errormessages, ErrorMessage, &nSizErrmsg, 10);
-       AppendString(&portlist, Port, &nSizPort, 2);
+       len = StrLength(errormessages);
+       if (len > 0) StrBufAppendBufPlain(errormessages, HKEY("; "), 0);
+       else errormessages = NewStrBuf();
+       StrBufAppendBufPlain(errormessages, ErrorMessage, -1, 0);
 
-       pos = strchr (portlist, ':');
-       if (pos != NULL) *pos = ';';
-       
-       len = strlen (errormessages);
-       if (nSizErrmsg * SIZ > len + 3)
-       {
-               errormessages[len] = ';';
-               errormessages[len+1] = ' ';
-               errormessages[len+2] = '\0';
-       }       
+
+       len = StrLength(portlist);
+       if (len > 0) StrBufAppendBufPlain(portlist, HKEY(";"), 0);
+       else portlist = NewStrBuf();
+       StrBufAppendBufPlain(portlist, Port, -1, 0);
 }
 
 
 int DLoader_Exec_Cmd(char *cmdbuf)
 {
        void *vP;
-       struct ProtoFunctionHook *p;
+       ProtoFunctionHook *p;
 
        if (GetHash(ProtoHookList, cmdbuf, 4, &vP) && (vP != NULL)) {
-               p = (struct ProtoFunctionHook*) vP;
+               p = (ProtoFunctionHook*) vP;
                p->handler(&cmdbuf[5]);
                return 1;
        }
        return 0;
 }
 
-int FourHash(const char *key, long length) 
-{
-       int i;
-       int ret = 0;
-       const unsigned char *ptr = (const unsigned char*)key;
-
-       for (i = 0; i < 4; i++, ptr ++) 
-               ret = (ret << 8) | 
-                       ( ((*ptr >= 'a') &&
-                          (*ptr <= 'z'))? 
-                         *ptr - 'a' + 'A': 
-                         *ptr);
-
-       return ret;
-}
 
 void CtdlRegisterProtoHook(void (*handler) (char *), char *cmd, char *desc)
 {
-       struct ProtoFunctionHook *p;
+       ProtoFunctionHook *p;
 
        if (ProtoHookList == NULL)
                ProtoHookList = NewHash (1, FourHash);
 
 
-       p = (struct ProtoFunctionHook *)
-               malloc(sizeof(struct ProtoFunctionHook));
+       p = (ProtoFunctionHook *)
+               malloc(sizeof(ProtoFunctionHook));
 
        if (p == NULL) {
                fprintf(stderr, "can't malloc new ProtoFunctionHook\n");
@@ -228,7 +274,7 @@ void CtdlRegisterProtoHook(void (*handler) (char *), char *cmd, char *desc)
        p->desc = desc;
 
        Put(ProtoHookList, cmd, 4, p, NULL);
-       CtdlLogPrintf(CTDL_INFO, "Registered server command %s (%s)\n", cmd, desc);
+       syslog(LOG_DEBUG, "extensions: registered server command %s (%s)", cmd, desc);
 }
 
 void CtdlDestroyProtoHooks(void)
@@ -241,45 +287,55 @@ void CtdlDestroyProtoHooks(void)
 void CtdlRegisterCleanupHook(void (*fcn_ptr) (void))
 {
 
-       struct CleanupFunctionHook *newfcn;
+       CleanupFunctionHook *newfcn;
 
-       newfcn = (struct CleanupFunctionHook *)
-           malloc(sizeof(struct CleanupFunctionHook));
+       newfcn = (CleanupFunctionHook *)
+           malloc(sizeof(CleanupFunctionHook));
        newfcn->next = CleanupHookTable;
        newfcn->h_function_pointer = fcn_ptr;
        CleanupHookTable = newfcn;
 
-       CtdlLogPrintf(CTDL_INFO, "Registered a new cleanup function\n");
+       syslog(LOG_DEBUG, "extensions: registered a new cleanup function");
 }
 
 
 void CtdlUnregisterCleanupHook(void (*fcn_ptr) (void))
 {
-       struct CleanupFunctionHook *cur, *p;
-
-       for (cur = CleanupHookTable; cur != NULL; cur = cur->next) {
-               /* This will also remove duplicates if any */
-               while (cur != NULL &&
-                               fcn_ptr == cur->h_function_pointer) {
-                       CtdlLogPrintf(CTDL_INFO, "Unregistered cleanup function\n");
+       CleanupFunctionHook *cur, *p, *last;
+       last = NULL;
+       cur = CleanupHookTable;
+       while (cur != NULL)
+       {
+               if (fcn_ptr == cur->h_function_pointer)
+               {
+                       syslog(LOG_DEBUG, "extensions: unregistered cleanup function");
                        p = cur->next;
-                       if (cur == CleanupHookTable) {
-                               CleanupHookTable = p;
-                       }
+
                        free(cur);
+                       cur = NULL;
+
+                       if (last != NULL)
+                               last->next = p;
+                       else 
+                               CleanupHookTable = p;
                        cur = p;
                }
+               else {
+                       last = cur;
+                       cur = cur->next;
+               }
        }
 }
 
+
 void CtdlDestroyCleanupHooks(void)
 {
-       struct CleanupFunctionHook *cur, *p;
+       CleanupFunctionHook *cur, *p;
 
        cur = CleanupHookTable;
        while (cur != NULL)
        {
-               CtdlLogPrintf(CTDL_INFO, "Destroyed cleanup function\n");
+               syslog(LOG_DEBUG, "extensions: destroyed cleanup function");
                p = cur->next;
                free(cur);
                cur = p;
@@ -287,53 +343,129 @@ void CtdlDestroyCleanupHooks(void)
        CleanupHookTable = NULL;
 }
 
+void CtdlRegisterEVCleanupHook(void (*fcn_ptr) (void))
+{
+
+       CleanupFunctionHook *newfcn;
+
+       newfcn = (CleanupFunctionHook *)
+           malloc(sizeof(CleanupFunctionHook));
+       newfcn->next = EVCleanupHookTable;
+       newfcn->h_function_pointer = fcn_ptr;
+       EVCleanupHookTable = newfcn;
+
+       syslog(LOG_DEBUG, "extensions: registered a new cleanup function");
+}
+
+
+void CtdlUnregisterEVCleanupHook(void (*fcn_ptr) (void))
+{
+       CleanupFunctionHook *cur, *p, *last;
+       last = NULL;
+       cur = EVCleanupHookTable;
+       while (cur != NULL)
+       {
+               if (fcn_ptr == cur->h_function_pointer)
+               {
+                       syslog(LOG_DEBUG, "extensions: unregistered cleanup function");
+                       p = cur->next;
+
+                       free(cur);
+                       cur = NULL;
+
+                       if (last != NULL)
+                               last->next = p;
+                       else 
+                               EVCleanupHookTable = p;
+                       cur = p;
+               }
+               else {
+                       last = cur;
+                       cur = cur->next;
+               }
+       }
+}
+
 
-void CtdlRegisterSessionHook(void (*fcn_ptr) (void), int EventType)
+void CtdlDestroyEVCleanupHooks(void)
 {
+       CleanupFunctionHook *cur, *p;
+
+       cur = EVCleanupHookTable;
+       while (cur != NULL)
+       {
+               syslog(LOG_DEBUG, "extensions: destroyed cleanup function");
+               p = cur->next;
+               cur->h_function_pointer();
+               free(cur);
+               cur = p;
+       }
+       EVCleanupHookTable = NULL;
+}
+
+
 
-       struct SessionFunctionHook *newfcn;
 
-       newfcn = (struct SessionFunctionHook *)
-           malloc(sizeof(struct SessionFunctionHook));
-       newfcn->next = SessionHookTable;
+void CtdlRegisterSessionHook(void (*fcn_ptr) (void), int EventType, int Priority)
+{
+       SessionFunctionHook *newfcn;
+
+       newfcn = (SessionFunctionHook *)
+           malloc(sizeof(SessionFunctionHook));
+       newfcn->Priority = Priority;
        newfcn->h_function_pointer = fcn_ptr;
        newfcn->eventtype = EventType;
-       SessionHookTable = newfcn;
 
-       CtdlLogPrintf(CTDL_INFO, "Registered a new session function (type %d)\n",
-               EventType);
+       SessionFunctionHook **pfcn;
+       pfcn = &SessionHookTable;
+       while ((*pfcn != NULL) && 
+              ((*pfcn)->Priority < newfcn->Priority) &&
+              ((*pfcn)->next != NULL))
+               pfcn = &(*pfcn)->next;
+               
+       newfcn->next = *pfcn;
+       *pfcn = newfcn;
+       
+       syslog(LOG_DEBUG, "extensions: registered a new session function (type %d Priority %d)", EventType, Priority);
 }
 
 
 void CtdlUnregisterSessionHook(void (*fcn_ptr) (void), int EventType)
 {
-       struct SessionFunctionHook *cur, *p;
-
-       for (cur = SessionHookTable; cur != NULL; cur = cur->next) {
-               /* This will also remove duplicates if any */
-               while (cur != NULL &&
-                               fcn_ptr == cur->h_function_pointer &&
-                               EventType == cur->eventtype) {
-                       CtdlLogPrintf(CTDL_INFO, "Unregistered session function (type %d)\n",
-                                       EventType);
+       SessionFunctionHook *cur, *p, *last;
+       last = NULL;
+       cur = SessionHookTable;
+       while  (cur != NULL) {
+               if ((fcn_ptr == cur->h_function_pointer) &&
+                   (EventType == cur->eventtype))
+               {
+                       syslog(LOG_DEBUG, "extensions: unregistered session function (type %d)", EventType);
                        p = cur->next;
-                       if (cur == SessionHookTable) {
-                               SessionHookTable = p;
-                       }
+
                        free(cur);
+                       cur = NULL;
+
+                       if (last != NULL)
+                               last->next = p;
+                       else 
+                               SessionHookTable = p;
                        cur = p;
                }
+               else {
+                       last = cur;
+                       cur = cur->next;
+               }
        }
 }
 
 void CtdlDestroySessionHooks(void)
 {
-       struct SessionFunctionHook *cur, *p;
+       SessionFunctionHook *cur, *p;
 
        cur = SessionHookTable;
        while (cur != NULL)
        {
-               CtdlLogPrintf(CTDL_INFO, "Destroyed session function\n");
+               syslog(LOG_DEBUG, "extensions: destroyed session function");
                p = cur->next;
                free(cur);
                cur = p;
@@ -342,52 +474,59 @@ void CtdlDestroySessionHooks(void)
 }
 
 
-void CtdlRegisterUserHook(void (*fcn_ptr) (struct ctdluser *), int EventType)
+void CtdlRegisterUserHook(void (*fcn_ptr) (ctdluser *), int EventType)
 {
 
-       struct UserFunctionHook *newfcn;
+       UserFunctionHook *newfcn;
 
-       newfcn = (struct UserFunctionHook *)
-           malloc(sizeof(struct UserFunctionHook));
+       newfcn = (UserFunctionHook *)
+           malloc(sizeof(UserFunctionHook));
        newfcn->next = UserHookTable;
        newfcn->h_function_pointer = fcn_ptr;
        newfcn->eventtype = EventType;
        UserHookTable = newfcn;
 
-       CtdlLogPrintf(CTDL_INFO, "Registered a new user function (type %d)\n",
-               EventType);
+       syslog(LOG_DEBUG, "extensions: registered a new user function (type %d)",
+                  EventType);
 }
 
 
 void CtdlUnregisterUserHook(void (*fcn_ptr) (struct ctdluser *), int EventType)
 {
-       struct UserFunctionHook *cur, *p;
-
-       for (cur = UserHookTable; cur != NULL; cur = cur->next) {
-               /* This will also remove duplicates if any */
-               while (cur != NULL &&
-                               fcn_ptr == cur->h_function_pointer &&
-                               EventType == cur->eventtype) {
-                       CtdlLogPrintf(CTDL_INFO, "Unregistered user function (type %d)\n",
-                                       EventType);
+       UserFunctionHook *cur, *p, *last;
+       last = NULL;
+       cur = UserHookTable;
+       while (cur != NULL) {
+               if ((fcn_ptr == cur->h_function_pointer) &&
+                   (EventType == cur->eventtype))
+               {
+                       syslog(LOG_DEBUG, "extensions: unregistered user function (type %d)", EventType);
                        p = cur->next;
-                       if (cur == UserHookTable) {
-                               UserHookTable = p;
-                       }
+
                        free(cur);
+                       cur = NULL;
+
+                       if (last != NULL)
+                               last->next = p;
+                       else 
+                               UserHookTable = p;
                        cur = p;
                }
+               else {
+                       last = cur;
+                       cur = cur->next;
+               }
        }
 }
 
 void CtdlDestroyUserHooks(void)
 {
-       struct UserFunctionHook *cur, *p;
+       UserFunctionHook *cur, *p;
 
        cur = UserHookTable;
        while (cur != NULL)
        {
-               CtdlLogPrintf(CTDL_INFO, "Destroyed user function \n");
+               syslog(LOG_DEBUG, "extensions: destroyed user function");
                p = cur->next;
                free(cur);
                cur = p;
@@ -396,54 +535,57 @@ void CtdlDestroyUserHooks(void)
 }
 
 
-void CtdlRegisterMessageHook(int (*handler)(struct CtdlMessage *),
-                               int EventType)
+void CtdlRegisterMessageHook(int (*handler)(struct CtdlMessage *, recptypes *), int EventType)
 {
 
-       struct MessageFunctionHook *newfcn;
+       MessageFunctionHook *newfcn;
 
-       newfcn = (struct MessageFunctionHook *)
-           malloc(sizeof(struct MessageFunctionHook));
+       newfcn = (MessageFunctionHook *)
+           malloc(sizeof(MessageFunctionHook));
        newfcn->next = MessageHookTable;
        newfcn->h_function_pointer = handler;
        newfcn->eventtype = EventType;
        MessageHookTable = newfcn;
 
-       CtdlLogPrintf(CTDL_INFO, "Registered a new message function (type %d)\n",
-               EventType);
+       syslog(LOG_DEBUG, "extensions: registered a new message function (type %d)", EventType);
 }
 
 
-void CtdlUnregisterMessageHook(int (*handler)(struct CtdlMessage *),
-               int EventType)
+void CtdlUnregisterMessageHook(int (*handler)(struct CtdlMessage *, recptypes *), int EventType)
 {
-       struct MessageFunctionHook *cur, *p;
-
-       for (cur = MessageHookTable; cur != NULL; cur = cur->next) {
-               /* This will also remove duplicates if any */
-               while (cur != NULL &&
-                               handler == cur->h_function_pointer &&
-                               EventType == cur->eventtype) {
-                       CtdlLogPrintf(CTDL_INFO, "Unregistered message function (type %d)\n",
-                                       EventType);
+       MessageFunctionHook *cur, *p, *last;
+       last = NULL;
+       cur = MessageHookTable;
+       while (cur != NULL) {
+               if ((handler == cur->h_function_pointer) &&
+                   (EventType == cur->eventtype))
+               {
+                       syslog(LOG_DEBUG, "extensions: unregistered message function (type %d)", EventType);
                        p = cur->next;
-                       if (cur == MessageHookTable) {
-                               MessageHookTable = p;
-                       }
                        free(cur);
+                       cur = NULL;
+
+                       if (last != NULL)
+                               last->next = p;
+                       else 
+                               MessageHookTable = p;
                        cur = p;
                }
+               else {
+                       last = cur;
+                       cur = cur->next;
+               }
        }
 }
 
 void CtdlDestroyMessageHook(void)
 {
-       struct MessageFunctionHook *cur, *p;
+       MessageFunctionHook *cur, *p;
 
        cur = MessageHookTable; 
        while (cur != NULL)
        {
-               CtdlLogPrintf(CTDL_INFO, "Destroyed message function (type %d)\n", cur->eventtype);
+               syslog(LOG_DEBUG, "extensions: destroyed message function (type %d)", cur->eventtype);
                p = cur->next;
                free(cur);
                cur = p;
@@ -454,44 +596,54 @@ void CtdlDestroyMessageHook(void)
 
 void CtdlRegisterRoomHook(int (*fcn_ptr)(struct ctdlroom *))
 {
-       struct RoomFunctionHook *newfcn;
+       RoomFunctionHook *newfcn;
 
-       newfcn = (struct RoomFunctionHook *)
-           malloc(sizeof(struct RoomFunctionHook));
+       newfcn = (RoomFunctionHook *)
+           malloc(sizeof(RoomFunctionHook));
        newfcn->next = RoomHookTable;
        newfcn->fcn_ptr = fcn_ptr;
        RoomHookTable = newfcn;
 
-       CtdlLogPrintf(CTDL_INFO, "Registered a new room function\n");
+       syslog(LOG_DEBUG, "extensions: registered a new room function");
 }
 
 
 void CtdlUnregisterRoomHook(int (*fcn_ptr)(struct ctdlroom *))
 {
-       struct RoomFunctionHook *cur, *p;
-
-       for (cur = RoomHookTable; cur != NULL; cur = cur->next) {
-               while (cur != NULL && fcn_ptr == cur->fcn_ptr) {
-                       CtdlLogPrintf(CTDL_INFO, "Unregistered room function\n");
+       RoomFunctionHook *cur, *p, *last;
+       last = NULL;
+       cur = RoomHookTable;
+       while (cur != NULL)
+       {
+               if (fcn_ptr == cur->fcn_ptr) {
+                       syslog(LOG_DEBUG, "extensions: unregistered room function");
                        p = cur->next;
-                       if (cur == RoomHookTable) {
-                               RoomHookTable = p;
-                       }
+
                        free(cur);
+                       cur = NULL;
+
+                       if (last != NULL)
+                               last->next = p;
+                       else 
+                               RoomHookTable = p;
                        cur = p;
                }
+               else {
+                       last = cur;
+                       cur = cur->next;
+               }
        }
 }
 
 
 void CtdlDestroyRoomHooks(void)
 {
-       struct RoomFunctionHook *cur, *p;
+       RoomFunctionHook *cur, *p;
 
        cur = RoomHookTable;
        while (cur != NULL)
        {
-               CtdlLogPrintf(CTDL_INFO, "Destroyed room function\n");
+               syslog(LOG_DEBUG, "extensions: destroyed room function");
                p = cur->next;
                free(cur);
                cur = p;
@@ -499,95 +651,57 @@ void CtdlDestroyRoomHooks(void)
        RoomHookTable = NULL;
 }
 
-void CtdlRegisterNetprocHook(int (*handler)(struct CtdlMessage *, char *) )
-{
-       struct NetprocFunctionHook *newfcn;
-
-       newfcn = (struct NetprocFunctionHook *)
-           malloc(sizeof(struct NetprocFunctionHook));
-       newfcn->next = NetprocHookTable;
-       newfcn->h_function_pointer = handler;
-       NetprocHookTable = newfcn;
-
-       CtdlLogPrintf(CTDL_INFO, "Registered a new netproc function\n");
-}
-
-
-void CtdlUnregisterNetprocHook(int (*handler)(struct CtdlMessage *, char *) )
-{
-       struct NetprocFunctionHook *cur, *p;
-
-       for (cur = NetprocHookTable; cur != NULL; cur = cur->next) {
-               /* This will also remove duplicates if any */
-               while (cur != NULL &&
-                               handler == cur->h_function_pointer ) {
-                       CtdlLogPrintf(CTDL_INFO, "Unregistered netproc function\n");
-                       p = cur->next;
-                       if (cur == NetprocHookTable) {
-                               NetprocHookTable = p;
-                       }
-                       free(cur);
-                       cur = p;
-               }
-       }
-}
-
-void CtdlDestroyNetprocHooks(void)
-{
-       struct NetprocFunctionHook *cur, *p;
-
-       cur = NetprocHookTable;
-       while (cur != NULL)
-       {
-               CtdlLogPrintf(CTDL_INFO, "Destroyed netproc function\n");
-               p = cur->next;
-               free(cur);
-               cur = p;
-       }
-       NetprocHookTable = NULL;
-}
-
 
 void CtdlRegisterDeleteHook(void (*handler)(char *, long) )
 {
-       struct DeleteFunctionHook *newfcn;
+       DeleteFunctionHook *newfcn;
 
-       newfcn = (struct DeleteFunctionHook *)
-           malloc(sizeof(struct DeleteFunctionHook));
+       newfcn = (DeleteFunctionHook *)
+           malloc(sizeof(DeleteFunctionHook));
        newfcn->next = DeleteHookTable;
        newfcn->h_function_pointer = handler;
        DeleteHookTable = newfcn;
 
-       CtdlLogPrintf(CTDL_INFO, "Registered a new delete function\n");
+       syslog(LOG_DEBUG, "extensions: registered a new delete function");
 }
 
 
 void CtdlUnregisterDeleteHook(void (*handler)(char *, long) )
 {
-       struct DeleteFunctionHook *cur, *p;
+       DeleteFunctionHook *cur, *p, *last;
 
-       for (cur = DeleteHookTable; cur != NULL; cur = cur->next) {
-               /* This will also remove duplicates if any */
-               while (cur != NULL &&
-                               handler == cur->h_function_pointer ) {
-                       CtdlLogPrintf(CTDL_INFO, "Unregistered delete function\n");
+       last = NULL;
+       cur = DeleteHookTable;
+       while (cur != NULL) {
+               if (handler == cur->h_function_pointer )
+               {
+                       syslog(LOG_DEBUG, "extensions: unregistered delete function");
                        p = cur->next;
-                       if (cur == DeleteHookTable) {
-                               DeleteHookTable = p;
-                       }
                        free(cur);
+
+                       if (last != NULL)
+                               last->next = p;
+                       else
+                               DeleteHookTable = p;
+
                        cur = p;
                }
+               else {
+                       last = cur;
+                       cur = cur->next;
+               }
        }
 }
+
+
 void CtdlDestroyDeleteHooks(void)
 {
-       struct DeleteFunctionHook *cur, *p;
+       DeleteFunctionHook *cur, *p;
 
        cur = DeleteHookTable;
        while (cur != NULL)
        {
-               CtdlLogPrintf(CTDL_INFO, "Destroyed delete function\n");
+               syslog(LOG_DEBUG, "extensions: destroyed delete function");
                p = cur->next;
                free(cur);
                cur = p;                
@@ -596,49 +710,57 @@ void CtdlDestroyDeleteHooks(void)
 }
 
 
-
-
 void CtdlRegisterFixedOutputHook(char *content_type, void (*handler)(char *, int) )
 {
-       struct FixedOutputHook *newfcn;
+       FixedOutputHook *newfcn;
 
-       newfcn = (struct FixedOutputHook *)
-           malloc(sizeof(struct FixedOutputHook));
+       newfcn = (FixedOutputHook *)
+           malloc(sizeof(FixedOutputHook));
        newfcn->next = FixedOutputTable;
        newfcn->h_function_pointer = handler;
        safestrncpy(newfcn->content_type, content_type, sizeof newfcn->content_type);
        FixedOutputTable = newfcn;
 
-       CtdlLogPrintf(CTDL_INFO, "Registered a new fixed output function for %s\n", newfcn->content_type);
+       syslog(LOG_DEBUG, "extensions: registered a new fixed output function for %s", newfcn->content_type);
 }
 
 
 void CtdlUnregisterFixedOutputHook(char *content_type)
 {
-       struct FixedOutputHook *cur, *p;
+       FixedOutputHook *cur, *p, *last;
 
-       for (cur = FixedOutputTable; cur != NULL; cur = cur->next) {
+       last = NULL;
+       cur = FixedOutputTable;
+       while (cur != NULL) {
                /* This will also remove duplicates if any */
-               while (cur != NULL && (!strcasecmp(content_type, cur->content_type))) {
-                       CtdlLogPrintf(CTDL_INFO, "Unregistered fixed output function for %s\n", content_type);
+               if (!strcasecmp(content_type, cur->content_type)) {
+                       syslog(LOG_DEBUG, "extensions: unregistered fixed output function for %s", content_type);
                        p = cur->next;
-                       if (cur == FixedOutputTable) {
-                               FixedOutputTable = p;
-                       }
                        free(cur);
+
+                       if (last != NULL)
+                               last->next = p;
+                       else
+                               FixedOutputTable = p;
+                       
                        cur = p;
                }
+               else
+               {
+                       last = cur;
+                       cur = cur->next;
+               }
        }
 }
 
 void CtdlDestroyFixedOutputHooks(void)
 {
-       struct FixedOutputHook *cur, *p;
+       FixedOutputHook *cur, *p;
 
        cur = FixedOutputTable; 
        while (cur != NULL)
        {
-               CtdlLogPrintf(CTDL_INFO, "Destroyed fixed output function for %s\n", cur->content_type);
+               syslog(LOG_DEBUG, "extensions: destroyed fixed output function for %s", cur->content_type);
                p = cur->next;
                free(cur);
                cur = p;
@@ -650,7 +772,7 @@ void CtdlDestroyFixedOutputHooks(void)
 /* returns nonzero if we found a hook and used it */
 int PerformFixedOutputHooks(char *content_type, char *content, int content_length)
 {
-       struct FixedOutputHook *fcn;
+       FixedOutputHook *fcn;
 
        for (fcn = FixedOutputTable; fcn != NULL; fcn = fcn->next) {
                if (!strcasecmp(content_type, fcn->content_type)) {
@@ -662,55 +784,59 @@ int PerformFixedOutputHooks(char *content_type, char *content, int content_lengt
 }
 
 
-
-
-
 void CtdlRegisterXmsgHook(int (*fcn_ptr) (char *, char *, char *, char *), int order)
 {
 
-       struct XmsgFunctionHook *newfcn;
+       XmsgFunctionHook *newfcn;
 
-       newfcn = (struct XmsgFunctionHook *) malloc(sizeof(struct XmsgFunctionHook));
+       newfcn = (XmsgFunctionHook *) malloc(sizeof(XmsgFunctionHook));
        newfcn->next = XmsgHookTable;
        newfcn->order = order;
        newfcn->h_function_pointer = fcn_ptr;
        XmsgHookTable = newfcn;
-       CtdlLogPrintf(CTDL_INFO, "Registered a new x-msg function (priority %d)\n", order);
+       syslog(LOG_DEBUG, "extensions: registered a new x-msg function (priority %d)", order);
 }
 
 
 void CtdlUnregisterXmsgHook(int (*fcn_ptr) (char *, char *, char *, char *), int order)
 {
-       struct XmsgFunctionHook *cur, *p;
+       XmsgFunctionHook *cur, *p, *last;
 
-       for (cur = XmsgHookTable; cur != NULL; cur = cur->next) {
+       last = NULL;
+       cur = XmsgHookTable;
+       while (cur != NULL) {
                /* This will also remove duplicates if any */
-               while (cur != NULL &&
-                               fcn_ptr == cur->h_function_pointer &&
-                               order == cur->order) {
-                       CtdlLogPrintf(CTDL_INFO, "Unregistered x-msg function "
-                                       "(priority %d)\n", order);
+               if (fcn_ptr == cur->h_function_pointer &&
+                   order == cur->order) {
+                       syslog(LOG_DEBUG, "extensions: unregistered x-msg function (priority %d)", order);
                        p = cur->next;
-                       if (cur == XmsgHookTable) {
+                       free(cur);
+
+                       if (last != NULL) {
+                               last->next = p;
+                       }
+                       else {
                                XmsgHookTable = p;
                        }
-                       free(cur);
                        cur = p;
                }
+               else {
+                       last = cur;
+                       cur = cur->next;
+               }
        }
 }
 
+
 void CtdlDestroyXmsgHooks(void)
 {
-       struct XmsgFunctionHook *cur, *p;
+       XmsgFunctionHook *cur, *p;
 
        cur = XmsgHookTable;
        while (cur != NULL)
        {
-               CtdlLogPrintf(CTDL_INFO, "Destroyed x-msg function "
-                       "(priority %d)\n", cur->order);
+               syslog(LOG_DEBUG, "extensions: destroyed x-msg function (priority %d)", cur->order);
                p = cur->next;
-                       
                free(cur);
                cur = p;
        }
@@ -725,14 +851,11 @@ void CtdlRegisterServiceHook(int tcp_port,
                             void (*h_async_function) (void),
                             const char *ServiceName)
 {
-       struct ServiceFunctionHook *newfcn;
+       ServiceFunctionHook *newfcn;
        char *message;
-       char *error;
 
-       error = NULL;
-       newfcn = (struct ServiceFunctionHook *)
-           malloc(sizeof(struct ServiceFunctionHook));
-       message = (char*) malloc (SIZ);
+       newfcn = (ServiceFunctionHook *) malloc(sizeof(ServiceFunctionHook));
+       message = (char*) malloc (SIZ + SIZ);
        
        newfcn->next = ServiceHookTable;
        newfcn->tcp_port = tcp_port;
@@ -743,34 +866,30 @@ void CtdlRegisterServiceHook(int tcp_port,
        newfcn->ServiceName = ServiceName;
 
        if (sockpath != NULL) {
-               newfcn->msock = ig_uds_server(sockpath, config.c_maxsessions, &error);
-               snprintf(message, SIZ, "Unix domain socket '%s': ", sockpath);
+               newfcn->msock = ctdl_uds_server(sockpath, CtdlGetConfigInt("c_maxsessions"));
+               snprintf(message, SIZ, "extensions: unix domain socket '%s': ", sockpath);
        }
        else if (tcp_port <= 0) {       /* port -1 to disable */
-               CtdlLogPrintf(CTDL_INFO, "Service %s has been manually disabled, skipping\n", ServiceName);
+               syslog(LOG_INFO, "extensions: service %s has been manually disabled, skipping", ServiceName);
                free (message);
                free(newfcn);
                return;
        }
        else {
-               newfcn->msock = ig_tcp_server(config.c_ip_addr,
-                                             tcp_port,
-                                             config.c_maxsessions, 
-                                             &error);
-               snprintf(message, SIZ, "TCP port %s:%d: (%s) ", 
-                        config.c_ip_addr, tcp_port, ServiceName);
+               newfcn->msock = ctdl_tcp_server(CtdlGetConfigStr("c_ip_addr"), tcp_port, CtdlGetConfigInt("c_maxsessions"));
+               snprintf(message, SIZ, "extensions: TCP port %s:%d: (%s) ", 
+                        CtdlGetConfigStr("c_ip_addr"), tcp_port, ServiceName);
        }
 
        if (newfcn->msock > 0) {
                ServiceHookTable = newfcn;
                strcat(message, "registered.");
-               CtdlLogPrintf(CTDL_INFO, "%s\n", message);
+               syslog(LOG_INFO, "%s", message);
        }
        else {
-               AddPortError(message, error);
+               AddPortError(message, "failed");
                strcat(message, "FAILED.");
-               CtdlLogPrintf(CTDL_CRIT, "%s\n", message);
-               free(error);
+               syslog(LOG_ERR, "%s", message);
                free(newfcn);
        }
        free(message);
@@ -783,51 +902,93 @@ void CtdlUnregisterServiceHook(int tcp_port, char *sockpath,
                        void (*h_async_function) (void)
                        )
 {
-       struct ServiceFunctionHook *cur, *p;
+       ServiceFunctionHook *cur, *p, *last;
 
-       for (cur = ServiceHookTable; cur != NULL; cur = cur->next) {
+       last = NULL;
+       cur = ServiceHookTable;
+       while (cur != NULL) {
                /* This will also remove duplicates if any */
-               while (cur != NULL &&
-                               !(sockpath && cur->sockpath &&
-                                       strcmp(sockpath, cur->sockpath)) &&
-                               h_greeting_function == cur->h_greeting_function &&
-                               h_command_function == cur->h_command_function &&
-                               h_async_function == cur->h_async_function &&
-                               tcp_port == cur->tcp_port) {
-                       close(cur->msock);
+               if (h_greeting_function == cur->h_greeting_function &&
+                   h_command_function == cur->h_command_function &&
+                   h_async_function == cur->h_async_function &&
+                   tcp_port == cur->tcp_port && 
+                   !(sockpath && cur->sockpath && strcmp(sockpath, cur->sockpath)) )
+               {
+                       if (cur->msock > 0)
+                               close(cur->msock);
                        if (sockpath) {
-                               CtdlLogPrintf(CTDL_INFO, "Closed UNIX domain socket %s\n",
-                                               sockpath);
+                               syslog(LOG_INFO, "extensions: closed UNIX domain socket %s", sockpath);
+                               unlink(sockpath);
                        } else if (tcp_port) {
-                               CtdlLogPrintf(CTDL_INFO, "Closed TCP port %d\n", tcp_port);
+                               syslog(LOG_INFO, "extensions: closed TCP port %d", tcp_port);
                        } else {
-                               CtdlLogPrintf(CTDL_INFO, "Unregistered service \"%s\"\n", cur->ServiceName);
+                               syslog(LOG_INFO, "extensions: unregistered service \"%s\"", cur->ServiceName);
                        }
                        p = cur->next;
-                       if (cur == ServiceHookTable) {
-                               ServiceHookTable = p;
-                       }
                        free(cur);
+                       if (last != NULL)
+                               last->next = p;
+                       else
+                               ServiceHookTable = p;
                        cur = p;
                }
+               else {
+                       last = cur;
+                       cur = cur->next;
+               }
        }
 }
 
+
+void CtdlShutdownServiceHooks(void)
+{
+       /* sort of a duplicate of close_masters() but called earlier */
+       ServiceFunctionHook *cur;
+
+       cur = ServiceHookTable;
+       while (cur != NULL) 
+       {
+               if (cur->msock != -1)
+               {
+                       close(cur->msock);
+                       cur->msock = -1;
+                       if (cur->sockpath != NULL){
+                               syslog(LOG_INFO, "extensions: [%s] Closed UNIX domain socket %s", cur->ServiceName, cur->sockpath);
+                               unlink(cur->sockpath);
+                       } else {
+                               syslog(LOG_INFO, "extensions: [%s] closing service", cur->ServiceName);
+                       }
+               }
+               cur = cur->next;
+       }
+}
+
+
 void CtdlDestroyServiceHook(void)
 {
-       struct ServiceFunctionHook *cur, *p;
+       const char *Text;
+       ServiceFunctionHook *cur, *p;
 
        cur = ServiceHookTable;
        while (cur != NULL)
        {
-               close(cur->msock);
+               if (cur->msock != -1)
+               {
+                       close(cur->msock);
+                       Text = "Closed";
+               }
+               else
+               {
+                       Text = " Not closing again";
+               }
+
                if (cur->sockpath) {
-                       CtdlLogPrintf(CTDL_INFO, "Closed UNIX domain socket %s\n",
-                               cur->sockpath);
+                       syslog(LOG_INFO, "extensions: %s UNIX domain socket %s", Text, cur->sockpath);
+                       unlink(cur->sockpath);
                } else if (cur->tcp_port) {
-                       CtdlLogPrintf(CTDL_INFO, "Closed TCP port %d\n", cur->tcp_port);
+                       syslog(LOG_INFO, "extensions: %s TCP port %d", Text, cur->tcp_port);
                } else {
-                       CtdlLogPrintf(CTDL_INFO, "Destroyed service \"%s\"\n", cur->ServiceName);
+                       syslog(LOG_INFO, "extensions: destroyed service \"%s\"", cur->ServiceName);
                }
                p = cur->next;
                free(cur);
@@ -838,42 +999,65 @@ void CtdlDestroyServiceHook(void)
 
 void CtdlRegisterSearchFuncHook(void (*fcn_ptr)(int *, long **, const char *), char *name)
 {
-       struct SearchFunctionHook *newfcn;
+       SearchFunctionHook *newfcn;
 
        if (!name || !fcn_ptr) {
                return;
        }
        
-       newfcn = (struct SearchFunctionHook *)
-           malloc(sizeof(struct SearchFunctionHook));
+       newfcn = (SearchFunctionHook *)
+           malloc(sizeof(SearchFunctionHook));
        newfcn->next = SearchFunctionHookTable;
        newfcn->name = name;
        newfcn->fcn_ptr = fcn_ptr;
        SearchFunctionHookTable = newfcn;
 
-       CtdlLogPrintf(CTDL_INFO, "Registered a new search function (%s)\n", name);
+       syslog(LOG_DEBUG, "extensions: registered a new search function (%s)", name);
 }
 
 void CtdlUnregisterSearchFuncHook(void (*fcn_ptr)(int *, long **, const char *), char *name)
 {
-       struct SearchFunctionHook *cur, *p;
+       SearchFunctionHook *cur, *p, *last;
        
-       for (cur = SearchFunctionHookTable; cur != NULL; cur = cur->next) {
-               while (fcn_ptr && (cur->fcn_ptr == fcn_ptr) && name && !strcmp(name, cur->name)) {
-                       CtdlLogPrintf(CTDL_INFO, "Unregistered search function(%s)\n", name);
+       last = NULL;
+       cur = SearchFunctionHookTable;
+       while (cur != NULL) {
+               if (fcn_ptr &&
+                   (cur->fcn_ptr == fcn_ptr) &&
+                   name && !strcmp(name, cur->name))
+               {
+                       syslog(LOG_DEBUG, "extensions: unregistered search function(%s)", name);
                        p = cur->next;
-                       if (cur == SearchFunctionHookTable) {
-                               SearchFunctionHookTable = p;
-                       }
                        free (cur);
+                       if (last != NULL)
+                               last->next = p;
+                       else
+                               SearchFunctionHookTable = p;
                        cur = p;
                }
+               else {
+                       last = cur;
+                       cur = cur->next;
+               }
+       }
+}
+
+void CtdlDestroySearchHooks(void)
+{
+        SearchFunctionHook *cur, *p;
+
+       cur = SearchFunctionHookTable;
+       SearchFunctionHookTable = NULL;
+        while (cur != NULL) {
+               p = cur->next;
+               free(cur);
+               cur = p;
        }
 }
 
 void CtdlModuleDoSearch(int *num_msgs, long **search_msgs, const char *search_string, const char *func_name)
 {
-       struct SearchFunctionHook *fcn = NULL;
+       SearchFunctionHook *fcn = NULL;
 
        for (fcn = SearchFunctionHookTable; fcn != NULL; fcn = fcn->next) {
                if (!func_name || !strcmp(func_name, fcn->name)) {
@@ -887,18 +1071,21 @@ void CtdlModuleDoSearch(int *num_msgs, long **search_msgs, const char *search_st
 
 void PerformSessionHooks(int EventType)
 {
-       struct SessionFunctionHook *fcn = NULL;
+       SessionFunctionHook *fcn = NULL;
 
        for (fcn = SessionHookTable; fcn != NULL; fcn = fcn->next) {
                if (fcn->eventtype == EventType) {
+                       if (EventType == EVT_TIMER) {
+                               pthread_setspecific(MyConKey, NULL);    /* for every hook */
+                       }
                        (*fcn->h_function_pointer) ();
                }
        }
 }
 
-void PerformUserHooks(struct ctdluser *usbuf, int EventType)
+void PerformUserHooks(ctdluser *usbuf, int EventType)
 {
-       struct UserFunctionHook *fcn = NULL;
+       UserFunctionHook *fcn = NULL;
 
        for (fcn = UserHookTable; fcn != NULL; fcn = fcn->next) {
                if (fcn->eventtype == EventType) {
@@ -907,18 +1094,15 @@ void PerformUserHooks(struct ctdluser *usbuf, int EventType)
        }
 }
 
-int PerformMessageHooks(struct CtdlMessage *msg, int EventType)
+int PerformMessageHooks(struct CtdlMessage *msg, recptypes *recps, int EventType)
 {
-       struct MessageFunctionHook *fcn = NULL;
+       MessageFunctionHook *fcn = NULL;
        int total_retval = 0;
 
        /* Other code may elect to protect this message from server-side
         * handlers; if this is the case, don't do anything.
-       CtdlLogPrintf(CTDL_DEBUG, "** Event type is %d, flags are %d\n",
-               EventType, msg->cm_flags);
         */
        if (msg->cm_flags & CM_SKIP_HOOKS) {
-               CtdlLogPrintf(CTDL_DEBUG, "Skipping hooks\n");
                return(0);
        }
 
@@ -926,8 +1110,7 @@ int PerformMessageHooks(struct CtdlMessage *msg, int EventType)
         */
        for (fcn = MessageHookTable; fcn != NULL; fcn = fcn->next) {
                if (fcn->eventtype == EventType) {
-                       total_retval = total_retval +
-                               (*fcn->h_function_pointer) (msg);
+                       total_retval = total_retval + (*fcn->h_function_pointer) (msg, recps);
                }
        }
 
@@ -941,10 +1124,10 @@ int PerformMessageHooks(struct CtdlMessage *msg, int EventType)
 
 int PerformRoomHooks(struct ctdlroom *target_room)
 {
-       struct RoomFunctionHook *fcn;
+       RoomFunctionHook *fcn;
        int total_retval = 0;
 
-       CtdlLogPrintf(CTDL_DEBUG, "Performing room hooks for <%s>\n", target_room->QRname);
+       syslog(LOG_DEBUG, "extensions: performing room hooks for <%s>", target_room->QRname);
 
        for (fcn = RoomHookTable; fcn != NULL; fcn = fcn->next) {
                total_retval = total_retval + (*fcn->fcn_ptr) (target_room);
@@ -956,26 +1139,9 @@ int PerformRoomHooks(struct ctdlroom *target_room)
 }
 
 
-int PerformNetprocHooks(struct CtdlMessage *msg, char *target_room)
-{
-       struct NetprocFunctionHook *fcn;
-       int total_retval = 0;
-
-       for (fcn = NetprocHookTable; fcn != NULL; fcn = fcn->next) {
-               total_retval = total_retval +
-                       (*fcn->h_function_pointer) (msg, target_room);
-       }
-
-       /* Return the sum of the return codes from the hook functions.
-        * A nonzero return code will cause the message to *not* be imported.
-        */
-       return total_retval;
-}
-
-
 void PerformDeleteHooks(char *room, long msgnum)
 {
-       struct DeleteFunctionHook *fcn;
+       DeleteFunctionHook *fcn;
 
        for (fcn = DeleteHookTable; fcn != NULL; fcn = fcn->next) {
                (*fcn->h_function_pointer) (room, msgnum);
@@ -983,12 +1149,9 @@ void PerformDeleteHooks(char *room, long msgnum)
 }
 
 
-
-
-
 int PerformXmsgHooks(char *sender, char *sender_email, char *recp, char *msg)
 {
-       struct XmsgFunctionHook *fcn;
+       XmsgFunctionHook *fcn;
        int total_sent = 0;
        int p;
 
@@ -1020,3 +1183,11 @@ void CtdlModuleStartCryptoMsgs(char *ok_response, char *nosup_response, char *er
        CtdlStartTLS (ok_response, nosup_response, error_response);
 #endif
 }
+
+
+CTDL_MODULE_INIT(modules)
+{
+       if (!threading) {
+       }
+       return "modules";
+}