Add busines logic for toggling multiple mx records etc.

[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 26c7e555dd47a7f141aae25da3fffb1ab236f4c4..87fbc3865ab29ac48e912601d32db77dd921c72c 100644 (file)
--- a/citadel/modules/smtp/serv_smtpqueue.c
+++ b/citadel/modules/smtp/serv_smtpqueue.c
@@ -88,20 +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, 
-             ParsedURL *RelayUrls);
+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)
@@ -117,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;
 }
 
@@ -140,9 +138,13 @@ void RemoveQItem(OneQueItem *MyQItem)
 
 void FreeURL(ParsedURL** Url)
 {
-       FreeStrBuf(&(*Url)->URL);
-       free(*Url);
-       *Url = NULL;
+       if (*Url != NULL) {
+               FreeStrBuf(&(*Url)->URL);
+               if ((*Url)->Next != NULL)
+                       FreeURL(&(*Url)->Next);
+               free(*Url);
+               *Url = NULL;
+       }
 }
 
 void FreeMailQEntry(void *qv)
@@ -416,7 +418,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] );
@@ -645,9 +647,11 @@ int ParseURL(ParsedURL **Url, StrBuf *UrlStr, short DefaultPort)
                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;
@@ -779,6 +783,26 @@ void smtp_do_procmsg(long msgnum, void *userdata) {
                        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);
@@ -793,18 +817,28 @@ void smtp_do_procmsg(long msgnum, void *userdata) {
        if (MyQItem->ActiveDeliveries > 0)
        {
                int n = MsgCount++;
+               int m = MyQItem->ActiveDeliveries;
                int i = 1;
                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 == MyQItem->ActiveDeliveries);
+                               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, KeepBuffers, n, RelayUrls);
+                               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++;
                        }