aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2009-09-27 11:59:11 +0100
committerMatthew Wild <mwild1@gmail.com>2009-09-27 11:59:11 +0100
commitf647dddfc8b571ac27de3917c7f38f014e2a2096 (patch)
tree2aa4065e4838e197a97188ffdd9318ab4fc58be4
parent4248f6078f66b450a2e9dc5e310ef10c3ed87bb0 (diff)
downloadprosody-f647dddfc8b571ac27de3917c7f38f014e2a2096.tar.gz
prosody-f647dddfc8b571ac27de3917c7f38f014e2a2096.zip
core.s2smanager: Always use last record in the DNS cache
-rw-r--r--core/s2smanager.lua14
1 files changed, 7 insertions, 7 deletions
diff --git a/core/s2smanager.lua b/core/s2smanager.lua
index ce8da1e6..e11b305a 100644
--- a/core/s2smanager.lua
+++ b/core/s2smanager.lua
@@ -254,20 +254,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 count > 0 and reply and reply[1] and not reply[1].a and reply[1].cname do
- log("debug", "Looking up %s (DNS depth is %d)", tostring(reply[1].cname), count);
- 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