* give all commands their own function

[citadel.git] / citadel / serv_extensions.c

diff --git a/citadel/serv_extensions.c b/citadel/serv_extensions.c
index 7644b624345aa3fba8ccf9da1f6b6be972a5a250..115b6769b32d98bf70e53940be8818cd810ed23f 100644 (file)
--- a/citadel/serv_extensions.c
+++ b/citadel/serv_extensions.c
@@ -46,10 +46,11 @@ struct SearchFunctionHook *SearchFunctionHookTable = NULL;
 
 struct ProtoFunctionHook {
        void (*handler) (char *cmdbuf);
-       char *cmd;
-       char *desc;
-       struct ProtoFunctionHook *next;
-} *ProtoHookList = NULL;
+       const char *cmd;
+       const char *desc;
+};
+
+HashList *ProtoHookList = NULL;
 
 
 struct DirectoryServiceHook {
@@ -101,6 +102,8 @@ void LogPrintMessages(long err)
        int n = nSizPort + nSizErrmsg + 5;
 
        Message = (char*) malloc(n * SIZ);
+       
+       DetailErrorFlags = DetailErrorFlags & ~err;
 
        switch (err)
        {
@@ -191,22 +194,37 @@ void AddPortError(char *Port, char *ErrorMessage)
 
 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;
+
+       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));
 
@@ -217,56 +235,15 @@ void CtdlRegisterProtoHook(void (*handler) (char *), char *cmd, char *desc)
        p->handler = handler;
        p->cmd = cmd;
        p->desc = desc;
-       p->next = ProtoHookList;
-       ProtoHookList = p;
-       CtdlLogPrintf(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)) {
-                       CtdlLogPrintf(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)
-       {
-               CtdlLogPrintf(CTDL_INFO, "Destroyed server command %s (%s)\n",
-                       cur->cmd, cur->desc);
-               p = cur->next;
-               free(cur);
-               cur = p;
-       }
-       ProtoHookList = NULL;
+       DeleteHash(&ProtoHookList);
 }
 
 
@@ -475,7 +452,7 @@ void CtdlDestroyMessageHook(void)
        cur = MessageHookTable; 
        while (cur != NULL)
        {
-               CtdlLogPrintf(CTDL_INFO, "Destroyed message function \n");
+               CtdlLogPrintf(CTDL_INFO, "Destroyed message function (type %d)\n", cur->eventtype);
                p = cur->next;
                free(cur);
                cur = p;
@@ -523,7 +500,7 @@ void CtdlDestroyRoomHooks(void)
        cur = RoomHookTable;
        while (cur != NULL)
        {
-               CtdlLogPrintf(CTDL_INFO, "Unregistered room function\n");
+               CtdlLogPrintf(CTDL_INFO, "Destroyed room function\n");
                p = cur->next;
                free(cur);
                cur = p;
@@ -571,7 +548,7 @@ void CtdlDestroyNetprocHooks(void)
        cur = NetprocHookTable;
        while (cur != NULL)
        {
-               CtdlLogPrintf(CTDL_INFO, "Unregistered netproc function\n");
+               CtdlLogPrintf(CTDL_INFO, "Destroyed netproc function\n");
                p = cur->next;
                free(cur);
                cur = p;
@@ -590,7 +567,7 @@ void CtdlRegisterDeleteHook(void (*handler)(char *, long) )
        newfcn->h_function_pointer = handler;
        DeleteHookTable = newfcn;
 
-       CtdlLogPrintf(CTDL_INFO, "Registered a new netproc function\n");
+       CtdlLogPrintf(CTDL_INFO, "Registered a new delete function\n");
 }
 
 
@@ -602,7 +579,7 @@ void CtdlUnregisterDeleteHook(void (*handler)(char *, long) )
                /* This will also remove duplicates if any */
                while (cur != NULL &&
                                handler == cur->h_function_pointer ) {
-                       CtdlLogPrintf(CTDL_INFO, "Unregistered netproc function\n");
+                       CtdlLogPrintf(CTDL_INFO, "Unregistered delete function\n");
                        p = cur->next;
                        if (cur == DeleteHookTable) {
                                DeleteHookTable = p;
@@ -619,7 +596,7 @@ void CtdlDestroyDeleteHooks(void)
        cur = DeleteHookTable;
        while (cur != NULL)
        {
-               CtdlLogPrintf(CTDL_INFO, "Destroyed netproc function\n");
+               CtdlLogPrintf(CTDL_INFO, "Destroyed delete function\n");
                p = cur->next;
                free(cur);
                cur = p;                
@@ -833,7 +810,7 @@ void CtdlUnregisterServiceHook(int tcp_port, char *sockpath,
                        } else if (tcp_port) {
                                CtdlLogPrintf(CTDL_INFO, "Closed TCP port %d\n", tcp_port);
                        } else {
-                               CtdlLogPrintf(CTDL_INFO, "Unregistered unknown service\n");
+                               CtdlLogPrintf(CTDL_INFO, "Unregistered service \"%s\"\n", cur->ServiceName);
                        }
                        p = cur->next;
                        if (cur == ServiceHookTable) {
@@ -859,7 +836,7 @@ void CtdlDestroyServiceHook(void)
                } else if (cur->tcp_port) {
                        CtdlLogPrintf(CTDL_INFO, "Closed TCP port %d\n", cur->tcp_port);
                } else {
-                       CtdlLogPrintf(CTDL_INFO, "Unregistered unknown service\n");
+                       CtdlLogPrintf(CTDL_INFO, "Destroyed service \"%s\"\n", cur->ServiceName);
                }
                p = cur->next;
                free(cur);