Mercurial > prosody-hg
diff core/portmanager.lua @ 5394:3d1de30fefec
Merge 0.9->trunk
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Thu, 28 Mar 2013 12:17:15 +0000 |
| parents | 613959dbd0b2 |
| children | 13454b2b86bf |
line wrap: on
line diff
--- a/core/portmanager.lua Thu Mar 28 12:49:19 2013 +0100 +++ b/core/portmanager.lua Thu Mar 28 12:17:15 2013 +0000 @@ -1,6 +1,7 @@ local config = require "core.configmanager"; local certmanager = require "core.certmanager"; local server = require "net.server"; +local socket = require "socket"; local log = require "util.logger".init("portmanager"); local multitable = require "util.multitable"; @@ -17,9 +18,13 @@ --- Config -local default_interfaces = { "*" }; -local default_local_interfaces = { "127.0.0.1" }; -if config.get("*", "use_ipv6") then +local default_interfaces = { }; +local default_local_interfaces = { }; +if config.get("*", "use_ipv4") ~= false then + table.insert(default_interfaces, "*"); + table.insert(default_local_interfaces, "127.0.0.1"); +end +if socket.tcp6 and config.get("*", "use_ipv6") ~= false then table.insert(default_interfaces, "::"); table.insert(default_local_interfaces, "::1"); end