Merge Tobias->trunk

[prosody.git] / net / connlisteners.lua

diff --git a/net/connlisteners.lua b/net/connlisteners.lua
index 932cd9cb53bb00a4670cf1a1a1676ee463910dd3..e13f85deb71cd55c38a867b7b9aecfda79c4435a 100644 (file)
--- a/net/connlisteners.lua
+++ b/net/connlisteners.lua
@@ -1,6 +1,6 @@
 -- Prosody IM
--- Copyright (C) 2008-2009 Matthew Wild
--- Copyright (C) 2008-2009 Waqas Hussain
+-- Copyright (C) 2008-2010 Matthew Wild
+-- Copyright (C) 2008-2010 Waqas Hussain
 -- 
 -- This project is MIT/X11 licensed. Please see the
 -- COPYING file in the source package for more information.
@@ -13,8 +13,8 @@ local server = require "net.server";
 local log = require "util.logger".init("connlisteners");
 local tostring = tostring;
 
-local dofile, pcall, error = 
-       dofile, pcall, error
+local dofile, pcall, error =
+      dofile, pcall, error
 
 module "connlisteners"
 
@@ -38,7 +38,10 @@ function get(name)
        local h = listeners[name];
        if not h then
                local ok, ret = pcall(dofile, listeners_dir..name:gsub("[^%w%-]", "_").."_listener.lua");
-               if not ok then return nil, ret; end
+               if not ok then
+                       log("error", "Error while loading listener '%s': %s", tostring(name), tostring(ret));
+                       return nil, ret;
+               end
                h = listeners[name];
        end
        return h;
@@ -50,17 +53,17 @@ function start(name, udata)
                error("No such connection module: "..name.. (err and (" ("..err..")") or ""), 0);
        end
        
-       if udata then
-               if (udata.type == "ssl" or udata.type == "tls") and not udata.ssl then
-                       error("No SSL context supplied for a "..tostring(udata.type):upper().." connection!", 0);
-               elseif udata.ssl and udata.type == "tcp" then
-                       error("SSL context supplied for a TCP connection!", 0);
-               end
+       local interface = (udata and udata.interface) or h.default_interface or "*";
+       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;
+       local autossl = udata and udata.type == "ssl";
+       
+       if autossl and not ssl then
+               return nil, "no ssl context";
        end
        
-       return server.addserver(h, 
-                       (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), 
-                               (udata and udata.interface) or h.default_interface or "*", (udata and udata.mode) or h.default_mode or 1, (udata and udata.ssl) or nil, 99999999, udata and udata.type == "ssl");
+       return server.addserver(interface, port, h, mode, autossl and ssl or nil);
 end
 
 return _M;