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;
p->desc = desc;
p->next = ProtoHookList;
ProtoHookList = p;
- lprintf(CTDL_INFO, "Registered server command %s (%s)\n", cmd, desc);
+ CtdlLogPrintf(CTDL_INFO, "Registered server command %s (%s)\n", cmd, desc);
}
while (cur != NULL &&
handler == cur->handler &&
!strcmp(cmd, cur->cmd)) {
- lprintf(CTDL_INFO, "Unregistered server command %s (%s)\n",
+ CtdlLogPrintf(CTDL_INFO, "Unregistered server command %s (%s)\n",
cmd, cur->desc);
p = cur->next;
if (cur == ProtoHookList) {
cur = ProtoHookList;
while (cur != NULL)
{
- lprintf(CTDL_INFO, "Destroyed server command %s (%s)\n",
+ CtdlLogPrintf(CTDL_INFO, "Destroyed server command %s (%s)\n",
cur->cmd, cur->desc);
p = cur->next;
free(cur);
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 \n");
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, "Unregistered 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, "Unregistered 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 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 == DeleteHookTable) {
DeleteHookTable = p;
cur = DeleteHookTable;
while (cur != NULL)
{
- lprintf(CTDL_INFO, "Destroyed netproc function\n");
+ CtdlLogPrintf(CTDL_INFO, "Destroyed netproc 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;
-void CtdlRegisterXmsgHook(int (*fcn_ptr) (char *, char *, char *), int order)
+void CtdlRegisterXmsgHook(int (*fcn_ptr) (char *, char *, char *, char *), int order)
{
struct XmsgFunctionHook *newfcn;
- newfcn = (struct XmsgFunctionHook *)
- malloc(sizeof(struct XmsgFunctionHook));
+ newfcn = (struct XmsgFunctionHook *) malloc(sizeof(struct 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);
+ CtdlLogPrintf(CTDL_INFO, "Registered a new x-msg function (priority %d)\n", 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;
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;
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;
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 unknown service\n");
}
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, "Unregistered unknown service\n");
}
p = cur->next;
free(cur);
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)
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;
/* 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 PerformXmsgHooks(char *sender, char *recp, char *msg)
+int PerformXmsgHooks(char *sender, char *sender_email, char *recp, char *msg)
{
struct XmsgFunctionHook *fcn;
int total_sent = 0;
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
{
if (newfcn->cmd == cmd && !strcmp(newfcn->module, module))
{
- lprintf(CTDL_ERR, "Directory service function already handled by module %s\n", module);
+ CtdlLogPrintf(CTDL_ERR, "Directory service function already handled by module %s\n", module);
return -1;
}
newfcn = newfcn->next;
newfcn->next = DirectoryServiceHookList;
DirectoryServiceHookList = newfcn;
- lprintf(CTDL_INFO, "Registered a new directory service function from module %s\n", module);
+ CtdlLogPrintf(CTDL_INFO, "Registered a new directory service function from module %s\n", module);
return 0;
}
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
*/