X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fserv_extensions.c;h=f967e411be2be7c846f7002bfa9d173cff0738b3;hb=80a659e06168b4cb0755c8b77cae8fb0d89c0ea6;hp=45221c514eef4a3ced49c122cadc8e8c49e14c32;hpb=e85aa196b15dae29036b46a28412ce57961c85f9;p=citadel.git diff --git a/citadel/serv_extensions.c b/citadel/serv_extensions.c index 45221c514..f967e411b 100644 --- a/citadel/serv_extensions.c +++ b/citadel/serv_extensions.c @@ -1,79 +1,41 @@ /* - * Citadel Dynamic Loading Module - * Written by Brian Costello + * Citadel Extension Loader + * Originally written by Brian Costello * - * 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 as published by - * the Free Software Foundation; either version 3 of the License, or - * (at your option) any later version. + * it under the terms of the GNU General Public License, version 3. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "sysdep.h" -#include #include #include -#include -#include -#include -#include -#include -#include +#include +#include #include -#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" -#ifndef HAVE_SNPRINTF -#include -#include "snprintf.h" -#endif - /* * Structure defentitions for hook tables */ -typedef struct __LogDebugEntry { - CtdlDbgFunction F; - const char *Name; - long Len; -} 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; /* @@ -85,10 +47,11 @@ extern FixedOutputHook *FixedOutputTable; typedef struct SessionFunctionHook SessionFunctionHook; struct SessionFunctionHook { SessionFunctionHook *next; + int Priority; void (*h_function_pointer) (void); int eventtype; }; -extern SessionFunctionHook *SessionHookTable; +SessionFunctionHook *SessionHookTable = NULL; /* @@ -102,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 @@ -111,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; /* @@ -138,7 +90,7 @@ struct DeleteFunctionHook { DeleteFunctionHook *next; void (*h_function_pointer) (char *target_room, long msgnum); }; -extern DeleteFunctionHook *DeleteHookTable; +DeleteFunctionHook *DeleteHookTable = NULL; /* @@ -153,9 +105,7 @@ struct XmsgFunctionHook { int (*h_function_pointer) (char *, char *, char *, char *); int order; }; -extern XmsgFunctionHook *XmsgHookTable; - - +XmsgFunctionHook *XmsgHookTable = NULL; /* @@ -167,8 +117,7 @@ struct RoomFunctionHook { RoomFunctionHook *next; int (*fcn_ptr) (struct ctdlroom *); }; -extern RoomFunctionHook *RoomHookTable; - +RoomFunctionHook *RoomHookTable = NULL; typedef struct SearchFunctionHook SearchFunctionHook; @@ -177,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 { @@ -207,7 +147,6 @@ HashList *ProtoHookList = NULL; static StrBuf *portlist = NULL; - static StrBuf *errormessages = NULL; @@ -216,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) @@ -240,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; @@ -275,8 +211,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); @@ -317,92 +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; -} -/* -typedef struct __LogDebugEntry { - CtdlDbgFunction F; - const char *Name; - long Len; -} LogDebugEntry; -HashList *LogDebugEntryTable = NULL; -*/ -void CtdlRegisterDebugFlagHook(const char *Name, long Len, CtdlDbgFunction F) -{ - LogDebugEntry *E; - if (LogDebugEntryTable == NULL) - LogDebugEntryTable = NewHash(1, NULL); - E = (LogDebugEntry*) malloc(sizeof(LogDebugEntry)); - E->F = F; - E->Name = Name; - E->Len = Len; - 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(); - } - } - } - 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(); - } - - DeleteHashPos(&Pos); - } -} -void CtdlDestroyDebugTable(void) -{ - - DeleteHash(&LogDebugEntryTable); -} void CtdlRegisterProtoHook(void (*handler) (char *), char *cmd, char *desc) { @@ -424,7 +274,7 @@ void CtdlRegisterProtoHook(void (*handler) (char *), char *cmd, char *desc) p->desc = desc; Put(ProtoHookList, cmd, 4, p, NULL); - syslog(LOG_INFO, "Registered server command %s (%s)\n", cmd, desc); + syslog(LOG_DEBUG, "extensions: registered server command %s (%s)", cmd, desc); } void CtdlDestroyProtoHooks(void) @@ -445,26 +295,35 @@ void CtdlRegisterCleanupHook(void (*fcn_ptr) (void)) newfcn->h_function_pointer = fcn_ptr; CleanupHookTable = newfcn; - syslog(LOG_INFO, "Registered a new cleanup function\n"); + syslog(LOG_DEBUG, "extensions: registered a new cleanup function"); } void CtdlUnregisterCleanupHook(void (*fcn_ptr) (void)) { - CleanupFunctionHook *cur, *p; - - for (cur = CleanupHookTable; cur != NULL; cur = cur->next) { - /* This will also remove duplicates if any */ - while (cur != NULL && - fcn_ptr == cur->h_function_pointer) { - syslog(LOG_INFO, "Unregistered cleanup function\n"); + CleanupFunctionHook *cur, *p, *last; + last = NULL; + cur = CleanupHookTable; + while (cur != NULL) + { + if (fcn_ptr == cur->h_function_pointer) + { + syslog(LOG_DEBUG, "extensions: unregistered cleanup function"); p = cur->next; - if (cur == CleanupHookTable) { - CleanupHookTable = p; - } + free(cur); + cur = NULL; + + if (last != NULL) + last->next = p; + else + CleanupHookTable = p; cur = p; } + else { + last = cur; + cur = cur->next; + } } } @@ -476,7 +335,7 @@ void CtdlDestroyCleanupHooks(void) cur = CleanupHookTable; while (cur != NULL) { - syslog(LOG_INFO, "Destroyed cleanup function\n"); + syslog(LOG_DEBUG, "extensions: destroyed cleanup function"); p = cur->next; free(cur); cur = p; @@ -495,26 +354,35 @@ void CtdlRegisterEVCleanupHook(void (*fcn_ptr) (void)) newfcn->h_function_pointer = fcn_ptr; EVCleanupHookTable = newfcn; - syslog(LOG_INFO, "Registered a new cleanup function\n"); + syslog(LOG_DEBUG, "extensions: registered a new cleanup function"); } void CtdlUnregisterEVCleanupHook(void (*fcn_ptr) (void)) { - CleanupFunctionHook *cur, *p; - - for (cur = EVCleanupHookTable; cur != NULL; cur = cur->next) { - /* This will also remove duplicates if any */ - while (cur != NULL && - fcn_ptr == cur->h_function_pointer) { - syslog(LOG_INFO, "Unregistered cleanup function\n"); + CleanupFunctionHook *cur, *p, *last; + last = NULL; + cur = EVCleanupHookTable; + while (cur != NULL) + { + if (fcn_ptr == cur->h_function_pointer) + { + syslog(LOG_DEBUG, "extensions: unregistered cleanup function"); p = cur->next; - if (cur == EVCleanupHookTable) { - EVCleanupHookTable = p; - } + free(cur); + cur = NULL; + + if (last != NULL) + last->next = p; + else + EVCleanupHookTable = p; cur = p; } + else { + last = cur; + cur = cur->next; + } } } @@ -526,8 +394,9 @@ void CtdlDestroyEVCleanupHooks(void) cur = EVCleanupHookTable; while (cur != NULL) { - syslog(LOG_INFO, "Destroyed cleanup function\n"); + syslog(LOG_DEBUG, "extensions: destroyed cleanup function"); p = cur->next; + cur->h_function_pointer(); free(cur); cur = p; } @@ -535,41 +404,57 @@ void CtdlDestroyEVCleanupHooks(void) } -void CtdlRegisterSessionHook(void (*fcn_ptr) (void), int EventType) -{ + +void CtdlRegisterSessionHook(void (*fcn_ptr) (void), int EventType, int Priority) +{ SessionFunctionHook *newfcn; newfcn = (SessionFunctionHook *) malloc(sizeof(SessionFunctionHook)); - newfcn->next = SessionHookTable; + newfcn->Priority = Priority; newfcn->h_function_pointer = fcn_ptr; newfcn->eventtype = EventType; - SessionHookTable = newfcn; - syslog(LOG_INFO, "Registered a new session function (type %d)\n", - EventType); + SessionFunctionHook **pfcn; + pfcn = &SessionHookTable; + while ((*pfcn != NULL) && + ((*pfcn)->Priority < newfcn->Priority) && + ((*pfcn)->next != NULL)) + pfcn = &(*pfcn)->next; + + newfcn->next = *pfcn; + *pfcn = newfcn; + + syslog(LOG_DEBUG, "extensions: registered a new session function (type %d Priority %d)", EventType, Priority); } void CtdlUnregisterSessionHook(void (*fcn_ptr) (void), int EventType) { - SessionFunctionHook *cur, *p; - - for (cur = SessionHookTable; cur != NULL; cur = cur->next) { - /* This will also remove duplicates if any */ - while (cur != NULL && - fcn_ptr == cur->h_function_pointer && - EventType == cur->eventtype) { - syslog(LOG_INFO, "Unregistered session function (type %d)\n", - EventType); + SessionFunctionHook *cur, *p, *last; + last = NULL; + cur = SessionHookTable; + while (cur != NULL) { + if ((fcn_ptr == cur->h_function_pointer) && + (EventType == cur->eventtype)) + { + syslog(LOG_DEBUG, "extensions: unregistered session function (type %d)", EventType); p = cur->next; - if (cur == SessionHookTable) { - SessionHookTable = p; - } + free(cur); + cur = NULL; + + if (last != NULL) + last->next = p; + else + SessionHookTable = p; cur = p; } + else { + last = cur; + cur = cur->next; + } } } @@ -580,7 +465,7 @@ void CtdlDestroySessionHooks(void) cur = SessionHookTable; while (cur != NULL) { - syslog(LOG_INFO, "Destroyed session function\n"); + syslog(LOG_DEBUG, "extensions: destroyed session function"); p = cur->next; free(cur); cur = p; @@ -601,29 +486,36 @@ void CtdlRegisterUserHook(void (*fcn_ptr) (ctdluser *), int EventType) newfcn->eventtype = EventType; UserHookTable = newfcn; - syslog(LOG_INFO, "Registered a new user function (type %d)\n", - EventType); + syslog(LOG_DEBUG, "extensions: registered a new user function (type %d)", + EventType); } void CtdlUnregisterUserHook(void (*fcn_ptr) (struct ctdluser *), int EventType) { - UserFunctionHook *cur, *p; - - for (cur = UserHookTable; cur != NULL; cur = cur->next) { - /* This will also remove duplicates if any */ - while (cur != NULL && - fcn_ptr == cur->h_function_pointer && - EventType == cur->eventtype) { - syslog(LOG_INFO, "Unregistered user function (type %d)\n", - EventType); + UserFunctionHook *cur, *p, *last; + last = NULL; + cur = UserHookTable; + while (cur != NULL) { + if ((fcn_ptr == cur->h_function_pointer) && + (EventType == cur->eventtype)) + { + syslog(LOG_DEBUG, "extensions: unregistered user function (type %d)", EventType); p = cur->next; - if (cur == UserHookTable) { - UserHookTable = p; - } + free(cur); + cur = NULL; + + if (last != NULL) + last->next = p; + else + UserHookTable = p; cur = p; } + else { + last = cur; + cur = cur->next; + } } } @@ -634,7 +526,7 @@ void CtdlDestroyUserHooks(void) cur = UserHookTable; while (cur != NULL) { - syslog(LOG_INFO, "Destroyed user function \n"); + syslog(LOG_DEBUG, "extensions: destroyed user function"); p = cur->next; free(cur); cur = p; @@ -643,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; @@ -656,30 +547,34 @@ void CtdlRegisterMessageHook(int (*handler)(struct CtdlMessage *), newfcn->eventtype = EventType; MessageHookTable = newfcn; - syslog(LOG_INFO, "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; - - for (cur = MessageHookTable; cur != NULL; cur = cur->next) { - /* This will also remove duplicates if any */ - while (cur != NULL && - handler == cur->h_function_pointer && - EventType == cur->eventtype) { - syslog(LOG_INFO, "Unregistered message function (type %d)\n", - EventType); + MessageFunctionHook *cur, *p, *last; + last = NULL; + cur = MessageHookTable; + while (cur != NULL) { + if ((handler == cur->h_function_pointer) && + (EventType == cur->eventtype)) + { + syslog(LOG_DEBUG, "extensions: unregistered message function (type %d)", EventType); p = cur->next; - if (cur == MessageHookTable) { - MessageHookTable = p; - } free(cur); + cur = NULL; + + if (last != NULL) + last->next = p; + else + MessageHookTable = p; cur = p; } + else { + last = cur; + cur = cur->next; + } } } @@ -690,7 +585,7 @@ void CtdlDestroyMessageHook(void) cur = MessageHookTable; while (cur != NULL) { - syslog(LOG_INFO, "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; @@ -709,24 +604,34 @@ void CtdlRegisterRoomHook(int (*fcn_ptr)(struct ctdlroom *)) newfcn->fcn_ptr = fcn_ptr; RoomHookTable = newfcn; - syslog(LOG_INFO, "Registered a new room function\n"); + syslog(LOG_DEBUG, "extensions: registered a new room function"); } void CtdlUnregisterRoomHook(int (*fcn_ptr)(struct ctdlroom *)) { - RoomFunctionHook *cur, *p; - - for (cur = RoomHookTable; cur != NULL; cur = cur->next) { - while (cur != NULL && fcn_ptr == cur->fcn_ptr) { - syslog(LOG_INFO, "Unregistered room function\n"); + RoomFunctionHook *cur, *p, *last; + last = NULL; + cur = RoomHookTable; + while (cur != NULL) + { + if (fcn_ptr == cur->fcn_ptr) { + syslog(LOG_DEBUG, "extensions: unregistered room function"); p = cur->next; - if (cur == RoomHookTable) { - RoomHookTable = p; - } + free(cur); + cur = NULL; + + if (last != NULL) + last->next = p; + else + RoomHookTable = p; cur = p; } + else { + last = cur; + cur = cur->next; + } } } @@ -738,7 +643,7 @@ void CtdlDestroyRoomHooks(void) cur = RoomHookTable; while (cur != NULL) { - syslog(LOG_INFO, "Destroyed room function\n"); + syslog(LOG_DEBUG, "extensions: destroyed room function"); p = cur->next; free(cur); cur = p; @@ -746,54 +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; - - syslog(LOG_INFO, "Registered a new netproc function\n"); -} - - -void CtdlUnregisterNetprocHook(int (*handler)(struct CtdlMessage *, char *) ) -{ - NetprocFunctionHook *cur, *p; - - for (cur = NetprocHookTable; cur != NULL; cur = cur->next) { - /* This will also remove duplicates if any */ - while (cur != NULL && - handler == cur->h_function_pointer ) { - syslog(LOG_INFO, "Unregistered netproc function\n"); - p = cur->next; - if (cur == NetprocHookTable) { - NetprocHookTable = p; - } - free(cur); - cur = p; - } - } -} - -void CtdlDestroyNetprocHooks(void) -{ - NetprocFunctionHook *cur, *p; - - cur = NetprocHookTable; - while (cur != NULL) - { - syslog(LOG_INFO, "Destroyed netproc function\n"); - p = cur->next; - free(cur); - cur = p; - } - NetprocHookTable = NULL; -} - void CtdlRegisterDeleteHook(void (*handler)(char *, long) ) { @@ -805,28 +662,38 @@ void CtdlRegisterDeleteHook(void (*handler)(char *, long) ) newfcn->h_function_pointer = handler; DeleteHookTable = newfcn; - syslog(LOG_INFO, "Registered a new delete function\n"); + syslog(LOG_DEBUG, "extensions: registered a new delete function"); } void CtdlUnregisterDeleteHook(void (*handler)(char *, long) ) { - DeleteFunctionHook *cur, *p; + DeleteFunctionHook *cur, *p, *last; - for (cur = DeleteHookTable; cur != NULL; cur = cur->next) { - /* This will also remove duplicates if any */ - while (cur != NULL && - handler == cur->h_function_pointer ) { - syslog(LOG_INFO, "Unregistered delete function\n"); + last = NULL; + cur = DeleteHookTable; + while (cur != NULL) { + if (handler == cur->h_function_pointer ) + { + syslog(LOG_DEBUG, "extensions: unregistered delete function"); p = cur->next; - if (cur == DeleteHookTable) { - DeleteHookTable = p; - } free(cur); + + if (last != NULL) + last->next = p; + else + DeleteHookTable = p; + cur = p; } + else { + last = cur; + cur = cur->next; + } } } + + void CtdlDestroyDeleteHooks(void) { DeleteFunctionHook *cur, *p; @@ -834,7 +701,7 @@ void CtdlDestroyDeleteHooks(void) cur = DeleteHookTable; while (cur != NULL) { - syslog(LOG_INFO, "Destroyed delete function\n"); + syslog(LOG_DEBUG, "extensions: destroyed delete function"); p = cur->next; free(cur); cur = p; @@ -843,8 +710,6 @@ void CtdlDestroyDeleteHooks(void) } - - void CtdlRegisterFixedOutputHook(char *content_type, void (*handler)(char *, int) ) { FixedOutputHook *newfcn; @@ -856,25 +721,35 @@ void CtdlRegisterFixedOutputHook(char *content_type, void (*handler)(char *, int safestrncpy(newfcn->content_type, content_type, sizeof newfcn->content_type); FixedOutputTable = newfcn; - syslog(LOG_INFO, "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); } void CtdlUnregisterFixedOutputHook(char *content_type) { - FixedOutputHook *cur, *p; + FixedOutputHook *cur, *p, *last; - for (cur = FixedOutputTable; cur != NULL; cur = cur->next) { + last = NULL; + cur = FixedOutputTable; + while (cur != NULL) { /* This will also remove duplicates if any */ - while (cur != NULL && (!strcasecmp(content_type, cur->content_type))) { - syslog(LOG_INFO, "Unregistered fixed output function for %s\n", content_type); + if (!strcasecmp(content_type, cur->content_type)) { + syslog(LOG_DEBUG, "extensions: unregistered fixed output function for %s", content_type); p = cur->next; - if (cur == FixedOutputTable) { - FixedOutputTable = p; - } free(cur); + + if (last != NULL) + last->next = p; + else + FixedOutputTable = p; + cur = p; } + else + { + last = cur; + cur = cur->next; + } } } @@ -885,7 +760,7 @@ void CtdlDestroyFixedOutputHooks(void) cur = FixedOutputTable; while (cur != NULL) { - syslog(LOG_INFO, "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; @@ -909,9 +784,6 @@ int PerformFixedOutputHooks(char *content_type, char *content, int content_lengt } - - - void CtdlRegisterXmsgHook(int (*fcn_ptr) (char *, char *, char *, char *), int order) { @@ -922,31 +794,40 @@ void CtdlRegisterXmsgHook(int (*fcn_ptr) (char *, char *, char *, char *), int o newfcn->order = order; newfcn->h_function_pointer = fcn_ptr; XmsgHookTable = newfcn; - syslog(LOG_INFO, "Registered a new x-msg function (priority %d)\n", order); + syslog(LOG_DEBUG, "extensions: registered a new x-msg function (priority %d)", order); } void CtdlUnregisterXmsgHook(int (*fcn_ptr) (char *, char *, char *, char *), int order) { - XmsgFunctionHook *cur, *p; + XmsgFunctionHook *cur, *p, *last; - for (cur = XmsgHookTable; cur != NULL; cur = cur->next) { + last = NULL; + cur = XmsgHookTable; + while (cur != NULL) { /* This will also remove duplicates if any */ - while (cur != NULL && - fcn_ptr == cur->h_function_pointer && - order == cur->order) { - syslog(LOG_INFO, "Unregistered x-msg function " - "(priority %d)\n", order); + if (fcn_ptr == cur->h_function_pointer && + order == cur->order) { + syslog(LOG_DEBUG, "extensions: unregistered x-msg function (priority %d)", order); p = cur->next; - if (cur == XmsgHookTable) { + free(cur); + + if (last != NULL) { + last->next = p; + } + else { XmsgHookTable = p; } - free(cur); cur = p; } + else { + last = cur; + cur = cur->next; + } } } + void CtdlDestroyXmsgHooks(void) { XmsgFunctionHook *cur, *p; @@ -954,10 +835,8 @@ void CtdlDestroyXmsgHooks(void) cur = XmsgHookTable; while (cur != NULL) { - syslog(LOG_INFO, "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; } @@ -989,33 +868,33 @@ 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"), error); + 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(config.c_ip_addr, + newfcn->msock = ctdl_tcp_server(CtdlGetConfigStr("c_ip_addr"), tcp_port, - config.c_maxsessions, + CtdlGetConfigInt("c_maxsessions"), error); - snprintf(message, SIZ, "TCP port %s:%d: (%s) ", - config.c_ip_addr, tcp_port, ServiceName); + 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); strcat(message, "FAILED."); - syslog(LOG_CRIT, "%s\n", message); + syslog(LOG_ERR, "%s", message); free(newfcn); } free(message); @@ -1028,35 +907,40 @@ void CtdlUnregisterServiceHook(int tcp_port, char *sockpath, void (*h_async_function) (void) ) { - ServiceFunctionHook *cur, *p; + ServiceFunctionHook *cur, *p, *last; + last = NULL; cur = ServiceHookTable; while (cur != NULL) { /* This will also remove duplicates if any */ - while (cur != NULL && - !(sockpath && cur->sockpath && - strcmp(sockpath, cur->sockpath)) && - h_greeting_function == cur->h_greeting_function && - h_command_function == cur->h_command_function && - h_async_function == cur->h_async_function && - tcp_port == cur->tcp_port) { - close(cur->msock); + if (h_greeting_function == cur->h_greeting_function && + h_command_function == cur->h_command_function && + h_async_function == cur->h_async_function && + tcp_port == cur->tcp_port && + !(sockpath && cur->sockpath && strcmp(sockpath, cur->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; - if (cur == ServiceHookTable) { - ServiceHookTable = p; - } free(cur); + if (last != NULL) + last->next = p; + else + ServiceHookTable = p; cur = p; } + else { + last = cur; + cur = cur->next; + } } } @@ -1074,35 +958,42 @@ 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) { - close(cur->msock); + if (cur->msock != -1) + { + close(cur->msock); + Text = "Closed"; + } + else + { + Text = " Not closing again"; + } + if (cur->sockpath) { - 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) { - syslog(LOG_INFO, "Closed TCP port %d\n", cur->tcp_port); + syslog(LOG_INFO, "extensions: %s TCP port %d", Text, cur->tcp_port); } else { - syslog(LOG_INFO, "Destroyed service \"%s\"\n", cur->ServiceName); + syslog(LOG_INFO, "extensions: destroyed service \"%s\"", cur->ServiceName); } p = cur->next; free(cur); @@ -1126,23 +1017,33 @@ void CtdlRegisterSearchFuncHook(void (*fcn_ptr)(int *, long **, const char *), c newfcn->fcn_ptr = fcn_ptr; SearchFunctionHookTable = newfcn; - syslog(LOG_INFO, "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) { - SearchFunctionHook *cur, *p; + SearchFunctionHook *cur, *p, *last; - for (cur = SearchFunctionHookTable; cur != NULL; cur = cur->next) { - while (fcn_ptr && (cur->fcn_ptr == fcn_ptr) && name && !strcmp(name, cur->name)) { - syslog(LOG_INFO, "Unregistered search function(%s)\n", name); + last = NULL; + cur = SearchFunctionHookTable; + while (cur != NULL) { + if (fcn_ptr && + (cur->fcn_ptr == fcn_ptr) && + name && !strcmp(name, cur->name)) + { + syslog(LOG_DEBUG, "extensions: unregistered search function(%s)", name); p = cur->next; - if (cur == SearchFunctionHookTable) { - SearchFunctionHookTable = p; - } free (cur); + if (last != NULL) + last->next = p; + else + SearchFunctionHookTable = p; cur = p; } + else { + last = cur; + cur = cur->next; + } } } @@ -1198,17 +1099,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. - 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); } @@ -1216,7 +1115,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); } } @@ -1233,7 +1132,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); @@ -1245,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; @@ -1272,9 +1154,6 @@ void PerformDeleteHooks(char *room, long msgnum) } - - - int PerformXmsgHooks(char *sender, char *sender_email, char *recp, char *msg) { XmsgFunctionHook *fcn; @@ -1309,3 +1188,11 @@ void CtdlModuleStartCryptoMsgs(char *ok_response, char *nosup_response, char *er CtdlStartTLS (ok_response, nosup_response, error_response); #endif } + + +CTDL_MODULE_INIT(modules) +{ + if (!threading) { + } + return "modules"; +}