Began removing $Id$ tags. This will be an ongoing process.
[citadel.git] / citadel / serv_extensions.c
index e6922b8cefe8020b7af3bae736cc6081f6323ccc..5417d2672ed65de4b7833cccbe1514a1de823c5e 100644 (file)
@@ -1,9 +1,6 @@
 /*
- * $Id$
- *
  * Citadel Dynamic Loading Module
  * Written by Brian Costello <btx@calyx.net>
- *
  */
 
 #include "sysdep.h"
 #include <string.h>
 #include <limits.h>
 #include <ctype.h>
+#include <libcitadel.h>
 #include "citadel.h"
 #include "server.h"
 #include "serv_extensions.h"
 #include "sysdep_decls.h"
 #include "msgbase.h"
-#include "tools.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"
+
 #ifndef HAVE_SNPRINTF
 #include <stdarg.h>
 #include "snprintf.h"
@@ -36,96 +37,202 @@ 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;
 
 struct ProtoFunctionHook {
        void (*handler) (char *cmdbuf);
-       char *cmd;
-       char *desc;
-       struct ProtoFunctionHook *next;
-} *ProtoHookList = NULL;
+       const char *cmd;
+       const char *desc;
+};
 
-void CtdlRegisterProtoHook(void (*handler) (char *), char *cmd, char *desc)
-{
-       struct ProtoFunctionHook *p;
+HashList *ProtoHookList = NULL;
 
-       p = (struct ProtoFunctionHook *)
-               malloc(sizeof(struct ProtoFunctionHook));
 
-       if (p == NULL) {
-               fprintf(stderr, "can't malloc new ProtoFunctionHook\n");
-               exit(EXIT_FAILURE);
+#define ERR_PORT (1 << 1)
+
+
+static char *portlist = NULL;
+static size_t nSizPort = 0;
+
+static char *errormessages = NULL;
+size_t nSizErrmsg = 0;
+
+
+long   DetailErrorFlags;
+
+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";
+
+
+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";
+
+
+void LogPrintMessages(long err)
+{
+       char *List, *DetailList, *Short, *Where, *Hint, *Message; 
+       int n = nSizPort + nSizErrmsg + 5;
+
+       Message = (char*) malloc(n * SIZ);
+       
+       DetailErrorFlags = DetailErrorFlags & ~err;
+
+       switch (err)
+       {
+       case ERR_PORT:
+               Short = ErrPortShort;
+               Where = ErrPortWhere;
+               Hint  = ErrPortHint;
+               List  = portlist;
+               DetailList = errormessages;
+               break;
+       default:
+               Short = "";
+               Where = "";
+               Hint  = "";
+               List  = "";
+               DetailList = "";
        }
-       p->handler = handler;
-       p->cmd = cmd;
-       p->desc = desc;
-       p->next = ProtoHookList;
-       ProtoHookList = p;
-       lprintf(CTDL_INFO, "Registered server command %s (%s)\n", cmd, desc);
+
+
+       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);
 }
 
 
-void CtdlUnregisterProtoHook(void (*handler) (char *), char *cmd)
+
+void AppendString(char **target, char *append, size_t *len, size_t rate)
 {
-       struct ProtoFunctionHook *cur, *p;
+       size_t oLen = 0;
+       long AddLen;
+       long RelPtr = 0;
 
-       for (cur = ProtoHookList; cur != NULL; cur = cur->next) {
-               /* This will also remove duplicates if any */
-               while (cur != NULL &&
-                               handler == cur->handler &&
-                               !strcmp(cmd, cur->cmd)) {
-                       lprintf(CTDL_INFO, "Unregistered server command %s (%s)\n",
-                                       cmd, cur->desc);
-                       p = cur->next;
-                       if (cur == ProtoHookList) {
-                               ProtoHookList = p;
-                       }
-                       free(cur);
-                       cur = p;
+       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);
+
+       pos = strchr (portlist, ':');
+       if (pos != NULL) *pos = ';';
+       
+       len = strlen (errormessages);
+       if (nSizErrmsg * SIZ > len + 3)
+       {
+               errormessages[len] = ';';
+               errormessages[len+1] = ' ';
+               errormessages[len+2] = '\0';
+       }       
 }
 
 
 int DLoader_Exec_Cmd(char *cmdbuf)
 {
+       void *vP;
        struct ProtoFunctionHook *p;
 
-       for (p = ProtoHookList; p; p = p->next) {
-               if (!strncasecmp(cmdbuf, p->cmd, 4)) {
-                       p->handler(&cmdbuf[5]);
-                       return 1;
-               }
+       if (GetHash(ProtoHookList, cmdbuf, 4, &vP) && (vP != NULL)) {
+               p = (struct ProtoFunctionHook*) vP;
+               p->handler(&cmdbuf[5]);
+               return 1;
        }
        return 0;
 }
 
-void initialize_server_extensions(void)
+int FourHash(const char *key, long length) 
 {
-       serv_bio_init();
-       serv_calendar_init();
-       serv_notes_init();
-       serv_ldap_init();
-       serv_chat_init();
-       serv_expire_init();
-       serv_imap_init();
-       serv_inetcfg_init();
-       serv_listsub_init();
-       serv_mrtg_init();
-       serv_netfilter_init();
-       serv_network_init();
-       serv_newuser_init();
-       serv_pas2_init();
-       serv_pop3_init();
-       serv_rwho_init();
-       serv_smtp_init();
-       serv_spam_init();
-       /* serv_test_init(); */
-       serv_upgrade_init();
-       serv_vandelay_init();
-       serv_vcard_init();
-       serv_fulltext_init();
+       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;
+
+       if (ProtoHookList == NULL)
+               ProtoHookList = NewHash (1, FourHash);
+
+
+       p = (struct ProtoFunctionHook *)
+               malloc(sizeof(struct ProtoFunctionHook));
+
+       if (p == NULL) {
+               fprintf(stderr, "can't malloc new ProtoFunctionHook\n");
+               exit(EXIT_FAILURE);
+       }
+       p->handler = handler;
+       p->cmd = cmd;
+       p->desc = desc;
+
+       Put(ProtoHookList, cmd, 4, p, NULL);
+       CtdlLogPrintf(CTDL_INFO, "Registered server command %s (%s)\n", cmd, desc);
 }
 
+void CtdlDestroyProtoHooks(void)
+{
+
+       DeleteHash(&ProtoHookList);
+}
 
 
 void CtdlRegisterCleanupHook(void (*fcn_ptr) (void))
@@ -139,7 +246,7 @@ void CtdlRegisterCleanupHook(void (*fcn_ptr) (void))
        newfcn->h_function_pointer = fcn_ptr;
        CleanupHookTable = newfcn;
 
-       lprintf(CTDL_INFO, "Registered a new cleanup function\n");
+       CtdlLogPrintf(CTDL_INFO, "Registered a new cleanup function\n");
 }
 
 
@@ -151,7 +258,7 @@ void CtdlUnregisterCleanupHook(void (*fcn_ptr) (void))
                /* This will also remove duplicates if any */
                while (cur != NULL &&
                                fcn_ptr == cur->h_function_pointer) {
-                       lprintf(CTDL_INFO, "Unregistered cleanup function\n");
+                       CtdlLogPrintf(CTDL_INFO, "Unregistered cleanup function\n");
                        p = cur->next;
                        if (cur == CleanupHookTable) {
                                CleanupHookTable = p;
@@ -162,6 +269,21 @@ void CtdlUnregisterCleanupHook(void (*fcn_ptr) (void))
        }
 }
 
+void CtdlDestroyCleanupHooks(void)
+{
+       struct CleanupFunctionHook *cur, *p;
+
+       cur = CleanupHookTable;
+       while (cur != NULL)
+       {
+               CtdlLogPrintf(CTDL_INFO, "Destroyed cleanup function\n");
+               p = cur->next;
+               free(cur);
+               cur = p;
+       }
+       CleanupHookTable = NULL;
+}
+
 
 void CtdlRegisterSessionHook(void (*fcn_ptr) (void), int EventType)
 {
@@ -175,7 +297,7 @@ void CtdlRegisterSessionHook(void (*fcn_ptr) (void), int EventType)
        newfcn->eventtype = EventType;
        SessionHookTable = newfcn;
 
-       lprintf(CTDL_INFO, "Registered a new session function (type %d)\n",
+       CtdlLogPrintf(CTDL_INFO, "Registered a new session function (type %d)\n",
                EventType);
 }
 
@@ -189,7 +311,7 @@ void CtdlUnregisterSessionHook(void (*fcn_ptr) (void), int EventType)
                while (cur != NULL &&
                                fcn_ptr == cur->h_function_pointer &&
                                EventType == cur->eventtype) {
-                       lprintf(CTDL_INFO, "Unregistered session function (type %d)\n",
+                       CtdlLogPrintf(CTDL_INFO, "Unregistered session function (type %d)\n",
                                        EventType);
                        p = cur->next;
                        if (cur == SessionHookTable) {
@@ -201,6 +323,21 @@ void CtdlUnregisterSessionHook(void (*fcn_ptr) (void), int EventType)
        }
 }
 
+void CtdlDestroySessionHooks(void)
+{
+       struct SessionFunctionHook *cur, *p;
+
+       cur = SessionHookTable;
+       while (cur != NULL)
+       {
+               CtdlLogPrintf(CTDL_INFO, "Destroyed session function\n");
+               p = cur->next;
+               free(cur);
+               cur = p;
+       }
+       SessionHookTable = NULL;
+}
+
 
 void CtdlRegisterUserHook(void (*fcn_ptr) (struct ctdluser *), int EventType)
 {
@@ -214,7 +351,7 @@ void CtdlRegisterUserHook(void (*fcn_ptr) (struct ctdluser *), int EventType)
        newfcn->eventtype = EventType;
        UserHookTable = newfcn;
 
-       lprintf(CTDL_INFO, "Registered a new user function (type %d)\n",
+       CtdlLogPrintf(CTDL_INFO, "Registered a new user function (type %d)\n",
                EventType);
 }
 
@@ -228,7 +365,7 @@ void CtdlUnregisterUserHook(void (*fcn_ptr) (struct ctdluser *), int EventType)
                while (cur != NULL &&
                                fcn_ptr == cur->h_function_pointer &&
                                EventType == cur->eventtype) {
-                       lprintf(CTDL_INFO, "Unregistered user function (type %d)\n",
+                       CtdlLogPrintf(CTDL_INFO, "Unregistered user function (type %d)\n",
                                        EventType);
                        p = cur->next;
                        if (cur == UserHookTable) {
@@ -240,6 +377,21 @@ void CtdlUnregisterUserHook(void (*fcn_ptr) (struct ctdluser *), int EventType)
        }
 }
 
+void CtdlDestroyUserHooks(void)
+{
+       struct UserFunctionHook *cur, *p;
+
+       cur = UserHookTable;
+       while (cur != NULL)
+       {
+               CtdlLogPrintf(CTDL_INFO, "Destroyed user function \n");
+               p = cur->next;
+               free(cur);
+               cur = p;
+       }
+       UserHookTable = NULL;
+}
+
 
 void CtdlRegisterMessageHook(int (*handler)(struct CtdlMessage *),
                                int EventType)
@@ -254,7 +406,7 @@ void CtdlRegisterMessageHook(int (*handler)(struct CtdlMessage *),
        newfcn->eventtype = EventType;
        MessageHookTable = newfcn;
 
-       lprintf(CTDL_INFO, "Registered a new message function (type %d)\n",
+       CtdlLogPrintf(CTDL_INFO, "Registered a new message function (type %d)\n",
                EventType);
 }
 
@@ -269,7 +421,7 @@ void CtdlUnregisterMessageHook(int (*handler)(struct CtdlMessage *),
                while (cur != NULL &&
                                handler == cur->h_function_pointer &&
                                EventType == cur->eventtype) {
-                       lprintf(CTDL_INFO, "Unregistered message function (type %d)\n",
+                       CtdlLogPrintf(CTDL_INFO, "Unregistered message function (type %d)\n",
                                        EventType);
                        p = cur->next;
                        if (cur == MessageHookTable) {
@@ -281,6 +433,68 @@ void CtdlUnregisterMessageHook(int (*handler)(struct CtdlMessage *),
        }
 }
 
+void CtdlDestroyMessageHook(void)
+{
+       struct MessageFunctionHook *cur, *p;
+
+       cur = MessageHookTable; 
+       while (cur != NULL)
+       {
+               CtdlLogPrintf(CTDL_INFO, "Destroyed message function (type %d)\n", cur->eventtype);
+               p = cur->next;
+               free(cur);
+               cur = p;
+       }
+       MessageHookTable = NULL;
+}
+
+
+void CtdlRegisterRoomHook(int (*fcn_ptr)(struct ctdlroom *))
+{
+       struct RoomFunctionHook *newfcn;
+
+       newfcn = (struct RoomFunctionHook *)
+           malloc(sizeof(struct RoomFunctionHook));
+       newfcn->next = RoomHookTable;
+       newfcn->fcn_ptr = fcn_ptr;
+       RoomHookTable = newfcn;
+
+       CtdlLogPrintf(CTDL_INFO, "Registered a new room function\n");
+}
+
+
+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");
+                       p = cur->next;
+                       if (cur == RoomHookTable) {
+                               RoomHookTable = p;
+                       }
+                       free(cur);
+                       cur = p;
+               }
+       }
+}
+
+
+void CtdlDestroyRoomHooks(void)
+{
+       struct RoomFunctionHook *cur, *p;
+
+       cur = RoomHookTable;
+       while (cur != NULL)
+       {
+               CtdlLogPrintf(CTDL_INFO, "Destroyed room function\n");
+               p = cur->next;
+               free(cur);
+               cur = p;
+       }
+       RoomHookTable = NULL;
+}
 
 void CtdlRegisterNetprocHook(int (*handler)(struct CtdlMessage *, char *) )
 {
@@ -292,7 +506,7 @@ void CtdlRegisterNetprocHook(int (*handler)(struct CtdlMessage *, char *) )
        newfcn->h_function_pointer = handler;
        NetprocHookTable = newfcn;
 
-       lprintf(CTDL_INFO, "Registered a new netproc function\n");
+       CtdlLogPrintf(CTDL_INFO, "Registered a new netproc function\n");
 }
 
 
@@ -304,7 +518,7 @@ void CtdlUnregisterNetprocHook(int (*handler)(struct CtdlMessage *, char *) )
                /* This will also remove duplicates if any */
                while (cur != NULL &&
                                handler == cur->h_function_pointer ) {
-                       lprintf(CTDL_INFO, "Unregistered netproc function\n");
+                       CtdlLogPrintf(CTDL_INFO, "Unregistered netproc function\n");
                        p = cur->next;
                        if (cur == NetprocHookTable) {
                                NetprocHookTable = p;
@@ -315,6 +529,21 @@ void CtdlUnregisterNetprocHook(int (*handler)(struct CtdlMessage *, char *) )
        }
 }
 
+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) )
 {
@@ -326,7 +555,7 @@ void CtdlRegisterDeleteHook(void (*handler)(char *, long) )
        newfcn->h_function_pointer = handler;
        DeleteHookTable = newfcn;
 
-       lprintf(CTDL_INFO, "Registered a new netproc function\n");
+       CtdlLogPrintf(CTDL_INFO, "Registered a new delete function\n");
 }
 
 
@@ -338,7 +567,7 @@ void CtdlUnregisterDeleteHook(void (*handler)(char *, long) )
                /* This will also remove duplicates if any */
                while (cur != NULL &&
                                handler == cur->h_function_pointer ) {
-                       lprintf(CTDL_INFO, "Unregistered netproc function\n");
+                       CtdlLogPrintf(CTDL_INFO, "Unregistered delete function\n");
                        p = cur->next;
                        if (cur == DeleteHookTable) {
                                DeleteHookTable = p;
@@ -348,24 +577,106 @@ void CtdlUnregisterDeleteHook(void (*handler)(char *, long) )
                }
        }
 }
+void CtdlDestroyDeleteHooks(void)
+{
+       struct DeleteFunctionHook *cur, *p;
+
+       cur = DeleteHookTable;
+       while (cur != NULL)
+       {
+               CtdlLogPrintf(CTDL_INFO, "Destroyed delete function\n");
+               p = cur->next;
+               free(cur);
+               cur = p;                
+       }
+       DeleteHookTable = NULL;
+}
+
 
 
-void CtdlRegisterXmsgHook(int (*fcn_ptr) (char *, char *, char *), int order)
+
+void CtdlRegisterFixedOutputHook(char *content_type, void (*handler)(char *, int) )
+{
+       struct FixedOutputHook *newfcn;
+
+       newfcn = (struct FixedOutputHook *)
+           malloc(sizeof(struct 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);
+}
+
+
+void CtdlUnregisterFixedOutputHook(char *content_type)
+{
+       struct FixedOutputHook *cur, *p;
+
+       for (cur = FixedOutputTable; cur != NULL; cur = cur->next) {
+               /* 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);
+                       p = cur->next;
+                       if (cur == FixedOutputTable) {
+                               FixedOutputTable = p;
+                       }
+                       free(cur);
+                       cur = p;
+               }
+       }
+}
+
+void CtdlDestroyFixedOutputHooks(void)
+{
+       struct FixedOutputHook *cur, *p;
+
+       cur = FixedOutputTable; 
+       while (cur != NULL)
+       {
+               CtdlLogPrintf(CTDL_INFO, "Destroyed fixed output function for %s\n", cur->content_type);
+               p = cur->next;
+               free(cur);
+               cur = p;
+               
+       }
+       FixedOutputTable = NULL;
+}
+
+/* returns nonzero if we found a hook and used it */
+int PerformFixedOutputHooks(char *content_type, char *content, int content_length)
+{
+       struct FixedOutputHook *fcn;
+
+       for (fcn = FixedOutputTable; fcn != NULL; fcn = fcn->next) {
+               if (!strcasecmp(content_type, fcn->content_type)) {
+                       (*fcn->h_function_pointer) (content, content_length);
+                       return(1);
+               }
+       }
+       return(0);
+}
+
+
+
+
+
+void CtdlRegisterXmsgHook(int (*fcn_ptr) (char *, char *, char *, char *), int order)
 {
 
        struct XmsgFunctionHook *newfcn;
 
-       newfcn = (struct XmsgFunctionHook *)
-           malloc(sizeof(struct XmsgFunctionHook));
+       newfcn = (struct XmsgFunctionHook *) malloc(sizeof(struct XmsgFunctionHook));
        newfcn->next = XmsgHookTable;
        newfcn->order = order;
        newfcn->h_function_pointer = fcn_ptr;
        XmsgHookTable = newfcn;
-       lprintf(CTDL_INFO, "Registered a new x-msg function (priority %d)\n", order);
+       CtdlLogPrintf(CTDL_INFO, "Registered a new x-msg function (priority %d)\n", order);
 }
 
 
-void CtdlUnregisterXmsgHook(int (*fcn_ptr) (char *, char *, char *), int order)
+void CtdlUnregisterXmsgHook(int (*fcn_ptr) (char *, char *, char *, char *), int order)
 {
        struct XmsgFunctionHook *cur, *p;
 
@@ -374,7 +685,7 @@ void CtdlUnregisterXmsgHook(int (*fcn_ptr) (char *, char *, char *), int order)
                while (cur != NULL &&
                                fcn_ptr == cur->h_function_pointer &&
                                order == cur->order) {
-                       lprintf(CTDL_INFO, "Unregistered x-msg function "
+                       CtdlLogPrintf(CTDL_INFO, "Unregistered x-msg function "
                                        "(priority %d)\n", order);
                        p = cur->next;
                        if (cur == XmsgHookTable) {
@@ -386,52 +697,79 @@ void CtdlUnregisterXmsgHook(int (*fcn_ptr) (char *, char *, char *), int order)
        }
 }
 
+void CtdlDestroyXmsgHooks(void)
+{
+       struct XmsgFunctionHook *cur, *p;
+
+       cur = XmsgHookTable;
+       while (cur != NULL)
+       {
+               CtdlLogPrintf(CTDL_INFO, "Destroyed x-msg function "
+                       "(priority %d)\n", cur->order);
+               p = cur->next;
+                       
+               free(cur);
+               cur = p;
+       }
+       XmsgHookTable = NULL;
+}
+
 
 void CtdlRegisterServiceHook(int tcp_port,
-                       char *sockpath,
-                       void (*h_greeting_function) (void),
-                       void (*h_command_function) (void),
-                       void (*h_async_function) (void)
-                       )
+                            char *sockpath,
+                            void (*h_greeting_function) (void),
+                            void (*h_command_function) (void),
+                            void (*h_async_function) (void),
+                            const char *ServiceName)
 {
        struct ServiceFunctionHook *newfcn;
-       char message[SIZ];
+       char *message;
+       char error[SIZ];
 
-       newfcn = (struct ServiceFunctionHook *)
-           malloc(sizeof(struct ServiceFunctionHook));
+       strcpy(error, "");
+       newfcn = (struct ServiceFunctionHook *) malloc(sizeof(struct ServiceFunctionHook));
+       message = (char*) malloc (SIZ + SIZ);
+       
        newfcn->next = ServiceHookTable;
        newfcn->tcp_port = tcp_port;
        newfcn->sockpath = sockpath;
        newfcn->h_greeting_function = h_greeting_function;
        newfcn->h_command_function = h_command_function;
        newfcn->h_async_function = h_async_function;
+       newfcn->ServiceName = ServiceName;
 
        if (sockpath != NULL) {
-               newfcn->msock = ig_uds_server(sockpath, config.c_maxsessions);
-               snprintf(message, sizeof message, "Unix domain socket '%s': ", sockpath);
+               newfcn->msock = ctdl_uds_server(sockpath, config.c_maxsessions, error);
+               snprintf(message, SIZ, "Unix domain socket '%s': ", sockpath);
        }
        else if (tcp_port <= 0) {       /* port -1 to disable */
-               lprintf(CTDL_INFO, "Service has been manually disabled, skipping\n");
+               CtdlLogPrintf(CTDL_INFO, "Service %s has been manually disabled, skipping\n", ServiceName);
+               free (message);
                free(newfcn);
                return;
        }
        else {
-               newfcn->msock = ig_tcp_server(config.c_ip_addr,
-                                       tcp_port,
-                                       config.c_maxsessions);
-               snprintf(message, sizeof message, "TCP port %d: ", tcp_port);
+               newfcn->msock = ctdl_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);
        }
 
        if (newfcn->msock > 0) {
                ServiceHookTable = newfcn;
                strcat(message, "registered.");
-               lprintf(CTDL_INFO, "%s\n", message);
+               CtdlLogPrintf(CTDL_INFO, "%s\n", message);
        }
        else {
+               AddPortError(message, error);
                strcat(message, "FAILED.");
-               lprintf(CTDL_CRIT, "%s\n", message);
+               CtdlLogPrintf(CTDL_CRIT, "%s\n", message);
+               free(error);
                free(newfcn);
        }
+       free(message);
 }
 
 
@@ -454,12 +792,12 @@ void CtdlUnregisterServiceHook(int tcp_port, char *sockpath,
                                tcp_port == cur->tcp_port) {
                        close(cur->msock);
                        if (sockpath) {
-                               lprintf(CTDL_INFO, "Closed UNIX domain socket %s\n",
+                               CtdlLogPrintf(CTDL_INFO, "Closed UNIX domain socket %s\n",
                                                sockpath);
                        } else if (tcp_port) {
-                               lprintf(CTDL_INFO, "Closed TCP port %d\n", tcp_port);
+                               CtdlLogPrintf(CTDL_INFO, "Closed TCP port %d\n", tcp_port);
                        } else {
-                               lprintf(CTDL_INFO, "Unregistered unknown service\n");
+                               CtdlLogPrintf(CTDL_INFO, "Unregistered service \"%s\"\n", cur->ServiceName);
                        }
                        p = cur->next;
                        if (cur == ServiceHookTable) {
@@ -471,13 +809,87 @@ void CtdlUnregisterServiceHook(int tcp_port, char *sockpath,
        }
 }
 
+void CtdlDestroyServiceHook(void)
+{
+       struct ServiceFunctionHook *cur, *p;
+
+       cur = ServiceHookTable;
+       while (cur != NULL)
+       {
+               close(cur->msock);
+               if (cur->sockpath) {
+                       CtdlLogPrintf(CTDL_INFO, "Closed UNIX domain socket %s\n",
+                               cur->sockpath);
+               } else if (cur->tcp_port) {
+                       CtdlLogPrintf(CTDL_INFO, "Closed TCP port %d\n", cur->tcp_port);
+               } else {
+                       CtdlLogPrintf(CTDL_INFO, "Destroyed service \"%s\"\n", cur->ServiceName);
+               }
+               p = cur->next;
+               free(cur);
+               cur = p;
+       }
+       ServiceHookTable = NULL;
+}
+
+void CtdlRegisterSearchFuncHook(void (*fcn_ptr)(int *, long **, const char *), char *name)
+{
+       struct SearchFunctionHook *newfcn;
+
+       if (!name || !fcn_ptr) {
+               return;
+       }
+       
+       newfcn = (struct SearchFunctionHook *)
+           malloc(sizeof(struct 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);
+}
+
+void CtdlUnregisterSearchFuncHook(void (*fcn_ptr)(int *, long **, const char *), char *name)
+{
+       struct SearchFunctionHook *cur, *p;
+       
+       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);
+                       p = cur->next;
+                       if (cur == SearchFunctionHookTable) {
+                               SearchFunctionHookTable = p;
+                       }
+                       free (cur);
+                       cur = p;
+               }
+       }
+}
+
+void CtdlModuleDoSearch(int *num_msgs, long **search_msgs, const char *search_string, const char *func_name)
+{
+       struct SearchFunctionHook *fcn = NULL;
+
+       for (fcn = SearchFunctionHookTable; fcn != NULL; fcn = fcn->next) {
+               if (!func_name || !strcmp(func_name, fcn->name)) {
+                       (*fcn->fcn_ptr) (num_msgs, search_msgs, search_string);
+                       return;
+               }
+       }
+       *num_msgs = 0;
+}
+
 
 void PerformSessionHooks(int EventType)
 {
-       struct SessionFunctionHook *fcn;
+       struct SessionFunctionHook *fcn = NULL;
 
        for (fcn = SessionHookTable; fcn != NULL; fcn = fcn->next) {
                if (fcn->eventtype == EventType) {
+                       if (EventType == EVT_TIMER) {
+                               citthread_setspecific(MyConKey, NULL);  /* for every hook */
+                       }
                        (*fcn->h_function_pointer) ();
                }
        }
@@ -485,7 +897,7 @@ void PerformSessionHooks(int EventType)
 
 void PerformUserHooks(struct ctdluser *usbuf, int EventType)
 {
-       struct UserFunctionHook *fcn;
+       struct UserFunctionHook *fcn = NULL;
 
        for (fcn = UserHookTable; fcn != NULL; fcn = fcn->next) {
                if (fcn->eventtype == EventType) {
@@ -496,16 +908,16 @@ void PerformUserHooks(struct ctdluser *usbuf, int EventType)
 
 int PerformMessageHooks(struct CtdlMessage *msg, int EventType)
 {
-       struct MessageFunctionHook *fcn;
+       struct 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.
-       lprintf(CTDL_DEBUG, "** Event type is %d, flags are %d\n",
+       CtdlLogPrintf(CTDL_DEBUG, "** Event type is %d, flags are %d\n",
                EventType, msg->cm_flags);
         */
        if (msg->cm_flags & CM_SKIP_HOOKS) {
-               lprintf(CTDL_DEBUG, "Skipping hooks\n");
+               CtdlLogPrintf(CTDL_DEBUG, "Skipping hooks\n");
                return(0);
        }
 
@@ -526,6 +938,22 @@ int PerformMessageHooks(struct CtdlMessage *msg, int EventType)
 }
 
 
+int PerformRoomHooks(struct ctdlroom *target_room)
+{
+       struct RoomFunctionHook *fcn;
+       int total_retval = 0;
+
+       CtdlLogPrintf(CTDL_DEBUG, "Performing room hooks for <%s>\n", target_room->QRname);
+
+       for (fcn = RoomHookTable; fcn != NULL; fcn = fcn->next) {
+               total_retval = total_retval + (*fcn->fcn_ptr) (target_room);
+       }
+
+       /* Return the sum of the return codes from the hook functions.
+        */
+       return total_retval;
+}
+
 
 int PerformNetprocHooks(struct CtdlMessage *msg, char *target_room)
 {
@@ -555,7 +983,9 @@ void PerformDeleteHooks(char *room, long msgnum)
 
 
 
-int PerformXmsgHooks(char *sender, char *recp, char *msg)
+
+
+int PerformXmsgHooks(char *sender, char *sender_email, char *recp, char *msg)
 {
        struct XmsgFunctionHook *fcn;
        int total_sent = 0;
@@ -566,7 +996,7 @@ int PerformXmsgHooks(char *sender, char *recp, char *msg)
                        if (fcn->order == p) {
                                total_sent +=
                                        (*fcn->h_function_pointer)
-                                               (sender, recp, msg);
+                                               (sender, sender_email, recp, msg);
                        }
                }
                /* Break out of the loop if a higher-priority function
@@ -578,3 +1008,14 @@ int PerformXmsgHooks(char *sender, char *recp, char *msg)
        }
        return total_sent;
 }
+
+
+/*
+ * Dirty hack until we impliment a hook mechanism for this
+ */
+void CtdlModuleStartCryptoMsgs(char *ok_response, char *nosup_response, char *error_response)
+{
+#ifdef HAVE_OPENSSL
+       CtdlStartTLS (ok_response, nosup_response, error_response);
+#endif
+}