No more cleanup hooks. The OS can reclaim memory better than we can. We want to...
[citadel.git] / citadel / serv_extensions.c
index ebb348c3f3097b38ed6911711f7300491cc741e0..cc594ce655f1a839a636245fa1aaf8116a71c450 100644 (file)
@@ -1,8 +1,8 @@
 /*
  * Citadel Extension Loader
- * Written by Brian Costello <btx@calyx.net>
+ * Originally written by Brian Costello <btx@calyx.net>
  *
- * Copyright (c) 1987-2015 by the citadel.org team
+ * Copyright (c) 1987-2021 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.
  * GNU General Public License for more details.
  */
 
+#include <stdlib.h>
+#include <unistd.h>
 #include <stdio.h>
+#include <sys/stat.h>
 #include <libcitadel.h>
-
 #include "sysdep_decls.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;
-int EnableMarkers = 0;
-int EnableCtlProto = 0;
-
 /*
  * Structure defentitions for hook tables
  */
 
-HashList *LogDebugEntryTable = NULL;
-
-typedef struct LogFunctionHook LogFunctionHook;
-struct LogFunctionHook {
-       LogFunctionHook *next;
-       int loglevel;
-       void (*h_function_pointer) (char *);
-};
-
-LogFunctionHook *LogHookTable = NULL;
-
 typedef struct FixedOutputHook FixedOutputHook;
 struct FixedOutputHook {
        FixedOutputHook *next;
@@ -52,23 +38,6 @@ struct FixedOutputHook {
 FixedOutputHook *FixedOutputTable = NULL;
 
 
-
-/*
- * TDAPVetoHookFunctionHook extensions are used for any type of hook for which
- * may prevent the autopurger to run for this specific data class.
- * the function should at least LOG_INFO that it does so.
- */
-typedef struct TDAPVetoHookFunctionHook TDAPVetoHookFunctionHook;
-struct TDAPVetoHookFunctionHook {
-       TDAPVetoHookFunctionHook *next;
-       int Priority;
-       int (*h_function_pointer) (StrBuf *);
-       int eventtype;
-};
-TDAPVetoHookFunctionHook *TDAPVetoHookTable = NULL;
-
-
-
 /*
  * 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
@@ -84,6 +53,7 @@ struct SessionFunctionHook {
 };
 SessionFunctionHook *SessionHookTable = NULL;
 
+
 /*
  * UserFunctionHook extensions are used for any type of hook which implements
  * an operation on a user or username (potentially) other than the one
@@ -97,6 +67,7 @@ struct UserFunctionHook {
 };
 UserFunctionHook *UserHookTable = NULL;
 
+
 /*
  * MessageFunctionHook extensions are used for hooks which implement handlers
  * for various types of message operations (save, read, etc.)
@@ -110,18 +81,6 @@ struct MessageFunctionHook {
 MessageFunctionHook *MessageHookTable = NULL;
 
 
-/*
- * 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);
-};
-NetprocFunctionHook *NetprocHookTable = NULL;
-
-
 /*
  * DeleteFunctionHook extensions are used for hooks which get called when a
  * message is about to be deleted.
@@ -149,11 +108,9 @@ struct XmsgFunctionHook {
 XmsgFunctionHook *XmsgHookTable = NULL;
 
 
-
-
 /*
  * RoomFunctionHook extensions are used for hooks which impliment room
- * processing functions when new messages are added EG. SIEVE.
+ * processing functions when new messages are added.
  */
 typedef struct RoomFunctionHook RoomFunctionHook;
 struct RoomFunctionHook {
@@ -163,7 +120,6 @@ struct RoomFunctionHook {
 RoomFunctionHook *RoomHookTable = NULL;
 
 
-
 typedef struct SearchFunctionHook SearchFunctionHook;
 struct SearchFunctionHook {
        SearchFunctionHook *next;
@@ -172,9 +128,6 @@ struct SearchFunctionHook {
 };
 SearchFunctionHook *SearchFunctionHookTable = NULL;
 
-CleanupFunctionHook *CleanupHookTable = NULL;
-CleanupFunctionHook *EVCleanupHookTable = NULL;
-
 ServiceFunctionHook *ServiceHookTable = NULL;
 
 typedef struct ProtoFunctionHook ProtoFunctionHook;
@@ -191,7 +144,6 @@ HashList *ProtoHookList = NULL;
 
 
 static StrBuf *portlist = NULL;
-
 static StrBuf *errormessages = NULL;
 
 
@@ -200,21 +152,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)
@@ -224,8 +174,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;
 
@@ -259,8 +208,8 @@ void LogPrintMessages(long err)
        StrBufAppendBufPlain(Message, HKEY("\n\n"), 0);
        StrBufAppendBufPlain(Message, CKEY(ErrGeneral[3]), 0);
 
-       syslog(LOG_EMERG, "%s", ChrPtr(Message));
-       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);
@@ -301,70 +250,6 @@ int DLoader_Exec_Cmd(char *cmdbuf)
        return 0;
 }
 
-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 CtdlDestroyDebugTable(void)
-{
-
-       DeleteHash(&LogDebugEntryTable);
-}
 
 void CtdlRegisterProtoHook(void (*handler) (char *), char *cmd, char *desc)
 {
@@ -386,202 +271,7 @@ void CtdlRegisterProtoHook(void (*handler) (char *), char *cmd, char *desc)
        p->desc = desc;
 
        Put(ProtoHookList, cmd, 4, p, NULL);
-       syslog(LOG_DEBUG, "Registered server command %s (%s)\n", cmd, desc);
-}
-
-void CtdlDestroyProtoHooks(void)
-{
-
-       DeleteHash(&ProtoHookList);
-}
-
-
-void CtdlRegisterCleanupHook(void (*fcn_ptr) (void))
-{
-
-       CleanupFunctionHook *newfcn;
-
-       newfcn = (CleanupFunctionHook *)
-           malloc(sizeof(CleanupFunctionHook));
-       newfcn->next = CleanupHookTable;
-       newfcn->h_function_pointer = fcn_ptr;
-       CleanupHookTable = newfcn;
-
-       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)
-               {
-                       syslog(LOG_DEBUG, "Unregistered cleanup function\n");
-                       p = cur->next;
-
-                       free(cur);
-                       cur = NULL;
-
-                       if (last != NULL)
-                               last->next = p;
-                       else 
-                               CleanupHookTable = p;
-                       cur = p;
-               }
-               else {
-                       last = cur;
-                       cur = cur->next;
-               }
-       }
-}
-
-
-void CtdlDestroyCleanupHooks(void)
-{
-       CleanupFunctionHook *cur, *p;
-
-       cur = CleanupHookTable;
-       while (cur != NULL)
-       {
-               syslog(LOG_DEBUG, "Destroyed cleanup function\n");
-               p = cur->next;
-               free(cur);
-               cur = p;
-       }
-       CleanupHookTable = NULL;
-}
-
-void CtdlRegisterEVCleanupHook(void (*fcn_ptr) (void))
-{
-
-       CleanupFunctionHook *newfcn;
-
-       newfcn = (CleanupFunctionHook *)
-           malloc(sizeof(CleanupFunctionHook));
-       newfcn->next = EVCleanupHookTable;
-       newfcn->h_function_pointer = fcn_ptr;
-       EVCleanupHookTable = newfcn;
-
-       syslog(LOG_DEBUG, "Registered a new cleanup function\n");
-}
-
-
-void CtdlUnregisterEVCleanupHook(void (*fcn_ptr) (void))
-{
-       CleanupFunctionHook *cur, *p, *last;
-       last = NULL;
-       cur = EVCleanupHookTable;
-       while (cur != NULL)
-       {
-               if (fcn_ptr == cur->h_function_pointer)
-               {
-                       syslog(LOG_DEBUG, "Unregistered cleanup function\n");
-                       p = cur->next;
-
-                       free(cur);
-                       cur = NULL;
-
-                       if (last != NULL)
-                               last->next = p;
-                       else 
-                               EVCleanupHookTable = p;
-                       cur = p;
-               }
-               else {
-                       last = cur;
-                       cur = cur->next;
-               }
-       }
-}
-
-
-void CtdlDestroyEVCleanupHooks(void)
-{
-       CleanupFunctionHook *cur, *p;
-
-       cur = EVCleanupHookTable;
-       while (cur != NULL)
-       {
-               syslog(LOG_DEBUG, "Destroyed cleanup function\n");
-               p = cur->next;
-               cur->h_function_pointer();
-               free(cur);
-               cur = p;
-       }
-       EVCleanupHookTable = NULL;
-}
-
-void CtdlRegisterTDAPVetoHook(int (*fcn_ptr) (StrBuf*), int EventType, int Priority)
-{
-       TDAPVetoHookFunctionHook *newfcn;
-
-       newfcn = (TDAPVetoHookFunctionHook *)
-           malloc(sizeof(TDAPVetoHookFunctionHook));
-       newfcn->Priority = Priority;
-       newfcn->h_function_pointer = fcn_ptr;
-       newfcn->eventtype = EventType;
-
-       TDAPVetoHookFunctionHook **pfcn;
-       pfcn = &TDAPVetoHookTable;
-       while ((*pfcn != NULL) && 
-              ((*pfcn)->Priority < newfcn->Priority) &&
-              ((*pfcn)->next != NULL))
-               pfcn = &(*pfcn)->next;
-               
-       newfcn->next = *pfcn;
-       *pfcn = newfcn;
-       
-       syslog(LOG_DEBUG, "Registered a new TDAP Veto function (type %d Priority %d)\n",
-                  EventType, Priority);
-}
-
-
-void CtdlUnregisterTDAPVetoHook(int (*fcn_ptr) (StrBuf*), int EventType)
-{
-       TDAPVetoHookFunctionHook *cur, *p, *last;
-       last = NULL;
-       cur = TDAPVetoHookTable;
-       while  (cur != NULL) {
-               if ((fcn_ptr == cur->h_function_pointer) &&
-                   (EventType == cur->eventtype))
-               {
-                       syslog(LOG_DEBUG, "Unregistered TDAP Veto function (type %d)\n",
-                                  EventType);
-                       p = cur->next;
-
-                       free(cur);
-                       cur = NULL;
-
-                       if (last != NULL)
-                               last->next = p;
-                       else 
-                               TDAPVetoHookTable = p;
-                       cur = p;
-               }
-               else {
-                       last = cur;
-                       cur = cur->next;
-               }
-       }
-}
-
-void CtdlDestroyTDAPVetoHooks(void)
-{
-       TDAPVetoHookFunctionHook *cur, *p;
-
-       cur = TDAPVetoHookTable;
-       while (cur != NULL)
-       {
-               syslog(LOG_DEBUG, "Destroyed TDAP Veto function\n");
-               p = cur->next;
-               free(cur);
-               cur = p;
-       }
-       TDAPVetoHookTable = NULL;
+       syslog(LOG_DEBUG, "extensions: registered server command %s (%s)", cmd, desc);
 }
 
 
@@ -605,8 +295,7 @@ void CtdlRegisterSessionHook(void (*fcn_ptr) (void), int EventType, int Priority
        newfcn->next = *pfcn;
        *pfcn = newfcn;
        
-       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);
 }
 
 
@@ -619,8 +308,7 @@ void CtdlUnregisterSessionHook(void (*fcn_ptr) (void), int EventType)
                if ((fcn_ptr == cur->h_function_pointer) &&
                    (EventType == cur->eventtype))
                {
-                       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);
@@ -639,21 +327,6 @@ void CtdlUnregisterSessionHook(void (*fcn_ptr) (void), int EventType)
        }
 }
 
-void CtdlDestroySessionHooks(void)
-{
-       SessionFunctionHook *cur, *p;
-
-       cur = SessionHookTable;
-       while (cur != NULL)
-       {
-               syslog(LOG_DEBUG, "Destroyed session function\n");
-               p = cur->next;
-               free(cur);
-               cur = p;
-       }
-       SessionHookTable = NULL;
-}
-
 
 void CtdlRegisterUserHook(void (*fcn_ptr) (ctdluser *), int EventType)
 {
@@ -667,7 +340,7 @@ void CtdlRegisterUserHook(void (*fcn_ptr) (ctdluser *), int EventType)
        newfcn->eventtype = EventType;
        UserHookTable = newfcn;
 
-       syslog(LOG_DEBUG, "Registered a new user function (type %d)\n",
+       syslog(LOG_DEBUG, "extensions: registered a new user function (type %d)",
                   EventType);
 }
 
@@ -681,8 +354,7 @@ void CtdlUnregisterUserHook(void (*fcn_ptr) (struct ctdluser *), int EventType)
                if ((fcn_ptr == cur->h_function_pointer) &&
                    (EventType == cur->eventtype))
                {
-                       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);
@@ -701,24 +373,8 @@ void CtdlUnregisterUserHook(void (*fcn_ptr) (struct ctdluser *), int EventType)
        }
 }
 
-void CtdlDestroyUserHooks(void)
-{
-       UserFunctionHook *cur, *p;
 
-       cur = UserHookTable;
-       while (cur != NULL)
-       {
-               syslog(LOG_DEBUG, "Destroyed user function \n");
-               p = cur->next;
-               free(cur);
-               cur = p;
-       }
-       UserHookTable = NULL;
-}
-
-
-void CtdlRegisterMessageHook(int (*handler)(struct CtdlMessage *, recptypes *),
-                               int EventType)
+void CtdlRegisterMessageHook(int (*handler)(struct CtdlMessage *, recptypes *), int EventType)
 {
 
        MessageFunctionHook *newfcn;
@@ -730,13 +386,11 @@ void CtdlRegisterMessageHook(int (*handler)(struct CtdlMessage *, recptypes *),
        newfcn->eventtype = EventType;
        MessageHookTable = newfcn;
 
-       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 *, recptypes *),
-               int EventType)
+void CtdlUnregisterMessageHook(int (*handler)(struct CtdlMessage *, recptypes *), int EventType)
 {
        MessageFunctionHook *cur, *p, *last;
        last = NULL;
@@ -745,8 +399,7 @@ void CtdlUnregisterMessageHook(int (*handler)(struct CtdlMessage *, recptypes *)
                if ((handler == cur->h_function_pointer) &&
                    (EventType == cur->eventtype))
                {
-                       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;
@@ -764,21 +417,6 @@ void CtdlUnregisterMessageHook(int (*handler)(struct CtdlMessage *, recptypes *)
        }
 }
 
-void CtdlDestroyMessageHook(void)
-{
-       MessageFunctionHook *cur, *p;
-
-       cur = MessageHookTable; 
-       while (cur != NULL)
-       {
-               syslog(LOG_DEBUG, "Destroyed message function (type %d)\n", cur->eventtype);
-               p = cur->next;
-               free(cur);
-               cur = p;
-       }
-       MessageHookTable = NULL;
-}
-
 
 void CtdlRegisterRoomHook(int (*fcn_ptr)(struct ctdlroom *))
 {
@@ -790,7 +428,7 @@ void CtdlRegisterRoomHook(int (*fcn_ptr)(struct ctdlroom *))
        newfcn->fcn_ptr = fcn_ptr;
        RoomHookTable = newfcn;
 
-       syslog(LOG_DEBUG, "Registered a new room function\n");
+       syslog(LOG_DEBUG, "extensions: registered a new room function");
 }
 
 
@@ -802,7 +440,7 @@ void CtdlUnregisterRoomHook(int (*fcn_ptr)(struct ctdlroom *))
        while (cur != NULL)
        {
                if (fcn_ptr == cur->fcn_ptr) {
-                       syslog(LOG_DEBUG, "Unregistered room function\n");
+                       syslog(LOG_DEBUG, "extensions: unregistered room function");
                        p = cur->next;
 
                        free(cur);
@@ -822,79 +460,6 @@ void CtdlUnregisterRoomHook(int (*fcn_ptr)(struct ctdlroom *))
 }
 
 
-void CtdlDestroyRoomHooks(void)
-{
-       RoomFunctionHook *cur, *p;
-
-       cur = RoomHookTable;
-       while (cur != NULL)
-       {
-               syslog(LOG_DEBUG, "Destroyed room function\n");
-               p = cur->next;
-               free(cur);
-               cur = p;
-       }
-       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;
-
-       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)
-               {
-                       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)
-       {
-               syslog(LOG_DEBUG, "Destroyed netproc function\n");
-               p = cur->next;
-               free(cur);
-               cur = p;
-       }
-       NetprocHookTable = NULL;
-}
-
-
 void CtdlRegisterDeleteHook(void (*handler)(char *, long) )
 {
        DeleteFunctionHook *newfcn;
@@ -905,7 +470,7 @@ void CtdlRegisterDeleteHook(void (*handler)(char *, long) )
        newfcn->h_function_pointer = handler;
        DeleteHookTable = newfcn;
 
-       syslog(LOG_DEBUG, "Registered a new delete function\n");
+       syslog(LOG_DEBUG, "extensions: registered a new delete function");
 }
 
 
@@ -918,7 +483,7 @@ void CtdlUnregisterDeleteHook(void (*handler)(char *, long) )
        while (cur != NULL) {
                if (handler == cur->h_function_pointer )
                {
-                       syslog(LOG_DEBUG, "Unregistered delete function\n");
+                       syslog(LOG_DEBUG, "extensions: unregistered delete function");
                        p = cur->next;
                        free(cur);
 
@@ -935,22 +500,6 @@ void CtdlUnregisterDeleteHook(void (*handler)(char *, long) )
                }
        }
 }
-void CtdlDestroyDeleteHooks(void)
-{
-       DeleteFunctionHook *cur, *p;
-
-       cur = DeleteHookTable;
-       while (cur != NULL)
-       {
-               syslog(LOG_DEBUG, "Destroyed delete function\n");
-               p = cur->next;
-               free(cur);
-               cur = p;                
-       }
-       DeleteHookTable = NULL;
-}
-
-
 
 
 void CtdlRegisterFixedOutputHook(char *content_type, void (*handler)(char *, int) )
@@ -964,7 +513,7 @@ void CtdlRegisterFixedOutputHook(char *content_type, void (*handler)(char *, int
        safestrncpy(newfcn->content_type, content_type, sizeof newfcn->content_type);
        FixedOutputTable = newfcn;
 
-       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);
 }
 
 
@@ -977,10 +526,7 @@ void CtdlUnregisterFixedOutputHook(char *content_type)
        while (cur != NULL) {
                /* This will also remove duplicates if any */
                if (!strcasecmp(content_type, cur->content_type)) {
-                       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);
 
@@ -999,21 +545,6 @@ void CtdlUnregisterFixedOutputHook(char *content_type)
        }
 }
 
-void CtdlDestroyFixedOutputHooks(void)
-{
-       FixedOutputHook *cur, *p;
-
-       cur = FixedOutputTable; 
-       while (cur != NULL)
-       {
-               syslog(LOG_DEBUG, "Destroyed fixed output function for %s\n", cur->content_type);
-               p = cur->next;
-               free(cur);
-               cur = p;
-               
-       }
-       FixedOutputTable = NULL;
-}
 
 /* returns nonzero if we found a hook and used it */
 int PerformFixedOutputHooks(char *content_type, char *content, int content_length)
@@ -1030,9 +561,6 @@ int PerformFixedOutputHooks(char *content_type, char *content, int content_lengt
 }
 
 
-
-
-
 void CtdlRegisterXmsgHook(int (*fcn_ptr) (char *, char *, char *, char *), int order)
 {
 
@@ -1043,7 +571,7 @@ void CtdlRegisterXmsgHook(int (*fcn_ptr) (char *, char *, char *, char *), int o
        newfcn->order = order;
        newfcn->h_function_pointer = fcn_ptr;
        XmsgHookTable = newfcn;
-       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);
 }
 
 
@@ -1057,16 +585,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) {
-                       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 {
@@ -1076,23 +604,6 @@ void CtdlUnregisterXmsgHook(int (*fcn_ptr) (char *, char *, char *, char *), int
        }
 }
 
-void CtdlDestroyXmsgHooks(void)
-{
-       XmsgFunctionHook *cur, *p;
-
-       cur = XmsgHookTable;
-       while (cur != NULL)
-       {
-               syslog(LOG_DEBUG, "Destroyed x-msg function "
-                       "(priority %d)\n", cur->order);
-               p = cur->next;
-                       
-               free(cur);
-               cur = p;
-       }
-       XmsgHookTable = NULL;
-}
-
 
 void CtdlRegisterServiceHook(int tcp_port,
                             char *sockpath,
@@ -1103,9 +614,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);
        
@@ -1118,33 +627,30 @@ void CtdlRegisterServiceHook(int tcp_port,
        newfcn->ServiceName = ServiceName;
 
        if (sockpath != NULL) {
-               newfcn->msock = ctdl_uds_server(sockpath, CtdlGetConfigInt("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 */
-               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(CtdlGetConfigStr("c_ip_addr"),
-                                             tcp_port,
-                                             CtdlGetConfigInt("c_maxsessions"), 
-                                             error);
-               snprintf(message, SIZ, "TCP port %s:%d: (%s) ", 
+               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.");
-               syslog(LOG_INFO, "%s\n", message);
+               syslog(LOG_INFO, "%s", message);
        }
        else {
-               AddPortError(message, error);
+               AddPortError(message, "failed");
                strcat(message, "FAILED.");
-               syslog(LOG_CRIT, "%s\n", message);
+               syslog(LOG_ERR, "%s", message);
                free(newfcn);
        }
        free(message);
@@ -1172,13 +678,12 @@ void CtdlUnregisterServiceHook(int tcp_port, char *sockpath,
                        if (cur->msock > 0)
                                close(cur->msock);
                        if (sockpath) {
-                               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) {
-                               syslog(LOG_INFO, "Closed TCP port %d\n", tcp_port);
+                               syslog(LOG_INFO, "extensions: closed TCP port %d", tcp_port);
                        } else {
-                               syslog(LOG_INFO, "Unregistered service \"%s\"\n", cur->ServiceName);
+                               syslog(LOG_INFO, "extensions: unregistered service \"%s\"", cur->ServiceName);
                        }
                        p = cur->next;
                        free(cur);
@@ -1209,53 +714,16 @@ void CtdlShutdownServiceHooks(void)
                        close(cur->msock);
                        cur->msock = -1;
                        if (cur->sockpath != NULL){
-                               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 {
-                               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)
-       {
-               if (cur->msock != -1)
-               {
-                       close(cur->msock);
-                       Text = "Closed";
-               }
-               else
-               {
-                       Text = " Not closing again";
-               }
-
-               if (cur->sockpath) {
-                       syslog(LOG_INFO, "%s UNIX domain socket %s\n",
-                                  Text,
-                                  cur->sockpath);
-                       unlink(cur->sockpath);
-               } else if (cur->tcp_port) {
-                       syslog(LOG_INFO, "%s TCP port %d\n", Text, cur->tcp_port);
-               } else {
-                       syslog(LOG_INFO, "Destroyed service \"%s\"\n", cur->ServiceName);
-               }
-               p = cur->next;
-               free(cur);
-               cur = p;
-       }
-       ServiceHookTable = NULL;
-}
 
 void CtdlRegisterSearchFuncHook(void (*fcn_ptr)(int *, long **, const char *), char *name)
 {
@@ -1272,7 +740,7 @@ void CtdlRegisterSearchFuncHook(void (*fcn_ptr)(int *, long **, const char *), c
        newfcn->fcn_ptr = fcn_ptr;
        SearchFunctionHookTable = newfcn;
 
-       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)
@@ -1286,7 +754,7 @@ void CtdlUnregisterSearchFuncHook(void (*fcn_ptr)(int *, long **, const char *),
                    (cur->fcn_ptr == fcn_ptr) &&
                    name && !strcmp(name, cur->name))
                {
-                       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)
@@ -1302,18 +770,6 @@ void CtdlUnregisterSearchFuncHook(void (*fcn_ptr)(int *, long **, const char *),
        }
 }
 
-void CtdlDestroySearchHooks(void)
-{
-        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)
 {
@@ -1328,18 +784,6 @@ void CtdlModuleDoSearch(int *num_msgs, long **search_msgs, const char *search_st
        *num_msgs = 0;
 }
 
-int CheckTDAPVeto (int DBType, StrBuf *ErrMsg)
-{
-       int Result = 0;
-       TDAPVetoHookFunctionHook *fcn = NULL;
-
-       for (fcn = TDAPVetoHookTable; (fcn != NULL) && (Result == 0); fcn = fcn->next) {
-               if (fcn->eventtype == DBType) {
-                       Result = (*fcn->h_function_pointer) (ErrMsg);
-               }
-       }
-       return Result;
-}
 
 void PerformSessionHooks(int EventType)
 {
@@ -1373,10 +817,8 @@ int PerformMessageHooks(struct CtdlMessage *msg, recptypes *recps, int EventType
 
        /* Other code may elect to protect this message from server-side
         * handlers; if this is the case, don't do anything.
-       syslog(LOG_DEBUG, "** Event type is %d, flags are %d\n", EventType, msg->cm_flags);
         */
        if (msg->cm_flags & CM_SKIP_HOOKS) {
-               syslog(LOG_DEBUG, "Skipping hooks\n");
                return(0);
        }
 
@@ -1401,7 +843,7 @@ int PerformRoomHooks(struct ctdlroom *target_room)
        RoomFunctionHook *fcn;
        int total_retval = 0;
 
-       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);
@@ -1413,23 +855,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;
@@ -1440,9 +865,6 @@ void PerformDeleteHooks(char *room, long msgnum)
 }
 
 
-
-
-
 int PerformXmsgHooks(char *sender, char *sender_email, char *recp, char *msg)
 {
        XmsgFunctionHook *fcn;
@@ -1478,25 +900,10 @@ void CtdlModuleStartCryptoMsgs(char *ok_response, char *nosup_response, char *er
 #endif
 }
 
-void DebugModulesEnable(const int n)
-{
-       DebugModules = n;
-}
-void MarkersEnable(const int n)
-{
-       EnableMarkers = n;
-}
-void DebugCitadelProtoEnable(const int n)
-{
-       EnableCtlProto = n;
-}
 
 CTDL_MODULE_INIT(modules)
 {
        if (!threading) {
-               CtdlRegisterDebugFlagHook(HKEY("modules"), DebugModulesEnable, &DebugModules);
-               CtdlRegisterDebugFlagHook(HKEY("periodicmarkers"), MarkersEnable, &EnableMarkers);
-               CtdlRegisterDebugFlagHook(HKEY("citadelprotocol"), DebugCitadelProtoEnable, &EnableCtlProto);
        }
        return "modules";
 }