X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fserv_extensions.c;h=f967e411be2be7c846f7002bfa9d173cff0738b3;hb=80a659e06168b4cb0755c8b77cae8fb0d89c0ea6;hp=9984e23cf23c2308610be2c7205f5e6448b4b240;hpb=e86cae42a7b279758e7d5de8785793af5cdf689d;p=citadel.git diff --git a/citadel/serv_extensions.c b/citadel/serv_extensions.c index 9984e23cf..f967e411b 100644 --- a/citadel/serv_extensions.c +++ b/citadel/serv_extensions.c @@ -1,8 +1,8 @@ /* * Citadel Extension Loader - * Written by Brian Costello + * Originally written by Brian Costello * - * Copyright (c) 1987-2015 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,34 +13,22 @@ * GNU General Public License for more details. */ +#include +#include #include +#include #include - #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; - /* * 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; @@ -50,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 @@ -82,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 @@ -95,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.) @@ -108,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. @@ -147,8 +108,6 @@ struct XmsgFunctionHook { XmsgFunctionHook *XmsgHookTable = NULL; - - /* * RoomFunctionHook extensions are used for hooks which impliment room * processing functions when new messages are added EG. SIEVE. @@ -161,7 +120,6 @@ struct RoomFunctionHook { RoomFunctionHook *RoomHookTable = NULL; - typedef struct SearchFunctionHook SearchFunctionHook; struct SearchFunctionHook { SearchFunctionHook *next; @@ -189,7 +147,6 @@ HashList *ProtoHookList = NULL; static StrBuf *portlist = NULL; - static StrBuf *errormessages = NULL; @@ -198,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) @@ -222,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; @@ -257,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); @@ -299,70 +253,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) { @@ -384,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) @@ -405,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"); } @@ -418,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); @@ -445,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; @@ -464,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"); } @@ -477,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); @@ -504,7 +394,7 @@ 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); @@ -513,74 +403,7 @@ void CtdlDestroyEVCleanupHooks(void) 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; - - MOD_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)) - { - MOD_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) - { - MODM_syslog(LOG_DEBUG, "Destroyed TDAP Veto function\n"); - p = cur->next; - free(cur); - cur = p; - } - TDAPVetoHookTable = NULL; -} void CtdlRegisterSessionHook(void (*fcn_ptr) (void), int EventType, int Priority) @@ -603,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); } @@ -617,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); @@ -644,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; @@ -665,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); } @@ -679,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); @@ -706,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; @@ -715,8 +535,7 @@ void CtdlDestroyUserHooks(void) } -void CtdlRegisterMessageHook(int (*handler)(struct CtdlMessage *, recptypes *), - int EventType) +void CtdlRegisterMessageHook(int (*handler)(struct CtdlMessage *, recptypes *), int EventType) { MessageFunctionHook *newfcn; @@ -728,13 +547,11 @@ void CtdlRegisterMessageHook(int (*handler)(struct CtdlMessage *, recptypes *), 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 *, recptypes *), - int EventType) +void CtdlUnregisterMessageHook(int (*handler)(struct CtdlMessage *, recptypes *), int EventType) { MessageFunctionHook *cur, *p, *last; last = NULL; @@ -743,8 +560,7 @@ void CtdlUnregisterMessageHook(int (*handler)(struct CtdlMessage *, recptypes *) 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; @@ -769,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; @@ -788,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"); } @@ -800,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); @@ -827,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; @@ -835,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) ) { @@ -903,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"); } @@ -916,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); @@ -933,6 +692,8 @@ void CtdlUnregisterDeleteHook(void (*handler)(char *, long) ) } } } + + void CtdlDestroyDeleteHooks(void) { DeleteFunctionHook *cur, *p; @@ -940,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; @@ -949,8 +710,6 @@ void CtdlDestroyDeleteHooks(void) } - - void CtdlRegisterFixedOutputHook(char *content_type, void (*handler)(char *, int) ) { FixedOutputHook *newfcn; @@ -962,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); } @@ -975,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); @@ -1004,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; @@ -1028,9 +784,6 @@ int PerformFixedOutputHooks(char *content_type, char *content, int content_lengt } - - - void CtdlRegisterXmsgHook(int (*fcn_ptr) (char *, char *, char *, char *), int order) { @@ -1041,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); } @@ -1055,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 { @@ -1074,6 +827,7 @@ void CtdlUnregisterXmsgHook(int (*fcn_ptr) (char *, char *, char *, char *), int } } + void CtdlDestroyXmsgHooks(void) { XmsgFunctionHook *cur, *p; @@ -1081,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; } @@ -1117,10 +869,10 @@ void CtdlRegisterServiceHook(int tcp_port, if (sockpath != NULL) { newfcn->msock = ctdl_uds_server(sockpath, CtdlGetConfigInt("c_maxsessions"), error); - snprintf(message, SIZ, "Unix domain socket '%s': ", sockpath); + 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; @@ -1130,19 +882,19 @@ void CtdlRegisterServiceHook(int tcp_port, tcp_port, CtdlGetConfigInt("c_maxsessions"), error); - snprintf(message, SIZ, "TCP port %s:%d: (%s) ", + 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); strcat(message, "FAILED."); - MOD_syslog(LOG_CRIT, "%s\n", message); + syslog(LOG_ERR, "%s", message); free(newfcn); } free(message); @@ -1170,13 +922,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); @@ -1207,19 +958,17 @@ 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; @@ -1239,14 +988,12 @@ void CtdlDestroyServiceHook(void) } if (cur->sockpath) { - MOD_syslog(LOG_INFO, "%s UNIX domain socket %s\n", - Text, - 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, "%s TCP port %d\n", Text, 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); @@ -1270,7 +1017,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) @@ -1284,7 +1031,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) @@ -1326,18 +1073,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) { @@ -1371,10 +1106,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. - 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); } @@ -1399,7 +1132,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); @@ -1411,23 +1144,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; @@ -1438,9 +1154,6 @@ void PerformDeleteHooks(char *room, long msgnum) } - - - int PerformXmsgHooks(char *sender, char *sender_email, char *recp, char *msg) { XmsgFunctionHook *fcn; @@ -1476,14 +1189,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); } return "modules"; }