Add framework for enabling (debug) logging per module
[citadel.git] / citadel / serv_extensions.c
index 4f2ddfa1fb38b707b2764a6340fc6834727b0fb7..45221c514eef4a3ced49c122cadc8e8c49e14c32 100644 (file)
 #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 __LogDebugEntry {
+       CtdlDbgFunction F;
+       const char *Name;
+       long Len;
+} LogDebugEntry;
+HashList *LogDebugEntryTable = NULL;
+
+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;
@@ -85,7 +221,7 @@ ConstStr ErrGeneral[] = {
        {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/faq:mastering_your_os:net#netstat")}
+             "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")};
@@ -171,10 +307,10 @@ void AddPortError(char *Port, char *ErrorMessage)
 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;
        }
@@ -196,17 +332,88 @@ long FourHash(const char *key, long length)
 
        return ret;
 }
+/*
+typedef struct __LogDebugEntry {
+       CtdlDbgFunction F;
+       const char *Name;
+       long Len;
+} LogDebugEntry;
+HashList *LogDebugEntryTable = NULL;
+*/
+void CtdlRegisterDebugFlagHook(const char *Name, long Len, CtdlDbgFunction F)
+{
+       LogDebugEntry *E;
+       if (LogDebugEntryTable == NULL)
+               LogDebugEntryTable = NewHash(1, NULL);
+       E = (LogDebugEntry*) malloc(sizeof(LogDebugEntry));
+       E->F = F;
+       E->Name = Name;
+       E->Len = Len;
+       Put(LogDebugEntryTable, Name, Len, E, NULL);
+       
+}
+void CtdlSetDebugLogFacilities(const char **Str, long n)
+{
+       StrBuf *Token = NULL;
+       StrBuf *Buf = NULL;
+       const char *ch;
+       int i;
+       int DoAll = 0;
+       void *vptr;
+
+       for (i=0; i < n; i++){
+               if ((Str[i] != NULL) && !IsEmptyStr(Str[i])) {
+                       if (strcmp(Str[i], "all") == 0) {
+                               DoAll = 1;
+                               continue;
+                       }
+                       Buf = NewStrBufPlain(Str[i], -1);
+                       ch = NULL;
+                       if (Token == NULL)
+                               Token = NewStrBufPlain(NULL, StrLength(Buf));
+                       while ((ch != StrBufNOTNULL) &&
+                              StrBufExtract_NextToken(Token, Buf, &ch, ',')) {
+                               if (GetHash(LogDebugEntryTable, SKEY(Token), &vptr) && 
+                                   (vptr != NULL))
+                               {
+                                       LogDebugEntry *E = (LogDebugEntry*)vptr;
+                                       E->F();
+                               }
+                       }
+               }
+               FreeStrBuf(&Buf);
+       }
+       FreeStrBuf(&Token);
+       if (DoAll) {
+               long HKLen;
+               const char *ch;
+               HashPos *Pos;
+
+               Pos = GetNewHashPos(LogDebugEntryTable, 0);
+               while (GetNextHashPos(LogDebugEntryTable, Pos, &HKLen, &ch, &vptr)) {
+                       LogDebugEntry *E = (LogDebugEntry*)vptr;
+                       E->F();
+               }
+
+               DeleteHashPos(&Pos);
+       }
+}
+void CtdlDestroyDebugTable(void)
+{
+
+       DeleteHash(&LogDebugEntryTable);
+}
 
 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");
@@ -230,10 +437,10 @@ 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;
@@ -244,7 +451,7 @@ void CtdlRegisterCleanupHook(void (*fcn_ptr) (void))
 
 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 */
@@ -261,9 +468,10 @@ void CtdlUnregisterCleanupHook(void (*fcn_ptr) (void))
        }
 }
 
+
 void CtdlDestroyCleanupHooks(void)
 {
-       struct CleanupFunctionHook *cur, *p;
+       CleanupFunctionHook *cur, *p;
 
        cur = CleanupHookTable;
        while (cur != NULL)
@@ -276,14 +484,64 @@ void CtdlDestroyCleanupHooks(void)
        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;
@@ -296,7 +554,7 @@ void CtdlRegisterSessionHook(void (*fcn_ptr) (void), int 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 */
@@ -317,7 +575,7 @@ void CtdlUnregisterSessionHook(void (*fcn_ptr) (void), int EventType)
 
 void CtdlDestroySessionHooks(void)
 {
-       struct SessionFunctionHook *cur, *p;
+       SessionFunctionHook *cur, *p;
 
        cur = SessionHookTable;
        while (cur != NULL)
@@ -331,13 +589,13 @@ void CtdlDestroySessionHooks(void)
 }
 
 
-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;
@@ -350,7 +608,7 @@ void CtdlRegisterUserHook(void (*fcn_ptr) (struct ctdluser *), int 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 */
@@ -371,7 +629,7 @@ void CtdlUnregisterUserHook(void (*fcn_ptr) (struct ctdluser *), int EventType)
 
 void CtdlDestroyUserHooks(void)
 {
-       struct UserFunctionHook *cur, *p;
+       UserFunctionHook *cur, *p;
 
        cur = UserHookTable;
        while (cur != NULL)
@@ -389,10 +647,10 @@ void CtdlRegisterMessageHook(int (*handler)(struct CtdlMessage *),
                                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;
@@ -406,7 +664,7 @@ void CtdlRegisterMessageHook(int (*handler)(struct CtdlMessage *),
 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 */
@@ -427,7 +685,7 @@ void CtdlUnregisterMessageHook(int (*handler)(struct CtdlMessage *),
 
 void CtdlDestroyMessageHook(void)
 {
-       struct MessageFunctionHook *cur, *p;
+       MessageFunctionHook *cur, *p;
 
        cur = MessageHookTable; 
        while (cur != NULL)
@@ -443,10 +701,10 @@ void CtdlDestroyMessageHook(void)
 
 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;
@@ -457,7 +715,7 @@ void CtdlRegisterRoomHook(int (*fcn_ptr)(struct ctdlroom *))
 
 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) {
@@ -475,7 +733,7 @@ void CtdlUnregisterRoomHook(int (*fcn_ptr)(struct ctdlroom *))
 
 void CtdlDestroyRoomHooks(void)
 {
-       struct RoomFunctionHook *cur, *p;
+       RoomFunctionHook *cur, *p;
 
        cur = RoomHookTable;
        while (cur != NULL)
@@ -490,10 +748,10 @@ void CtdlDestroyRoomHooks(void)
 
 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;
@@ -504,7 +762,7 @@ void CtdlRegisterNetprocHook(int (*handler)(struct CtdlMessage *, char *) )
 
 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 */
@@ -523,7 +781,7 @@ void CtdlUnregisterNetprocHook(int (*handler)(struct CtdlMessage *, char *) )
 
 void CtdlDestroyNetprocHooks(void)
 {
-       struct NetprocFunctionHook *cur, *p;
+       NetprocFunctionHook *cur, *p;
 
        cur = NetprocHookTable;
        while (cur != NULL)
@@ -539,10 +797,10 @@ void CtdlDestroyNetprocHooks(void)
 
 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;
@@ -553,7 +811,7 @@ void CtdlRegisterDeleteHook(void (*handler)(char *, long) )
 
 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 */
@@ -571,7 +829,7 @@ void CtdlUnregisterDeleteHook(void (*handler)(char *, long) )
 }
 void CtdlDestroyDeleteHooks(void)
 {
-       struct DeleteFunctionHook *cur, *p;
+       DeleteFunctionHook *cur, *p;
 
        cur = DeleteHookTable;
        while (cur != NULL)
@@ -589,10 +847,10 @@ void CtdlDestroyDeleteHooks(void)
 
 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);
@@ -604,7 +862,7 @@ void CtdlRegisterFixedOutputHook(char *content_type, void (*handler)(char *, int
 
 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 */
@@ -622,7 +880,7 @@ void CtdlUnregisterFixedOutputHook(char *content_type)
 
 void CtdlDestroyFixedOutputHooks(void)
 {
-       struct FixedOutputHook *cur, *p;
+       FixedOutputHook *cur, *p;
 
        cur = FixedOutputTable; 
        while (cur != NULL)
@@ -639,7 +897,7 @@ void CtdlDestroyFixedOutputHooks(void)
 /* 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)) {
@@ -657,9 +915,9 @@ int PerformFixedOutputHooks(char *content_type, char *content, int content_lengt
 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;
@@ -670,7 +928,7 @@ void CtdlRegisterXmsgHook(int (*fcn_ptr) (char *, char *, char *, char *), int o
 
 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 */
@@ -691,7 +949,7 @@ void CtdlUnregisterXmsgHook(int (*fcn_ptr) (char *, char *, char *, char *), int
 
 void CtdlDestroyXmsgHooks(void)
 {
-       struct XmsgFunctionHook *cur, *p;
+       XmsgFunctionHook *cur, *p;
 
        cur = XmsgHookTable;
        while (cur != NULL)
@@ -714,12 +972,12 @@ void CtdlRegisterServiceHook(int tcp_port,
                             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;
@@ -770,7 +1028,7 @@ void CtdlUnregisterServiceHook(int tcp_port, char *sockpath,
                        void (*h_async_function) (void)
                        )
 {
-       struct ServiceFunctionHook *cur, *p;
+       ServiceFunctionHook *cur, *p;
 
        cur = ServiceHookTable;
        while (cur != NULL) {
@@ -786,6 +1044,7 @@ void CtdlUnregisterServiceHook(int tcp_port, char *sockpath,
                        if (sockpath) {
                                syslog(LOG_INFO, "Closed UNIX domain socket %s\n",
                                                sockpath);
+                               unlink(sockpath);
                        } else if (tcp_port) {
                                syslog(LOG_INFO, "Closed TCP port %d\n", tcp_port);
                        } else {
@@ -805,7 +1064,7 @@ void CtdlUnregisterServiceHook(int tcp_port, char *sockpath,
 void CtdlShutdownServiceHooks(void)
 {
        /* sort of a duplicate of close_masters() but called earlier */
-       struct ServiceFunctionHook *cur;
+       ServiceFunctionHook *cur;
 
        cur = ServiceHookTable;
        while (cur != NULL) 
@@ -818,6 +1077,7 @@ void CtdlShutdownServiceHooks(void)
                                syslog(LOG_INFO, "[%s] Closed UNIX domain socket %s\n",
                                              cur->ServiceName,
                                              cur->sockpath);
+                               unlink(cur->sockpath);
                        } else {
                                syslog(LOG_INFO, "[%s] closing service\n", 
                                              cur->ServiceName);
@@ -829,7 +1089,7 @@ void CtdlShutdownServiceHooks(void)
 
 void CtdlDestroyServiceHook(void)
 {
-       struct ServiceFunctionHook *cur, *p;
+       ServiceFunctionHook *cur, *p;
 
        cur = ServiceHookTable;
        while (cur != NULL)
@@ -838,6 +1098,7 @@ void CtdlDestroyServiceHook(void)
                if (cur->sockpath) {
                        syslog(LOG_INFO, "Closed UNIX domain socket %s\n",
                                cur->sockpath);
+                       unlink(cur->sockpath);
                } else if (cur->tcp_port) {
                        syslog(LOG_INFO, "Closed TCP port %d\n", cur->tcp_port);
                } else {
@@ -852,14 +1113,14 @@ void CtdlDestroyServiceHook(void)
 
 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;
@@ -870,7 +1131,7 @@ void CtdlRegisterSearchFuncHook(void (*fcn_ptr)(int *, long **, const char *), c
 
 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)) {
@@ -887,7 +1148,7 @@ void CtdlUnregisterSearchFuncHook(void (*fcn_ptr)(int *, long **, const char *),
 
 void CtdlDestroySearchHooks(void)
 {
-        struct SearchFunctionHook *cur, *p;
+        SearchFunctionHook *cur, *p;
 
        cur = SearchFunctionHookTable;
        SearchFunctionHookTable = NULL;
@@ -900,7 +1161,7 @@ void CtdlDestroySearchHooks(void)
 
 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)) {
@@ -914,7 +1175,7 @@ void CtdlModuleDoSearch(int *num_msgs, long **search_msgs, const char *search_st
 
 void PerformSessionHooks(int EventType)
 {
-       struct SessionFunctionHook *fcn = NULL;
+       SessionFunctionHook *fcn = NULL;
 
        for (fcn = SessionHookTable; fcn != NULL; fcn = fcn->next) {
                if (fcn->eventtype == EventType) {
@@ -926,9 +1187,9 @@ void PerformSessionHooks(int EventType)
        }
 }
 
-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) {
@@ -939,7 +1200,7 @@ void PerformUserHooks(struct ctdluser *usbuf, int 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
@@ -969,7 +1230,7 @@ int PerformMessageHooks(struct CtdlMessage *msg, int EventType)
 
 int PerformRoomHooks(struct ctdlroom *target_room)
 {
-       struct RoomFunctionHook *fcn;
+       RoomFunctionHook *fcn;
        int total_retval = 0;
 
        syslog(LOG_DEBUG, "Performing room hooks for <%s>\n", target_room->QRname);
@@ -986,7 +1247,7 @@ int PerformRoomHooks(struct ctdlroom *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) {
@@ -1003,7 +1264,7 @@ int PerformNetprocHooks(struct CtdlMessage *msg, char *target_room)
 
 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);
@@ -1016,7 +1277,7 @@ void PerformDeleteHooks(char *room, long msgnum)
 
 int PerformXmsgHooks(char *sender, char *sender_email, char *recp, char *msg)
 {
-       struct XmsgFunctionHook *fcn;
+       XmsgFunctionHook *fcn;
        int total_sent = 0;
        int p;