connlistener, server_select, prosody: Add support for binding to multiple addresses

[prosody.git] / net / connlisteners.lua

diff --git a/net/connlisteners.lua b/net/connlisteners.lua
index 93dce8b3aecb5c179c2bb09e7ee6a41c325af6ef..6a227c9dc576115af0675c55ed5e359ab238dfdf 100644 (file)
--- a/net/connlisteners.lua
+++ b/net/connlisteners.lua
@@ -12,9 +12,13 @@ local listeners_dir = (CFG_SOURCEDIR or ".").."/net/";
 local server = require "net.server";
 local log = require "util.logger".init("connlisteners");
 local tostring = tostring;
+local type = type
+local ipairs = ipairs
 
-local dofile, pcall, error = 
-       dofile, pcall, error
+local dofile, xpcall, error =
+      dofile, xpcall, error
+
+local debug_traceback = debug.traceback;
 
 module "connlisteners"
 
@@ -37,7 +41,7 @@ end
 function get(name)
        local h = listeners[name];
        if not h then
-               local ok, ret = pcall(dofile, listeners_dir..name:gsub("[^%w%-]", "_").."_listener.lua");
+               local ok, ret = xpcall(function() dofile(listeners_dir..name:gsub("[^%w%-]", "_").."_listener.lua") end, debug_traceback);
                if not ok then
                        log("error", "Error while loading listener '%s': %s", tostring(name), tostring(ret));
                        return nil, ret;
@@ -53,7 +57,8 @@ function start(name, udata)
                error("No such connection module: "..name.. (err and (" ("..err..")") or ""), 0);
        end
        
-       local interface = (udata and udata.interface) or h.default_interface or "*";
+       local interfaces = (udata and udata.interface) or h.default_interface or "*";
+       if type(interfaces) == "string" then interfaces = {interfaces}; end
        local port = (udata and udata.port) or h.default_port or error("Can't start listener "..name.." because no port was specified, and it has no default port", 0);
        local mode = (udata and udata.mode) or h.default_mode or 1;
        local ssl = (udata and udata.ssl) or nil;
@@ -62,8 +67,15 @@ function start(name, udata)
        if autossl and not ssl then
                return nil, "no ssl context";
        end
-       
-       return server.addserver(interface, port, h, mode, autossl and ssl or nil);
+
+       ok, err = true, {};
+       for _, interface in ipairs(interfaces) do
+               local handler
+               handler, err[interface] = server.addserver(interface, port, h, mode, autossl and ssl or nil);
+               ok = ok and handler;
+       end
+
+       return ok, err;
 end
 
 return _M;