/*
* 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"
snprintf(Message, n * SIZ, ErrGeneral, Short, Where, List, Hint, DetailList);
- CtdlLogPrintf(0,Message);
- CtdlLogPrintf(0,ErrSubject);
+ syslog(LOG_EMERG, "%s", Message);
+ syslog(LOG_EMERG, "%s", ErrSubject);
quickie_message("Citadel", NULL, NULL, AIDEROOM, Message, FMT_FIXED, ErrSubject);
if (errormessages!=NULL) free (errormessages);
errormessages = NULL;
return 0;
}
-int FourHash(const char *key, long length)
+long FourHash(const char *key, long length)
{
int i;
int ret = 0;
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)
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");
}
/* 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;
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;
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);
}
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) {
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;
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);
}
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) {
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;
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);
}
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) {
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;
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");
}
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;
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;
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");
}
/* 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;
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;
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");
}
/* 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;
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;
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);
}
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;
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;
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);
}
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) {
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;
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);
- free(error);
+ syslog(LOG_CRIT, "%s\n", message);
free(newfcn);
}
free(message);
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);
} 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) {
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);
} else {
- CtdlLogPrintf(CTDL_INFO, "[%s] closing service\n",
+ syslog(LOG_INFO, "[%s] closing service\n",
cur->ServiceName);
}
}
{
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);
} 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);
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)
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)
+{
+ struct 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;
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) ();
}
/* 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);
}
/* Otherwise, run all the hooks appropriate to this event type.
*/
+ int num_hooks_processed = 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);
+ syslog(LOG_DEBUG, "%d hooks completed, total_retval=%d",
+ ++num_hooks_processed, total_retval
+ );
}
}
struct 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);
projects / citadel.git / blobdiff