Mercurial > prosody-hg

comparison core/portmanager.lua @ 5394:3d1de30fefec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge 0.9->trunk
author Matthew Wild <mwild1@gmail.com>
date Thu, 28 Mar 2013 12:17:15 +0000
parents 613959dbd0b2
children 13454b2b86bf
comparison
equal deleted inserted replaced
5382:214c32e10734 5394:3d1de30fefec
1 local config = require "core.configmanager"; 1 local config = require "core.configmanager";
2 local certmanager = require "core.certmanager"; 2 local certmanager = require "core.certmanager";
3 local server = require "net.server"; 3 local server = require "net.server";
4 local socket = require "socket";
4 5
5 local log = require "util.logger".init("portmanager"); 6 local log = require "util.logger".init("portmanager");
6 local multitable = require "util.multitable"; 7 local multitable = require "util.multitable";
7 local set = require "util.set"; 8 local set = require "util.set";
8 9
15 16
16 module "portmanager"; 17 module "portmanager";
17 18
18 --- Config 19 --- Config
19 20
20 local default_interfaces = { "*" }; 21 local default_interfaces = { };
21 local default_local_interfaces = { "127.0.0.1" }; 22 local default_local_interfaces = { };
22 if config.get("*", "use_ipv6") then 23 if config.get("*", "use_ipv4") ~= false then
24 table.insert(default_interfaces, "*");
25 table.insert(default_local_interfaces, "127.0.0.1");
26 end
27 if socket.tcp6 and config.get("*", "use_ipv6") ~= false then
23 table.insert(default_interfaces, "::"); 28 table.insert(default_interfaces, "::");
24 table.insert(default_local_interfaces, "::1"); 29 table.insert(default_local_interfaces, "::1");
25 end 30 end
26 31
27 --- Private state 32 --- Private state