aboutsummaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2009-09-21 14:42:29 +0100
committerMatthew Wild <mwild1@gmail.com>2009-09-21 14:42:29 +0100
commit3f47ff7634d43c5e8c4dcbc502344cd53d6ffcb4 (patch)
tree73510b521fc690f45cefeac2d0b61411ed51247a /core
parent9b64edcf81c16e0aaee7456306cfd991cd2332d8 (diff)
parent46e4ac25f4f8e0ba69a3b852573dd5892406fd00 (diff)
downloadprosody-3f47ff7634d43c5e8c4dcbc502344cd53d6ffcb4.tar.gz
prosody-3f47ff7634d43c5e8c4dcbc502344cd53d6ffcb4.zip
Merge with 0.5
Diffstat (limited to 'core')
-rw-r--r--core/s2smanager.lua6
1 files changed, 5 insertions, 1 deletions
diff --git a/core/s2smanager.lua b/core/s2smanager.lua
index fbce0c2b..118bbf0c 100644
--- 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;
@@ -255,9 +256,12 @@ function try_connect(host_session, connect_host, connect_port)
-- COMPAT: This is a compromise for all you CNAME-(ab)users :)
if not (reply and reply[1] and reply[1].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
+ 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");
+ count = count - 1;
end
end
-- end of CNAME resolving