aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2013-06-18 12:11:40 +0100
committerMatthew Wild <mwild1@gmail.com>2013-06-18 12:11:40 +0100
commit28e1592c0c34865d1583efc8d6aaf1740f22e439 (patch)
treed4b603b1c84d57c06ed69ee173f6712510eaadac
parentc4d2d22648a98a1dbef3dd7f3dfa292c6b3a7370 (diff)
downloadprosody-28e1592c0c34865d1583efc8d6aaf1740f22e439.tar.gz
prosody-28e1592c0c34865d1583efc8d6aaf1740f22e439.zip
mod_s2s/s2sout.lib: Only attempt to create an IPv6 socket if LuaSocket supports IPv6
-rw-r--r--plugins/mod_s2s/s2sout.lib.lua7
1 files changed, 5 insertions, 2 deletions
diff --git a/plugins/mod_s2s/s2sout.lib.lua b/plugins/mod_s2s/s2sout.lib.lua
index cb2f8be4..9e26dbee 100644
--- a/plugins/mod_s2s/s2sout.lib.lua
+++ b/plugins/mod_s2s/s2sout.lib.lua
@@ -276,10 +276,13 @@ function s2sout.make_connect(host_session, connect_host, connect_port)
host_session.secure = nil;
local conn, handler;
- if connect_host.proto == "IPv4" then
+ local proto = connect_host.proto;
+ if proto == "IPv4" then
conn, handler = socket.tcp();
- else
+ elseif proto == "IPv6" and socket.tcp6 then
conn, handler = socket.tcp6();
+ else
+ handler = "Unsupported protocol: "..tostring(proto);
end
if not conn then