mirrors/prosody
1
0
Fork 0
mirror of https://github.com/bjc/prosody.git synced 2025-04-06 22:57:38 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

mod_s2s/s2sout.lib: Use new util.net.local_addresses() to fetch local interface addresses

Browse source
This commit is contained in:
Matthew Wild 2013-06-18 12:12:12 +01:00
parent 28e1592c0c
commit f538d14ed4
1 changed files with 5 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

17
plugins/mod_s2s/s2sout.lib.lua
View file

@ -19,6 +19,7 @@ local adns = require "net.adns";
local dns = require "net.dns";
local t_insert, t_sort, ipairs = table.insert, table.sort, ipairs;
local st = require "util.stanza";
local local_addresses = require "util.net".local_addresses;
local s2s_destroy_session = require "core.s2smanager".destroy_session;
@ -333,20 +334,12 @@ module:hook_global("service-added", function (event)
end
for source, _ in pairs(s2s_sources) do
if source == "*" or source == "0.0.0.0" then
if not socket.local_addresses then
sources[#sources + 1] = new_ip("0.0.0.0", "IPv4");
else
for _, addr in ipairs(socket.local_addresses("ipv4", true)) do
sources[#sources + 1] = new_ip(addr, "IPv4");
end
for _, addr in ipairs(local_addresses("ipv4", true)) do
sources[#sources + 1] = new_ip(addr, "IPv4");
end
elseif source == "::" then
if not socket.local_addresses then
sources[#sources + 1] = new_ip("::", "IPv6");
else
for _, addr in ipairs(socket.local_addresses("ipv6", true)) do
sources[#sources + 1] = new_ip(addr, "IPv6");
end
for _, addr in ipairs(local_addresses("ipv6", true)) do
sources[#sources + 1] = new_ip(addr, "IPv6");
end
else
sources[#sources + 1] = new_ip(source, (source:find(":") and "IPv6") or "IPv4");