use long hash function, if we intend to use long values as keys, else we won't find...

[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 eb4d3f17bff899e87dd9033c78d4bbba23fc97a7..6b46164c611e399605d040268bc0f6116c26d97a 100644 (file)
--- a/citadel/modules/smtp/serv_smtpqueue.c
+++ b/citadel/modules/smtp/serv_smtpqueue.c
@@ -88,19 +88,20 @@
 #include "smtpqueue.h"
 #include "event_client.h"
 
-HashList *QItemHandlers = NULL;
 
 citthread_mutex_t ActiveQItemsLock;
-HashList *ActiveQItems = NULL;
+HashList *ActiveQItems  = NULL;
+HashList *QItemHandlers = NULL;
 
-int MsgCount = 0;
-int run_queue_now = 0; /* Set to 1 to ignore SMTP send retry times */
+int MsgCount            = 0;
+int run_queue_now       = 0;   /* Set to 1 to ignore SMTP send retry times */
 
-void smtp_try(OneQueItem *MyQItem, 
-             MailQEntry *MyQEntry, 
-             StrBuf *MsgText, 
-             int KeepMsgText, /* KeepMsgText allows us to use MsgText as ours. */
-             int MsgCount);
+void smtp_try_one_queue_entry(OneQueItem *MyQItem, 
+                             MailQEntry *MyQEntry, 
+                             StrBuf *MsgText, 
+                             int KeepMsgText, /* KeepMsgText allows us to use MsgText as ours. */
+                             int MsgCount, 
+                             ParsedURL *RelayUrls);
 
 
 void smtp_evq_cleanup(void)
@@ -116,10 +117,8 @@ int DecreaseQReference(OneQueItem *MyQItem)
 {
        int IDestructQueItem;
 
-       citthread_mutex_lock(&ActiveQItemsLock);
        MyQItem->ActiveDeliveries--;
        IDestructQueItem = MyQItem->ActiveDeliveries == 0;
-       citthread_mutex_unlock(&ActiveQItemsLock);
        return IDestructQueItem;
 }
 
@@ -138,7 +137,6 @@ void RemoveQItem(OneQueItem *MyQItem)
 }
 
 
-
 void FreeMailQEntry(void *qv)
 {
        MailQEntry *Q = qv;
@@ -151,6 +149,7 @@ void FreeQueItem(OneQueItem **Item)
        DeleteHash(&(*Item)->MailQEntries);
        FreeStrBuf(&(*Item)->EnvelopeFrom);
        FreeStrBuf(&(*Item)->BounceTo);
+       FreeURL(&(*Item)->URL);
        free(*Item);
        Item = NULL;
 }
@@ -206,7 +205,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. */
@@ -409,7 +408,7 @@ StrBuf *smtp_load_msg(OneQueItem *MyQItem, int n)
        if ((StrLength(SendMsg) > 0) && 
            ChrPtr(SendMsg)[StrLength(SendMsg) - 1] != '\n') {
                CtdlLogPrintf(CTDL_WARNING, 
-                             "SMTP client[%ld]: Possible problem: message did not "
+                             "SMTP client[%d]: Possible problem: message did not "
                              "correctly terminate. (expecting 0x10, got 0x%02x)\n",
                              MsgCount, //yes uncool, but best choice here... 
                              ChrPtr(SendMsg)[StrLength(SendMsg) - 1] );
@@ -588,6 +587,15 @@ void smtpq_do_bounce(OneQueItem *MyQItem, StrBuf *OMsgTxt)
        CtdlLogPrintf(CTDL_DEBUG, "Done processing bounces\n");
 }
 
+
+
+/*
+{
+
+       if (threadding)
+               n_smarthosts =  get_hosts(char *mxbuf, char *rectype);
+}
+*/
 /*
  * smtp_do_procmsg()
  *
@@ -603,7 +611,11 @@ void smtp_do_procmsg(long msgnum, void *userdata) {
        void *vQE;
        long len;
        const char *Key;
-
+       int nRelays = 0;
+       ParsedURL *RelayUrls = NULL;
+       int HaveBuffers = 0;
+       StrBuf *Msg =NULL;
+       
        CtdlLogPrintf(CTDL_DEBUG, "SMTP Queue: smtp_do_procmsg(%ld)\n", msgnum);
        ///strcpy(envelope_from, "");
 
@@ -668,6 +680,52 @@ void smtp_do_procmsg(long msgnum, void *userdata) {
                return;
        }
 
+       {
+               char mxbuf[SIZ];
+               ParsedURL **Url = &MyQItem->URL;
+               nRelays = get_hosts(mxbuf, "smarthost");
+               if (nRelays > 0) {
+                       StrBuf *All;
+                       StrBuf *One;
+                       const char *Pos = NULL;
+                       All = NewStrBufPlain(mxbuf, -1);
+                       One = NewStrBufPlain(NULL, StrLength(All) + 1);
+                       
+                       while ((Pos != StrBufNOTNULL) && ((Pos == NULL) || !IsEmptyStr(Pos))) {
+                               StrBufExtract_NextToken(One, All, &Pos, '|');
+                               if (!ParseURL(Url, One, 25))
+                                       CtdlLogPrintf(CTDL_DEBUG, "Failed to parse: %s\n", ChrPtr(One));
+                               else {
+                                       ///if (!Url->IsIP)) /// todo dupe me fork ipv6
+                                       Url = &(*Url)->Next;
+                                       
+                               }
+                       }
+                       FreeStrBuf(&All);
+                       FreeStrBuf(&One);
+               }
+
+               Url = &MyQItem->FallBackHost;
+               nRelays = get_hosts(mxbuf, "fallbackhost");
+               if (nRelays > 0) {
+                       StrBuf *All;
+                       StrBuf *One;
+                       const char *Pos = NULL;
+                       All = NewStrBufPlain(mxbuf, -1);
+                       One = NewStrBufPlain(NULL, StrLength(All) + 1);
+                       
+                       while ((Pos != StrBufNOTNULL) && ((Pos == NULL) || !IsEmptyStr(Pos))) {
+                               StrBufExtract_NextToken(One, All, &Pos, '|');
+                               if (!ParseURL(Url, One, 25))
+                                       CtdlLogPrintf(CTDL_DEBUG, "Failed to parse: %s\n", ChrPtr(One));
+                               else 
+                                       Url = &(*Url)->Next;
+                       }
+                       FreeStrBuf(&All);
+                       FreeStrBuf(&One);
+               }
+       }
+
        It = GetNewHashPos(MyQItem->MailQEntries, 0);
        while (GetNextHashPos(MyQItem->MailQEntries, It, &len, &Key, &vQE))
        {
@@ -680,17 +738,29 @@ void smtp_do_procmsg(long msgnum, void *userdata) {
        if (MyQItem->ActiveDeliveries > 0)
        {
                int n = MsgCount++;
+               int m = MyQItem->ActiveDeliveries;
                int i = 1;
-               StrBuf *Msg = smtp_load_msg(MyQItem, n);
+               Msg = smtp_load_msg(MyQItem, n);
                It = GetNewHashPos(MyQItem->MailQEntries, 0);
-               while ((i <= MyQItem->ActiveDeliveries) && 
+               while ((i <= m) && 
                       (GetNextHashPos(MyQItem->MailQEntries, It, &len, &Key, &vQE)))
                {
                        MailQEntry *ThisItem = vQE;
                        if (ThisItem->Active == 1) {
+                               int KeepBuffers = (i == m);
                                if (i > 1) n = MsgCount++;
-                               CtdlLogPrintf(CTDL_DEBUG, "SMTP Queue: Trying <%s>\n", ChrPtr(ThisItem->Recipient));
-                               smtp_try(MyQItem, ThisItem, Msg, (i == MyQItem->ActiveDeliveries), n);
+                               CtdlLogPrintf(CTDL_DEBUG, 
+                                             "SMTP Queue: Trying <%s> %d / %d \n", 
+                                             ChrPtr(ThisItem->Recipient), 
+                                             i, 
+                                             m);
+                               smtp_try_one_queue_entry(MyQItem, 
+                                                        ThisItem, 
+                                                        Msg, 
+                                                        KeepBuffers, 
+                                                        n, 
+                                                        RelayUrls);
+                               if (KeepBuffers) HaveBuffers = 1;
                                i++;
                        }
                }
@@ -711,6 +781,10 @@ void smtp_do_procmsg(long msgnum, void *userdata) {
 // TODO: bounce & delete?
 
        }
+       if (!HaveBuffers) {
+               FreeStrBuf (&Msg);
+// TODO : free RelayUrls
+       }
 }
 
 
@@ -823,7 +897,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);