/*
- * $Id$
+ * Citadel Extension Loader
+ * Originally written by Brian Costello <btx@calyx.net>
*
- * Citadel Dynamic Loading Module
- * Written by Brian Costello <btx@calyx.net>
+ * 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.
+ *
+ * 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.
*/
-#include "sysdep.h"
-#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
-#include <sys/types.h>
-#include <dirent.h>
-#include <string.h>
-#include <limits.h>
-#include <ctype.h>
-#include "citadel.h"
-#include "server.h"
-#include "serv_extensions.h"
+#include <stdio.h>
+#include <sys/stat.h>
+#include <libcitadel.h>
#include "sysdep_decls.h"
-#include "msgbase.h"
-#include "tools.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 <stdarg.h>
-#include "snprintf.h"
-#endif
-struct CleanupFunctionHook *CleanupHookTable = NULL;
-struct SessionFunctionHook *SessionHookTable = NULL;
-struct UserFunctionHook *UserHookTable = NULL;
-struct XmsgFunctionHook *XmsgHookTable = NULL;
-struct MessageFunctionHook *MessageHookTable = NULL;
-struct NetprocFunctionHook *NetprocHookTable = NULL;
-struct DeleteFunctionHook *DeleteHookTable = NULL;
-struct ServiceFunctionHook *ServiceHookTable = NULL;
-struct FixedOutputHook *FixedOutputTable = NULL;
-struct RoomFunctionHook *RoomHookTable = NULL;
+/*
+ * Structure defentitions for hook tables
+ */
+typedef struct FixedOutputHook FixedOutputHook;
+struct FixedOutputHook {
+ FixedOutputHook *next;
+ char content_type[64];
+ void (*h_function_pointer) (char *, int);
+};
+FixedOutputHook *FixedOutputTable = NULL;
-struct ProtoFunctionHook {
- void (*handler) (char *cmdbuf);
- char *cmd;
- char *desc;
- struct ProtoFunctionHook *next;
-} *ProtoHookList = 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
+ * type) will make it obvious for the hook function to know where to look for
+ * pertinent data.
+ */
+typedef struct SessionFunctionHook SessionFunctionHook;
+struct SessionFunctionHook {
+ SessionFunctionHook *next;
+ int Priority;
+ void (*h_function_pointer) (void);
+ int eventtype;
+};
+SessionFunctionHook *SessionHookTable = NULL;
-#define ERR_PORT (1 << 1)
+/*
+ * UserFunctionHook extensions are used for any type of hook which implements
+ * an operation on a user or username (potentially) other than the one
+ * operating the current session.
+ */
+typedef struct UserFunctionHook UserFunctionHook;
+struct UserFunctionHook {
+ UserFunctionHook *next;
+ void (*h_function_pointer) (struct ctdluser *usbuf);
+ int eventtype;
+};
+UserFunctionHook *UserHookTable = NULL;
-static char *portlist = NULL;
-static size_t nSizPort = 0;
-static char *errormessages = NULL;
-static size_t nSizErrmsg = 0;
+/*
+ * MessageFunctionHook extensions are used for hooks which implement handlers
+ * for various types of message operations (save, read, etc.)
+ */
+typedef struct MessageFunctionHook MessageFunctionHook;
+struct MessageFunctionHook {
+ MessageFunctionHook *next;
+ int (*h_function_pointer) (struct CtdlMessage *msg, recptypes *recps);
+ int eventtype;
+};
+MessageFunctionHook *MessageHookTable = NULL;
-static long DetailErrorFlags;
+/*
+ * DeleteFunctionHook extensions are used for hooks which get called when a
+ * message is about to be deleted.
+ */
+typedef struct DeleteFunctionHook DeleteFunctionHook;
+struct DeleteFunctionHook {
+ DeleteFunctionHook *next;
+ void (*h_function_pointer) (char *target_room, long msgnum);
+};
+DeleteFunctionHook *DeleteHookTable = NULL;
-char *ErrSubject = "Startup Problems";
-char *ErrGeneral = "Citadel had trouble on starting up. %s 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 %s%s\n\n%s\n\n"
-"To make both ways actualy take place restart the citserver with \"sendcommand down\"\n\n"
-"The errors returned by the system were:\n%s\n"
-"You can recheck the above if you follow this faq item:\n"
-"http://www.citadel.org/doku.php/faq:mastering_your_os:net#netstat";
+/*
+ * ExpressMessageFunctionHook extensions are used for hooks which implement
+ * the sending of an instant message through various channels. Any function
+ * registered should return the number of recipients to whom the message was
+ * successfully transmitted.
+ */
+typedef struct XmsgFunctionHook XmsgFunctionHook;
+struct XmsgFunctionHook {
+ XmsgFunctionHook *next;
+ int (*h_function_pointer) (char *, char *, char *, char *);
+ int order;
+};
+XmsgFunctionHook *XmsgHookTable = NULL;
-char *ErrPortShort = "We couldn't bind all ports you configured to be provided by citadel server.";
-char *ErrPortWhere = "Admin->System Preferences->Network.\n\nThe failed ports and sockets are: ";
-char *ErrPortHint = "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 programm, that binds these ports. You should eventually remove "
-" their initscripts in /etc/init.d so that you won't get this trouble once more.\n";
+/*
+ * RoomFunctionHook extensions are used for hooks which impliment room
+ * processing functions when new messages are added.
+ */
+typedef struct RoomFunctionHook RoomFunctionHook;
+struct RoomFunctionHook {
+ RoomFunctionHook *next;
+ int (*fcn_ptr) (struct ctdlroom *);
+};
+RoomFunctionHook *RoomHookTable = NULL;
-void LogPrintMessages(long err)
-{
- char *List, *DetailList, *Short, *Where, *Hint, *Message;
- int n = nSizPort + nSizErrmsg + 5;
- Message = (char*) malloc(n * SIZ);
+typedef struct SearchFunctionHook SearchFunctionHook;
+struct SearchFunctionHook {
+ SearchFunctionHook *next;
+ void (*fcn_ptr) (int *, long **, const char *);
+ char *name;
+};
+SearchFunctionHook *SearchFunctionHookTable = NULL;
- switch (err)
- {
- case ERR_PORT:
- Short = ErrPortShort;
- Where = ErrPortWhere;
- Hint = ErrPortHint;
- List = portlist;
- DetailList = errormessages;
- break;
- default:
- Short = "";
- Where = "";
- Hint = "";
- List = "";
- DetailList = "";
- }
+ServiceFunctionHook *ServiceHookTable = NULL;
+typedef struct ProtoFunctionHook ProtoFunctionHook;
+struct ProtoFunctionHook {
+ void (*handler) (char *cmdbuf);
+ const char *cmd;
+ const char *desc;
+};
- snprintf(Message, n * SIZ, ErrGeneral, Short, Where, List, Hint, DetailList);
+HashList *ProtoHookList = NULL;
- quickie_message("Citadel", NULL, NULL, AIDEROOM, Message, FMT_FIXED, ErrSubject);
- if (errormessages!=NULL) free (errormessages);
- errormessages = NULL;
- if (portlist!=NULL) free (portlist);
- portlist = NULL;
- free(Message);
-}
+#define ERR_PORT (1 << 1)
-void AppendString(char **target, char *append, size_t *len, size_t rate)
-{
- size_t oLen = 0;
- long AddLen;
- long RelPtr = 0;
+static StrBuf *portlist = NULL;
+static StrBuf *errormessages = NULL;
- AddLen = strlen(append);
- if (*len == 0)
- {
- *len = rate;
+long DetailErrorFlags;
+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("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 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, or \"netstat -na\" on BSD"
+ " and disable the program that binds these ports.\n")};
- *target = (char*)malloc (*len * SIZ);
- }
- else
- {
- oLen = strlen(*target);
- RelPtr = strlen(*target);
- if (oLen + AddLen + 2 > *len * SIZ)
- {
- char *Buff = *target;
- size_t NewSiz = *len + 10;
- *target = malloc (NewSiz * SIZ);
- memcpy (*target, Buff, NewSiz * SIZ);
- *len = NewSiz;
- }
- }
- memcpy (*target + oLen, append, AddLen);
- (*target)[oLen + AddLen + 1] = '\n';
- (*target)[oLen + AddLen + 2] = '\0';
-}
-void AddPortError(char *Port, char *ErrorMessage)
+void LogPrintMessages(long err)
{
- char *pos;
- long len;
-
- DetailErrorFlags |= ERR_PORT;
-
- AppendString(&errormessages, ErrorMessage, &nSizErrmsg, 10);
- AppendString(&portlist, Port, &nSizPort, 2);
+ StrBuf *Message;
+ StrBuf *List, *DetailList;
+ ConstStr *Short, *Where, *Hint;
- pos = strchr (portlist, ':');
- if (pos != NULL) *pos = ';';
- len = strlen (errormessages);
- if (nSizErrmsg * SIZ > len + 3)
- {
- errormessages[len] = ';';
- errormessages[len+1] = ' ';
- errormessages[len+2] = '\0';
- }
-}
+ Message = NewStrBufPlain(NULL, StrLength(portlist) + StrLength(errormessages));
+
+ DetailErrorFlags = DetailErrorFlags & ~err;
+ switch (err)
+ {
+ case ERR_PORT:
+ Short = &ErrPortShort;
+ Where = &ErrPortWhere;
+ Hint = &ErrPortHint;
+ List = portlist;
+ DetailList = errormessages;
+ break;
+ default:
+ Short = &Empty;
+ Where = &Empty;
+ Hint = &Empty;
+ List = NULL;
+ DetailList = NULL;
+ }
-void CtdlRegisterProtoHook(void (*handler) (char *), char *cmd, char *desc)
-{
- struct ProtoFunctionHook *p;
+ StrBufAppendBufPlain(Message, CKEY(ErrGeneral[0]), 0);
+ StrBufAppendBufPlain(Message, CKEY(*Short), 0);
+ StrBufAppendBufPlain(Message, CKEY(ErrGeneral[1]), 0);
+ StrBufAppendBufPlain(Message, CKEY(*Where), 0);
+ StrBufAppendBuf(Message, List, 0);
+ StrBufAppendBufPlain(Message, HKEY("\n\n"), 0);
+ StrBufAppendBufPlain(Message, CKEY(*Hint), 0);
+ StrBufAppendBufPlain(Message, HKEY("\n\n"), 0);
+ StrBufAppendBufPlain(Message, CKEY(ErrGeneral[2]), 0);
+ StrBufAppendBuf(Message, DetailList, 0);
+ StrBufAppendBufPlain(Message, HKEY("\n\n"), 0);
+ StrBufAppendBufPlain(Message, CKEY(ErrGeneral[3]), 0);
- p = (struct ProtoFunctionHook *)
- malloc(sizeof(struct ProtoFunctionHook));
+ syslog(LOG_EMERG, "extensions: %s", ChrPtr(Message));
+ syslog(LOG_EMERG, "extensions: %s", ErrSubject);
+ quickie_message("Citadel", NULL, NULL, AIDEROOM, ChrPtr(Message), FMT_FIXED, ErrSubject);
- if (p == NULL) {
- fprintf(stderr, "can't malloc new ProtoFunctionHook\n");
- exit(EXIT_FAILURE);
- }
- p->handler = handler;
- p->cmd = cmd;
- p->desc = desc;
- p->next = ProtoHookList;
- ProtoHookList = p;
- lprintf(CTDL_INFO, "Registered server command %s (%s)\n", cmd, desc);
+ FreeStrBuf(&Message);
+ FreeStrBuf(&List);
+ FreeStrBuf(&DetailList);
}
-void CtdlUnregisterProtoHook(void (*handler) (char *), char *cmd)
+void AddPortError(char *Port, char *ErrorMessage)
{
- struct ProtoFunctionHook *cur = NULL;
- struct ProtoFunctionHook *p = NULL;
- struct ProtoFunctionHook *lastcur = NULL;
+ long len;
- for (cur = ProtoHookList;
- cur != NULL;
- cur = (cur != NULL)? cur->next: NULL) {
- /* This will also remove duplicates if any */
- while (cur != NULL &&
- handler == cur->handler &&
- !strcmp(cmd, cur->cmd)) {
- lprintf(CTDL_INFO, "Unregistered server command %s (%s)\n",
- cmd, cur->desc);
- p = cur->next;
- if (cur == ProtoHookList) {
- ProtoHookList = p;
- }
- else if (lastcur != NULL)
- {
- lastcur->next = p;
- }
- free(cur);
- cur = p;
- }
- lastcur = cur;
- }
-}
+ DetailErrorFlags |= ERR_PORT;
-void CtdlDestroyProtoHooks(void)
-{
- struct ProtoFunctionHook *cur, *p;
+ len = StrLength(errormessages);
+ if (len > 0) StrBufAppendBufPlain(errormessages, HKEY("; "), 0);
+ else errormessages = NewStrBuf();
+ StrBufAppendBufPlain(errormessages, ErrorMessage, -1, 0);
- cur = ProtoHookList;
- while (cur != NULL)
- {
- lprintf(CTDL_INFO, "Destroyed server command %s (%s)\n",
- cur->cmd, cur->desc);
- p = cur->next;
- free(cur);
- cur = p;
- }
- ProtoHookList = NULL;
+
+ len = StrLength(portlist);
+ if (len > 0) StrBufAppendBufPlain(portlist, HKEY(";"), 0);
+ else portlist = NewStrBuf();
+ StrBufAppendBufPlain(portlist, Port, -1, 0);
}
int DLoader_Exec_Cmd(char *cmdbuf)
{
- struct ProtoFunctionHook *p;
+ void *vP;
+ ProtoFunctionHook *p;
- for (p = ProtoHookList; p; p = p->next) {
- if (!strncasecmp(cmdbuf, p->cmd, 4)) {
- p->handler(&cmdbuf[5]);
- return 1;
- }
+ if (GetHash(ProtoHookList, cmdbuf, 4, &vP) && (vP != NULL)) {
+ p = (ProtoFunctionHook*) vP;
+ p->handler(&cmdbuf[5]);
+ return 1;
}
return 0;
}
-#if 0
-void initialize_server_extensions(void)
-{
- long filter;
-
- nSizErrmsg = 0;
-
- /*lprintf(CTDL_INFO, "%s\n", serv_bio_init());
- lprintf(CTDL_INFO, "%s\n", serv_calendar_init());
- lprintf(CTDL_INFO, "%s\n", serv_notes_init());
- lprintf(CTDL_INFO, "%s\n", serv_ldap_init());
- lprintf(CTDL_INFO, "%s\n", serv_chat_init());
- lprintf(CTDL_INFO, "%s\n", serv_expire_init());
- lprintf(CTDL_INFO, "%s\n", serv_imap_init());
- lprintf(CTDL_INFO, "%s\n", serv_upgrade_init());
- lprintf(CTDL_INFO, "%s\n", serv_inetcfg_init());
- lprintf(CTDL_INFO, "%s\n", serv_listsub_init());
- lprintf(CTDL_INFO, "%s\n", serv_mrtg_init());
- lprintf(CTDL_INFO, "%s\n", serv_netfilter_init());
- lprintf(CTDL_INFO, "%s\n", serv_network_init());
- lprintf(CTDL_INFO, "%s\n", serv_newuser_init());
- lprintf(CTDL_INFO, "%s\n", serv_pas2_init());
- lprintf(CTDL_INFO, "%s\n", serv_smtp_init());
- lprintf(CTDL_INFO, "%s\n", serv_pop3_init());
- lprintf(CTDL_INFO, "%s\n", serv_rwho_init());
- lprintf(CTDL_INFO, "%s\n", serv_spam_init());*/
- /* lprintf(CTDL_INFO, "%s\n", serv_test_init()); */
- /*lprintf(CTDL_INFO, "%s\n", serv_vandelay_init());
- lprintf(CTDL_INFO, "%s\n", serv_vcard_init());
- lprintf(CTDL_INFO, "%s\n", serv_fulltext_init());
- lprintf(CTDL_INFO, "%s\n", serv_autocompletion_init());
- lprintf(CTDL_INFO, "%s\n", serv_postfix_tcpdict());
- lprintf(CTDL_INFO, "%s\n", serv_sieve_init());
- lprintf(CTDL_INFO, "%s\n", serv_managesieve_init());
- lprintf(CTDL_INFO, "%s\n", serv_funambol_init());*/
- for (filter = 1; filter != 0; filter = filter << 1)
- if ((filter & DetailErrorFlags) != 0)
- LogPrintMessages(filter);
-}
-
-#endif
-void CtdlRegisterCleanupHook(void (*fcn_ptr) (void))
+void CtdlRegisterProtoHook(void (*handler) (char *), char *cmd, char *desc)
{
+ ProtoFunctionHook *p;
- struct CleanupFunctionHook *newfcn;
-
- newfcn = (struct CleanupFunctionHook *)
- malloc(sizeof(struct CleanupFunctionHook));
- newfcn->next = CleanupHookTable;
- newfcn->h_function_pointer = fcn_ptr;
- CleanupHookTable = newfcn;
-
- lprintf(CTDL_INFO, "Registered a new cleanup function\n");
-}
+ if (ProtoHookList == NULL)
+ ProtoHookList = NewHash (1, FourHash);
-void CtdlUnregisterCleanupHook(void (*fcn_ptr) (void))
-{
- struct CleanupFunctionHook *cur, *p;
+ p = (ProtoFunctionHook *)
+ malloc(sizeof(ProtoFunctionHook));
- for (cur = CleanupHookTable; cur != NULL; cur = cur->next) {
- /* This will also remove duplicates if any */
- while (cur != NULL &&
- fcn_ptr == cur->h_function_pointer) {
- lprintf(CTDL_INFO, "Unregistered cleanup function\n");
- p = cur->next;
- if (cur == CleanupHookTable) {
- CleanupHookTable = p;
- }
- free(cur);
- cur = p;
- }
+ if (p == NULL) {
+ fprintf(stderr, "can't malloc new ProtoFunctionHook\n");
+ exit(EXIT_FAILURE);
}
-}
-
-void CtdlDestroyCleanupHooks(void)
-{
- struct CleanupFunctionHook *cur, *p;
+ p->handler = handler;
+ p->cmd = cmd;
+ p->desc = desc;
- cur = CleanupHookTable;
- while (cur != NULL)
- {
- lprintf(CTDL_INFO, "Destroyed cleanup function\n");
- p = cur->next;
- free(cur);
- cur = p;
- }
- CleanupHookTable = NULL;
+ Put(ProtoHookList, cmd, 4, p, NULL);
+ syslog(LOG_DEBUG, "extensions: registered server command %s (%s)", cmd, desc);
}
-void CtdlRegisterSessionHook(void (*fcn_ptr) (void), int EventType)
+void CtdlRegisterSessionHook(void (*fcn_ptr) (void), int EventType, int Priority)
{
+ SessionFunctionHook *newfcn;
- struct SessionFunctionHook *newfcn;
-
- newfcn = (struct SessionFunctionHook *)
- malloc(sizeof(struct SessionFunctionHook));
- newfcn->next = SessionHookTable;
+ newfcn = (SessionFunctionHook *)
+ malloc(sizeof(SessionFunctionHook));
+ newfcn->Priority = Priority;
newfcn->h_function_pointer = fcn_ptr;
newfcn->eventtype = EventType;
- SessionHookTable = newfcn;
- lprintf(CTDL_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)
{
- struct 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) {
- lprintf(CTDL_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;
+ }
}
}
-void CtdlDestroySessionHooks(void)
-{
- struct SessionFunctionHook *cur, *p;
-
- cur = SessionHookTable;
- while (cur != NULL)
- {
- lprintf(CTDL_INFO, "Destroyed session function\n");
- p = cur->next;
- free(cur);
- cur = p;
- }
- SessionHookTable = NULL;
-}
-
-void CtdlRegisterUserHook(void (*fcn_ptr) (struct ctdluser *), int EventType)
+void CtdlRegisterUserHook(void (*fcn_ptr) (ctdluser *), int EventType)
{
- struct UserFunctionHook *newfcn;
+ UserFunctionHook *newfcn;
- newfcn = (struct UserFunctionHook *)
- malloc(sizeof(struct UserFunctionHook));
+ newfcn = (UserFunctionHook *)
+ malloc(sizeof(UserFunctionHook));
newfcn->next = UserHookTable;
newfcn->h_function_pointer = fcn_ptr;
newfcn->eventtype = EventType;
UserHookTable = newfcn;
- lprintf(CTDL_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)
{
- struct 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) {
- lprintf(CTDL_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;
+ }
}
}
-void CtdlDestroyUserHooks(void)
-{
- struct UserFunctionHook *cur, *p;
-
- cur = UserHookTable;
- while (cur != NULL)
- {
- lprintf(CTDL_INFO, "Destroyed user function \n");
- p = cur->next;
- free(cur);
- cur = p;
- }
- UserHookTable = NULL;
-}
-
-void CtdlRegisterMessageHook(int (*handler)(struct CtdlMessage *),
- int EventType)
+void CtdlRegisterMessageHook(int (*handler)(struct CtdlMessage *, recptypes *), int EventType)
{
- struct MessageFunctionHook *newfcn;
+ MessageFunctionHook *newfcn;
- newfcn = (struct MessageFunctionHook *)
- malloc(sizeof(struct MessageFunctionHook));
+ newfcn = (MessageFunctionHook *)
+ malloc(sizeof(MessageFunctionHook));
newfcn->next = MessageHookTable;
newfcn->h_function_pointer = handler;
newfcn->eventtype = EventType;
MessageHookTable = newfcn;
- lprintf(CTDL_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)
{
- struct 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) {
- lprintf(CTDL_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;
+ }
}
}
-void CtdlDestroyMessageHook(void)
-{
- struct MessageFunctionHook *cur, *p;
-
- cur = MessageHookTable;
- while (cur != NULL)
- {
- lprintf(CTDL_INFO, "Destroyed message function \n");
- p = cur->next;
- free(cur);
- cur = p;
- }
- MessageHookTable = NULL;
-}
-
void CtdlRegisterRoomHook(int (*fcn_ptr)(struct ctdlroom *))
{
- struct RoomFunctionHook *newfcn;
+ RoomFunctionHook *newfcn;
- newfcn = (struct RoomFunctionHook *)
- malloc(sizeof(struct RoomFunctionHook));
+ newfcn = (RoomFunctionHook *)
+ malloc(sizeof(RoomFunctionHook));
newfcn->next = RoomHookTable;
newfcn->fcn_ptr = fcn_ptr;
RoomHookTable = newfcn;
- lprintf(CTDL_INFO, "Registered a new room function\n");
+ syslog(LOG_DEBUG, "extensions: registered a new room function");
}
void CtdlUnregisterRoomHook(int (*fcn_ptr)(struct ctdlroom *))
{
- struct RoomFunctionHook *cur, *p;
-
- for (cur = RoomHookTable; cur != NULL; cur = cur->next) {
- while (cur != NULL && fcn_ptr == cur->fcn_ptr) {
- lprintf(CTDL_INFO, "Unregistered room function\n");
- p = cur->next;
- if (cur == RoomHookTable) {
- RoomHookTable = p;
- }
- free(cur);
- cur = p;
- }
- }
-}
-
-
-void CtdlDestroyRoomHooks(void)
-{
- struct RoomFunctionHook *cur, *p;
-
+ RoomFunctionHook *cur, *p, *last;
+ last = NULL;
cur = RoomHookTable;
while (cur != NULL)
{
- lprintf(CTDL_INFO, "Unregistered room function\n");
- p = cur->next;
- free(cur);
- cur = p;
- }
- RoomHookTable = NULL;
-}
-
-void CtdlRegisterNetprocHook(int (*handler)(struct CtdlMessage *, char *) )
-{
- struct NetprocFunctionHook *newfcn;
-
- newfcn = (struct NetprocFunctionHook *)
- malloc(sizeof(struct NetprocFunctionHook));
- newfcn->next = NetprocHookTable;
- newfcn->h_function_pointer = handler;
- NetprocHookTable = newfcn;
-
- lprintf(CTDL_INFO, "Registered a new netproc function\n");
-}
-
-
-void CtdlUnregisterNetprocHook(int (*handler)(struct CtdlMessage *, char *) )
-{
- struct 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 ) {
- lprintf(CTDL_INFO, "Unregistered netproc function\n");
+ if (fcn_ptr == cur->fcn_ptr) {
+ syslog(LOG_DEBUG, "extensions: unregistered room function");
p = cur->next;
- if (cur == NetprocHookTable) {
- NetprocHookTable = p;
- }
+
free(cur);
+ cur = NULL;
+
+ if (last != NULL)
+ last->next = p;
+ else
+ RoomHookTable = p;
cur = p;
}
+ else {
+ last = cur;
+ cur = cur->next;
+ }
}
}
-void CtdlDestroyNetprocHooks(void)
-{
- struct NetprocFunctionHook *cur, *p;
-
- cur = NetprocHookTable;
- while (cur != NULL)
- {
- lprintf(CTDL_INFO, "Unregistered netproc function\n");
- p = cur->next;
- free(cur);
- cur = p;
- }
- NetprocHookTable = NULL;
-}
-
void CtdlRegisterDeleteHook(void (*handler)(char *, long) )
{
- struct DeleteFunctionHook *newfcn;
+ DeleteFunctionHook *newfcn;
- newfcn = (struct DeleteFunctionHook *)
- malloc(sizeof(struct DeleteFunctionHook));
+ newfcn = (DeleteFunctionHook *)
+ malloc(sizeof(DeleteFunctionHook));
newfcn->next = DeleteHookTable;
newfcn->h_function_pointer = handler;
DeleteHookTable = newfcn;
- lprintf(CTDL_INFO, "Registered a new netproc function\n");
+ syslog(LOG_DEBUG, "extensions: registered a new delete function");
}
void CtdlUnregisterDeleteHook(void (*handler)(char *, long) )
{
- struct 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 ) {
- lprintf(CTDL_INFO, "Unregistered netproc 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)
-{
- struct DeleteFunctionHook *cur, *p;
-
- cur = DeleteHookTable;
- while (cur != NULL)
- {
- lprintf(CTDL_INFO, "Destroyed netproc function\n");
- p = cur->next;
- free(cur);
- cur = p;
- }
- DeleteHookTable = NULL;
-}
-
-
void CtdlRegisterFixedOutputHook(char *content_type, void (*handler)(char *, int) )
{
- struct FixedOutputHook *newfcn;
+ FixedOutputHook *newfcn;
- newfcn = (struct FixedOutputHook *)
- malloc(sizeof(struct FixedOutputHook));
+ newfcn = (FixedOutputHook *)
+ malloc(sizeof(FixedOutputHook));
newfcn->next = FixedOutputTable;
newfcn->h_function_pointer = handler;
safestrncpy(newfcn->content_type, content_type, sizeof newfcn->content_type);
FixedOutputTable = newfcn;
- lprintf(CTDL_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)
{
- struct 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))) {
- lprintf(CTDL_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;
+ }
}
}
-void CtdlDestroyFixedOutputHooks(void)
-{
- struct FixedOutputHook *cur, *p;
-
- cur = FixedOutputTable;
- while (cur != NULL)
- {
- lprintf(CTDL_INFO, "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)
{
- struct FixedOutputHook *fcn;
+ FixedOutputHook *fcn;
for (fcn = FixedOutputTable; fcn != NULL; fcn = fcn->next) {
if (!strcasecmp(content_type, fcn->content_type)) {
}
-
-
-
-void CtdlRegisterXmsgHook(int (*fcn_ptr) (char *, char *, char *), int order)
+void CtdlRegisterXmsgHook(int (*fcn_ptr) (char *, char *, char *, char *), int order)
{
- struct XmsgFunctionHook *newfcn;
+ XmsgFunctionHook *newfcn;
- newfcn = (struct XmsgFunctionHook *)
- malloc(sizeof(struct XmsgFunctionHook));
+ newfcn = (XmsgFunctionHook *) malloc(sizeof(XmsgFunctionHook));
newfcn->next = XmsgHookTable;
newfcn->order = order;
newfcn->h_function_pointer = fcn_ptr;
XmsgHookTable = newfcn;
- lprintf(CTDL_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 *), int order)
+void CtdlUnregisterXmsgHook(int (*fcn_ptr) (char *, char *, char *, char *), int order)
{
- struct 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) {
- lprintf(CTDL_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)
-{
- struct XmsgFunctionHook *cur, *p;
-
- cur = XmsgHookTable;
- while (cur != NULL)
- {
- lprintf(CTDL_INFO, "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,
- void (*h_greeting_function) (void),
- void (*h_command_function) (void),
- void (*h_async_function) (void)
- )
+ char *sockpath,
+ void (*h_greeting_function) (void),
+ void (*h_command_function) (void),
+ void (*h_async_function) (void),
+ const char *ServiceName)
{
- struct ServiceFunctionHook *newfcn;
+ ServiceFunctionHook *newfcn;
char *message;
- char *error;
- error = NULL;
- newfcn = (struct ServiceFunctionHook *)
- malloc(sizeof(struct ServiceFunctionHook));
- message = (char*) malloc (SIZ);
+ newfcn = (ServiceFunctionHook *) malloc(sizeof(ServiceFunctionHook));
+ message = (char*) malloc (SIZ + SIZ);
newfcn->next = ServiceHookTable;
newfcn->tcp_port = tcp_port;
newfcn->h_greeting_function = h_greeting_function;
newfcn->h_command_function = h_command_function;
newfcn->h_async_function = h_async_function;
+ newfcn->ServiceName = ServiceName;
if (sockpath != NULL) {
- newfcn->msock = ig_uds_server(sockpath, config.c_maxsessions, &error);
- snprintf(message, SIZ, "Unix domain socket '%s': ", sockpath);
+ newfcn->msock = ctdl_uds_server(sockpath, CtdlGetConfigInt("c_maxsessions"));
+ snprintf(message, SIZ, "extensions: unix domain socket '%s': ", sockpath);
}
else if (tcp_port <= 0) { /* port -1 to disable */
- lprintf(CTDL_INFO, "Service has been manually disabled, skipping\n");
+ syslog(LOG_INFO, "extensions: service %s has been manually disabled, skipping", ServiceName);
free (message);
free(newfcn);
return;
}
else {
- newfcn->msock = ig_tcp_server(config.c_ip_addr,
- tcp_port,
- config.c_maxsessions,
- &error);
- snprintf(message, SIZ, "TCP port %s:%d: ",
- config.c_ip_addr, tcp_port);
+ 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.");
- lprintf(CTDL_INFO, "%s\n", message);
+ syslog(LOG_INFO, "%s", message);
}
else {
- AddPortError(message, error);
+ AddPortError(message, "failed");
strcat(message, "FAILED.");
- lprintf(CTDL_CRIT, "%s\n", message);
- free(error);
+ syslog(LOG_ERR, "%s", message);
free(newfcn);
}
free(message);
void (*h_async_function) (void)
)
{
- struct ServiceFunctionHook *cur, *p;
+ ServiceFunctionHook *cur, *p, *last;
- for (cur = ServiceHookTable; cur != NULL; cur = cur->next) {
+ 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) {
- lprintf(CTDL_INFO, "Closed UNIX domain socket %s\n",
- sockpath);
+ syslog(LOG_INFO, "extensions: closed UNIX domain socket %s", sockpath);
+ unlink(sockpath);
} else if (tcp_port) {
- lprintf(CTDL_INFO, "Closed TCP port %d\n", tcp_port);
+ syslog(LOG_INFO, "extensions: closed TCP port %d", tcp_port);
} else {
- lprintf(CTDL_INFO, "Unregistered unknown service\n");
+ 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;
+ }
}
}
-void CtdlDestroyServiceHook(void)
+
+void CtdlShutdownServiceHooks(void)
{
- struct ServiceFunctionHook *cur, *p;
+ /* sort of a duplicate of close_masters() but called earlier */
+ ServiceFunctionHook *cur;
cur = ServiceHookTable;
- while (cur != NULL)
+ while (cur != NULL)
{
- close(cur->msock);
- if (cur->sockpath) {
- lprintf(CTDL_INFO, "Closed UNIX domain socket %s\n",
- cur->sockpath);
- } else if (cur->tcp_port) {
- lprintf(CTDL_INFO, "Closed TCP port %d\n", cur->tcp_port);
- } else {
- lprintf(CTDL_INFO, "Unregistered unknown service\n");
+ if (cur->msock != -1)
+ {
+ close(cur->msock);
+ cur->msock = -1;
+ if (cur->sockpath != NULL){
+ syslog(LOG_INFO, "extensions: [%s] Closed UNIX domain socket %s", cur->ServiceName, cur->sockpath);
+ unlink(cur->sockpath);
+ } else {
+ syslog(LOG_INFO, "extensions: [%s] closing service", cur->ServiceName);
+ }
+ }
+ cur = cur->next;
+ }
+}
+
+
+void CtdlRegisterSearchFuncHook(void (*fcn_ptr)(int *, long **, const char *), char *name)
+{
+ SearchFunctionHook *newfcn;
+
+ if (!name || !fcn_ptr) {
+ return;
+ }
+
+ newfcn = (SearchFunctionHook *)
+ malloc(sizeof(SearchFunctionHook));
+ newfcn->next = SearchFunctionHookTable;
+ newfcn->name = name;
+ newfcn->fcn_ptr = fcn_ptr;
+ SearchFunctionHookTable = newfcn;
+
+ 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, *last;
+
+ 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;
+ free (cur);
+ if (last != NULL)
+ last->next = p;
+ else
+ SearchFunctionHookTable = p;
+ cur = p;
+ }
+ else {
+ last = cur;
+ cur = cur->next;
}
- p = cur->next;
- free(cur);
- cur = p;
}
- ServiceHookTable = NULL;
+}
+
+
+void CtdlModuleDoSearch(int *num_msgs, long **search_msgs, const char *search_string, const char *func_name)
+{
+ SearchFunctionHook *fcn = NULL;
+
+ for (fcn = SearchFunctionHookTable; fcn != NULL; fcn = fcn->next) {
+ if (!func_name || !strcmp(func_name, fcn->name)) {
+ (*fcn->fcn_ptr) (num_msgs, search_msgs, search_string);
+ return;
+ }
+ }
+ *num_msgs = 0;
}
void PerformSessionHooks(int EventType)
{
- struct SessionFunctionHook *fcn = NULL;
+ SessionFunctionHook *fcn = NULL;
for (fcn = SessionHookTable; fcn != NULL; fcn = fcn->next) {
if (fcn->eventtype == EventType) {
+ if (EventType == EVT_TIMER) {
+ pthread_setspecific(MyConKey, NULL); /* for every hook */
+ }
(*fcn->h_function_pointer) ();
}
}
}
-void PerformUserHooks(struct ctdluser *usbuf, int EventType)
+void PerformUserHooks(ctdluser *usbuf, int EventType)
{
- struct UserFunctionHook *fcn = NULL;
+ UserFunctionHook *fcn = NULL;
for (fcn = UserHookTable; fcn != NULL; fcn = fcn->next) {
if (fcn->eventtype == EventType) {
}
}
-int PerformMessageHooks(struct CtdlMessage *msg, int EventType)
+int PerformMessageHooks(struct CtdlMessage *msg, recptypes *recps, int EventType)
{
- struct MessageFunctionHook *fcn = NULL;
+ 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.
- lprintf(CTDL_DEBUG, "** Event type is %d, flags are %d\n",
- EventType, msg->cm_flags);
*/
if (msg->cm_flags & CM_SKIP_HOOKS) {
- lprintf(CTDL_DEBUG, "Skipping hooks\n");
return(0);
}
*/
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);
}
}
int PerformRoomHooks(struct ctdlroom *target_room)
{
- struct RoomFunctionHook *fcn;
+ RoomFunctionHook *fcn;
int total_retval = 0;
- lprintf(CTDL_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);
}
-int PerformNetprocHooks(struct CtdlMessage *msg, char *target_room)
-{
- struct 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)
{
- struct DeleteFunctionHook *fcn;
+ DeleteFunctionHook *fcn;
for (fcn = DeleteHookTable; fcn != NULL; fcn = fcn->next) {
(*fcn->h_function_pointer) (room, msgnum);
}
-
-
-
-int PerformXmsgHooks(char *sender, char *recp, char *msg)
+int PerformXmsgHooks(char *sender, char *sender_email, char *recp, char *msg)
{
- struct XmsgFunctionHook *fcn;
+ XmsgFunctionHook *fcn;
int total_sent = 0;
int p;
if (fcn->order == p) {
total_sent +=
(*fcn->h_function_pointer)
- (sender, recp, msg);
+ (sender, sender_email, recp, msg);
}
}
/* Break out of the loop if a higher-priority function
}
return total_sent;
}
+
+
+/*
+ * Dirty hack until we impliment a hook mechanism for this
+ */
+void CtdlModuleStartCryptoMsgs(char *ok_response, char *nosup_response, char *error_response)
+{
+#ifdef HAVE_OPENSSL
+ CtdlStartTLS (ok_response, nosup_response, error_response);
+#endif
+}
+
+
+CTDL_MODULE_INIT(modules)
+{
+ if (!threading) {
+ }
+ return "modules";
+}
projects / citadel.git / blobdiff