diff options
| author | Matthew Wild <mwild1@gmail.com> | 2013-05-01 13:45:42 +0100 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2013-05-01 13:45:42 +0100 |
| commit | 333918c20296b46b7cd26a54cba1b4c3d51e5862 (patch) | |
| tree | 3e00cd2af58e4602779b13c51761bd86b48ea264 /plugins | |
| parent | 105c76f9673203559c46666b6d1ee25e059175ba (diff) | |
| parent | 37094685f47c050702a6fc2f9cdd9b6b06dccd90 (diff) | |
| download | prosody-333918c20296b46b7cd26a54cba1b4c3d51e5862.tar.gz prosody-333918c20296b46b7cd26a54cba1b4c3d51e5862.zip | |
Merge 0.9->trunk
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/mod_s2s/s2sout.lib.lua | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/plugins/mod_s2s/s2sout.lib.lua b/plugins/mod_s2s/s2sout.lib.lua index a22846db..cb2f8be4 100644 --- a/plugins/mod_s2s/s2sout.lib.lua +++ b/plugins/mod_s2s/s2sout.lib.lua @@ -13,7 +13,7 @@ local wrapclient = require "net.server".wrapclient; local initialize_filters = require "util.filters".initialize; local idna_to_ascii = require "util.encodings".idna.to_ascii; local new_ip = require "util.ip".new_ip; -local rfc3484_dest = require "util.rfc3484".destination; +local rfc6724_dest = require "util.rfc6724".destination; local socket = require "socket"; local adns = require "net.adns"; local dns = require "net.dns"; @@ -191,7 +191,7 @@ function s2sout.try_connect(host_session, connect_host, connect_port, err) if have_other_result then if #IPs > 0 then - rfc3484_dest(host_session.ip_hosts, sources); + rfc6724_dest(host_session.ip_hosts, sources); for i = 1, #IPs do IPs[i] = {ip = IPs[i], port = connect_port}; end @@ -227,7 +227,7 @@ function s2sout.try_connect(host_session, connect_host, connect_port, err) if have_other_result then if #IPs > 0 then - rfc3484_dest(host_session.ip_hosts, sources); + rfc6724_dest(host_session.ip_hosts, sources); for i = 1, #IPs do IPs[i] = {ip = IPs[i], port = connect_port}; end |