Merge Tobias->trunk

[prosody.git] / net / connlisteners.lua

diff --git a/net/connlisteners.lua b/net/connlisteners.lua
index 9be144da50d38664d4576cecf3ba83feea9febe9..e13f85deb71cd55c38a867b7b9aecfda79c4435a 100644 (file)
--- a/net/connlisteners.lua
+++ b/net/connlisteners.lua
@@ -1,30 +1,20 @@
--- Prosody IM v0.1
--- Copyright (C) 2008 Matthew Wild
--- Copyright (C) 2008 Waqas Hussain
+-- Prosody IM
+-- Copyright (C) 2008-2010 Matthew Wild
+-- Copyright (C) 2008-2010 Waqas Hussain
 -- 
--- This program is free software; you can redistribute it and/or
--- modify it under the terms of the GNU General Public License
--- as published by the Free Software Foundation; either version 2
--- of the License, or (at your option) any later version.
--- 
--- This program is distributed in the hope that it will be useful,
--- but WITHOUT ANY WARRANTY; without even the implied warranty of
--- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--- GNU General Public License for more details.
--- 
--- You should have received a copy of the GNU General Public License
--- along with this program; if not, write to the Free Software
--- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+-- This project is MIT/X11 licensed. Please see the
+-- COPYING file in the source package for more information.
 --
 
 
 
 local listeners_dir = (CFG_SOURCEDIR or ".").."/net/";
-local server_add = require "net.server".add;
+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"
 
@@ -32,11 +22,11 @@ local listeners = {};
 
 function register(name, listener)
        if listeners[name] and listeners[name] ~= listener then
-               log("warning", "Listener %s is already registered, not registering any more", name);
+               log("debug", "Listener %s is already registered, not registering any more", name);
                return false;
        end
        listeners[name] = listener;
-       log("info", "Registered connection listener %s", name);
+       log("debug", "Registered connection listener %s", name);
        return true;
 end
 
@@ -47,20 +37,33 @@ end
 function get(name)
        local h = listeners[name];
        if not h then
-               pcall(dofile, listeners_dir..name:gsub("[^%w%-]", "_").."_listener.lua");
+               local ok, ret = pcall(dofile, listeners_dir..name:gsub("[^%w%-]", "_").."_listener.lua");
+               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;
 end
 
 function start(name, udata)
-       local h = get(name);
+       local h, err = get(name);
        if not h then
-               error("No such connection module: "..name, 0);
+               error("No such connection module: "..name.. (err and (" ("..err..")") or ""), 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_add(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 "*", (udata and udata.mode) or h.default_mode or 1, (udata and udata.ssl) or nil );
+       
+       return server.addserver(interface, port, h, mode, autossl and ssl or nil);
 end
 
 return _M;