X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fserv_extensions.c;h=73a1b7911094dc48858a5cf95b5d2c824c1fcee5;hb=45fc293fa4f3071711a67c85b1337e5b1eebea23;hp=dee82748d13053bf27d62217b1fce1fc56a91649;hpb=b42480fc7900ffa7af50090b051d9c6359ad54ec;p=citadel.git

diff --git a/citadel/serv_extensions.c b/citadel/serv_extensions.c
index dee82748d..73a1b7911 100644
--- a/citadel/serv_extensions.c
+++ b/citadel/serv_extensions.c
@@ -1,8 +1,8 @@
 /*
- * Citadel Dynamic Loading Module
- * Written by Brian Costello <btx@calyx.net>
+ * Citadel Extension Loader
+ * Originally written by Brian Costello <btx@calyx.net>
  *
- * Copyright (c) 1987-2011 by the citadel.org team
+ * Copyright (c) 1987-2019 by the citadel.org team
  *
  * This program is open source software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License, version 3.
@@ -13,59 +13,29 @@
  * GNU General Public License for more details.
  */
 
-#include "sysdep.h"
-#include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
-#include <sys/types.h>
-#include <dirent.h>
-#include <string.h>
-#include <limits.h>
-#include <ctype.h>
-#include <syslog.h>
+#include <stdio.h>
+#include <sys/stat.h>
 #include <libcitadel.h>
-#include "citadel.h"
-#include "server.h"
-#include "serv_extensions.h"
 #include "sysdep_decls.h"
-#include "msgbase.h"
-#include "config.h"
-
 #include "modules/crypto/serv_crypto.h"	/* Needed until a universal crypto startup hook is implimented for CtdlStartTLS */
-
+#include "serv_extensions.h"
 #include "ctdl_module.h"
+#include "config.h"
 
 
-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;
-
+FixedOutputHook *FixedOutputTable = NULL;
 
 
 /*
@@ -81,7 +51,7 @@ struct SessionFunctionHook {
 	void (*h_function_pointer) (void);
 	int eventtype;
 };
-extern SessionFunctionHook *SessionHookTable;
+SessionFunctionHook *SessionHookTable = NULL;
 
 
 /*
@@ -95,7 +65,8 @@ struct UserFunctionHook {
 	void (*h_function_pointer) (struct ctdluser *usbuf);
 	int eventtype;
 };
-extern UserFunctionHook *UserHookTable;
+UserFunctionHook *UserHookTable = NULL;
+
 
 /*
  * MessageFunctionHook extensions are used for hooks which implement handlers
@@ -104,22 +75,10 @@ extern UserFunctionHook *UserHookTable;
 typedef struct MessageFunctionHook MessageFunctionHook;
 struct MessageFunctionHook {
 	MessageFunctionHook *next;
-	int (*h_function_pointer) (struct CtdlMessage *msg);
+	int (*h_function_pointer) (struct CtdlMessage *msg, recptypes *recps);
 	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;
+MessageFunctionHook *MessageHookTable = NULL;
 
 
 /*
@@ -131,7 +90,7 @@ struct DeleteFunctionHook {
 	DeleteFunctionHook *next;
 	void (*h_function_pointer) (char *target_room, long msgnum);
 };
-extern DeleteFunctionHook *DeleteHookTable;
+DeleteFunctionHook *DeleteHookTable = NULL;
 
 
 /*
@@ -146,9 +105,7 @@ struct XmsgFunctionHook {
 	int (*h_function_pointer) (char *, char *, char *, char *);
 	int order;
 };
-extern XmsgFunctionHook *XmsgHookTable;
-
-
+XmsgFunctionHook *XmsgHookTable = NULL;
 
 
 /*
@@ -160,8 +117,7 @@ struct RoomFunctionHook {
 	RoomFunctionHook *next;
 	int (*fcn_ptr) (struct ctdlroom *);
 };
-extern RoomFunctionHook *RoomHookTable;
-
+RoomFunctionHook *RoomHookTable = NULL;
 
 
 typedef struct SearchFunctionHook SearchFunctionHook;
@@ -170,21 +126,12 @@ struct SearchFunctionHook {
 	void (*fcn_ptr) (int *, long **, const char *);
 	char *name;
 };
-extern SearchFunctionHook *SearchFunctionHookTable;
-
+SearchFunctionHook *SearchFunctionHookTable = NULL;
 
 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 {
@@ -200,7 +147,6 @@ HashList *ProtoHookList = NULL;
 
 
 static StrBuf *portlist = NULL;
-
 static StrBuf *errormessages = NULL;
 
 
@@ -209,21 +155,19 @@ ConstStr Empty = {HKEY("")};
 char *ErrSubject = "Startup Problems";
 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(" 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")}
 };
 
-ConstStr ErrPortShort = { HKEY("We couldn't bind all ports you configured to be provided by citadel server.\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")};
+ConstStr ErrPortHint  = { HKEY("If you want Citadel to provide you with that functionality, "
+			       "check the output of \"netstat -lnp\" on Linux, or \"netstat -na\" on BSD"
+			       " and disable the program that binds these ports.\n")};
 
 
 void LogPrintMessages(long err)
@@ -233,8 +177,7 @@ void LogPrintMessages(long err)
 	ConstStr *Short, *Where, *Hint; 
 
 	
-	Message = NewStrBufPlain(NULL, 
-				 StrLength(portlist) + StrLength(errormessages));
+	Message = NewStrBufPlain(NULL, StrLength(portlist) + StrLength(errormessages));
 	
 	DetailErrorFlags = DetailErrorFlags & ~err;
 
@@ -268,8 +211,8 @@ void LogPrintMessages(long err)
 	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);
+	syslog(LOG_EMERG, "extensions: %s", ChrPtr(Message));
+	syslog(LOG_EMERG, "extensions: %s", ErrSubject);
 	quickie_message("Citadel", NULL, NULL, AIDEROOM, ChrPtr(Message), FMT_FIXED, ErrSubject);
 
 	FreeStrBuf(&Message);
@@ -310,132 +253,6 @@ int DLoader_Exec_Cmd(char *cmdbuf)
 	return 0;
 }
 
-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;
-}
-
-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);
-	}
-	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);
-	}
-}
-void cmd_log_get(char *argbuf)
-{
-	long HKLen;
-	const char *ch;
-	HashPos *Pos;
-	void *vptr;
-
-	if (CtdlAccessCheck(ac_aide)) return;
-
-	cprintf("%d Log modules enabled:\n", LISTING_FOLLOWS);
-
-	Pos = GetNewHashPos(LogDebugEntryTable, 0);
-
-	while (GetNextHashPos(LogDebugEntryTable, Pos, &HKLen, &ch, &vptr)) {
-		LogDebugEntry *E = (LogDebugEntry*)vptr;
-		cprintf("%s|%d\n", ch, *E->LogP);
-	}
-	
-	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))
-	{
-		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)
 {
@@ -457,7 +274,7 @@ void CtdlRegisterProtoHook(void (*handler) (char *), char *cmd, char *desc)
 	p->desc = desc;
 
 	Put(ProtoHookList, cmd, 4, p, NULL);
-	MOD_syslog(LOG_DEBUG, "Registered server command %s (%s)\n", cmd, desc);
+	syslog(LOG_DEBUG, "extensions: registered server command %s (%s)", cmd, desc);
 }
 
 void CtdlDestroyProtoHooks(void)
@@ -478,7 +295,7 @@ void CtdlRegisterCleanupHook(void (*fcn_ptr) (void))
 	newfcn->h_function_pointer = fcn_ptr;
 	CleanupHookTable = newfcn;
 
-	MODM_syslog(LOG_DEBUG, "Registered a new cleanup function\n");
+	syslog(LOG_DEBUG, "extensions: registered a new cleanup function");
 }
 
 
@@ -491,7 +308,7 @@ void CtdlUnregisterCleanupHook(void (*fcn_ptr) (void))
 	{
 		if (fcn_ptr == cur->h_function_pointer)
 		{
-			MODM_syslog(LOG_DEBUG, "Unregistered cleanup function\n");
+			syslog(LOG_DEBUG, "extensions: unregistered cleanup function");
 			p = cur->next;
 
 			free(cur);
@@ -518,7 +335,7 @@ void CtdlDestroyCleanupHooks(void)
 	cur = CleanupHookTable;
 	while (cur != NULL)
 	{
-		MODM_syslog(LOG_DEBUG, "Destroyed cleanup function\n");
+		syslog(LOG_DEBUG, "extensions: destroyed cleanup function");
 		p = cur->next;
 		free(cur);
 		cur = p;
@@ -537,7 +354,7 @@ void CtdlRegisterEVCleanupHook(void (*fcn_ptr) (void))
 	newfcn->h_function_pointer = fcn_ptr;
 	EVCleanupHookTable = newfcn;
 
-	MODM_syslog(LOG_DEBUG, "Registered a new cleanup function\n");
+	syslog(LOG_DEBUG, "extensions: registered a new cleanup function");
 }
 
 
@@ -550,7 +367,7 @@ void CtdlUnregisterEVCleanupHook(void (*fcn_ptr) (void))
 	{
 		if (fcn_ptr == cur->h_function_pointer)
 		{
-			MODM_syslog(LOG_DEBUG, "Unregistered cleanup function\n");
+			syslog(LOG_DEBUG, "extensions: unregistered cleanup function");
 			p = cur->next;
 
 			free(cur);
@@ -577,8 +394,9 @@ void CtdlDestroyEVCleanupHooks(void)
 	cur = EVCleanupHookTable;
 	while (cur != NULL)
 	{
-		MODM_syslog(LOG_DEBUG, "Destroyed cleanup function\n");
+		syslog(LOG_DEBUG, "extensions: destroyed cleanup function");
 		p = cur->next;
+		cur->h_function_pointer();
 		free(cur);
 		cur = p;
 	}
@@ -586,6 +404,8 @@ void CtdlDestroyEVCleanupHooks(void)
 }
 
 
+
+
 void CtdlRegisterSessionHook(void (*fcn_ptr) (void), int EventType, int Priority)
 {
 	SessionFunctionHook *newfcn;
@@ -606,8 +426,7 @@ void CtdlRegisterSessionHook(void (*fcn_ptr) (void), int EventType, int Priority
 	newfcn->next = *pfcn;
 	*pfcn = newfcn;
 	
-	MOD_syslog(LOG_DEBUG, "Registered a new session function (type %d Priority %d)\n",
-		   EventType, Priority);
+	syslog(LOG_DEBUG, "extensions: registered a new session function (type %d Priority %d)", EventType, Priority);
 }
 
 
@@ -620,8 +439,7 @@ void CtdlUnregisterSessionHook(void (*fcn_ptr) (void), int EventType)
 		if ((fcn_ptr == cur->h_function_pointer) &&
 		    (EventType == cur->eventtype))
 		{
-			MOD_syslog(LOG_DEBUG, "Unregistered session function (type %d)\n",
-				   EventType);
+			syslog(LOG_DEBUG, "extensions: unregistered session function (type %d)", EventType);
 			p = cur->next;
 
 			free(cur);
@@ -647,7 +465,7 @@ void CtdlDestroySessionHooks(void)
 	cur = SessionHookTable;
 	while (cur != NULL)
 	{
-		MODM_syslog(LOG_DEBUG, "Destroyed session function\n");
+		syslog(LOG_DEBUG, "extensions: destroyed session function");
 		p = cur->next;
 		free(cur);
 		cur = p;
@@ -668,7 +486,7 @@ void CtdlRegisterUserHook(void (*fcn_ptr) (ctdluser *), int EventType)
 	newfcn->eventtype = EventType;
 	UserHookTable = newfcn;
 
-	MOD_syslog(LOG_DEBUG, "Registered a new user function (type %d)\n",
+	syslog(LOG_DEBUG, "extensions: registered a new user function (type %d)",
 		   EventType);
 }
 
@@ -682,8 +500,7 @@ void CtdlUnregisterUserHook(void (*fcn_ptr) (struct ctdluser *), int EventType)
 		if ((fcn_ptr == cur->h_function_pointer) &&
 		    (EventType == cur->eventtype))
 		{
-			MOD_syslog(LOG_DEBUG, "Unregistered user function (type %d)\n",
-				   EventType);
+			syslog(LOG_DEBUG, "extensions: unregistered user function (type %d)", EventType);
 			p = cur->next;
 
 			free(cur);
@@ -709,7 +526,7 @@ void CtdlDestroyUserHooks(void)
 	cur = UserHookTable;
 	while (cur != NULL)
 	{
-		MODM_syslog(LOG_DEBUG, "Destroyed user function \n");
+		syslog(LOG_DEBUG, "extensions: destroyed user function");
 		p = cur->next;
 		free(cur);
 		cur = p;
@@ -718,8 +535,7 @@ void CtdlDestroyUserHooks(void)
 }
 
 
-void CtdlRegisterMessageHook(int (*handler)(struct CtdlMessage *),
-				int EventType)
+void CtdlRegisterMessageHook(int (*handler)(struct CtdlMessage *, recptypes *), int EventType)
 {
 
 	MessageFunctionHook *newfcn;
@@ -731,13 +547,11 @@ void CtdlRegisterMessageHook(int (*handler)(struct CtdlMessage *),
 	newfcn->eventtype = EventType;
 	MessageHookTable = newfcn;
 
-	MOD_syslog(LOG_DEBUG, "Registered a new message function (type %d)\n",
-		   EventType);
+	syslog(LOG_DEBUG, "extensions: registered a new message function (type %d)", EventType);
 }
 
 
-void CtdlUnregisterMessageHook(int (*handler)(struct CtdlMessage *),
-		int EventType)
+void CtdlUnregisterMessageHook(int (*handler)(struct CtdlMessage *, recptypes *), int EventType)
 {
 	MessageFunctionHook *cur, *p, *last;
 	last = NULL;
@@ -746,8 +560,7 @@ void CtdlUnregisterMessageHook(int (*handler)(struct CtdlMessage *),
 		if ((handler == cur->h_function_pointer) &&
 		    (EventType == cur->eventtype))
 		{
-			MOD_syslog(LOG_DEBUG, "Unregistered message function (type %d)\n",
-				   EventType);
+			syslog(LOG_DEBUG, "extensions: unregistered message function (type %d)", EventType);
 			p = cur->next;
 			free(cur);
 			cur = NULL;
@@ -772,7 +585,7 @@ void CtdlDestroyMessageHook(void)
 	cur = MessageHookTable; 
 	while (cur != NULL)
 	{
-		MOD_syslog(LOG_DEBUG, "Destroyed message function (type %d)\n", cur->eventtype);
+		syslog(LOG_DEBUG, "extensions: destroyed message function (type %d)", cur->eventtype);
 		p = cur->next;
 		free(cur);
 		cur = p;
@@ -791,7 +604,7 @@ void CtdlRegisterRoomHook(int (*fcn_ptr)(struct ctdlroom *))
 	newfcn->fcn_ptr = fcn_ptr;
 	RoomHookTable = newfcn;
 
-	MODM_syslog(LOG_DEBUG, "Registered a new room function\n");
+	syslog(LOG_DEBUG, "extensions: registered a new room function");
 }
 
 
@@ -803,7 +616,7 @@ void CtdlUnregisterRoomHook(int (*fcn_ptr)(struct ctdlroom *))
 	while (cur != NULL)
 	{
 		if (fcn_ptr == cur->fcn_ptr) {
-			MODM_syslog(LOG_DEBUG, "Unregistered room function\n");
+			syslog(LOG_DEBUG, "extensions: unregistered room function");
 			p = cur->next;
 
 			free(cur);
@@ -830,7 +643,7 @@ void CtdlDestroyRoomHooks(void)
 	cur = RoomHookTable;
 	while (cur != NULL)
 	{
-		MODM_syslog(LOG_DEBUG, "Destroyed room function\n");
+		syslog(LOG_DEBUG, "extensions: destroyed room function");
 		p = cur->next;
 		free(cur);
 		cur = p;
@@ -838,63 +651,6 @@ void CtdlDestroyRoomHooks(void)
 	RoomHookTable = NULL;
 }
 
-void CtdlRegisterNetprocHook(int (*handler)(struct CtdlMessage *, char *) )
-{
-	NetprocFunctionHook *newfcn;
-
-	newfcn = (NetprocFunctionHook *)
-	    malloc(sizeof(NetprocFunctionHook));
-	newfcn->next = NetprocHookTable;
-	newfcn->h_function_pointer = handler;
-	NetprocHookTable = newfcn;
-
-	MODM_syslog(LOG_DEBUG, "Registered a new netproc function\n");
-}
-
-
-void CtdlUnregisterNetprocHook(int (*handler)(struct CtdlMessage *, char *) )
-{
-	NetprocFunctionHook *cur, *p, *last;
-
-	cur = NetprocHookTable;
-	last = NULL;
-
-	while (cur != NULL) {
-		if (handler == cur->h_function_pointer)
-		{
-			MODM_syslog(LOG_DEBUG, "Unregistered netproc function\n");
-			p = cur->next;
-			free(cur);
-			if (last != NULL) {
-				last->next = p;
-			}
-			else {
-				NetprocHookTable = p;
-			}
-			cur = p;
-		}
-		else {
-			last = cur;
-			cur = cur->next;
-		}
-	}
-}
-
-void CtdlDestroyNetprocHooks(void)
-{
-	NetprocFunctionHook *cur, *p;
-
-	cur = NetprocHookTable;
-	while (cur != NULL)
-	{
-		MODM_syslog(LOG_DEBUG, "Destroyed netproc function\n");
-		p = cur->next;
-		free(cur);
-		cur = p;
-	}
-	NetprocHookTable = NULL;
-}
-
 
 void CtdlRegisterDeleteHook(void (*handler)(char *, long) )
 {
@@ -906,7 +662,7 @@ void CtdlRegisterDeleteHook(void (*handler)(char *, long) )
 	newfcn->h_function_pointer = handler;
 	DeleteHookTable = newfcn;
 
-	MODM_syslog(LOG_DEBUG, "Registered a new delete function\n");
+	syslog(LOG_DEBUG, "extensions: registered a new delete function");
 }
 
 
@@ -919,7 +675,7 @@ void CtdlUnregisterDeleteHook(void (*handler)(char *, long) )
 	while (cur != NULL) {
 		if (handler == cur->h_function_pointer )
 		{
-			MODM_syslog(LOG_DEBUG, "Unregistered delete function\n");
+			syslog(LOG_DEBUG, "extensions: unregistered delete function");
 			p = cur->next;
 			free(cur);
 
@@ -936,6 +692,8 @@ void CtdlUnregisterDeleteHook(void (*handler)(char *, long) )
 		}
 	}
 }
+
+
 void CtdlDestroyDeleteHooks(void)
 {
 	DeleteFunctionHook *cur, *p;
@@ -943,7 +701,7 @@ void CtdlDestroyDeleteHooks(void)
 	cur = DeleteHookTable;
 	while (cur != NULL)
 	{
-		MODM_syslog(LOG_DEBUG, "Destroyed delete function\n");
+		syslog(LOG_DEBUG, "extensions: destroyed delete function");
 		p = cur->next;
 		free(cur);
 		cur = p;		
@@ -952,8 +710,6 @@ void CtdlDestroyDeleteHooks(void)
 }
 
 
-
-
 void CtdlRegisterFixedOutputHook(char *content_type, void (*handler)(char *, int) )
 {
 	FixedOutputHook *newfcn;
@@ -965,7 +721,7 @@ void CtdlRegisterFixedOutputHook(char *content_type, void (*handler)(char *, int
 	safestrncpy(newfcn->content_type, content_type, sizeof newfcn->content_type);
 	FixedOutputTable = newfcn;
 
-	MOD_syslog(LOG_DEBUG, "Registered a new fixed output function for %s\n", newfcn->content_type);
+	syslog(LOG_DEBUG, "extensions: registered a new fixed output function for %s", newfcn->content_type);
 }
 
 
@@ -978,10 +734,7 @@ void CtdlUnregisterFixedOutputHook(char *content_type)
 	while (cur != NULL) {
 		/* This will also remove duplicates if any */
 		if (!strcasecmp(content_type, cur->content_type)) {
-			MOD_syslog(LOG_DEBUG,
-				   "Unregistered fixed output function for %s\n",
-				   content_type);
-
+			syslog(LOG_DEBUG, "extensions: unregistered fixed output function for %s", content_type);
 			p = cur->next;
 			free(cur);
 
@@ -1007,7 +760,7 @@ void CtdlDestroyFixedOutputHooks(void)
 	cur = FixedOutputTable; 
 	while (cur != NULL)
 	{
-		MOD_syslog(LOG_DEBUG, "Destroyed fixed output function for %s\n", cur->content_type);
+		syslog(LOG_DEBUG, "extensions: destroyed fixed output function for %s", cur->content_type);
 		p = cur->next;
 		free(cur);
 		cur = p;
@@ -1031,9 +784,6 @@ int PerformFixedOutputHooks(char *content_type, char *content, int content_lengt
 }
 
 
-
-
-
 void CtdlRegisterXmsgHook(int (*fcn_ptr) (char *, char *, char *, char *), int order)
 {
 
@@ -1044,7 +794,7 @@ void CtdlRegisterXmsgHook(int (*fcn_ptr) (char *, char *, char *, char *), int o
 	newfcn->order = order;
 	newfcn->h_function_pointer = fcn_ptr;
 	XmsgHookTable = newfcn;
-	MOD_syslog(LOG_DEBUG, "Registered a new x-msg function (priority %d)\n", order);
+	syslog(LOG_DEBUG, "extensions: registered a new x-msg function (priority %d)", order);
 }
 
 
@@ -1058,16 +808,16 @@ void CtdlUnregisterXmsgHook(int (*fcn_ptr) (char *, char *, char *, char *), int
 		/* This will also remove duplicates if any */
 		if (fcn_ptr == cur->h_function_pointer &&
 		    order == cur->order) {
-			MOD_syslog(LOG_DEBUG, "Unregistered x-msg function "
-				   "(priority %d)\n", order);
+			syslog(LOG_DEBUG, "extensions: unregistered x-msg function (priority %d)", order);
 			p = cur->next;
 			free(cur);
 
-			if (last != NULL)
+			if (last != NULL) {
 				last->next = p;
-			else
+			}
+			else {
 				XmsgHookTable = p;
-			
+			}
 			cur = p;
 		}
 		else {
@@ -1077,6 +827,7 @@ void CtdlUnregisterXmsgHook(int (*fcn_ptr) (char *, char *, char *, char *), int
 	}
 }
 
+
 void CtdlDestroyXmsgHooks(void)
 {
 	XmsgFunctionHook *cur, *p;
@@ -1084,10 +835,8 @@ void CtdlDestroyXmsgHooks(void)
 	cur = XmsgHookTable;
 	while (cur != NULL)
 	{
-		MOD_syslog(LOG_DEBUG, "Destroyed x-msg function "
-			"(priority %d)\n", cur->order);
+		syslog(LOG_DEBUG, "extensions: destroyed x-msg function (priority %d)", cur->order);
 		p = cur->next;
-			
 		free(cur);
 		cur = p;
 	}
@@ -1104,9 +853,7 @@ void CtdlRegisterServiceHook(int tcp_port,
 {
 	ServiceFunctionHook *newfcn;
 	char *message;
-	char error[SIZ];
 
-	strcpy(error, "");
 	newfcn = (ServiceFunctionHook *) malloc(sizeof(ServiceFunctionHook));
 	message = (char*) malloc (SIZ + SIZ);
 	
@@ -1119,33 +866,30 @@ void CtdlRegisterServiceHook(int tcp_port,
 	newfcn->ServiceName = ServiceName;
 
 	if (sockpath != NULL) {
-		newfcn->msock = ctdl_uds_server(sockpath, config.c_maxsessions, error);
-		snprintf(message, SIZ, "Unix domain socket '%s': ", sockpath);
+		newfcn->msock = ctdl_uds_server(sockpath, CtdlGetConfigInt("c_maxsessions"));
+		snprintf(message, SIZ, "extensions: unix domain socket '%s': ", sockpath);
 	}
 	else if (tcp_port <= 0) {	/* port -1 to disable */
-		MOD_syslog(LOG_INFO, "Service %s has been manually disabled, skipping\n", ServiceName);
+		syslog(LOG_INFO, "extensions: service %s has been manually disabled, skipping", ServiceName);
 		free (message);
 		free(newfcn);
 		return;
 	}
 	else {
-		newfcn->msock = ctdl_tcp_server(config.c_ip_addr,
-					      tcp_port,
-					      config.c_maxsessions, 
-					      error);
-		snprintf(message, SIZ, "TCP port %s:%d: (%s) ", 
-			 config.c_ip_addr, tcp_port, ServiceName);
+		newfcn->msock = ctdl_tcp_server(CtdlGetConfigStr("c_ip_addr"), tcp_port, CtdlGetConfigInt("c_maxsessions"));
+		snprintf(message, SIZ, "extensions: TCP port %s:%d: (%s) ", 
+			 CtdlGetConfigStr("c_ip_addr"), tcp_port, ServiceName);
 	}
 
 	if (newfcn->msock > 0) {
 		ServiceHookTable = newfcn;
 		strcat(message, "registered.");
-		MOD_syslog(LOG_INFO, "%s\n", message);
+		syslog(LOG_INFO, "%s", message);
 	}
 	else {
-		AddPortError(message, error);
+		AddPortError(message, "failed");
 		strcat(message, "FAILED.");
-		MOD_syslog(LOG_CRIT, "%s\n", message);
+		syslog(LOG_ERR, "%s", message);
 		free(newfcn);
 	}
 	free(message);
@@ -1173,13 +917,12 @@ void CtdlUnregisterServiceHook(int tcp_port, char *sockpath,
 			if (cur->msock > 0)
 				close(cur->msock);
 			if (sockpath) {
-				MOD_syslog(LOG_INFO, "Closed UNIX domain socket %s\n",
-					   sockpath);
+				syslog(LOG_INFO, "extensions: closed UNIX domain socket %s", sockpath);
 				unlink(sockpath);
 			} else if (tcp_port) {
-				MOD_syslog(LOG_INFO, "Closed TCP port %d\n", tcp_port);
+				syslog(LOG_INFO, "extensions: closed TCP port %d", tcp_port);
 			} else {
-				MOD_syslog(LOG_INFO, "Unregistered service \"%s\"\n", cur->ServiceName);
+				syslog(LOG_INFO, "extensions: unregistered service \"%s\"", cur->ServiceName);
 			}
 			p = cur->next;
 			free(cur);
@@ -1210,35 +953,42 @@ void CtdlShutdownServiceHooks(void)
 			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);
+				syslog(LOG_INFO, "extensions: [%s] Closed UNIX domain socket %s", cur->ServiceName, cur->sockpath);
 				unlink(cur->sockpath);
 			} else {
-				MOD_syslog(LOG_INFO, "[%s] closing service\n", 
-					   cur->ServiceName);
+				syslog(LOG_INFO, "extensions: [%s] closing service", cur->ServiceName);
 			}
 		}
 		cur = cur->next;
 	}
 }
 
+
 void CtdlDestroyServiceHook(void)
 {
+	const char *Text;
 	ServiceFunctionHook *cur, *p;
 
 	cur = ServiceHookTable;
 	while (cur != NULL)
 	{
-		close(cur->msock);
+		if (cur->msock != -1)
+		{
+			close(cur->msock);
+			Text = "Closed";
+		}
+		else
+		{
+			Text = " Not closing again";
+		}
+
 		if (cur->sockpath) {
-			MOD_syslog(LOG_INFO, "Closed UNIX domain socket %s\n",
-				   cur->sockpath);
+			syslog(LOG_INFO, "extensions: %s UNIX domain socket %s", Text, cur->sockpath);
 			unlink(cur->sockpath);
 		} else if (cur->tcp_port) {
-			MOD_syslog(LOG_INFO, "Closed TCP port %d\n", cur->tcp_port);
+			syslog(LOG_INFO, "extensions: %s TCP port %d", Text, cur->tcp_port);
 		} else {
-			MOD_syslog(LOG_INFO, "Destroyed service \"%s\"\n", cur->ServiceName);
+			syslog(LOG_INFO, "extensions: destroyed service \"%s\"", cur->ServiceName);
 		}
 		p = cur->next;
 		free(cur);
@@ -1262,7 +1012,7 @@ void CtdlRegisterSearchFuncHook(void (*fcn_ptr)(int *, long **, const char *), c
 	newfcn->fcn_ptr = fcn_ptr;
 	SearchFunctionHookTable = newfcn;
 
-	MOD_syslog(LOG_DEBUG, "Registered a new search function (%s)\n", name);
+	syslog(LOG_DEBUG, "extensions: registered a new search function (%s)", name);
 }
 
 void CtdlUnregisterSearchFuncHook(void (*fcn_ptr)(int *, long **, const char *), char *name)
@@ -1276,7 +1026,7 @@ void CtdlUnregisterSearchFuncHook(void (*fcn_ptr)(int *, long **, const char *),
 		    (cur->fcn_ptr == fcn_ptr) &&
 		    name && !strcmp(name, cur->name))
 		{
-			MOD_syslog(LOG_DEBUG, "Unregistered search function(%s)\n", name);
+			syslog(LOG_DEBUG, "extensions: unregistered search function(%s)", name);
 			p = cur->next;
 			free (cur);
 			if (last != NULL)
@@ -1344,17 +1094,15 @@ void PerformUserHooks(ctdluser *usbuf, int EventType)
 	}
 }
 
-int PerformMessageHooks(struct CtdlMessage *msg, int EventType)
+int PerformMessageHooks(struct CtdlMessage *msg, recptypes *recps, int EventType)
 {
 	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.
-	MOD_syslog(LOG_DEBUG, "** Event type is %d, flags are %d\n", EventType, msg->cm_flags);
 	 */
 	if (msg->cm_flags & CM_SKIP_HOOKS) {
-		MODM_syslog(LOG_DEBUG, "Skipping hooks\n");
 		return(0);
 	}
 
@@ -1362,7 +1110,7 @@ int PerformMessageHooks(struct CtdlMessage *msg, int EventType)
 	 */
 	for (fcn = MessageHookTable; fcn != NULL; fcn = fcn->next) {
 		if (fcn->eventtype == EventType) {
-			total_retval = total_retval + (*fcn->h_function_pointer) (msg);
+			total_retval = total_retval + (*fcn->h_function_pointer) (msg, recps);
 		}
 	}
 
@@ -1379,7 +1127,7 @@ int PerformRoomHooks(struct ctdlroom *target_room)
 	RoomFunctionHook *fcn;
 	int total_retval = 0;
 
-	MOD_syslog(LOG_DEBUG, "Performing room hooks for <%s>\n", target_room->QRname);
+	syslog(LOG_DEBUG, "extensions: performing room hooks for <%s>", target_room->QRname);
 
 	for (fcn = RoomHookTable; fcn != NULL; fcn = fcn->next) {
 		total_retval = total_retval + (*fcn->fcn_ptr) (target_room);
@@ -1391,23 +1139,6 @@ int PerformRoomHooks(struct ctdlroom *target_room)
 }
 
 
-int PerformNetprocHooks(struct CtdlMessage *msg, char *target_room)
-{
-	NetprocFunctionHook *fcn;
-	int total_retval = 0;
-
-	for (fcn = NetprocHookTable; fcn != NULL; fcn = fcn->next) {
-		total_retval = total_retval +
-			(*fcn->h_function_pointer) (msg, target_room);
-	}
-
-	/* Return the sum of the return codes from the hook functions.
-	 * A nonzero return code will cause the message to *not* be imported.
-	 */
-	return total_retval;
-}
-
-
 void PerformDeleteHooks(char *room, long msgnum)
 {
 	DeleteFunctionHook *fcn;
@@ -1418,9 +1149,6 @@ void PerformDeleteHooks(char *room, long msgnum)
 }
 
 
-
-
-
 int PerformXmsgHooks(char *sender, char *sender_email, char *recp, char *msg)
 {
 	XmsgFunctionHook *fcn;
@@ -1456,17 +1184,10 @@ void CtdlModuleStartCryptoMsgs(char *ok_response, char *nosup_response, char *er
 #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";
 }