ejabberdsql2prosody: Initial commit

[prosody.git] / net / connlisteners.lua

diff --git a/net/connlisteners.lua b/net/connlisteners.lua
index f7321cdc95b214a5db36df1532965a542baf7fcd..ebb3cc18e2cec986ccfd888deacc83e777c35f36 100644 (file)
--- a/net/connlisteners.lua
+++ b/net/connlisteners.lua
@@ -1,5 +1,15 @@
+-- Prosody IM
+-- Copyright (C) 2008-2009 Matthew Wild
+-- Copyright (C) 2008-2009 Waqas Hussain
+-- 
+-- This project is MIT/X11 licensed. Please see the
+-- COPYING file in the source package for more information.
+--
 
-local server_add = require "net.server".add;
+
+
+local listeners_dir = (CFG_SOURCEDIR or ".").."/net/";
+local server = require "net.server";
 local log = require "util.logger".init("connlisteners");
 
 local dofile, pcall, error = 
@@ -11,11 +21,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
 
@@ -26,21 +36,30 @@ end
 function get(name)
        local h = listeners[name];
        if not h then
-               pcall(dofile, "net/"..name:gsub("[^%w%-]", "_").."_listener.lua");
+               local ok, ret = pcall(dofile, listeners_dir..name:gsub("[^%w%-]", "_").."_listener.lua");
+               if not ok then 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
+       
+       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
        end
-       return server_add(h, 
-                       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.interface or "*", udata.mode or h.default_mode or 1, udata.ssl );
+       
+       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");
 end
 
-return _M;
\ No newline at end of file
+return _M;