util.pposix: Compatibility with Solaris systems (thanks Filip)

[prosody.git] / core / s2smanager.lua

diff --git a/core/s2smanager.lua b/core/s2smanager.lua
index 6388168fb1b4b518ac3b6d9b10999d3f1325efbf..daf2c871f8da6e7deb7008c735db625eea9cb72c 100644 (file)
--- a/core/s2smanager.lua
+++ b/core/s2smanager.lua
@@ -41,6 +41,7 @@ local adns, dns = require "net.adns", require "net.dns";
 
 local connect_timeout = config.get("*", "core", "s2s_timeout") or 60;
 local dns_timeout = config.get("*", "core", "dns_timeout") or 60;
+local max_dns_depth = config.get("*", "core", "dns_max_depth") or 3;
 
 incoming_s2s = {};
 local incoming_s2s = incoming_s2s;
@@ -127,6 +128,7 @@ function new_incoming(conn)
        end
        open_sessions = open_sessions + 1;
        local w, log = conn.write, logger_init("s2sin"..tostring(conn):match("[a-f0-9]+$"));
+       session.log = log;
        session.sends2s = function (t) log("debug", "sending: %s", tostring(t)); w(tostring(t)); end
        incoming_s2s[session] = true;
        add_task(connect_timeout, function ()
@@ -253,17 +255,20 @@ function try_connect(host_session, connect_host, connect_port)
                host_session.connecting = nil;
                
                -- COMPAT: This is a compromise for all you CNAME-(ab)users :)
-               if not (reply and reply[1] and reply[1].a) then
+               if not (reply and reply[#reply] and reply[#reply].a) then
+                       local count = max_dns_depth;
                        reply = dns.peek(connect_host, "CNAME", "IN");
-                       while reply and reply[1] and not reply[1].a and reply[1].cname do
-                               reply = dns.peek(reply[1].cname, "A", "IN") or dns.peek(reply[1].cname, "CNAME", "IN");
+                       while count > 0 and reply and reply[#reply] and not reply[#reply].a and reply[#reply].cname do
+                               log("debug", "Looking up %s (DNS depth is %d)", tostring(reply[#reply].cname), count);
+                               reply = dns.peek(reply[#reply].cname, "A", "IN") or dns.peek(reply[#reply].cname, "CNAME", "IN");
+                               count = count - 1;
                        end
                end
                -- end of CNAME resolving
                
-               if reply and reply[1] and reply[1].a then
-                       log("debug", "DNS reply for %s gives us %s", connect_host, reply[1].a);
-                       return make_connect(host_session, reply[1].a, connect_port);
+               if reply and reply[#reply] and reply[#reply].a then
+                       log("debug", "DNS reply for %s gives us %s", connect_host, reply[#reply].a);
+                       return make_connect(host_session, reply[#reply].a, connect_port);
                else
                        log("debug", "DNS lookup failed to get a response for %s", connect_host);
                        if not attempt_connection(host_session, "name resolution failed") then -- Retry if we can