protect access to the counter by mutex, else we might get race conditions.

[citadel.git] / citadel / modules / smtp / serv_smtpqueue.c

diff --git a/citadel/modules/smtp/serv_smtpqueue.c b/citadel/modules/smtp/serv_smtpqueue.c
index 87fbc3865ab29ac48e912601d32db77dd921c72c..6ce5600728ecde9616b4309d292c39fd522ae632 100644 (file)
--- a/citadel/modules/smtp/serv_smtpqueue.c
+++ b/citadel/modules/smtp/serv_smtpqueue.c
@@ -117,8 +117,10 @@ int DecreaseQReference(OneQueItem *MyQItem)
 {
        int IDestructQueItem;
 
+       citthread_mutex_lock(&ActiveQItemsLock);
        MyQItem->ActiveDeliveries--;
        IDestructQueItem = MyQItem->ActiveDeliveries == 0;
+       citthread_mutex_unlock(&ActiveQItemsLock);
        return IDestructQueItem;
 }
 
@@ -136,16 +138,6 @@ void RemoveQItem(OneQueItem *MyQItem)
        DeleteHashPos(&It);
 }
 
-void FreeURL(ParsedURL** Url)
-{
-       if (*Url != NULL) {
-               FreeStrBuf(&(*Url)->URL);
-               if ((*Url)->Next != NULL)
-                       FreeURL(&(*Url)->Next);
-               free(*Url);
-               *Url = NULL;
-       }
-}
 
 void FreeMailQEntry(void *qv)
 {
@@ -215,7 +207,7 @@ OneQueItem *DeserializeQueueItem(StrBuf *RawQItem, long QueMsgID)
 
        citthread_mutex_lock(&ActiveQItemsLock);
        if (GetHash(ActiveQItems, 
-                   IKEY(Item->QueMsgID), 
+                   IKEY(QueMsgID), 
                    &v))
        {
                /* WHOOPS. somebody else is already working on this. */
@@ -599,78 +591,6 @@ void smtpq_do_bounce(OneQueItem *MyQItem, StrBuf *OMsgTxt)
 
 
 
-int ParseURL(ParsedURL **Url, StrBuf *UrlStr, short DefaultPort)
-{
-       const char *pch, *pEndHost, *pPort, *pCredEnd, *pUserEnd;
-       ParsedURL *url = (ParsedURL *)malloc(sizeof(ParsedURL));
-       memset(url, 0, sizeof(ParsedURL));
-
-       url->af = AF_INET;
-       url->Port =  DefaultPort;
-       /*
-        * http://username:passvoid@[ipv6]:port/url 
-        */
-       url->URL = NewStrBufDup(UrlStr);
-       url->Host = pch = ChrPtr(url->URL);
-       url->LocalPart = strchr(pch, '/');
-       if (url->LocalPart != NULL) {
-               if ((*(url->LocalPart + 1) == '/') && 
-                   (*(url->LocalPart + 2) == ':')) { /* TODO: find default port for this protocol... */
-                       url->Host = url->LocalPart + 3;
-                       url->LocalPart = strchr(url->Host, '/');
-               }
-       }
-       if (url->LocalPart == NULL) {
-               url->LocalPart = pch + StrLength(url->URL);
-       }
-
-       pCredEnd = strchr(pch, '@');
-       if (pCredEnd >= url->LocalPart)
-               pCredEnd = NULL;
-       if (pCredEnd != NULL)
-       {
-               url->User = url->Host;
-               url->Host = pCredEnd + 1;
-               pUserEnd = strchr(url->User, ':');
-               
-               if (pUserEnd > pCredEnd)
-                       pUserEnd = pCredEnd;
-               else {
-                       url->Pass = pUserEnd + 1;
-               }
-               StrBufPeek(url->URL, pUserEnd, 0, '\0');
-               StrBufPeek(url->URL, pCredEnd, 0, '\0');                
-       }
-       
-       pPort = NULL;
-       if (*url->Host == '[') {
-               url->Host ++;
-               pEndHost = strchr(url->Host, ']');
-               if (pEndHost == NULL) {
-                       FreeStrBuf(&url->URL);
-                       free(url);
-                       return 0; /* invalid syntax, no ipv6 */
-               }
-               StrBufPeek(url->URL, pEndHost, 0, '\0');
-               if (*(pEndHost + 1) == ':'){
-                       StrBufPeek(url->URL, pEndHost + 1, 0, '\0');
-                       pPort = pEndHost + 2;
-               }
-               url->af = AF_INET6;
-       }
-       else {
-               pPort = strchr(url->Host, ':');
-               if (pPort != NULL) {
-                       StrBufPeek(url->URL, pPort, 0, '\0');
-                       pPort ++;
-               }
-       }
-       if (pPort != NULL)
-               url->Port = atol(pPort);
-       url->IsIP = inet_pton(url->af, url->Host, &url->Addr);
-       *Url = url;
-       return 1;
-}
 /*
 {
 
@@ -777,8 +697,11 @@ void smtp_do_procmsg(long msgnum, void *userdata) {
                                StrBufExtract_NextToken(One, All, &Pos, '|');
                                if (!ParseURL(Url, One, 25))
                                        CtdlLogPrintf(CTDL_DEBUG, "Failed to parse: %s\n", ChrPtr(One));
-                               else 
+                               else {
+                                       ///if (!Url->IsIP)) /// todo dupe me fork ipv6
                                        Url = &(*Url)->Next;
+                                       
+                               }
                        }
                        FreeStrBuf(&All);
                        FreeStrBuf(&One);
@@ -976,7 +899,7 @@ CTDL_MODULE_INIT(smtp_queu)
 #ifdef EXPERIMENTAL_SMTP_EVENT_CLIENT
        if (!threading)
        {
-               ActiveQItems = NewHash(1, Flathash);
+               ActiveQItems = NewHash(1, lFlathash);
                citthread_mutex_init(&ActiveQItemsLock, NULL);
 
                QItemHandlers = NewHash(0, NULL);