/*
- * $Id$
- *
* Citadel Dynamic Loading Module
* Written by Brian Costello <btx@calyx.net>
- *
*/
#include "sysdep.h"
struct ProtoFunctionHook {
void (*handler) (char *cmdbuf);
- char *cmd;
- char *desc;
- struct ProtoFunctionHook *next;
-} *ProtoHookList = NULL;
-
-
-struct DirectoryServiceHook {
- int (*handler) (char *cn, char *ou, void **object);
- int cmd;
- char *module;
- struct DirectoryServiceHook *next;
-} *DirectoryServiceHookList = NULL;
-
-struct DirectoryObject {
- char *module;
- void *object;
- struct DirectoryObject *next;
+ const char *cmd;
+ const char *desc;
};
+HashList *ProtoHookList = NULL;
+
+
#define ERR_PORT (1 << 1)
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 "
+" 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";
int n = nSizPort + nSizErrmsg + 5;
Message = (char*) malloc(n * SIZ);
+
+ DetailErrorFlags = DetailErrorFlags & ~err;
switch (err)
{
snprintf(Message, n * SIZ, ErrGeneral, Short, Where, List, Hint, DetailList);
- lprintf(0,Message);
- lprintf(0,ErrSubject);
+ CtdlLogPrintf(0,Message);
+ CtdlLogPrintf(0,ErrSubject);
quickie_message("Citadel", NULL, NULL, AIDEROOM, Message, FMT_FIXED, ErrSubject);
if (errormessages!=NULL) free (errormessages);
errormessages = NULL;
int DLoader_Exec_Cmd(char *cmdbuf)
{
+ void *vP;
struct 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 = (struct ProtoFunctionHook*) vP;
+ p->handler(&cmdbuf[5]);
+ return 1;
}
return 0;
}
+int 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 CtdlRegisterProtoHook(void (*handler) (char *), char *cmd, char *desc)
{
struct ProtoFunctionHook *p;
+ if (ProtoHookList == NULL)
+ ProtoHookList = NewHash (1, FourHash);
+
+
p = (struct ProtoFunctionHook *)
malloc(sizeof(struct ProtoFunctionHook));
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);
-}
-
-
-void CtdlUnregisterProtoHook(void (*handler) (char *), char *cmd)
-{
- struct ProtoFunctionHook *cur = NULL;
- struct ProtoFunctionHook *p = NULL;
- struct ProtoFunctionHook *lastcur = NULL;
- 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;
- }
+ Put(ProtoHookList, cmd, 4, p, NULL);
+ CtdlLogPrintf(CTDL_INFO, "Registered server command %s (%s)\n", cmd, desc);
}
void CtdlDestroyProtoHooks(void)
{
- struct ProtoFunctionHook *cur, *p;
- 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;
+ DeleteHash(&ProtoHookList);
}
newfcn->h_function_pointer = fcn_ptr;
CleanupHookTable = newfcn;
- lprintf(CTDL_INFO, "Registered a new cleanup function\n");
+ CtdlLogPrintf(CTDL_INFO, "Registered a new cleanup function\n");
}
/* This will also remove duplicates if any */
while (cur != NULL &&
fcn_ptr == cur->h_function_pointer) {
- lprintf(CTDL_INFO, "Unregistered cleanup function\n");
+ CtdlLogPrintf(CTDL_INFO, "Unregistered cleanup function\n");
p = cur->next;
if (cur == CleanupHookTable) {
CleanupHookTable = p;
cur = CleanupHookTable;
while (cur != NULL)
{
- lprintf(CTDL_INFO, "Destroyed cleanup function\n");
+ CtdlLogPrintf(CTDL_INFO, "Destroyed cleanup function\n");
p = cur->next;
free(cur);
cur = p;
newfcn->eventtype = EventType;
SessionHookTable = newfcn;
- lprintf(CTDL_INFO, "Registered a new session function (type %d)\n",
+ CtdlLogPrintf(CTDL_INFO, "Registered a new session function (type %d)\n",
EventType);
}
while (cur != NULL &&
fcn_ptr == cur->h_function_pointer &&
EventType == cur->eventtype) {
- lprintf(CTDL_INFO, "Unregistered session function (type %d)\n",
+ CtdlLogPrintf(CTDL_INFO, "Unregistered session function (type %d)\n",
EventType);
p = cur->next;
if (cur == SessionHookTable) {
cur = SessionHookTable;
while (cur != NULL)
{
- lprintf(CTDL_INFO, "Destroyed session function\n");
+ CtdlLogPrintf(CTDL_INFO, "Destroyed session function\n");
p = cur->next;
free(cur);
cur = p;
newfcn->eventtype = EventType;
UserHookTable = newfcn;
- lprintf(CTDL_INFO, "Registered a new user function (type %d)\n",
+ CtdlLogPrintf(CTDL_INFO, "Registered a new user function (type %d)\n",
EventType);
}
while (cur != NULL &&
fcn_ptr == cur->h_function_pointer &&
EventType == cur->eventtype) {
- lprintf(CTDL_INFO, "Unregistered user function (type %d)\n",
+ CtdlLogPrintf(CTDL_INFO, "Unregistered user function (type %d)\n",
EventType);
p = cur->next;
if (cur == UserHookTable) {
cur = UserHookTable;
while (cur != NULL)
{
- lprintf(CTDL_INFO, "Destroyed user function \n");
+ CtdlLogPrintf(CTDL_INFO, "Destroyed user function \n");
p = cur->next;
free(cur);
cur = p;
newfcn->eventtype = EventType;
MessageHookTable = newfcn;
- lprintf(CTDL_INFO, "Registered a new message function (type %d)\n",
+ CtdlLogPrintf(CTDL_INFO, "Registered a new message function (type %d)\n",
EventType);
}
while (cur != NULL &&
handler == cur->h_function_pointer &&
EventType == cur->eventtype) {
- lprintf(CTDL_INFO, "Unregistered message function (type %d)\n",
+ CtdlLogPrintf(CTDL_INFO, "Unregistered message function (type %d)\n",
EventType);
p = cur->next;
if (cur == MessageHookTable) {
cur = MessageHookTable;
while (cur != NULL)
{
- lprintf(CTDL_INFO, "Destroyed message function \n");
+ CtdlLogPrintf(CTDL_INFO, "Destroyed message function (type %d)\n", cur->eventtype);
p = cur->next;
free(cur);
cur = p;
newfcn->fcn_ptr = fcn_ptr;
RoomHookTable = newfcn;
- lprintf(CTDL_INFO, "Registered a new room function\n");
+ CtdlLogPrintf(CTDL_INFO, "Registered a new room function\n");
}
for (cur = RoomHookTable; cur != NULL; cur = cur->next) {
while (cur != NULL && fcn_ptr == cur->fcn_ptr) {
- lprintf(CTDL_INFO, "Unregistered room function\n");
+ CtdlLogPrintf(CTDL_INFO, "Unregistered room function\n");
p = cur->next;
if (cur == RoomHookTable) {
RoomHookTable = p;
cur = RoomHookTable;
while (cur != NULL)
{
- lprintf(CTDL_INFO, "Unregistered room function\n");
+ CtdlLogPrintf(CTDL_INFO, "Destroyed room function\n");
p = cur->next;
free(cur);
cur = p;
newfcn->h_function_pointer = handler;
NetprocHookTable = newfcn;
- lprintf(CTDL_INFO, "Registered a new netproc function\n");
+ CtdlLogPrintf(CTDL_INFO, "Registered a new netproc function\n");
}
/* This will also remove duplicates if any */
while (cur != NULL &&
handler == cur->h_function_pointer ) {
- lprintf(CTDL_INFO, "Unregistered netproc function\n");
+ CtdlLogPrintf(CTDL_INFO, "Unregistered netproc function\n");
p = cur->next;
if (cur == NetprocHookTable) {
NetprocHookTable = p;
cur = NetprocHookTable;
while (cur != NULL)
{
- lprintf(CTDL_INFO, "Unregistered netproc function\n");
+ CtdlLogPrintf(CTDL_INFO, "Destroyed netproc function\n");
p = cur->next;
free(cur);
cur = p;
newfcn->h_function_pointer = handler;
DeleteHookTable = newfcn;
- lprintf(CTDL_INFO, "Registered a new netproc function\n");
+ CtdlLogPrintf(CTDL_INFO, "Registered a new delete function\n");
}
/* This will also remove duplicates if any */
while (cur != NULL &&
handler == cur->h_function_pointer ) {
- lprintf(CTDL_INFO, "Unregistered netproc function\n");
+ CtdlLogPrintf(CTDL_INFO, "Unregistered delete function\n");
p = cur->next;
if (cur == DeleteHookTable) {
DeleteHookTable = p;
cur = DeleteHookTable;
while (cur != NULL)
{
- lprintf(CTDL_INFO, "Destroyed netproc function\n");
+ CtdlLogPrintf(CTDL_INFO, "Destroyed delete function\n");
p = cur->next;
free(cur);
cur = p;
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);
+ CtdlLogPrintf(CTDL_INFO, "Registered a new fixed output function for %s\n", newfcn->content_type);
}
for (cur = FixedOutputTable; cur != NULL; cur = cur->next) {
/* 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);
+ CtdlLogPrintf(CTDL_INFO, "Unregistered fixed output function for %s\n", content_type);
p = cur->next;
if (cur == FixedOutputTable) {
FixedOutputTable = p;
cur = FixedOutputTable;
while (cur != NULL)
{
- lprintf(CTDL_INFO, "Destroyed fixed output function for %s\n", cur->content_type);
+ CtdlLogPrintf(CTDL_INFO, "Destroyed fixed output function for %s\n", cur->content_type);
p = cur->next;
free(cur);
cur = p;
newfcn->order = order;
newfcn->h_function_pointer = fcn_ptr;
XmsgHookTable = newfcn;
- lprintf(CTDL_INFO, "Registered a new x-msg function (priority %d)\n", order);
+ CtdlLogPrintf(CTDL_INFO, "Registered a new x-msg function (priority %d)\n", order);
}
while (cur != NULL &&
fcn_ptr == cur->h_function_pointer &&
order == cur->order) {
- lprintf(CTDL_INFO, "Unregistered x-msg function "
+ CtdlLogPrintf(CTDL_INFO, "Unregistered x-msg function "
"(priority %d)\n", order);
p = cur->next;
if (cur == XmsgHookTable) {
cur = XmsgHookTable;
while (cur != NULL)
{
- lprintf(CTDL_INFO, "Destroyed x-msg function "
+ CtdlLogPrintf(CTDL_INFO, "Destroyed x-msg function "
"(priority %d)\n", cur->order);
p = cur->next;
{
struct ServiceFunctionHook *newfcn;
char *message;
- char *error;
+ char error[SIZ];
- error = NULL;
- newfcn = (struct ServiceFunctionHook *)
- malloc(sizeof(struct ServiceFunctionHook));
- message = (char*) malloc (SIZ);
+ strcpy(error, "");
+ newfcn = (struct ServiceFunctionHook *) malloc(sizeof(struct ServiceFunctionHook));
+ message = (char*) malloc (SIZ + SIZ);
newfcn->next = ServiceHookTable;
newfcn->tcp_port = tcp_port;
newfcn->ServiceName = ServiceName;
if (sockpath != NULL) {
- newfcn->msock = ig_uds_server(sockpath, config.c_maxsessions, &error);
+ newfcn->msock = ctdl_uds_server(sockpath, config.c_maxsessions, error);
snprintf(message, SIZ, "Unix domain socket '%s': ", sockpath);
}
else if (tcp_port <= 0) { /* port -1 to disable */
- lprintf(CTDL_INFO, "Service %s has been manually disabled, skipping\n", ServiceName);
+ CtdlLogPrintf(CTDL_INFO, "Service %s has been manually disabled, skipping\n", ServiceName);
free (message);
free(newfcn);
return;
}
else {
- newfcn->msock = ig_tcp_server(config.c_ip_addr,
+ newfcn->msock = ctdl_tcp_server(config.c_ip_addr,
tcp_port,
config.c_maxsessions,
- &error);
+ error);
snprintf(message, SIZ, "TCP port %s:%d: (%s) ",
config.c_ip_addr, tcp_port, ServiceName);
}
if (newfcn->msock > 0) {
ServiceHookTable = newfcn;
strcat(message, "registered.");
- lprintf(CTDL_INFO, "%s\n", message);
+ CtdlLogPrintf(CTDL_INFO, "%s\n", message);
}
else {
AddPortError(message, error);
strcat(message, "FAILED.");
- lprintf(CTDL_CRIT, "%s\n", message);
+ CtdlLogPrintf(CTDL_CRIT, "%s\n", message);
free(error);
free(newfcn);
}
tcp_port == cur->tcp_port) {
close(cur->msock);
if (sockpath) {
- lprintf(CTDL_INFO, "Closed UNIX domain socket %s\n",
+ CtdlLogPrintf(CTDL_INFO, "Closed UNIX domain socket %s\n",
sockpath);
} else if (tcp_port) {
- lprintf(CTDL_INFO, "Closed TCP port %d\n", tcp_port);
+ CtdlLogPrintf(CTDL_INFO, "Closed TCP port %d\n", tcp_port);
} else {
- lprintf(CTDL_INFO, "Unregistered unknown service\n");
+ CtdlLogPrintf(CTDL_INFO, "Unregistered service \"%s\"\n", cur->ServiceName);
}
p = cur->next;
if (cur == ServiceHookTable) {
{
close(cur->msock);
if (cur->sockpath) {
- lprintf(CTDL_INFO, "Closed UNIX domain socket %s\n",
+ CtdlLogPrintf(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);
+ CtdlLogPrintf(CTDL_INFO, "Closed TCP port %d\n", cur->tcp_port);
} else {
- lprintf(CTDL_INFO, "Unregistered unknown service\n");
+ CtdlLogPrintf(CTDL_INFO, "Destroyed service \"%s\"\n", cur->ServiceName);
}
p = cur->next;
free(cur);
ServiceHookTable = NULL;
}
-void CtdlRegisterSearchFuncHook(void (*fcn_ptr)(int *, long **, char *), char *name)
+void CtdlRegisterSearchFuncHook(void (*fcn_ptr)(int *, long **, const char *), char *name)
{
struct SearchFunctionHook *newfcn;
newfcn->fcn_ptr = fcn_ptr;
SearchFunctionHookTable = newfcn;
- lprintf(CTDL_INFO, "Registered a new search function (%s)\n", name);
+ CtdlLogPrintf(CTDL_INFO, "Registered a new search function (%s)\n", name);
}
-void CtdlUnregisterSearchFuncHook(void (*fcn_ptr)(int *, long **, char *), char *name)
+void CtdlUnregisterSearchFuncHook(void (*fcn_ptr)(int *, long **, const char *), char *name)
{
struct SearchFunctionHook *cur, *p;
for (cur = SearchFunctionHookTable; cur != NULL; cur = cur->next) {
while (fcn_ptr && (cur->fcn_ptr == fcn_ptr) && name && !strcmp(name, cur->name)) {
- lprintf(CTDL_INFO, "Unregistered search function(%s)\n", name);
+ CtdlLogPrintf(CTDL_INFO, "Unregistered search function(%s)\n", name);
p = cur->next;
if (cur == SearchFunctionHookTable) {
SearchFunctionHookTable = p;
}
}
-void CtdlModuleDoSearch(int *num_msgs, long **search_msgs, char *search_string, char *func_name)
+void CtdlModuleDoSearch(int *num_msgs, long **search_msgs, const char *search_string, const char *func_name)
{
struct SearchFunctionHook *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 */
+ }
(*fcn->h_function_pointer) ();
}
}
/* 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",
+ CtdlLogPrintf(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");
+ CtdlLogPrintf(CTDL_DEBUG, "Skipping hooks\n");
return(0);
}
struct RoomFunctionHook *fcn;
int total_retval = 0;
- lprintf(CTDL_DEBUG, "Performing room hooks for <%s>\n", target_room->QRname);
+ CtdlLogPrintf(CTDL_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 CtdlRegisterDirectoryServiceFunc(int (*func)(char *cn, char *ou, void **object), int cmd, char *module)
-{
- struct DirectoryServiceHook *newfcn;
-
- newfcn = DirectoryServiceHookList;
- while (newfcn)
- {
- if (newfcn->cmd == cmd && !strcmp(newfcn->module, module))
- {
- lprintf(CTDL_ERR, "Directory service function already handled by module %s\n", module);
- return -1;
- }
- newfcn = newfcn->next;
- }
-
- newfcn = (struct DirectoryServiceHook *) malloc (sizeof(struct DirectoryServiceHook));
- newfcn->handler = func;
- newfcn->cmd = cmd;
- newfcn->module = module;
- newfcn->next = DirectoryServiceHookList;
- DirectoryServiceHookList = newfcn;
-
- lprintf(CTDL_INFO, "Registered a new directory service function from module %s\n", module);
- return 0;
-}
-
-int CtdlDoDirectoryServiceFunc(char *cn, char *ou, void **object, char *module, int cmd)
-{
- struct DirectoryServiceHook *curfcn;
- struct DirectoryObject *our_object_list = NULL;
- struct DirectoryObject *newobject = NULL;
- struct DirectoryObject *oldobject = NULL;
-
-
- curfcn = DirectoryServiceHookList;
- if (object)
- our_object_list = (struct DirectoryObject *) *object;
-
- while (curfcn)
- {
- if (curfcn->cmd == cmd)
- {
- if (!module)
- {
- if (cmd == DIRECTORY_CREATE_OBJECT)
- {
- newobject = (struct DirectoryObject*) malloc (sizeof(struct DirectoryObject));
- newobject->module = curfcn->module;
- newobject->object = NULL;
- newobject->next = our_object_list;
- our_object_list = newobject;
- }
- if (our_object_list)
- {
- for(newobject = our_object_list; newobject; newobject=newobject->next)
- {
- if (!strcmp(newobject->module, curfcn->module))
- (void) curfcn->handler(cn, ou, &newobject->object);
- }
- }
- else
- (void) curfcn->handler(cn, ou, NULL);
-
- continue;
- }
- else
- {
- if(!strcmp(curfcn->module, module))
- {
- if (cmd == DIRECTORY_CREATE_OBJECT)
- {
- newobject = (struct DirectoryObject*) malloc (sizeof(struct DirectoryObject));
- newobject->module = module;
- newobject->object = NULL;
- newobject->next = our_object_list;
- our_object_list = newobject;
- }
- if (our_object_list)
- {
- for(newobject = our_object_list; newobject; newobject=newobject->next)
- {
- if (!strcmp(newobject->module, curfcn->module))
- (void) curfcn->handler(cn, ou, &newobject->object);
- }
- }
- else
- (void) (curfcn->handler(cn, ou, NULL));
-
- break;
- }
- }
- }
- curfcn=curfcn->next;
- }
- if (our_object_list)
- {
- *object = our_object_list;
- if (cmd == DIRECTORY_FREE_OBJECT)
- { // The objects pointed to by the list should have been freed by the module that created it
- for(newobject = our_object_list; newobject; )
- {
- oldobject=newobject;
- newobject=newobject->next;
- free(oldobject);
- }
- *object=NULL;
- }
- }
- return 0;
-}
-
-void CtdlDestroyDirectoryServiceFuncs(void)
-{
- struct DirectoryServiceHook *cur, *next;
-
- cur = DirectoryServiceHookList;
- DirectoryServiceHookList = NULL;
- while (cur)
- {
- next = cur->next;
- CtdlLogPrintf(CTDL_INFO, "Destroyed directory service function for module %s.\n", cur->module);
- free(cur);
- cur = next;
- }
-}
-
/*
* Dirty hack until we impliment a hook mechanism for this
*/
projects / citadel.git / blobdiff