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

diff --git a/citadel/serv_extensions.c b/citadel/serv_extensions.c
index 18e425830..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"
@@ -46,25 +43,13 @@ struct SearchFunctionHook *SearchFunctionHookTable = NULL;
 
 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)
 
 
@@ -90,7 +75,7 @@ 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 "
+" 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";
 
@@ -101,6 +86,8 @@ void LogPrintMessages(long err)
 	int n = nSizPort + nSizErrmsg + 5;
 
 	Message = (char*) malloc(n * SIZ);
+	
+	DetailErrorFlags = DetailErrorFlags & ~err;
 
 	switch (err)
 	{
@@ -122,8 +109,8 @@ void LogPrintMessages(long err)
 
 	snprintf(Message, n * SIZ, ErrGeneral, Short, Where, List, Hint, DetailList);
 
-	lprintf(0,Message);
-	lprintf(0,ErrSubject);
+	CtdlLogPrintf(0,Message);
+	CtdlLogPrintf(0,ErrSubject);
 	quickie_message("Citadel", NULL, NULL, AIDEROOM, Message, FMT_FIXED, ErrSubject);
 	if (errormessages!=NULL) free (errormessages);
 	errormessages = NULL;
@@ -191,22 +178,41 @@ void AddPortError(char *Port, char *ErrorMessage)
 
 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;
 }
 
+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));
 
@@ -217,56 +223,15 @@ 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);
 }
 
 
@@ -281,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");
 }
 
 
@@ -293,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;
@@ -311,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;
@@ -332,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);
 }
 
@@ -346,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) {
@@ -365,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;
@@ -386,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);
 }
 
@@ -400,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) {
@@ -419,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;
@@ -441,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);
 }
 
@@ -456,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) {
@@ -475,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;
@@ -494,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");
 }
 
 
@@ -504,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;
@@ -523,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;
@@ -541,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");
 }
 
 
@@ -553,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;
@@ -571,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;
@@ -590,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");
 }
 
 
@@ -602,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;
@@ -619,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;		
@@ -641,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);
 }
 
 
@@ -652,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;
@@ -670,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;
@@ -697,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;
 
@@ -721,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) {
@@ -740,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;
 			
@@ -760,12 +724,11 @@ void CtdlRegisterServiceHook(int tcp_port,
 {
 	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;
@@ -776,20 +739,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);
+		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);
+					      error);
 		snprintf(message, SIZ, "TCP port %s:%d: (%s) ", 
 			 config.c_ip_addr, tcp_port, ServiceName);
 	}
@@ -797,12 +760,12 @@ void CtdlRegisterServiceHook(int tcp_port,
 	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);
 	}
@@ -829,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) {
@@ -855,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);
@@ -869,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;
 
@@ -884,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;
@@ -904,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;
 
@@ -924,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) ();
 		}
 	}
@@ -947,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);
 	}
 
@@ -977,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);
@@ -1019,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;
@@ -1030,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
@@ -1044,119 +1010,6 @@ int PerformXmsgHooks(char *sender, char *recp, char *msg)
 }
 
 
-
-
-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
  */