Free all our allocated resources after notifying / sending a http request.

[citadel.git] / citadel / modules / extnotify / extnotify_main.c

diff --git a/citadel/modules/extnotify/extnotify_main.c b/citadel/modules/extnotify/extnotify_main.c
index db1967eba78e5dd4651f3df46375c7a8ebed8ab5..5ab54c2c7d54aa28ff16d9a9bdfc27d6da5241b0 100644 (file)
--- a/citadel/modules/extnotify/extnotify_main.c
+++ b/citadel/modules/extnotify/extnotify_main.c
@@ -68,7 +68,7 @@
 
 #include "ctdl_module.h"
 
-
+struct CitContext extnotify_queue_CC;
 
 void ExtNotify_PutErrorMessage(NotifyContext *Ctx, StrBuf *ErrMsg)
 {
@@ -92,7 +92,7 @@ StrBuf* GetNHBuf(int i, int allocit, StrBuf **NotifyHostList)
 }
 
 
-StrBuf** GetNotifyHosts(void)
+int GetNotifyHosts(NotifyContext *Ctx)
 {
        char NotifyHostsBuf[SIZ];
        StrBuf *Host;
@@ -101,22 +101,20 @@ StrBuf** GetNotifyHosts(void)
        int notify;
        const char *pchs, *pche;
        const char *NextHost = NULL;
-       StrBuf **NotifyHostList;
-       int num_notify;
 
        /* See if we have any Notification Hosts configured */
-       num_notify = get_hosts(NotifyHostsBuf, "notify");
-       if (num_notify < 1)
-               return(NULL);
+       Ctx->nNotifyHosts = get_hosts(NotifyHostsBuf, "notify");
+       if (Ctx->nNotifyHosts < 1)
+               return 0;
 
-       NotifyHostList = malloc(sizeof(StrBuf*) * 2 * (num_notify + 1));
-       memset(NotifyHostList, 0, sizeof(StrBuf*) * 2 * (num_notify + 1));
+       Ctx->NotifyHostList = malloc(sizeof(StrBuf*) * 2 * (Ctx->nNotifyHosts + 1));
+       memset(Ctx->NotifyHostList, 0, sizeof(StrBuf*) * 2 * (Ctx->nNotifyHosts + 1));
        
        NotifyBuf = NewStrBufPlain(NotifyHostsBuf, -1);
        /* get all configured notifiers's */
-        for (notify=0; notify<num_notify; notify++) {
+        for (notify=0; notify<Ctx->nNotifyHosts; notify++) {
                
-               Host = GetNHBuf(notify * 2, 1, NotifyHostList);
+               Host = GetNHBuf(notify * 2, 1, Ctx->NotifyHostList);
                StrBufExtract_NextToken(Host, NotifyBuf, &NextHost, '|');
                pchs = ChrPtr(Host);
                pche = strchr(pchs, ':');
@@ -126,11 +124,12 @@ StrBuf** GetNotifyHosts(void)
                                      pchs);
                        continue;
                }
-               File = GetNHBuf(notify * 2 + 1, 1, NotifyHostList);
+               File = GetNHBuf(notify * 2 + 1, 1, Ctx->NotifyHostList);
                StrBufPlain(File, pchs, pche - pchs);
                StrBufCutLeft(Host, pche - pchs + 1);
        }
-       return NotifyHostList;
+       FreeStrBuf(&NotifyBuf);
+       return Ctx->nNotifyHosts;
 }
 
 
@@ -183,6 +182,7 @@ eNotifyType extNotify_getConfigMessage(char *username, char **PagerNumber, char
                }
        }
        
+       free(msglist);
        if (msg == NULL)
                return eNone;
 
@@ -261,6 +261,7 @@ void process_notify(long NotifyMsgnum, void *usrdata)
        char remoteurl[SIZ];
        char *FreeMe = NULL;
        char *PagerNo;
+       CitContext *SubC;
 
        Ctx = (NotifyContext*) usrdata;
 
@@ -281,13 +282,17 @@ void process_notify(long NotifyMsgnum, void *usrdata)
                                 config.c_funambol_host,
                                 config.c_funambol_port,
                                 FUNAMBOL_WS);
+
+                       SubC = CloneContext (CC);
+                       SubC->session_specific_data = NULL;// (char*) DupNotifyContext(Ctx);
+                       
                        notify_http_server(remoteurl, 
                                           file_funambol_msg,
                                           strlen(file_funambol_msg),/*GNA*/
                                           msg->cm_fields['W'], 
                                           msg->cm_fields['I'],
                                           msgnum, 
-                                          Ctx);
+                                          NULL);
                        break;
                case eHttpMessages:
                {
@@ -297,7 +302,7 @@ void process_notify(long NotifyMsgnum, void *usrdata)
                        StrBuf *File;
                        StrBuf *FileBuf = NewStrBuf();
                
-                       while(1)
+                       for (i = 0; i < Ctx->nNotifyHosts; i++)
                        {
 
                                URL = GetNHBuf(i*2, 0, Ctx->NotifyHostList);
@@ -313,14 +318,15 @@ void process_notify(long NotifyMsgnum, void *usrdata)
                                        FlushStrBuf(FileBuf);
                                memcpy(URLBuf, ChrPtr(URL), StrLength(URL) + 1);
 
+                               SubC = CloneContext (CC);
+                               SubC->session_specific_data = NULL;// (char*) DupNotifyContext(Ctx);
                                notify_http_server(URLBuf, 
                                                   ChrPtr(FileBuf),
                                                   StrLength(FileBuf),
                                                   msg->cm_fields['W'], 
                                                   msg->cm_fields['I'],
                                                   msgnum, 
-                                                  Ctx);
-                               i++;
+                                                  NULL);
                        }
                        FreeStrBuf(&FileBuf);
                } 
@@ -358,10 +364,9 @@ void process_notify(long NotifyMsgnum, void *usrdata)
  */
 void do_extnotify_queue(void) 
 {
-
        NotifyContext Ctx;
        static int doing_queue = 0;
-       //int i = 0;
+       int i = 0;
     
        /*
         * This is a simple concurrency check to make sure only one queue run
@@ -380,22 +385,37 @@ void do_extnotify_queue(void)
        if (doing_queue) return;
        doing_queue = 1;
 
+       citthread_setspecific(MyConKey, (void *)&extnotify_queue_CC);
+
        /*
         * Go ahead and run the queue
         */
        CtdlLogPrintf(CTDL_DEBUG, "serv_extnotify: processing notify queue\n");
-    
+
        memset(&Ctx, 0, sizeof(NotifyContext));
-       Ctx.NotifyHostList = GetNotifyHosts();
-       if (CtdlGetRoom(&CC->room, FNBL_QUEUE_ROOM) != 0) {
+       if ((GetNotifyHosts(&Ctx) > 0) && 
+           (CtdlGetRoom(&CC->room, FNBL_QUEUE_ROOM) != 0))
+       {
                CtdlLogPrintf(CTDL_ERR, "Cannot find room <%s>\n", FNBL_QUEUE_ROOM);
                CtdlClearSystemContext();
+               if (Ctx.nNotifyHosts > 0)
+               {
+                       for (i = 0; i < Ctx.nNotifyHosts * 2; i++)
+                               FreeStrBuf(&Ctx.NotifyHostList[i]);
+                       free(Ctx.NotifyHostList);
+               }
                return;
        }
        CtdlForEachMessage(MSGS_ALL, 0L, NULL,
                           SPOOLMIME, NULL, process_notify, &Ctx);
        CtdlLogPrintf(CTDL_DEBUG, "serv_extnotify: queue run completed\n");
        doing_queue = 0;
+       if (Ctx.nNotifyHosts > 0)
+       {
+               for (i = 0; i < Ctx.nNotifyHosts * 2; i++)
+                       FreeStrBuf(&Ctx.NotifyHostList[i]);
+               free(Ctx.NotifyHostList);
+       }
 }
 
 
@@ -410,6 +430,8 @@ void create_extnotify_queue(void) {
        struct ctdlroom qrbuf;
     
        CtdlCreateRoom(FNBL_QUEUE_ROOM, 3, "", 0, 1, 0, VIEW_MAILBOX);
+
+       CtdlFillSystemContext(&extnotify_queue_CC, "Extnotify");
     
        /*
         * Make sure it's set to be a "system room" so it doesn't show up