diff options
author | Kim Alvefur <zash@zash.se> | 2015-11-09 22:56:32 +0100 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2015-11-09 22:56:32 +0100 |
commit | dd417c0f4a850be9280c2589f0a582aa0d7d566d (patch) | |
tree | 3e6fc617741dec52b661ba121b7949d6b284399d /plugins/mod_s2s | |
parent | 1407c9f7a72c9e27efb9983554e7579d157aecc6 (diff) | |
parent | 5d077a0c17dbe89c2481cdebd18f4051dd2d10ae (diff) | |
download | prosody-dd417c0f4a850be9280c2589f0a582aa0d7d566d.tar.gz prosody-dd417c0f4a850be9280c2589f0a582aa0d7d566d.zip |
Merge 0.10->trunk
Diffstat (limited to 'plugins/mod_s2s')
-rw-r--r-- | plugins/mod_s2s/s2sout.lib.lua | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/plugins/mod_s2s/s2sout.lib.lua b/plugins/mod_s2s/s2sout.lib.lua index 7c6033a3..395406cd 100644 --- a/plugins/mod_s2s/s2sout.lib.lua +++ b/plugins/mod_s2s/s2sout.lib.lua @@ -103,11 +103,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 |