X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fserv_extensions.c;h=5417d2672ed65de4b7833cccbe1514a1de823c5e;hb=56d69e5d8434e98835a2582c59b771ba69475431;hp=3cbc5b9069d01469a50ace56f7f30ae87b90f35e;hpb=13f214043d3697db7a3ca1c751cee41fd2fcf695;p=citadel.git

diff --git a/citadel/serv_extensions.c b/citadel/serv_extensions.c
index 3cbc5b906..5417d2672 100644
--- a/citadel/serv_extensions.c
+++ b/citadel/serv_extensions.c
@@ -1,9 +1,6 @@
 /*
- * $Id$
- *
  * Citadel Dynamic Loading Module
  * Written by Brian Costello <btx@calyx.net>
- *
  */
 
 #include "sysdep.h"
@@ -15,16 +12,18 @@
 #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"
@@ -40,15 +39,15 @@ struct DeleteFunctionHook *DeleteHookTable = NULL;
 struct ServiceFunctionHook *ServiceHookTable = NULL;
 struct FixedOutputHook *FixedOutputTable = NULL;
 struct RoomFunctionHook *RoomHookTable = NULL;
-struct MaintenanceThreadHook *MaintenanceThreadHookTable = 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;
+};
+
+HashList *ProtoHookList = NULL;
 
 
 #define ERR_PORT (1 << 1)
@@ -58,10 +57,10 @@ static char *portlist = NULL;
 static size_t nSizPort = 0;
 
 static char *errormessages = NULL;
-static size_t nSizErrmsg = 0;
+size_t nSizErrmsg = 0;
 
 
-static long   DetailErrorFlags;
+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"
@@ -76,8 +75,9 @@ char *ErrPortShort = "We couldn't bind all ports you configured to be provided b
 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";
+" 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)
@@ -86,6 +86,8 @@ void LogPrintMessages(long err)
 	int n = nSizPort + nSizErrmsg + 5;
 
 	Message = (char*) malloc(n * SIZ);
+	
+	DetailErrorFlags = DetailErrorFlags & ~err;
 
 	switch (err)
 	{
@@ -107,6 +109,8 @@ void LogPrintMessages(long err)
 
 	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;
@@ -172,10 +176,43 @@ void AddPortError(char *Port, char *ErrorMessage)
 }
 
 
+int DLoader_Exec_Cmd(char *cmdbuf)
+{
+	void *vP;
+	struct ProtoFunctionHook *p;
+
+	if (GetHash(ProtoHookList, cmdbuf, 4, &vP) && (vP != NULL)) {
+		p = (struct 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;
 
+	if (ProtoHookList == NULL)
+		ProtoHookList = NewHash (1, FourHash);
+
+
 	p = (struct ProtoFunctionHook *)
 		malloc(sizeof(struct ProtoFunctionHook));
 
@@ -186,114 +223,18 @@ 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);
-}
-
 
-void CtdlUnregisterProtoHook(void (*handler) (char *), char *cmd)
-{
-	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);
-			p = cur->next;
-			if (cur == ProtoHookList) {
-				ProtoHookList = p;
-			}
-			else if (lastcur != NULL)
-			{
-				lastcur->next = p;
-			}
-			free(cur);
-			cur = p;
-		}
-		lastcur = cur;
-	}
+	Put(ProtoHookList, cmd, 4, p, NULL);
+	CtdlLogPrintf(CTDL_INFO, "Registered server command %s (%s)\n", cmd, desc);
 }
 
 void CtdlDestroyProtoHooks(void)
 {
-	struct ProtoFunctionHook *cur, *p;
 
-	cur = ProtoHookList; 
-	while (cur != NULL)
-	{
-		lprintf(CTDL_INFO, "Destroyed server command %s (%s)\n",
-			cur->cmd, cur->desc);
-		p = cur->next;
-		free(cur);
-		cur = p;
-	}
-	ProtoHookList = NULL;
+	DeleteHash(&ProtoHookList);
 }
 
 
-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;
-}
-
-#if 0
-void initialize_server_extensions(void)
-{
-	long filter;
-
-	nSizErrmsg = 0;
-
-	/*lprintf(CTDL_INFO, "%s\n", serv_bio_init());
-	lprintf(CTDL_INFO, "%s\n", serv_calendar_init());
-	lprintf(CTDL_INFO, "%s\n", serv_notes_init());
-	lprintf(CTDL_INFO, "%s\n", serv_ldap_init());
-	lprintf(CTDL_INFO, "%s\n", serv_chat_init());
-	lprintf(CTDL_INFO, "%s\n", serv_expire_init());
-	lprintf(CTDL_INFO, "%s\n", serv_imap_init());
-	lprintf(CTDL_INFO, "%s\n", serv_upgrade_init());
-	lprintf(CTDL_INFO, "%s\n", serv_inetcfg_init());
-	lprintf(CTDL_INFO, "%s\n", serv_listsub_init());
-	lprintf(CTDL_INFO, "%s\n", serv_mrtg_init());
-	lprintf(CTDL_INFO, "%s\n", serv_netfilter_init());
-	lprintf(CTDL_INFO, "%s\n", serv_network_init());
-	lprintf(CTDL_INFO, "%s\n", serv_newuser_init());
-	lprintf(CTDL_INFO, "%s\n", serv_pas2_init());
-	lprintf(CTDL_INFO, "%s\n", serv_smtp_init());
-	lprintf(CTDL_INFO, "%s\n", serv_pop3_init());
-	lprintf(CTDL_INFO, "%s\n", serv_rwho_init());
-	lprintf(CTDL_INFO, "%s\n", serv_spam_init());*/
-	/* lprintf(CTDL_INFO, "%s\n", serv_test_init()); */
-	/*lprintf(CTDL_INFO, "%s\n", serv_vandelay_init());
-	lprintf(CTDL_INFO, "%s\n", serv_vcard_init());
-	lprintf(CTDL_INFO, "%s\n", serv_fulltext_init());
-	lprintf(CTDL_INFO, "%s\n", serv_autocompletion_init());
-	lprintf(CTDL_INFO, "%s\n", serv_postfix_tcpdict());
-	lprintf(CTDL_INFO, "%s\n", serv_sieve_init());
-	lprintf(CTDL_INFO, "%s\n", serv_managesieve_init());
-	lprintf(CTDL_INFO, "%s\n", serv_funambol_init());*/
-	for (filter = 1; filter != 0; filter = filter << 1)
-		if ((filter & DetailErrorFlags) != 0)
-			LogPrintMessages(filter);
-}
-
-#endif
-
 void CtdlRegisterCleanupHook(void (*fcn_ptr) (void))
 {
 
@@ -305,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");
 }
 
 
@@ -317,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;
@@ -335,7 +276,7 @@ void CtdlDestroyCleanupHooks(void)
 	cur = CleanupHookTable;
 	while (cur != NULL)
 	{
-		lprintf(CTDL_INFO, "Destroyed cleanup function\n");
+		CtdlLogPrintf(CTDL_INFO, "Destroyed cleanup function\n");
 		p = cur->next;
 		free(cur);
 		cur = p;
@@ -356,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);
 }
 
@@ -370,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) {
@@ -389,7 +330,7 @@ void CtdlDestroySessionHooks(void)
 	cur = SessionHookTable;
 	while (cur != NULL)
 	{
-		lprintf(CTDL_INFO, "Destroyed session function\n");
+		CtdlLogPrintf(CTDL_INFO, "Destroyed session function\n");
 		p = cur->next;
 		free(cur);
 		cur = p;
@@ -410,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);
 }
 
@@ -424,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) {
@@ -443,7 +384,7 @@ void CtdlDestroyUserHooks(void)
 	cur = UserHookTable;
 	while (cur != NULL)
 	{
-		lprintf(CTDL_INFO, "Destroyed user function \n");
+		CtdlLogPrintf(CTDL_INFO, "Destroyed user function \n");
 		p = cur->next;
 		free(cur);
 		cur = p;
@@ -465,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);
 }
 
@@ -480,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) {
@@ -499,7 +440,7 @@ void CtdlDestroyMessageHook(void)
 	cur = MessageHookTable; 
 	while (cur != NULL)
 	{
-		lprintf(CTDL_INFO, "Destroyed message function \n");
+		CtdlLogPrintf(CTDL_INFO, "Destroyed message function (type %d)\n", cur->eventtype);
 		p = cur->next;
 		free(cur);
 		cur = p;
@@ -518,7 +459,7 @@ void CtdlRegisterRoomHook(int (*fcn_ptr)(struct ctdlroom *))
 	newfcn->fcn_ptr = fcn_ptr;
 	RoomHookTable = newfcn;
 
-	lprintf(CTDL_INFO, "Registered a new room function\n");
+	CtdlLogPrintf(CTDL_INFO, "Registered a new room function\n");
 }
 
 
@@ -528,7 +469,7 @@ void CtdlUnregisterRoomHook(int (*fcn_ptr)(struct ctdlroom *))
 
 	for (cur = RoomHookTable; cur != NULL; cur = cur->next) {
 		while (cur != NULL && fcn_ptr == cur->fcn_ptr) {
-			lprintf(CTDL_INFO, "Unregistered room function\n");
+			CtdlLogPrintf(CTDL_INFO, "Unregistered room function\n");
 			p = cur->next;
 			if (cur == RoomHookTable) {
 				RoomHookTable = p;
@@ -547,7 +488,7 @@ void CtdlDestroyRoomHooks(void)
 	cur = RoomHookTable;
 	while (cur != NULL)
 	{
-		lprintf(CTDL_INFO, "Unregistered room function\n");
+		CtdlLogPrintf(CTDL_INFO, "Destroyed room function\n");
 		p = cur->next;
 		free(cur);
 		cur = p;
@@ -565,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");
 }
 
 
@@ -577,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;
@@ -595,7 +536,7 @@ void CtdlDestroyNetprocHooks(void)
 	cur = NetprocHookTable;
 	while (cur != NULL)
 	{
-		lprintf(CTDL_INFO, "Unregistered netproc function\n");
+		CtdlLogPrintf(CTDL_INFO, "Destroyed netproc function\n");
 		p = cur->next;
 		free(cur);
 		cur = p;
@@ -614,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");
 }
 
 
@@ -626,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;
@@ -643,7 +584,7 @@ void CtdlDestroyDeleteHooks(void)
 	cur = DeleteHookTable;
 	while (cur != NULL)
 	{
-		lprintf(CTDL_INFO, "Destroyed netproc function\n");
+		CtdlLogPrintf(CTDL_INFO, "Destroyed delete function\n");
 		p = cur->next;
 		free(cur);
 		cur = p;		
@@ -665,7 +606,7 @@ void CtdlRegisterFixedOutputHook(char *content_type, void (*handler)(char *, int
 	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);
+	CtdlLogPrintf(CTDL_INFO, "Registered a new fixed output function for %s\n", newfcn->content_type);
 }
 
 
@@ -676,7 +617,7 @@ void CtdlUnregisterFixedOutputHook(char *content_type)
 	for (cur = FixedOutputTable; cur != NULL; cur = cur->next) {
 		/* 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);
+			CtdlLogPrintf(CTDL_INFO, "Unregistered fixed output function for %s\n", content_type);
 			p = cur->next;
 			if (cur == FixedOutputTable) {
 				FixedOutputTable = p;
@@ -694,7 +635,7 @@ void CtdlDestroyFixedOutputHooks(void)
 	cur = FixedOutputTable; 
 	while (cur != NULL)
 	{
-		lprintf(CTDL_INFO, "Destroyed fixed output function for %s\n", cur->content_type);
+		CtdlLogPrintf(CTDL_INFO, "Destroyed fixed output function for %s\n", cur->content_type);
 		p = cur->next;
 		free(cur);
 		cur = p;
@@ -721,22 +662,21 @@ 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;
 
-	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;
 
@@ -745,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) {
@@ -764,7 +704,7 @@ void CtdlDestroyXmsgHooks(void)
 	cur = XmsgHookTable;
 	while (cur != NULL)
 	{
-		lprintf(CTDL_INFO, "Destroyed x-msg function "
+		CtdlLogPrintf(CTDL_INFO, "Destroyed x-msg function "
 			"(priority %d)\n", cur->order);
 		p = cur->next;
 			
@@ -776,20 +716,19 @@ void CtdlDestroyXmsgHooks(void)
 
 
 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;
-	char *error;
+	char error[SIZ];
 
-	error = NULL;
-	newfcn = (struct ServiceFunctionHook *)
-	    malloc(sizeof(struct ServiceFunctionHook));
-	message = (char*) malloc (SIZ);
+	strcpy(error, "");
+	newfcn = (struct ServiceFunctionHook *) malloc(sizeof(struct ServiceFunctionHook));
+	message = (char*) malloc (SIZ + SIZ);
 	
 	newfcn->next = ServiceHookTable;
 	newfcn->tcp_port = tcp_port;
@@ -797,35 +736,36 @@ void CtdlRegisterServiceHook(int tcp_port,
 	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, &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 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,
+		newfcn->msock = ctdl_tcp_server(config.c_ip_addr,
 					      tcp_port,
 					      config.c_maxsessions, 
-					      &error);
-		snprintf(message, SIZ, "TCP port %s:%d: ", 
-			 config.c_ip_addr, tcp_port);
+					      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);
 	}
@@ -852,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) {
@@ -878,12 +818,12 @@ void CtdlDestroyServiceHook(void)
 	{
 		close(cur->msock);
 		if (cur->sockpath) {
-			lprintf(CTDL_INFO, "Closed UNIX domain socket %s\n",
+			CtdlLogPrintf(CTDL_INFO, "Closed UNIX domain socket %s\n",
 				cur->sockpath);
 		} else if (cur->tcp_port) {
-			lprintf(CTDL_INFO, "Closed TCP port %d\n", cur->tcp_port);
+			CtdlLogPrintf(CTDL_INFO, "Closed TCP port %d\n", cur->tcp_port);
 		} else {
-			lprintf(CTDL_INFO, "Unregistered unknown service\n");
+			CtdlLogPrintf(CTDL_INFO, "Destroyed service \"%s\"\n", cur->ServiceName);
 		}
 		p = cur->next;
 		free(cur);
@@ -892,7 +832,7 @@ 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;
 
@@ -907,16 +847,16 @@ void CtdlRegisterSearchFuncHook(void (*fcn_ptr)(int *, long **, char *), char *n
 	newfcn->fcn_ptr = fcn_ptr;
 	SearchFunctionHookTable = newfcn;
 
-	lprintf(CTDL_INFO, "Registered a new search function (%s)\n", name);
+	CtdlLogPrintf(CTDL_INFO, "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;
 	
 	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);
+			CtdlLogPrintf(CTDL_INFO, "Unregistered search function(%s)\n", name);
 			p = cur->next;
 			if (cur == SearchFunctionHookTable) {
 				SearchFunctionHookTable = p;
@@ -927,7 +867,7 @@ void CtdlUnregisterSearchFuncHook(void (*fcn_ptr)(int *, long **, char *), char
 	}
 }
 
-void CtdlModuleDoSearch(int *num_msgs, long **search_msgs, char *search_string, char *func_name)
+void CtdlModuleDoSearch(int *num_msgs, long **search_msgs, const char *search_string, const char *func_name)
 {
 	struct SearchFunctionHook *fcn = NULL;
 
@@ -947,6 +887,9 @@ void PerformSessionHooks(int EventType)
 
 	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) ();
 		}
 	}
@@ -970,11 +913,11 @@ int PerformMessageHooks(struct CtdlMessage *msg, int EventType)
 
 	/* 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);
 	}
 
@@ -1000,7 +943,7 @@ int PerformRoomHooks(struct ctdlroom *target_room)
 	struct RoomFunctionHook *fcn;
 	int total_retval = 0;
 
-	lprintf(CTDL_DEBUG, "Performing room hooks for <%s>\n", target_room->QRname);
+	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);
@@ -1042,7 +985,7 @@ 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;
@@ -1053,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
@@ -1066,20 +1009,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");
-}
-
 
 /*
  * Dirty hack until we impliment a hook mechanism for this