X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fserv_extensions.c;h=861ecb8497adee990ab428fb624c116f78b1c599;hb=aa7365c86de8e26e796d3aa3fd605c85d8c26220;hp=9cc062c6c3dcfc1e1d54e8ae8a437cc51ed2f6c8;hpb=e646cd5a79374f3a3aee98df28468dacecfe6ec0;p=citadel.git

diff --git a/citadel/serv_extensions.c b/citadel/serv_extensions.c
index 9cc062c6c..861ecb849 100644
--- a/citadel/serv_extensions.c
+++ b/citadel/serv_extensions.c
@@ -1,9 +1,16 @@
 /*
- * $Id$
- *
  * Citadel Dynamic Loading Module
  * Written by Brian Costello <btx@calyx.net>
  *
+ * Copyright (c) 1987-2011 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"
@@ -15,12 +22,13 @@
 #include <string.h>
 #include <limits.h>
 #include <ctype.h>
+#include <syslog.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 */
@@ -32,169 +40,417 @@
 #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 MaintenanceThreadHook *MaintenanceThreadHookTable = NULL;
-struct SearchFunctionHook *SearchFunctionHookTable = NULL;
+int DebugModules = 0;
+ 
+/*
+ * Structure defentitions for hook tables
+ */
+
+typedef struct __LogDebugEntry {
+	CtdlDbgFunction F;
+	const char *Name;
+	long Len;
+	const int *LogP;
+} LogDebugEntry;
+HashList *LogDebugEntryTable = NULL;
+
+typedef struct LogFunctionHook LogFunctionHook;
+struct LogFunctionHook {
+	LogFunctionHook *next;
+	int loglevel;
+	void (*h_function_pointer) (char *);
+};
+extern LogFunctionHook *LogHookTable;
+
+typedef struct FixedOutputHook FixedOutputHook;
+struct FixedOutputHook {
+	FixedOutputHook *next;
+	char content_type[64];
+	void (*h_function_pointer) (char *, int);
+};
+extern FixedOutputHook *FixedOutputTable;
+
+
+
+/*
+ * 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;
+};
+extern SessionFunctionHook *SessionHookTable;
+
+
+/*
+ * 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;
+};
+extern UserFunctionHook *UserHookTable;
+
+/*
+ * 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);
+	int eventtype;
+};
+extern MessageFunctionHook *MessageHookTable;
+
+
+/*
+ * NetprocFunctionHook extensions are used for hooks which implement handlers
+ * for incoming network messages.
+ */
+typedef struct NetprocFunctionHook NetprocFunctionHook;
+struct NetprocFunctionHook {
+	NetprocFunctionHook *next;
+	int (*h_function_pointer) (struct CtdlMessage *msg, char *target_room);
+};
+extern NetprocFunctionHook *NetprocHookTable;
+
+
+/*
+ * 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);
+};
+extern DeleteFunctionHook *DeleteHookTable;
+
+
+/*
+ * 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;
+};
+extern XmsgFunctionHook *XmsgHookTable;
+
+
 
+
+/*
+ * 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 *);
+};
+extern RoomFunctionHook *RoomHookTable;
+
+
+
+typedef struct SearchFunctionHook SearchFunctionHook;
+struct SearchFunctionHook {
+	SearchFunctionHook *next;
+	void (*fcn_ptr) (int *, long **, const char *);
+	char *name;
+};
+extern SearchFunctionHook *SearchFunctionHookTable;
+
+
+CleanupFunctionHook *CleanupHookTable = NULL;
+CleanupFunctionHook *EVCleanupHookTable = NULL;
+SessionFunctionHook *SessionHookTable = NULL;
+UserFunctionHook *UserHookTable = NULL;
+XmsgFunctionHook *XmsgHookTable = NULL;
+MessageFunctionHook *MessageHookTable = NULL;
+NetprocFunctionHook *NetprocHookTable = NULL;
+DeleteFunctionHook *DeleteHookTable = NULL;
+ServiceFunctionHook *ServiceHookTable = NULL;
+FixedOutputHook *FixedOutputTable = NULL;
+RoomFunctionHook *RoomHookTable = NULL;
+SearchFunctionHook *SearchFunctionHookTable = NULL;
+
+typedef struct ProtoFunctionHook ProtoFunctionHook;
 struct ProtoFunctionHook {
 	void (*handler) (char *cmdbuf);
-	char *cmd;
-	char *desc;
-	struct ProtoFunctionHook *next;
-} *ProtoHookList = NULL;
-
-
-struct DirectoryServiceHook {
-	int (*handler) (char *cn, char *ou, void **object);
-	int cmd;
-	char *module;
-	struct DirectoryServiceHook *next;
-} *DirectoryServiceHookList = NULL;
-
-struct DirectoryObject {
-	char *module;
-	void *object;
-	struct DirectoryObject *next;
+	const char *cmd;
+	const char *desc;
 };
 
+HashList *ProtoHookList = NULL;
+
+
 #define ERR_PORT (1 << 1)
 
 
-static char *portlist = NULL;
-static size_t nSizPort = 0;
+static StrBuf *portlist = NULL;
 
-static char *errormessages = NULL;
-size_t nSizErrmsg = 0;
+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. You should eventually remove "
-" their initscripts in /etc/init.d so that you won't get this trouble once more.\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 Servers or \"netstat -na\" on *BSD"
+			       " and stop the program 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 restart & retry to bind this port.\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;
 	}
 
+	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);
+
+	MOD_syslog(LOG_EMERG, "%s", ChrPtr(Message));
+	MOD_syslog(LOG_EMERG, "%s", ErrSubject);
+	quickie_message("Citadel", NULL, NULL, AIDEROOM, ChrPtr(Message), FMT_FIXED, ErrSubject);
+
+	FreeStrBuf(&Message);
+	FreeStrBuf(&List);
+	FreeStrBuf(&DetailList);
+}
 
-	snprintf(Message, n * SIZ, ErrGeneral, Short, Where, List, Hint, DetailList);
 
-	lprintf(0,Message);
-	lprintf(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 AddPortError(char *Port, char *ErrorMessage)
+{
+	long len;
 
+	DetailErrorFlags |= ERR_PORT;
 
+	len = StrLength(errormessages);
+	if (len > 0) StrBufAppendBufPlain(errormessages, HKEY("; "), 0);
+	else errormessages = NewStrBuf();
+	StrBufAppendBufPlain(errormessages, ErrorMessage, -1, 0);
 
-void AppendString(char **target, char *append, size_t *len, size_t rate)
+
+	len = StrLength(portlist);
+	if (len > 0) StrBufAppendBufPlain(portlist, HKEY(";"), 0);
+	else portlist = NewStrBuf();
+	StrBufAppendBufPlain(portlist, Port, -1, 0);
+}
+
+
+int DLoader_Exec_Cmd(char *cmdbuf)
 {
-	size_t oLen = 0;
-	long AddLen;
-	long RelPtr = 0;
+	void *vP;
+	ProtoFunctionHook *p;
 
-	AddLen = strlen(append);
+	if (GetHash(ProtoHookList, cmdbuf, 4, &vP) && (vP != NULL)) {
+		p = (ProtoFunctionHook*) vP;
+		p->handler(&cmdbuf[5]);
+		return 1;
+	}
+	return 0;
+}
 
-	if (*len == 0)
-	{
-		*len = rate;
+long 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;
+}
 
-		*target = (char*)malloc (*len * SIZ);
+void CtdlRegisterDebugFlagHook(const char *Name, long Len, CtdlDbgFunction F, const int *LogP)
+{
+	LogDebugEntry *E;
+	if (LogDebugEntryTable == NULL)
+		LogDebugEntryTable = NewHash(1, NULL);
+	E = (LogDebugEntry*) malloc(sizeof(LogDebugEntry));
+	E->F = F;
+	E->Name = Name;
+	E->Len = Len;
+	E->LogP = LogP;
+	Put(LogDebugEntryTable, Name, Len, E, NULL);
+	
+}
+void CtdlSetDebugLogFacilities(const char **Str, long n)
+{
+	StrBuf *Token = NULL;
+	StrBuf *Buf = NULL;
+	const char *ch;
+	int i;
+	int DoAll = 0;
+	void *vptr;
+
+	for (i=0; i < n; i++){
+		if ((Str[i] != NULL) && !IsEmptyStr(Str[i])) {
+			if (strcmp(Str[i], "all") == 0) {
+				DoAll = 1;
+				continue;
+			}
+			Buf = NewStrBufPlain(Str[i], -1);
+			ch = NULL;
+			if (Token == NULL)
+				Token = NewStrBufPlain(NULL, StrLength(Buf));
+			while ((ch != StrBufNOTNULL) &&
+			       StrBufExtract_NextToken(Token, Buf, &ch, ',')) {
+				if (GetHash(LogDebugEntryTable, SKEY(Token), &vptr) && 
+				    (vptr != NULL))
+				{
+					LogDebugEntry *E = (LogDebugEntry*)vptr;
+					E->F(1);
+				}
+			}
+		}
+		FreeStrBuf(&Buf);
 	}
-	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;
+	FreeStrBuf(&Token);
+	if (DoAll) {
+		long HKLen;
+		const char *ch;
+		HashPos *Pos;
+
+		Pos = GetNewHashPos(LogDebugEntryTable, 0);
+		while (GetNextHashPos(LogDebugEntryTable, Pos, &HKLen, &ch, &vptr)) {
+			LogDebugEntry *E = (LogDebugEntry*)vptr;
+			E->F(1);
 		}
+
+		DeleteHashPos(&Pos);
 	}
-	memcpy (*target + oLen, append, AddLen);
-	(*target)[oLen + AddLen + 1] = '\n';
-	(*target)[oLen + AddLen + 2] = '\0';
 }
-
-void AddPortError(char *Port, char *ErrorMessage)
+void cmd_log_get(char *argbuf)
 {
-	char *pos;
-	long len;
+	long HKLen;
+	const char *ch;
+	HashPos *Pos;
+	void *vptr;
 
-	DetailErrorFlags |= ERR_PORT;
+	if (CtdlAccessCheck(ac_aide)) return;
+
+	cprintf("%d Log modules enabled:\n", LISTING_FOLLOWS);
 
-	AppendString(&errormessages, ErrorMessage, &nSizErrmsg, 10);
-	AppendString(&portlist, Port, &nSizPort, 2);
+	Pos = GetNewHashPos(LogDebugEntryTable, 0);
 
-	pos = strchr (portlist, ':');
-	if (pos != NULL) *pos = ';';
+	while (GetNextHashPos(LogDebugEntryTable, Pos, &HKLen, &ch, &vptr)) {
+		LogDebugEntry *E = (LogDebugEntry*)vptr;
+		cprintf("%s|%d\n", ch, *E->LogP);
+	}
 	
-	len = strlen (errormessages);
-	if (nSizErrmsg * SIZ > len + 3)
+	DeleteHashPos(&Pos);
+	cprintf("000\n");
+}
+void cmd_log_set(char *argbuf)
+{
+	void *vptr;
+	int lset;
+	int wlen;
+	char which[SIZ] = "";
+
+	if (CtdlAccessCheck(ac_aide)) return;
+
+	wlen = extract_token(which, argbuf, 0, '|', sizeof(which));
+	if (wlen < 0) wlen = 0;
+	lset = extract_int(argbuf, 1);
+	if (lset != 0) lset = 1;
+	if (GetHash(LogDebugEntryTable, which, wlen, &vptr) && 
+	    (vptr != NULL))
 	{
-		errormessages[len] = ';';
-		errormessages[len+1] = ' ';
-		errormessages[len+2] = '\0';
-	}	
+		LogDebugEntry *E = (LogDebugEntry*)vptr;
+		E->F(lset);
+		cprintf("%d %s|%d\n", CIT_OK, which, lset);
+	}
+	else {
+		cprintf("%d Log setting %s not known\n", 
+			ERROR, which);
+	}
 }
+void CtdlDestroyDebugTable(void)
+{
 
+	DeleteHash(&LogDebugEntryTable);
+}
 
 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");
@@ -203,169 +459,199 @@ void CtdlRegisterProtoHook(void (*handler) (char *), char *cmd, char *desc)
 	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);
+
+	Put(ProtoHookList, cmd, 4, p, NULL);
+	MOD_syslog(LOG_DEBUG, "Registered server command %s (%s)\n", cmd, desc);
 }
 
+void CtdlDestroyProtoHooks(void)
+{
+
+	DeleteHash(&ProtoHookList);
+}
 
-void CtdlUnregisterProtoHook(void (*handler) (char *), char *cmd)
+
+void CtdlRegisterCleanupHook(void (*fcn_ptr) (void))
 {
-	struct ProtoFunctionHook *cur = NULL;
-	struct ProtoFunctionHook *p = NULL;
-	struct ProtoFunctionHook *lastcur = NULL;
 
-	for (cur = ProtoHookList; 
-	     cur != NULL; 
-	     cur = (cur != NULL)? cur->next: NULL) {
-		/* 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);
+	CleanupFunctionHook *newfcn;
+
+	newfcn = (CleanupFunctionHook *)
+	    malloc(sizeof(CleanupFunctionHook));
+	newfcn->next = CleanupHookTable;
+	newfcn->h_function_pointer = fcn_ptr;
+	CleanupHookTable = newfcn;
+
+	MODM_syslog(LOG_DEBUG, "Registered a new cleanup function\n");
+}
+
+
+void CtdlUnregisterCleanupHook(void (*fcn_ptr) (void))
+{
+	CleanupFunctionHook *cur, *p, *last;
+	last = NULL;
+	cur = CleanupHookTable;
+	while (cur != NULL)
+	{
+		if (fcn_ptr == cur->h_function_pointer)
+		{
+			MODM_syslog(LOG_DEBUG, "Unregistered cleanup function\n");
 			p = cur->next;
-			if (cur == ProtoHookList) {
-				ProtoHookList = p;
-			}
-			else if (lastcur != NULL)
-			{
-				lastcur->next = p;
-			}
+
 			free(cur);
+			cur = NULL;
+
+			if (last != NULL)
+				last->next = p;
+			else 
+				CleanupHookTable = p;
 			cur = p;
 		}
-		lastcur = cur;
+		else {
+			last = cur;
+			cur = cur->next;
+		}
 	}
 }
 
-void CtdlDestroyProtoHooks(void)
+
+void CtdlDestroyCleanupHooks(void)
 {
-	struct ProtoFunctionHook *cur, *p;
+	CleanupFunctionHook *cur, *p;
 
-	cur = ProtoHookList; 
+	cur = CleanupHookTable;
 	while (cur != NULL)
 	{
-		lprintf(CTDL_INFO, "Destroyed server command %s (%s)\n",
-			cur->cmd, cur->desc);
+		MODM_syslog(LOG_DEBUG, "Destroyed cleanup function\n");
 		p = cur->next;
 		free(cur);
 		cur = p;
 	}
-	ProtoHookList = NULL;
-}
-
-
-int DLoader_Exec_Cmd(char *cmdbuf)
-{
-	struct ProtoFunctionHook *p;
-
-	for (p = ProtoHookList; p; p = p->next) {
-		if (!strncasecmp(cmdbuf, p->cmd, 4)) {
-			p->handler(&cmdbuf[5]);
-			return 1;
-		}
-	}
-	return 0;
+	CleanupHookTable = NULL;
 }
 
-
-void CtdlRegisterCleanupHook(void (*fcn_ptr) (void))
+void CtdlRegisterEVCleanupHook(void (*fcn_ptr) (void))
 {
 
-	struct CleanupFunctionHook *newfcn;
+	CleanupFunctionHook *newfcn;
 
-	newfcn = (struct CleanupFunctionHook *)
-	    malloc(sizeof(struct CleanupFunctionHook));
-	newfcn->next = CleanupHookTable;
+	newfcn = (CleanupFunctionHook *)
+	    malloc(sizeof(CleanupFunctionHook));
+	newfcn->next = EVCleanupHookTable;
 	newfcn->h_function_pointer = fcn_ptr;
-	CleanupHookTable = newfcn;
+	EVCleanupHookTable = newfcn;
 
-	lprintf(CTDL_INFO, "Registered a new cleanup function\n");
+	MODM_syslog(LOG_DEBUG, "Registered a new cleanup function\n");
 }
 
 
-void CtdlUnregisterCleanupHook(void (*fcn_ptr) (void))
+void CtdlUnregisterEVCleanupHook(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) {
-			lprintf(CTDL_INFO, "Unregistered cleanup function\n");
+	CleanupFunctionHook *cur, *p, *last;
+	last = NULL;
+	cur = EVCleanupHookTable;
+	while (cur != NULL)
+	{
+		if (fcn_ptr == cur->h_function_pointer)
+		{
+			MODM_syslog(LOG_DEBUG, "Unregistered cleanup function\n");
 			p = cur->next;
-			if (cur == CleanupHookTable) {
-				CleanupHookTable = p;
-			}
+
 			free(cur);
+			cur = NULL;
+
+			if (last != NULL)
+				last->next = p;
+			else 
+				EVCleanupHookTable = p;
 			cur = p;
 		}
+		else {
+			last = cur;
+			cur = cur->next;
+		}
 	}
 }
 
-void CtdlDestroyCleanupHooks(void)
+
+void CtdlDestroyEVCleanupHooks(void)
 {
-	struct CleanupFunctionHook *cur, *p;
+	CleanupFunctionHook *cur, *p;
 
-	cur = CleanupHookTable;
+	cur = EVCleanupHookTable;
 	while (cur != NULL)
 	{
-		lprintf(CTDL_INFO, "Destroyed cleanup function\n");
+		MODM_syslog(LOG_DEBUG, "Destroyed cleanup function\n");
 		p = cur->next;
 		free(cur);
 		cur = p;
 	}
-	CleanupHookTable = NULL;
+	EVCleanupHookTable = NULL;
 }
 
 
-void CtdlRegisterSessionHook(void (*fcn_ptr) (void), int EventType)
+void CtdlRegisterSessionHook(void (*fcn_ptr) (void), int EventType, int Priority)
 {
+	SessionFunctionHook *newfcn;
 
-	struct SessionFunctionHook *newfcn;
-
-	newfcn = (struct SessionFunctionHook *)
-	    malloc(sizeof(struct SessionFunctionHook));
-	newfcn->next = SessionHookTable;
+	newfcn = (SessionFunctionHook *)
+	    malloc(sizeof(SessionFunctionHook));
+	newfcn->Priority = Priority;
 	newfcn->h_function_pointer = fcn_ptr;
 	newfcn->eventtype = EventType;
-	SessionHookTable = newfcn;
 
-	lprintf(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;
+	
+	MOD_syslog(LOG_DEBUG, "Registered a new session function (type %d Priority %d)\n",
+		   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) {
-			lprintf(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))
+		{
+			MOD_syslog(LOG_DEBUG, "Unregistered session function (type %d)\n",
+				   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)
 	{
-		lprintf(CTDL_INFO, "Destroyed session function\n");
+		MODM_syslog(LOG_DEBUG, "Destroyed session function\n");
 		p = cur->next;
 		free(cur);
 		cur = p;
@@ -374,52 +660,60 @@ 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;
 
-	lprintf(CTDL_INFO, "Registered a new user function (type %d)\n",
-		EventType);
+	MOD_syslog(LOG_DEBUG, "Registered a new user function (type %d)\n",
+		   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) {
-			lprintf(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))
+		{
+			MOD_syslog(LOG_DEBUG, "Unregistered user function (type %d)\n",
+				   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)
 	{
-		lprintf(CTDL_INFO, "Destroyed user function \n");
+		MODM_syslog(LOG_DEBUG, "Destroyed user function \n");
 		p = cur->next;
 		free(cur);
 		cur = p;
@@ -432,50 +726,57 @@ void CtdlRegisterMessageHook(int (*handler)(struct CtdlMessage *),
 				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;
 
-	lprintf(CTDL_INFO, "Registered a new message function (type %d)\n",
-		EventType);
+	MOD_syslog(LOG_DEBUG, "Registered a new message function (type %d)\n",
+		   EventType);
 }
 
 
 void CtdlUnregisterMessageHook(int (*handler)(struct CtdlMessage *),
 		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) {
-			lprintf(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))
+		{
+			MOD_syslog(LOG_DEBUG, "Unregistered message function (type %d)\n",
+				   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)
 	{
-		lprintf(CTDL_INFO, "Destroyed message function \n");
+		MOD_syslog(LOG_DEBUG, "Destroyed message function (type %d)\n", cur->eventtype);
 		p = cur->next;
 		free(cur);
 		cur = p;
@@ -486,44 +787,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;
 
-	lprintf(CTDL_INFO, "Registered a new room function\n");
+	MODM_syslog(LOG_DEBUG, "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) {
-			lprintf(CTDL_INFO, "Unregistered room function\n");
+	RoomFunctionHook *cur, *p, *last;
+	last = NULL;
+	cur = RoomHookTable;
+	while (cur != NULL)
+	{
+		if (fcn_ptr == cur->fcn_ptr) {
+			MODM_syslog(LOG_DEBUG, "Unregistered room function\n");
 			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)
 	{
-		lprintf(CTDL_INFO, "Unregistered room function\n");
+		MODM_syslog(LOG_DEBUG, "Destroyed room function\n");
 		p = cur->next;
 		free(cur);
 		cur = p;
@@ -533,45 +844,54 @@ void CtdlDestroyRoomHooks(void)
 
 void CtdlRegisterNetprocHook(int (*handler)(struct CtdlMessage *, char *) )
 {
-	struct NetprocFunctionHook *newfcn;
+	NetprocFunctionHook *newfcn;
 
-	newfcn = (struct NetprocFunctionHook *)
-	    malloc(sizeof(struct NetprocFunctionHook));
+	newfcn = (NetprocFunctionHook *)
+	    malloc(sizeof(NetprocFunctionHook));
 	newfcn->next = NetprocHookTable;
 	newfcn->h_function_pointer = handler;
 	NetprocHookTable = newfcn;
 
-	lprintf(CTDL_INFO, "Registered a new netproc function\n");
+	MODM_syslog(LOG_DEBUG, "Registered a new netproc function\n");
 }
 
 
 void CtdlUnregisterNetprocHook(int (*handler)(struct CtdlMessage *, char *) )
 {
-	struct NetprocFunctionHook *cur, *p;
+	NetprocFunctionHook *cur, *p, *last;
 
-	for (cur = NetprocHookTable; cur != NULL; cur = cur->next) {
-		/* This will also remove duplicates if any */
-		while (cur != NULL &&
-				handler == cur->h_function_pointer ) {
-			lprintf(CTDL_INFO, "Unregistered netproc function\n");
+	cur = NetprocHookTable;
+	last = NULL;
+
+	while (cur != NULL) {
+		if (handler == cur->h_function_pointer)
+		{
+			MODM_syslog(LOG_DEBUG, "Unregistered netproc function\n");
 			p = cur->next;
-			if (cur == NetprocHookTable) {
+			free(cur);
+			if (last != NULL) {
+				last->next = p;
+			}
+			else {
 				NetprocHookTable = p;
 			}
-			free(cur);
 			cur = p;
 		}
+		else {
+			last = cur;
+			cur = cur->next;
+		}
 	}
 }
 
 void CtdlDestroyNetprocHooks(void)
 {
-	struct NetprocFunctionHook *cur, *p;
+	NetprocFunctionHook *cur, *p;
 
 	cur = NetprocHookTable;
 	while (cur != NULL)
 	{
-		lprintf(CTDL_INFO, "Unregistered netproc function\n");
+		MODM_syslog(LOG_DEBUG, "Destroyed netproc function\n");
 		p = cur->next;
 		free(cur);
 		cur = p;
@@ -582,44 +902,52 @@ void CtdlDestroyNetprocHooks(void)
 
 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;
 
-	lprintf(CTDL_INFO, "Registered a new netproc function\n");
+	MODM_syslog(LOG_DEBUG, "Registered a new delete function\n");
 }
 
 
 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 ) {
-			lprintf(CTDL_INFO, "Unregistered netproc function\n");
+	last = NULL;
+	cur = DeleteHookTable;
+	while (cur != NULL) {
+		if (handler == cur->h_function_pointer )
+		{
+			MODM_syslog(LOG_DEBUG, "Unregistered delete function\n");
 			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)
 	{
-		lprintf(CTDL_INFO, "Destroyed netproc function\n");
+		MODM_syslog(LOG_DEBUG, "Destroyed delete function\n");
 		p = cur->next;
 		free(cur);
 		cur = p;		
@@ -632,45 +960,58 @@ 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;
 
-	lprintf(CTDL_INFO, "Registered a new fixed output function for %s\n", newfcn->content_type);
+	MOD_syslog(LOG_DEBUG, "Registered a new fixed output function for %s\n", 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))) {
-			lprintf(CTDL_INFO, "Unregistered fixed output function for %s\n", content_type);
+		if (!strcasecmp(content_type, cur->content_type)) {
+			MOD_syslog(LOG_DEBUG,
+				   "Unregistered fixed output function for %s\n",
+				   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)
 	{
-		lprintf(CTDL_INFO, "Destroyed fixed output function for %s\n", cur->content_type);
+		MOD_syslog(LOG_DEBUG, "Destroyed fixed output function for %s\n", cur->content_type);
 		p = cur->next;
 		free(cur);
 		cur = p;
@@ -682,7 +1023,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)) {
@@ -697,50 +1038,57 @@ int PerformFixedOutputHooks(char *content_type, char *content, int content_lengt
 
 
 
-void CtdlRegisterXmsgHook(int (*fcn_ptr) (char *, char *, char *), int order)
+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;
-	lprintf(CTDL_INFO, "Registered a new x-msg function (priority %d)\n", order);
+	MOD_syslog(LOG_DEBUG, "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;
+	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) {
-			lprintf(CTDL_INFO, "Unregistered x-msg function "
-					"(priority %d)\n", order);
+		if (fcn_ptr == cur->h_function_pointer &&
+		    order == cur->order) {
+			MOD_syslog(LOG_DEBUG, "Unregistered x-msg function "
+				   "(priority %d)\n", order);
 			p = cur->next;
-			if (cur == XmsgHookTable) {
-				XmsgHookTable = p;
-			}
 			free(cur);
+
+			if (last != NULL)
+				last->next = p;
+			else
+				XmsgHookTable = p;
+			
 			cur = p;
 		}
+		else {
+			last = cur;
+			cur = cur->next;
+		}
 	}
 }
 
 void CtdlDestroyXmsgHooks(void)
 {
-	struct XmsgFunctionHook *cur, *p;
+	XmsgFunctionHook *cur, *p;
 
 	cur = XmsgHookTable;
 	while (cur != NULL)
 	{
-		lprintf(CTDL_INFO, "Destroyed x-msg function "
+		MOD_syslog(LOG_DEBUG, "Destroyed x-msg function "
 			"(priority %d)\n", cur->order);
 		p = cur->next;
 			
@@ -758,14 +1106,13 @@ void CtdlRegisterServiceHook(int tcp_port,
 			     void (*h_async_function) (void),
 			     const char *ServiceName)
 {
-	struct ServiceFunctionHook *newfcn;
+	ServiceFunctionHook *newfcn;
 	char *message;
-	char *error;
+	char error[SIZ];
 
-	error = NULL;
-	newfcn = (struct ServiceFunctionHook *)
-	    malloc(sizeof(struct ServiceFunctionHook));
-	message = (char*) malloc (SIZ);
+	strcpy(error, "");
+	newfcn = (ServiceFunctionHook *) malloc(sizeof(ServiceFunctionHook));
+	message = (char*) malloc (SIZ + SIZ);
 	
 	newfcn->next = ServiceHookTable;
 	newfcn->tcp_port = tcp_port;
@@ -776,20 +1123,20 @@ void CtdlRegisterServiceHook(int tcp_port,
 	newfcn->ServiceName = ServiceName;
 
 	if (sockpath != NULL) {
-		newfcn->msock = ig_uds_server(sockpath, config.c_maxsessions, &error);
+		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 %s has been manually disabled, skipping\n", ServiceName);
+		MOD_syslog(LOG_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,
+		newfcn->msock = ctdl_tcp_server(config.c_ip_addr,
 					      tcp_port,
 					      config.c_maxsessions, 
-					      &error);
+					      error);
 		snprintf(message, SIZ, "TCP port %s:%d: (%s) ", 
 			 config.c_ip_addr, tcp_port, ServiceName);
 	}
@@ -797,13 +1144,12 @@ void CtdlRegisterServiceHook(int tcp_port,
 	if (newfcn->msock > 0) {
 		ServiceHookTable = newfcn;
 		strcat(message, "registered.");
-		lprintf(CTDL_INFO, "%s\n", message);
+		MOD_syslog(LOG_INFO, "%s\n", message);
 	}
 	else {
 		AddPortError(message, error);
 		strcat(message, "FAILED.");
-		lprintf(CTDL_CRIT, "%s\n", message);
-		free(error);
+		MOD_syslog(LOG_CRIT, "%s\n", message);
 		free(newfcn);
 	}
 	free(message);
@@ -816,51 +1162,87 @@ 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) {
-				lprintf(CTDL_INFO, "Closed UNIX domain socket %s\n",
-						sockpath);
+				MOD_syslog(LOG_INFO, "Closed UNIX domain socket %s\n",
+					   sockpath);
+				unlink(sockpath);
 			} else if (tcp_port) {
-				lprintf(CTDL_INFO, "Closed TCP port %d\n", tcp_port);
+				MOD_syslog(LOG_INFO, "Closed TCP port %d\n", tcp_port);
 			} else {
-				lprintf(CTDL_INFO, "Unregistered unknown service\n");
+				MOD_syslog(LOG_INFO, "Unregistered service \"%s\"\n", 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){
+				MOD_syslog(LOG_INFO, "[%s] Closed UNIX domain socket %s\n",
+					   cur->ServiceName,
+					   cur->sockpath);
+				unlink(cur->sockpath);
+			} else {
+				MOD_syslog(LOG_INFO, "[%s] closing service\n", 
+					   cur->ServiceName);
+			}
+		}
+		cur = cur->next;
 	}
 }
 
 void CtdlDestroyServiceHook(void)
 {
-	struct ServiceFunctionHook *cur, *p;
+	ServiceFunctionHook *cur, *p;
 
 	cur = ServiceHookTable;
 	while (cur != NULL)
 	{
 		close(cur->msock);
 		if (cur->sockpath) {
-			lprintf(CTDL_INFO, "Closed UNIX domain socket %s\n",
-				cur->sockpath);
+			MOD_syslog(LOG_INFO, "Closed UNIX domain socket %s\n",
+				   cur->sockpath);
+			unlink(cur->sockpath);
 		} else if (cur->tcp_port) {
-			lprintf(CTDL_INFO, "Closed TCP port %d\n", cur->tcp_port);
+			MOD_syslog(LOG_INFO, "Closed TCP port %d\n", cur->tcp_port);
 		} else {
-			lprintf(CTDL_INFO, "Unregistered unknown service\n");
+			MOD_syslog(LOG_INFO, "Destroyed service \"%s\"\n", cur->ServiceName);
 		}
 		p = cur->next;
 		free(cur);
@@ -869,44 +1251,67 @@ void CtdlDestroyServiceHook(void)
 	ServiceHookTable = NULL;
 }
 
-void CtdlRegisterSearchFuncHook(void (*fcn_ptr)(int *, long **, char *), char *name)
+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;
 
-	lprintf(CTDL_INFO, "Registered a new search function (%s)\n", name);
+	MOD_syslog(LOG_DEBUG, "Registered a new search function (%s)\n", name);
 }
 
-void CtdlUnregisterSearchFuncHook(void (*fcn_ptr)(int *, long **, char *), char *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)) {
-			lprintf(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))
+		{
+			MOD_syslog(LOG_DEBUG, "Unregistered search function(%s)\n", 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 CtdlModuleDoSearch(int *num_msgs, long **search_msgs, char *search_string, char *func_name)
+void CtdlDestroySearchHooks(void)
 {
-	struct SearchFunctionHook *fcn = NULL;
+        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)
+{
+	SearchFunctionHook *fcn = NULL;
 
 	for (fcn = SearchFunctionHookTable; fcn != NULL; fcn = fcn->next) {
 		if (!func_name || !strcmp(func_name, fcn->name)) {
@@ -920,18 +1325,21 @@ void CtdlModuleDoSearch(int *num_msgs, long **search_msgs, char *search_string,
 
 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) {
@@ -942,16 +1350,15 @@ void PerformUserHooks(struct ctdluser *usbuf, int EventType)
 
 int PerformMessageHooks(struct CtdlMessage *msg, 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.
-	lprintf(CTDL_DEBUG, "** Event type is %d, flags are %d\n",
-		EventType, msg->cm_flags);
+	MOD_syslog(LOG_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");
+		MODM_syslog(LOG_DEBUG, "Skipping hooks\n");
 		return(0);
 	}
 
@@ -959,8 +1366,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);
 		}
 	}
 
@@ -974,10 +1380,10 @@ int PerformMessageHooks(struct CtdlMessage *msg, int EventType)
 
 int PerformRoomHooks(struct ctdlroom *target_room)
 {
-	struct RoomFunctionHook *fcn;
+	RoomFunctionHook *fcn;
 	int total_retval = 0;
 
-	lprintf(CTDL_DEBUG, "Performing room hooks for <%s>\n", target_room->QRname);
+	MOD_syslog(LOG_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);
@@ -991,7 +1397,7 @@ int PerformRoomHooks(struct ctdlroom *target_room)
 
 int PerformNetprocHooks(struct CtdlMessage *msg, char *target_room)
 {
-	struct NetprocFunctionHook *fcn;
+	NetprocFunctionHook *fcn;
 	int total_retval = 0;
 
 	for (fcn = NetprocHookTable; fcn != NULL; fcn = fcn->next) {
@@ -1008,7 +1414,7 @@ int PerformNetprocHooks(struct CtdlMessage *msg, char *target_room)
 
 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);
@@ -1019,9 +1425,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;
+	XmsgFunctionHook *fcn;
 	int total_sent = 0;
 	int p;
 
@@ -1030,7 +1436,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
@@ -1043,132 +1449,6 @@ int PerformXmsgHooks(char *sender, char *recp, char *msg)
 	return total_sent;
 }
 
-void CtdlRegisterMaintenanceThread(char *name, void *(*thread_proc)(void *arg))
-{
-	struct MaintenanceThreadHook *newfcn;
-
-	newfcn = (struct MaintenanceThreadHook *)
-	    malloc(sizeof(struct MaintenanceThreadHook));
-	newfcn->name = name;
-	newfcn->next = MaintenanceThreadHookTable;
-	newfcn->fcn_ptr = thread_proc;
-	MaintenanceThreadHookTable = newfcn;
-
-	lprintf(CTDL_INFO, "Registered a new maintenance thread function\n");
-}
-
-
-
-int CtdlRegisterDirectoryServiceFunc(int (*func)(char *cn, char *ou, void **object), int cmd, char *module)
-{
-	struct DirectoryServiceHook *newfcn;
-	
-	newfcn = DirectoryServiceHookList;
-	while (newfcn)
-	{
-		if (newfcn->cmd == cmd && !strcmp(newfcn->module, module))
-		{
-			lprintf(CTDL_ERR, "Directory service function already handled by module %s\n", module);
-			return -1;
-		}
-		newfcn = newfcn->next;
-	}
-	
-	newfcn = (struct DirectoryServiceHook *) malloc (sizeof(struct DirectoryServiceHook));
-	newfcn->handler = func;
-	newfcn->cmd = cmd;
-	newfcn->module = module;
-	newfcn->next = DirectoryServiceHookList;
-	DirectoryServiceHookList = newfcn;
-	
-	lprintf(CTDL_INFO, "Registered a new directory service function from module %s\n", module);
-	return 0;
-}
-
-int CtdlDoDirectoryServiceFunc(char *cn, char *ou, void **object, char *module, int cmd)
-{
-	struct DirectoryServiceHook *curfcn;
-	struct DirectoryObject *our_object_list = NULL;
-	struct DirectoryObject *newobject = NULL;
-	struct DirectoryObject *oldobject = NULL;
-	
-	
-	curfcn = DirectoryServiceHookList;
-	if (object)
-		our_object_list = (struct DirectoryObject *) *object;
-	
-	while (curfcn)
-	{
-		if (curfcn->cmd == cmd)
-		{
-			if (!module)
-			{
-				if (cmd == DIRECTORY_CREATE_OBJECT)
-				{
-					newobject = (struct DirectoryObject*) malloc (sizeof(struct DirectoryObject));
-					newobject->module = curfcn->module;
-					newobject->object = NULL;
-					newobject->next = our_object_list;
-					our_object_list = newobject;
-				}
-				if (our_object_list)
-				{
-					for(newobject = our_object_list; newobject; newobject=newobject->next)
-					{
-						if (!strcmp(newobject->module, curfcn->module))
-							(void) curfcn->handler(cn, ou, &newobject->object);
-					}
-				}
-				else
-					(void) curfcn->handler(cn, ou, NULL);
-
-				continue;
-			}
-			else 
-			{
-				if(!strcmp(curfcn->module, module))
-				{
-					if (cmd == DIRECTORY_CREATE_OBJECT)
-					{
-						newobject = (struct DirectoryObject*) malloc (sizeof(struct DirectoryObject));
-						newobject->module = module;
-						newobject->object = NULL;
-						newobject->next = our_object_list;
-						our_object_list = newobject;
-					}
-					if (our_object_list)
-					{
-						for(newobject = our_object_list; newobject; newobject=newobject->next)
-						{
-							if (!strcmp(newobject->module, curfcn->module))
-								(void) curfcn->handler(cn, ou, &newobject->object);
-						}
-					}
-					else
-						(void) (curfcn->handler(cn, ou, NULL));
-
-					break;
-				}
-			}
-		}
-		curfcn=curfcn->next;
-	}
-	if (our_object_list)
-	{
-		*object = our_object_list;
-		if (cmd == DIRECTORY_FREE_OBJECT)
-		{	// The objects pointed to by the list should have been freed by the module that created it
-			for(newobject = our_object_list; newobject; )
-			{
-				oldobject=newobject;
-				newobject=newobject->next;
-				free(oldobject);
-			}
-			*object=NULL;
-		}
-	}
-	return 0;
-}
 
 /*
  * Dirty hack until we impliment a hook mechanism for this
@@ -1179,3 +1459,18 @@ void CtdlModuleStartCryptoMsgs(char *ok_response, char *nosup_response, char *er
 	CtdlStartTLS (ok_response, nosup_response, error_response);
 #endif
 }
+
+void DebugModulesEnable(const int n)
+{
+	DebugModules = n;
+}
+CTDL_MODULE_INIT(modules)
+{
+	if (!threading) {
+		CtdlRegisterDebugFlagHook(HKEY("modules"), DebugModulesEnable, &DebugModules);
+
+		CtdlRegisterProtoHook(cmd_log_get, "LOGP", "Print Log-parameters");
+		CtdlRegisterProtoHook(cmd_log_set, "LOGS", "Set Log-parameters");
+	}
+	return "modules";
+}