X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fserv_extensions.c;h=9984e23cf23c2308610be2c7205f5e6448b4b240;hb=e86cae42a7b279758e7d5de8785793af5cdf689d;hp=861ecb8497adee990ab428fb624c116f78b1c599;hpb=cd367fad021ddbae6f6977a4eb80e426da39248d;p=citadel.git diff --git a/citadel/serv_extensions.c b/citadel/serv_extensions.c index 861ecb849..9984e23cf 100644 --- a/citadel/serv_extensions.c +++ b/citadel/serv_extensions.c @@ -1,8 +1,8 @@ /* - * Citadel Dynamic Loading Module + * Citadel Extension Loader * Written by Brian Costello * - * Copyright (c) 1987-2011 by the citadel.org team + * Copyright (c) 1987-2015 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,32 +13,16 @@ * GNU General Public License for more details. */ -#include "sysdep.h" #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 "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" -#ifndef HAVE_SNPRINTF -#include -#include "snprintf.h" -#endif int DebugModules = 0; @@ -46,12 +30,6 @@ int DebugModules = 0; * Structure defentitions for hook tables */ -typedef struct __LogDebugEntry { - CtdlDbgFunction F; - const char *Name; - long Len; - const int *LogP; -} LogDebugEntry; HashList *LogDebugEntryTable = NULL; typedef struct LogFunctionHook LogFunctionHook; @@ -60,7 +38,8 @@ struct LogFunctionHook { int loglevel; void (*h_function_pointer) (char *); }; -extern LogFunctionHook *LogHookTable; + +LogFunctionHook *LogHookTable = NULL; typedef struct FixedOutputHook FixedOutputHook; struct FixedOutputHook { @@ -68,7 +47,23 @@ struct FixedOutputHook { char content_type[64]; void (*h_function_pointer) (char *, int); }; -extern FixedOutputHook *FixedOutputTable; +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; @@ -85,8 +80,7 @@ struct SessionFunctionHook { void (*h_function_pointer) (void); int eventtype; }; -extern SessionFunctionHook *SessionHookTable; - +SessionFunctionHook *SessionHookTable = NULL; /* * UserFunctionHook extensions are used for any type of hook which implements @@ -99,7 +93,7 @@ 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 @@ -108,10 +102,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; +MessageFunctionHook *MessageHookTable = NULL; /* @@ -123,7 +117,7 @@ struct NetprocFunctionHook { NetprocFunctionHook *next; int (*h_function_pointer) (struct CtdlMessage *msg, char *target_room); }; -extern NetprocFunctionHook *NetprocHookTable; +NetprocFunctionHook *NetprocHookTable = NULL; /* @@ -135,7 +129,7 @@ struct DeleteFunctionHook { DeleteFunctionHook *next; void (*h_function_pointer) (char *target_room, long msgnum); }; -extern DeleteFunctionHook *DeleteHookTable; +DeleteFunctionHook *DeleteHookTable = NULL; /* @@ -150,7 +144,7 @@ struct XmsgFunctionHook { int (*h_function_pointer) (char *, char *, char *, char *); int order; }; -extern XmsgFunctionHook *XmsgHookTable; +XmsgFunctionHook *XmsgHookTable = NULL; @@ -164,7 +158,7 @@ struct RoomFunctionHook { RoomFunctionHook *next; int (*fcn_ptr) (struct ctdlroom *); }; -extern RoomFunctionHook *RoomHookTable; +RoomFunctionHook *RoomHookTable = NULL; @@ -174,21 +168,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 { @@ -314,22 +299,6 @@ int DLoader_Exec_Cmd(char *cmdbuf) return 0; } -long FourHash(const char *key, long length) -{ - int i; - int ret = 0; - const unsigned char *ptr = (const unsigned char*)key; - - for (i = 0; i < 4; i++, ptr ++) - ret = (ret << 8) | - ( ((*ptr >= 'a') && - (*ptr <= 'z'))? - *ptr - 'a' + 'A': - *ptr); - - return ret; -} - void CtdlRegisterDebugFlagHook(const char *Name, long Len, CtdlDbgFunction F, const int *LogP) { LogDebugEntry *E; @@ -389,52 +358,6 @@ void CtdlSetDebugLogFacilities(const char **Str, long n) DeleteHashPos(&Pos); } } -void cmd_log_get(char *argbuf) -{ - long HKLen; - const char *ch; - HashPos *Pos; - void *vptr; - - if (CtdlAccessCheck(ac_aide)) return; - - cprintf("%d Log modules enabled:\n", LISTING_FOLLOWS); - - Pos = GetNewHashPos(LogDebugEntryTable, 0); - - while (GetNextHashPos(LogDebugEntryTable, Pos, &HKLen, &ch, &vptr)) { - LogDebugEntry *E = (LogDebugEntry*)vptr; - cprintf("%s|%d\n", ch, *E->LogP); - } - - DeleteHashPos(&Pos); - cprintf("000\n"); -} -void cmd_log_set(char *argbuf) -{ - void *vptr; - int lset; - int wlen; - char which[SIZ] = ""; - - if (CtdlAccessCheck(ac_aide)) return; - - wlen = extract_token(which, argbuf, 0, '|', sizeof(which)); - if (wlen < 0) wlen = 0; - lset = extract_int(argbuf, 1); - if (lset != 0) lset = 1; - if (GetHash(LogDebugEntryTable, which, wlen, &vptr) && - (vptr != NULL)) - { - LogDebugEntry *E = (LogDebugEntry*)vptr; - E->F(lset); - cprintf("%d %s|%d\n", CIT_OK, which, lset); - } - else { - cprintf("%d Log setting %s not known\n", - ERROR, which); - } -} void CtdlDestroyDebugTable(void) { @@ -583,12 +506,82 @@ void CtdlDestroyEVCleanupHooks(void) { MODM_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; + + 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) { @@ -722,7 +715,7 @@ void CtdlDestroyUserHooks(void) } -void CtdlRegisterMessageHook(int (*handler)(struct CtdlMessage *), +void CtdlRegisterMessageHook(int (*handler)(struct CtdlMessage *, recptypes *), int EventType) { @@ -740,7 +733,7 @@ void CtdlRegisterMessageHook(int (*handler)(struct CtdlMessage *), } -void CtdlUnregisterMessageHook(int (*handler)(struct CtdlMessage *), +void CtdlUnregisterMessageHook(int (*handler)(struct CtdlMessage *, recptypes *), int EventType) { MessageFunctionHook *cur, *p, *last; @@ -1123,7 +1116,7 @@ void CtdlRegisterServiceHook(int tcp_port, newfcn->ServiceName = ServiceName; if (sockpath != NULL) { - newfcn->msock = ctdl_uds_server(sockpath, config.c_maxsessions, error); + newfcn->msock = ctdl_uds_server(sockpath, CtdlGetConfigInt("c_maxsessions"), error); snprintf(message, SIZ, "Unix domain socket '%s': ", sockpath); } else if (tcp_port <= 0) { /* port -1 to disable */ @@ -1133,12 +1126,12 @@ void CtdlRegisterServiceHook(int tcp_port, 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); + CtdlGetConfigStr("c_ip_addr"), tcp_port, ServiceName); } if (newfcn->msock > 0) { @@ -1229,18 +1222,29 @@ void CtdlShutdownServiceHooks(void) void CtdlDestroyServiceHook(void) { + const char *Text; ServiceFunctionHook *cur, *p; cur = ServiceHookTable; while (cur != NULL) { - close(cur->msock); + if (cur->msock != -1) + { + close(cur->msock); + Text = "Closed"; + } + else + { + Text = " Not closing again"; + } + if (cur->sockpath) { - MOD_syslog(LOG_INFO, "Closed UNIX domain socket %s\n", + MOD_syslog(LOG_INFO, "%s UNIX domain socket %s\n", + Text, cur->sockpath); unlink(cur->sockpath); } else if (cur->tcp_port) { - MOD_syslog(LOG_INFO, "Closed TCP port %d\n", cur->tcp_port); + MOD_syslog(LOG_INFO, "%s TCP port %d\n", Text, cur->tcp_port); } else { MOD_syslog(LOG_INFO, "Destroyed service \"%s\"\n", cur->ServiceName); } @@ -1322,6 +1326,18 @@ 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) { @@ -1348,7 +1364,7 @@ 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; @@ -1366,7 +1382,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); } } @@ -1468,9 +1484,6 @@ CTDL_MODULE_INIT(modules) { if (!threading) { CtdlRegisterDebugFlagHook(HKEY("modules"), DebugModulesEnable, &DebugModules); - - CtdlRegisterProtoHook(cmd_log_get, "LOGP", "Print Log-parameters"); - CtdlRegisterProtoHook(cmd_log_set, "LOGS", "Set Log-parameters"); } return "modules"; }