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 65cde8f15354eff3c15ed6e2066ab9bce9b4389e..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;
 }
 
@@ -205,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. */
@@ -695,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);
@@ -894,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);