SMTP-Client: respect MX-Priority in the sequence of attempting delivery.

diff --git a/citadel/modules/smtp/serv_smtpeventclient.c b/citadel/modules/smtp/serv_smtpeventclient.c
index 3a65977ffc12c1dce78d76c1e9c45b83e7daaa09..7ac66f3c19c9c9118601e16ac7e024c4fc4ffc3f 100644 (file)
--- a/citadel/modules/smtp/serv_smtpeventclient.c
+++ b/citadel/modules/smtp/serv_smtpeventclient.c
@@ -372,9 +372,6 @@ eNextState smtp_resolve_mx_record_done(AsyncIO *IO)
        QueryCbDone(IO);
 
        EVS_syslog(LOG_DEBUG, "SMTP: %s\n", __FUNCTION__);
-       pp = &Msg->Relay;
-       while ((pp != NULL) && (*pp != NULL) && ((*pp)->Next != NULL))
-               pp = &(*pp)->Next;
 
        if ((IO->DNS.Query->DNSStatus == ARES_SUCCESS) &&
            (IO->DNS.Query->VParsedDNSReply != NULL))
@@ -390,19 +387,38 @@ eNextState smtp_resolve_mx_record_done(AsyncIO *IO)
 
                                p = (ParsedURL*) malloc(sizeof(ParsedURL));
                                memset(p, 0, sizeof(ParsedURL));
+                               p->Priority = Msg->CurrMX->priority;
                                p->IsIP = 0;
                                p->Port = DefaultMXPort;
                                p->IPv6 = i == 1;
                                p->Host = Msg->CurrMX->host;
-
-                               *pp = p;
-                               pp = &p->Next;
+                               if (Msg->Relay == NULL)
+                                       Msg->Relay = p;
+                               else {
+                                       ParsedURL *pp = Msg->Relay;
+
+                                       while ((pp->Next != NULL) &&
+                                              (pp->Next->Priority <= p->Priority))
+                                              pp = pp->Next;
+                                       if ((pp == Msg->Relay) &&
+                                           (pp->Priority > p->Priority)) {
+                                               p->Next = Msg->Relay;
+                                               Msg->Relay = p;
+                                       }
+                                       else {
+                                               p->Next = pp->Next;
+                                               pp->Next = p;
+                                       }
+                               }
                        }
                        Msg->CurrMX    = Msg->CurrMX->next;
                }
                Msg->CXFlags   = Msg->CXFlags & F_HAVE_MX;
        }
        else { /* else fall back to the plain hostname */
+               pp = &Msg->Relay;
+               while ((pp != NULL) && (*pp != NULL) && ((*pp)->Next != NULL))
+                       pp = &(*pp)->Next;
                int i;
                for (i = 0; i < 2; i++) {
                        ParsedURL *p;

diff --git a/libcitadel/lib/libcitadel.h b/libcitadel/lib/libcitadel.h
index 7f3da262d78b2ac5d407a1318142c2a1e6514f94..a0a70305a574fc8d45674910de43054463f6d12c 100644 (file)
--- a/libcitadel/lib/libcitadel.h
+++ b/libcitadel/lib/libcitadel.h
@@ -369,6 +369,7 @@ const char *GetIconFilename(char *MimeType, size_t len);
 /* URL parsing & connection data */
 typedef struct ParsedURL ParsedURL;
 struct ParsedURL {
+       int Priority;
        StrBuf *URL;
        StrBuf *UrlWithoutCred;
        StrBuf *CurlCreds;