Merge 0.9->0.10

[prosody.git] / plugins / mod_s2s / s2sout.lib.lua

diff --git a/plugins/mod_s2s/s2sout.lib.lua b/plugins/mod_s2s/s2sout.lib.lua
index ec8ea4d47941e7bc7faddd2cc5b751edbc3b4c4d..4241316469e35bfce1fc237fa05c251d37fec367 100644 (file)
--- a/plugins/mod_s2s/s2sout.lib.lua
+++ b/plugins/mod_s2s/s2sout.lib.lua
@@ -29,7 +29,6 @@ local has_ipv4, has_ipv6;
 
 local dns_timeout = module:get_option_number("dns_timeout", 15);
 dns.settimeout(dns_timeout);
-local max_dns_depth = module:get_option_number("dns_max_depth", 3);
 
 local s2sout = {};
 
@@ -86,11 +85,12 @@ function s2sout.attempt_connection(host_session, err)
                local handle;
                handle = adns.lookup(function (answer)
                        handle = nil;
+                       local srv_hosts = { answer = answer };
+                       host_session.srv_hosts = srv_hosts;
+                       host_session.srv_choice = 0;
                        host_session.connecting = nil;
                        if answer and #answer > 0 then
                                log("debug", "%s has SRV records, handling...", to_host);
-                               local srv_hosts = { answer = answer };
-                               host_session.srv_hosts = srv_hosts;
                                for _, record in ipairs(answer) do
                                        t_insert(srv_hosts, record.srv);
                                end
@@ -169,18 +169,6 @@ function s2sout.try_connect(host_session, connect_host, connect_port, err)
                        handle4 = adns.lookup(function (reply, err)
                                handle4 = nil;
 
-                               -- COMPAT: This is a compromise for all you CNAME-(ab)users :)
-                               if not (reply and reply[#reply] and reply[#reply].a) then
-                                       local count = max_dns_depth;
-                                       reply = dns.peek(connect_host, "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[#reply] and reply[#reply].a then
                                        for _, ip in ipairs(reply) do
                                                log("debug", "DNS reply for %s gives us %s", connect_host, ip.a);
@@ -270,6 +258,7 @@ function s2sout.make_connect(host_session, connect_host, connect_port)
        -- Reset secure flag in case this is another
        -- connection attempt after a failed STARTTLS
        host_session.secure = nil;
+       host_session.encrypted = nil;
 
        local conn, handler;
        local proto = connect_host.proto;
@@ -296,21 +285,6 @@ function s2sout.make_connect(host_session, connect_host, connect_port)
        conn = wrapclient(conn, connect_host.addr, connect_port, s2s_listener, "*a");
        host_session.conn = conn;
 
-       local filter = initialize_filters(host_session);
-       local w, log = conn.write, host_session.log;
-       host_session.sends2s = function (t)
-               log("debug", "sending: %s", (t.top_tag and t:top_tag()) or t:match("^[^>]*>?"));
-               if t.name then
-                       t = filter("stanzas/out", t);
-               end
-               if t then
-                       t = filter("bytes/out", tostring(t));
-                       if t then
-                               return w(conn, tostring(t));
-                       end
-               end
-       end
-
        -- Register this outgoing connection so that xmppserver_listener knows about it
        -- otherwise it will assume it is a new incoming connection
        s2s_listener.register_outgoing(conn, host_session);
@@ -347,6 +321,9 @@ module:hook_global("service-added", function (event)
                        has_ipv4 = true;
                end
        end
+       if not (has_ipv4 or has_ipv6)  then
+               module:log("warn", "No local IPv4 or IPv6 addresses detected, outgoing connections may fail");
+       end
 end);
 
 return s2sout;