aboutsummaryrefslogtreecommitdiffstats
path: root/plugins/mod_s2s/s2sout.lib.lua
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2017-09-25 23:12:47 +0100
committerMatthew Wild <mwild1@gmail.com>2017-09-25 23:12:47 +0100
commit86ee041be81ad313a24c87b6e38f92fe4400cf17 (patch)
tree69935cea9d1df264c65044bab938330ff25a8a23 /plugins/mod_s2s/s2sout.lib.lua
parenta2e27dd4fb9e2f8a6c1d46958b878f78d872eba8 (diff)
downloadprosody-86ee041be81ad313a24c87b6e38f92fe4400cf17.tar.gz
prosody-86ee041be81ad313a24c87b6e38f92fe4400cf17.zip
mod_s2s: Use a separate resolver object for each outgoing session
Cleaner approach hopefully fixes problems with some peoples' DNS hanging after a while, failed DNS when a large number of queries are made at once, and source port re-use. Related issues: #487, 761, #991, #992, #1001
Diffstat (limited to 'plugins/mod_s2s/s2sout.lib.lua')
-rw-r--r--plugins/mod_s2s/s2sout.lib.lua10
1 files changed, 5 insertions, 5 deletions
diff --git a/plugins/mod_s2s/s2sout.lib.lua b/plugins/mod_s2s/s2sout.lib.lua
index 61d6086e..cd8553e1 100644
--- a/plugins/mod_s2s/s2sout.lib.lua
+++ b/plugins/mod_s2s/s2sout.lib.lua
@@ -49,6 +49,8 @@ function s2sout.initiate_connection(host_session)
initialize_filters(host_session);
host_session.version = 1;
+ host_session.resolver = adns.resolver();
+
-- Kick the connection attempting machine into life
if not s2sout.attempt_connection(host_session) then
-- Intentionally not returning here, the
@@ -84,9 +86,7 @@ function s2sout.attempt_connection(host_session, err)
if not err then -- This is our first attempt
log("debug", "First attempt to connect to %s, starting with SRV lookup...", to_host);
host_session.connecting = true;
- local handle;
- handle = adns.lookup(function (answer)
- handle = nil;
+ host_session.resolver:lookup(function (answer)
local srv_hosts = { answer = answer };
host_session.srv_hosts = srv_hosts;
host_session.srv_choice = 0;
@@ -168,7 +168,7 @@ function s2sout.try_connect(host_session, connect_host, connect_port, err)
local have_other_result = not(has_ipv4) or not(has_ipv6) or false;
if has_ipv4 then
- handle4 = adns.lookup(function (reply, err)
+ handle4 = host_session.resolver:lookup(function (reply, err)
handle4 = nil;
if reply and reply[#reply] and reply[#reply].a then
@@ -206,7 +206,7 @@ function s2sout.try_connect(host_session, connect_host, connect_port, err)
end
if has_ipv6 then
- handle6 = adns.lookup(function (reply, err)
+ handle6 = host_session.resolver:lookup(function (reply, err)
handle6 = nil;
if reply and reply[#reply] and reply[#reply].aaaa then