/*
* Citadel Dynamic Loading Module
* Written by Brian Costello <btx@calyx.net>
+ *
+ * Copyright (c) 1987-2011 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.
+ *
+ * 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 <string.h>
#include <limits.h>
#include <ctype.h>
+#include <syslog.h>
#include <libcitadel.h>
#include "citadel.h"
#include "server.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;
-struct SearchFunctionHook *SearchFunctionHookTable = NULL;
+
+/*
+ * Structure defentitions for hook tables
+ */
+
+
+
+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;
+
+
+
+/*
+ * 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;
+ void (*h_function_pointer) (void);
+ int eventtype;
+};
+extern SessionFunctionHook *SessionHookTable;
+
+
+/*
+ * 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;
+};
+extern UserFunctionHook *UserHookTable;
+
+/*
+ * 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);
+ 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;
+
+
+/*
+ * 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);
+};
+extern DeleteFunctionHook *DeleteHookTable;
+
+
+/*
+ * 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;
+};
+extern XmsgFunctionHook *XmsgHookTable;
+
+
+
+/*
+ * RoomFunctionHook extensions are used for hooks which impliment room
+ * processing functions when new messages are added EG. SIEVE.
+ */
+typedef struct RoomFunctionHook RoomFunctionHook;
+struct RoomFunctionHook {
+ RoomFunctionHook *next;
+ int (*fcn_ptr) (struct ctdlroom *);
+};
+extern RoomFunctionHook *RoomHookTable;
+
+
+
+typedef struct SearchFunctionHook SearchFunctionHook;
+struct SearchFunctionHook {
+ SearchFunctionHook *next;
+ void (*fcn_ptr) (int *, long **, const char *);
+ char *name;
+};
+extern SearchFunctionHook *SearchFunctionHookTable;
+
+
+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 {
void (*handler) (char *cmdbuf);
const char *cmd;
#define ERR_PORT (1 << 1)
-static char *portlist = NULL;
-static size_t nSizPort = 0;
+static StrBuf *portlist = NULL;
-static char *errormessages = NULL;
-size_t nSizErrmsg = 0;
+static StrBuf *errormessages = NULL;
long DetailErrorFlags;
-
+ConstStr Empty = {HKEY("")};
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";
-
+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")}
+};
-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.\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 retry to bind this port.\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")};
void LogPrintMessages(long err)
{
- char *List, *DetailList, *Short, *Where, *Hint, *Message;
- int n = nSizPort + nSizErrmsg + 5;
+ StrBuf *Message;
+ StrBuf *List, *DetailList;
+ ConstStr *Short, *Where, *Hint;
- Message = (char*) malloc(n * SIZ);
+
+ Message = NewStrBufPlain(NULL,
+ StrLength(portlist) + StrLength(errormessages));
DetailErrorFlags = DetailErrorFlags & ~err;
switch (err)
{
case ERR_PORT:
- Short = ErrPortShort;
- Where = ErrPortWhere;
- Hint = ErrPortHint;
+ Short = &ErrPortShort;
+ Where = &ErrPortWhere;
+ Hint = &ErrPortHint;
List = portlist;
DetailList = errormessages;
break;
default:
- Short = "";
- Where = "";
- Hint = "";
- List = "";
- DetailList = "";
+ Short = &Empty;
+ Where = &Empty;
+ Hint = &Empty;
+ List = NULL;
+ DetailList = NULL;
}
-
- snprintf(Message, n * SIZ, ErrGeneral, Short, Where, List, Hint, DetailList);
-
- CtdlLogPrintf(0,Message);
- CtdlLogPrintf(0,ErrSubject);
- 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);
+ 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);
+
+ syslog(LOG_EMERG, "%s", ChrPtr(Message));
+ syslog(LOG_EMERG, "%s", ErrSubject);
+ quickie_message("Citadel", NULL, NULL, AIDEROOM, ChrPtr(Message), FMT_FIXED, ErrSubject);
+
+ FreeStrBuf(&Message);
+ FreeStrBuf(&List);
+ FreeStrBuf(&DetailList);
}
-
-void AppendString(char **target, char *append, size_t *len, size_t rate)
-{
- size_t oLen = 0;
- long AddLen;
- long RelPtr = 0;
-
- AddLen = strlen(append);
-
- if (*len == 0)
- {
- *len = rate;
-
- *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)
{
- char *pos;
long len;
DetailErrorFlags |= ERR_PORT;
- AppendString(&errormessages, ErrorMessage, &nSizErrmsg, 10);
- AppendString(&portlist, Port, &nSizPort, 2);
+ len = StrLength(errormessages);
+ if (len > 0) StrBufAppendBufPlain(errormessages, HKEY("; "), 0);
+ else errormessages = NewStrBuf();
+ StrBufAppendBufPlain(errormessages, ErrorMessage, -1, 0);
- pos = strchr (portlist, ':');
- if (pos != NULL) *pos = ';';
-
- len = strlen (errormessages);
- if (nSizErrmsg * SIZ > len + 3)
- {
- errormessages[len] = ';';
- errormessages[len+1] = ' ';
- errormessages[len+2] = '\0';
- }
+
+ len = StrLength(portlist);
+ if (len > 0) StrBufAppendBufPlain(portlist, HKEY(";"), 0);
+ else portlist = NewStrBuf();
+ StrBufAppendBufPlain(portlist, Port, -1, 0);
}
int DLoader_Exec_Cmd(char *cmdbuf)
{
void *vP;
- struct ProtoFunctionHook *p;
+ ProtoFunctionHook *p;
if (GetHash(ProtoHookList, cmdbuf, 4, &vP) && (vP != NULL)) {
- p = (struct ProtoFunctionHook*) vP;
+ p = (ProtoFunctionHook*) vP;
p->handler(&cmdbuf[5]);
return 1;
}
void CtdlRegisterProtoHook(void (*handler) (char *), char *cmd, char *desc)
{
- struct ProtoFunctionHook *p;
+ ProtoFunctionHook *p;
if (ProtoHookList == NULL)
ProtoHookList = NewHash (1, FourHash);
- p = (struct ProtoFunctionHook *)
- malloc(sizeof(struct ProtoFunctionHook));
+ p = (ProtoFunctionHook *)
+ malloc(sizeof(ProtoFunctionHook));
if (p == NULL) {
fprintf(stderr, "can't malloc new ProtoFunctionHook\n");
p->desc = desc;
Put(ProtoHookList, cmd, 4, p, NULL);
- CtdlLogPrintf(CTDL_INFO, "Registered server command %s (%s)\n", cmd, desc);
+ syslog(LOG_INFO, "Registered server command %s (%s)\n", cmd, desc);
}
void CtdlDestroyProtoHooks(void)
void CtdlRegisterCleanupHook(void (*fcn_ptr) (void))
{
- struct CleanupFunctionHook *newfcn;
+ CleanupFunctionHook *newfcn;
- newfcn = (struct CleanupFunctionHook *)
- malloc(sizeof(struct CleanupFunctionHook));
+ newfcn = (CleanupFunctionHook *)
+ malloc(sizeof(CleanupFunctionHook));
newfcn->next = CleanupHookTable;
newfcn->h_function_pointer = fcn_ptr;
CleanupHookTable = newfcn;
- CtdlLogPrintf(CTDL_INFO, "Registered a new cleanup function\n");
+ syslog(LOG_INFO, "Registered a new cleanup function\n");
}
void CtdlUnregisterCleanupHook(void (*fcn_ptr) (void))
{
- struct CleanupFunctionHook *cur, *p;
+ 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) {
- CtdlLogPrintf(CTDL_INFO, "Unregistered cleanup function\n");
+ syslog(LOG_INFO, "Unregistered cleanup function\n");
p = cur->next;
if (cur == CleanupHookTable) {
CleanupHookTable = p;
}
}
+
void CtdlDestroyCleanupHooks(void)
{
- struct CleanupFunctionHook *cur, *p;
+ CleanupFunctionHook *cur, *p;
cur = CleanupHookTable;
while (cur != NULL)
{
- CtdlLogPrintf(CTDL_INFO, "Destroyed cleanup function\n");
+ syslog(LOG_INFO, "Destroyed cleanup function\n");
p = cur->next;
free(cur);
cur = p;
CleanupHookTable = NULL;
}
+void CtdlRegisterEVCleanupHook(void (*fcn_ptr) (void))
+{
+
+ CleanupFunctionHook *newfcn;
+
+ newfcn = (CleanupFunctionHook *)
+ malloc(sizeof(CleanupFunctionHook));
+ newfcn->next = EVCleanupHookTable;
+ newfcn->h_function_pointer = fcn_ptr;
+ EVCleanupHookTable = newfcn;
+
+ syslog(LOG_INFO, "Registered a new cleanup function\n");
+}
+
+
+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");
+ p = cur->next;
+ if (cur == EVCleanupHookTable) {
+ EVCleanupHookTable = p;
+ }
+ free(cur);
+ cur = p;
+ }
+ }
+}
+
+
+void CtdlDestroyEVCleanupHooks(void)
+{
+ CleanupFunctionHook *cur, *p;
+
+ cur = EVCleanupHookTable;
+ while (cur != NULL)
+ {
+ syslog(LOG_INFO, "Destroyed cleanup function\n");
+ p = cur->next;
+ free(cur);
+ cur = p;
+ }
+ EVCleanupHookTable = NULL;
+}
+
void CtdlRegisterSessionHook(void (*fcn_ptr) (void), int EventType)
{
- struct SessionFunctionHook *newfcn;
+ SessionFunctionHook *newfcn;
- newfcn = (struct SessionFunctionHook *)
- malloc(sizeof(struct SessionFunctionHook));
+ newfcn = (SessionFunctionHook *)
+ malloc(sizeof(SessionFunctionHook));
newfcn->next = SessionHookTable;
newfcn->h_function_pointer = fcn_ptr;
newfcn->eventtype = EventType;
SessionHookTable = newfcn;
- CtdlLogPrintf(CTDL_INFO, "Registered a new session function (type %d)\n",
+ syslog(LOG_INFO, "Registered a new session function (type %d)\n",
EventType);
}
void CtdlUnregisterSessionHook(void (*fcn_ptr) (void), int EventType)
{
- struct SessionFunctionHook *cur, *p;
+ 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) {
- CtdlLogPrintf(CTDL_INFO, "Unregistered session function (type %d)\n",
+ syslog(LOG_INFO, "Unregistered session function (type %d)\n",
EventType);
p = cur->next;
if (cur == SessionHookTable) {
void CtdlDestroySessionHooks(void)
{
- struct SessionFunctionHook *cur, *p;
+ SessionFunctionHook *cur, *p;
cur = SessionHookTable;
while (cur != NULL)
{
- CtdlLogPrintf(CTDL_INFO, "Destroyed session function\n");
+ syslog(LOG_INFO, "Destroyed session function\n");
p = cur->next;
free(cur);
cur = p;
}
-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;
- CtdlLogPrintf(CTDL_INFO, "Registered a new user function (type %d)\n",
+ syslog(LOG_INFO, "Registered a new user function (type %d)\n",
EventType);
}
void CtdlUnregisterUserHook(void (*fcn_ptr) (struct ctdluser *), int EventType)
{
- struct UserFunctionHook *cur, *p;
+ 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) {
- CtdlLogPrintf(CTDL_INFO, "Unregistered user function (type %d)\n",
+ syslog(LOG_INFO, "Unregistered user function (type %d)\n",
EventType);
p = cur->next;
if (cur == UserHookTable) {
void CtdlDestroyUserHooks(void)
{
- struct UserFunctionHook *cur, *p;
+ UserFunctionHook *cur, *p;
cur = UserHookTable;
while (cur != NULL)
{
- CtdlLogPrintf(CTDL_INFO, "Destroyed user function \n");
+ syslog(LOG_INFO, "Destroyed user function \n");
p = cur->next;
free(cur);
cur = p;
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;
- CtdlLogPrintf(CTDL_INFO, "Registered a new message function (type %d)\n",
+ syslog(LOG_INFO, "Registered a new message function (type %d)\n",
EventType);
}
void CtdlUnregisterMessageHook(int (*handler)(struct CtdlMessage *),
int EventType)
{
- struct MessageFunctionHook *cur, *p;
+ 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) {
- CtdlLogPrintf(CTDL_INFO, "Unregistered message function (type %d)\n",
+ syslog(LOG_INFO, "Unregistered message function (type %d)\n",
EventType);
p = cur->next;
if (cur == MessageHookTable) {
void CtdlDestroyMessageHook(void)
{
- struct MessageFunctionHook *cur, *p;
+ MessageFunctionHook *cur, *p;
cur = MessageHookTable;
while (cur != NULL)
{
- CtdlLogPrintf(CTDL_INFO, "Destroyed message function (type %d)\n", cur->eventtype);
+ syslog(LOG_INFO, "Destroyed message function (type %d)\n", cur->eventtype);
p = cur->next;
free(cur);
cur = p;
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;
- CtdlLogPrintf(CTDL_INFO, "Registered a new room function\n");
+ syslog(LOG_INFO, "Registered a new room function\n");
}
void CtdlUnregisterRoomHook(int (*fcn_ptr)(struct ctdlroom *))
{
- struct RoomFunctionHook *cur, *p;
+ RoomFunctionHook *cur, *p;
for (cur = RoomHookTable; cur != NULL; cur = cur->next) {
while (cur != NULL && fcn_ptr == cur->fcn_ptr) {
- CtdlLogPrintf(CTDL_INFO, "Unregistered room function\n");
+ syslog(LOG_INFO, "Unregistered room function\n");
p = cur->next;
if (cur == RoomHookTable) {
RoomHookTable = p;
void CtdlDestroyRoomHooks(void)
{
- struct RoomFunctionHook *cur, *p;
+ RoomFunctionHook *cur, *p;
cur = RoomHookTable;
while (cur != NULL)
{
- CtdlLogPrintf(CTDL_INFO, "Destroyed room function\n");
+ syslog(LOG_INFO, "Destroyed room function\n");
p = cur->next;
free(cur);
cur = p;
void CtdlRegisterNetprocHook(int (*handler)(struct CtdlMessage *, char *) )
{
- struct NetprocFunctionHook *newfcn;
+ NetprocFunctionHook *newfcn;
- newfcn = (struct NetprocFunctionHook *)
- malloc(sizeof(struct NetprocFunctionHook));
+ newfcn = (NetprocFunctionHook *)
+ malloc(sizeof(NetprocFunctionHook));
newfcn->next = NetprocHookTable;
newfcn->h_function_pointer = handler;
NetprocHookTable = newfcn;
- CtdlLogPrintf(CTDL_INFO, "Registered a new netproc function\n");
+ syslog(LOG_INFO, "Registered a new netproc function\n");
}
void CtdlUnregisterNetprocHook(int (*handler)(struct CtdlMessage *, char *) )
{
- struct NetprocFunctionHook *cur, *p;
+ 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 ) {
- CtdlLogPrintf(CTDL_INFO, "Unregistered netproc function\n");
+ syslog(LOG_INFO, "Unregistered netproc function\n");
p = cur->next;
if (cur == NetprocHookTable) {
NetprocHookTable = p;
void CtdlDestroyNetprocHooks(void)
{
- struct NetprocFunctionHook *cur, *p;
+ NetprocFunctionHook *cur, *p;
cur = NetprocHookTable;
while (cur != NULL)
{
- CtdlLogPrintf(CTDL_INFO, "Destroyed netproc function\n");
+ syslog(LOG_INFO, "Destroyed netproc function\n");
p = cur->next;
free(cur);
cur = p;
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;
- CtdlLogPrintf(CTDL_INFO, "Registered a new delete function\n");
+ syslog(LOG_INFO, "Registered a new delete function\n");
}
void CtdlUnregisterDeleteHook(void (*handler)(char *, long) )
{
- struct DeleteFunctionHook *cur, *p;
+ DeleteFunctionHook *cur, *p;
for (cur = DeleteHookTable; cur != NULL; cur = cur->next) {
/* This will also remove duplicates if any */
while (cur != NULL &&
handler == cur->h_function_pointer ) {
- CtdlLogPrintf(CTDL_INFO, "Unregistered delete function\n");
+ syslog(LOG_INFO, "Unregistered delete function\n");
p = cur->next;
if (cur == DeleteHookTable) {
DeleteHookTable = p;
}
void CtdlDestroyDeleteHooks(void)
{
- struct DeleteFunctionHook *cur, *p;
+ DeleteFunctionHook *cur, *p;
cur = DeleteHookTable;
while (cur != NULL)
{
- CtdlLogPrintf(CTDL_INFO, "Destroyed delete function\n");
+ syslog(LOG_INFO, "Destroyed delete function\n");
p = cur->next;
free(cur);
cur = p;
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;
- CtdlLogPrintf(CTDL_INFO, "Registered a new fixed output function for %s\n", newfcn->content_type);
+ syslog(LOG_INFO, "Registered a new fixed output function for %s\n", newfcn->content_type);
}
void CtdlUnregisterFixedOutputHook(char *content_type)
{
- struct FixedOutputHook *cur, *p;
+ FixedOutputHook *cur, *p;
for (cur = FixedOutputTable; cur != NULL; cur = cur->next) {
/* This will also remove duplicates if any */
while (cur != NULL && (!strcasecmp(content_type, cur->content_type))) {
- CtdlLogPrintf(CTDL_INFO, "Unregistered fixed output function for %s\n", content_type);
+ syslog(LOG_INFO, "Unregistered fixed output function for %s\n", content_type);
p = cur->next;
if (cur == FixedOutputTable) {
FixedOutputTable = p;
void CtdlDestroyFixedOutputHooks(void)
{
- struct FixedOutputHook *cur, *p;
+ FixedOutputHook *cur, *p;
cur = FixedOutputTable;
while (cur != NULL)
{
- CtdlLogPrintf(CTDL_INFO, "Destroyed fixed output function for %s\n", cur->content_type);
+ syslog(LOG_INFO, "Destroyed fixed output function for %s\n", cur->content_type);
p = cur->next;
free(cur);
cur = p;
/* 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 *, 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;
- CtdlLogPrintf(CTDL_INFO, "Registered a new x-msg function (priority %d)\n", order);
+ syslog(LOG_INFO, "Registered a new x-msg function (priority %d)\n", order);
}
void CtdlUnregisterXmsgHook(int (*fcn_ptr) (char *, char *, char *, char *), int order)
{
- struct XmsgFunctionHook *cur, *p;
+ XmsgFunctionHook *cur, *p;
for (cur = XmsgHookTable; cur != NULL; cur = cur->next) {
/* This will also remove duplicates if any */
while (cur != NULL &&
fcn_ptr == cur->h_function_pointer &&
order == cur->order) {
- CtdlLogPrintf(CTDL_INFO, "Unregistered x-msg function "
+ syslog(LOG_INFO, "Unregistered x-msg function "
"(priority %d)\n", order);
p = cur->next;
if (cur == XmsgHookTable) {
void CtdlDestroyXmsgHooks(void)
{
- struct XmsgFunctionHook *cur, *p;
+ XmsgFunctionHook *cur, *p;
cur = XmsgHookTable;
while (cur != NULL)
{
- CtdlLogPrintf(CTDL_INFO, "Destroyed x-msg function "
+ syslog(LOG_INFO, "Destroyed x-msg function "
"(priority %d)\n", cur->order);
p = cur->next;
void (*h_async_function) (void),
const char *ServiceName)
{
- struct ServiceFunctionHook *newfcn;
+ ServiceFunctionHook *newfcn;
char *message;
char error[SIZ];
strcpy(error, "");
- newfcn = (struct ServiceFunctionHook *) malloc(sizeof(struct ServiceFunctionHook));
+ newfcn = (ServiceFunctionHook *) malloc(sizeof(ServiceFunctionHook));
message = (char*) malloc (SIZ + SIZ);
newfcn->next = ServiceHookTable;
snprintf(message, SIZ, "Unix domain socket '%s': ", sockpath);
}
else if (tcp_port <= 0) { /* port -1 to disable */
- CtdlLogPrintf(CTDL_INFO, "Service %s has been manually disabled, skipping\n", ServiceName);
+ syslog(LOG_INFO, "Service %s has been manually disabled, skipping\n", ServiceName);
free (message);
free(newfcn);
return;
if (newfcn->msock > 0) {
ServiceHookTable = newfcn;
strcat(message, "registered.");
- CtdlLogPrintf(CTDL_INFO, "%s\n", message);
+ syslog(LOG_INFO, "%s\n", message);
}
else {
AddPortError(message, error);
strcat(message, "FAILED.");
- CtdlLogPrintf(CTDL_CRIT, "%s\n", message);
+ syslog(LOG_CRIT, "%s\n", message);
free(newfcn);
}
free(message);
void (*h_async_function) (void)
)
{
- struct ServiceFunctionHook *cur, *p;
+ ServiceFunctionHook *cur, *p;
cur = ServiceHookTable;
while (cur != NULL) {
tcp_port == cur->tcp_port) {
close(cur->msock);
if (sockpath) {
- CtdlLogPrintf(CTDL_INFO, "Closed UNIX domain socket %s\n",
+ syslog(LOG_INFO, "Closed UNIX domain socket %s\n",
sockpath);
+ unlink(sockpath);
} else if (tcp_port) {
- CtdlLogPrintf(CTDL_INFO, "Closed TCP port %d\n", tcp_port);
+ syslog(LOG_INFO, "Closed TCP port %d\n", tcp_port);
} else {
- CtdlLogPrintf(CTDL_INFO, "Unregistered service \"%s\"\n", cur->ServiceName);
+ syslog(LOG_INFO, "Unregistered service \"%s\"\n", cur->ServiceName);
}
p = cur->next;
if (cur == ServiceHookTable) {
void CtdlShutdownServiceHooks(void)
{
/* sort of a duplicate of close_masters() but called earlier */
- struct ServiceFunctionHook *cur;
+ ServiceFunctionHook *cur;
cur = ServiceHookTable;
while (cur != NULL)
close(cur->msock);
cur->msock = -1;
if (cur->sockpath != NULL){
- CtdlLogPrintf(CTDL_INFO, "[%s] Closed UNIX domain socket %s\n",
+ syslog(LOG_INFO, "[%s] Closed UNIX domain socket %s\n",
cur->ServiceName,
cur->sockpath);
+ unlink(cur->sockpath);
} else {
- CtdlLogPrintf(CTDL_INFO, "[%s] closing service\n",
+ syslog(LOG_INFO, "[%s] closing service\n",
cur->ServiceName);
}
}
void CtdlDestroyServiceHook(void)
{
- struct ServiceFunctionHook *cur, *p;
+ ServiceFunctionHook *cur, *p;
cur = ServiceHookTable;
while (cur != NULL)
{
close(cur->msock);
if (cur->sockpath) {
- CtdlLogPrintf(CTDL_INFO, "Closed UNIX domain socket %s\n",
+ syslog(LOG_INFO, "Closed UNIX domain socket %s\n",
cur->sockpath);
+ unlink(cur->sockpath);
} else if (cur->tcp_port) {
- CtdlLogPrintf(CTDL_INFO, "Closed TCP port %d\n", cur->tcp_port);
+ syslog(LOG_INFO, "Closed TCP port %d\n", cur->tcp_port);
} else {
- CtdlLogPrintf(CTDL_INFO, "Destroyed service \"%s\"\n", cur->ServiceName);
+ syslog(LOG_INFO, "Destroyed service \"%s\"\n", cur->ServiceName);
}
p = cur->next;
free(cur);
void CtdlRegisterSearchFuncHook(void (*fcn_ptr)(int *, long **, const char *), char *name)
{
- struct SearchFunctionHook *newfcn;
+ SearchFunctionHook *newfcn;
if (!name || !fcn_ptr) {
return;
}
- newfcn = (struct SearchFunctionHook *)
- malloc(sizeof(struct SearchFunctionHook));
+ newfcn = (SearchFunctionHook *)
+ malloc(sizeof(SearchFunctionHook));
newfcn->next = SearchFunctionHookTable;
newfcn->name = name;
newfcn->fcn_ptr = fcn_ptr;
SearchFunctionHookTable = newfcn;
- CtdlLogPrintf(CTDL_INFO, "Registered a new search function (%s)\n", name);
+ syslog(LOG_INFO, "Registered a new search function (%s)\n", name);
}
void CtdlUnregisterSearchFuncHook(void (*fcn_ptr)(int *, long **, const char *), char *name)
{
- struct SearchFunctionHook *cur, *p;
+ SearchFunctionHook *cur, *p;
for (cur = SearchFunctionHookTable; cur != NULL; cur = cur->next) {
while (fcn_ptr && (cur->fcn_ptr == fcn_ptr) && name && !strcmp(name, cur->name)) {
- CtdlLogPrintf(CTDL_INFO, "Unregistered search function(%s)\n", name);
+ syslog(LOG_INFO, "Unregistered search function(%s)\n", name);
p = cur->next;
if (cur == SearchFunctionHookTable) {
SearchFunctionHookTable = p;
}
}
+void CtdlDestroySearchHooks(void)
+{
+ SearchFunctionHook *cur, *p;
+
+ cur = SearchFunctionHookTable;
+ SearchFunctionHookTable = NULL;
+ while (cur != NULL) {
+ p = cur->next;
+ free(cur);
+ cur = p;
+ }
+}
+
void CtdlModuleDoSearch(int *num_msgs, long **search_msgs, const char *search_string, const char *func_name)
{
- struct SearchFunctionHook *fcn = NULL;
+ SearchFunctionHook *fcn = NULL;
for (fcn = SearchFunctionHookTable; fcn != NULL; fcn = fcn->next) {
if (!func_name || !strcmp(func_name, fcn->name)) {
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) {
- citthread_setspecific(MyConKey, NULL); /* for every hook */
+ 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)
{
- 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.
- CtdlLogPrintf(CTDL_DEBUG, "** Event type is %d, flags are %d\n",
- EventType, msg->cm_flags);
+ syslog(LOG_DEBUG, "** Event type is %d, flags are %d\n", EventType, msg->cm_flags);
*/
if (msg->cm_flags & CM_SKIP_HOOKS) {
- CtdlLogPrintf(CTDL_DEBUG, "Skipping hooks\n");
+ syslog(LOG_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);
}
}
int PerformRoomHooks(struct ctdlroom *target_room)
{
- struct RoomFunctionHook *fcn;
+ RoomFunctionHook *fcn;
int total_retval = 0;
- CtdlLogPrintf(CTDL_DEBUG, "Performing room hooks for <%s>\n", target_room->QRname);
+ syslog(LOG_DEBUG, "Performing room hooks for <%s>\n", 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;
+ NetprocFunctionHook *fcn;
int total_retval = 0;
for (fcn = NetprocHookTable; fcn != NULL; fcn = fcn->next) {
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 *sender_email, char *recp, char *msg)
{
- struct XmsgFunctionHook *fcn;
+ XmsgFunctionHook *fcn;
int total_sent = 0;
int p;
projects / citadel.git / blobdiff