net.dns: Support for resolving AAAA records

[prosody.git] / net / connlisteners.lua

diff --git a/net/connlisteners.lua b/net/connlisteners.lua
index f7321cdc95b214a5db36df1532965a542baf7fcd..7da25c62df3e4d52c7824d71432c516ff16650e1 100644 (file)
--- a/net/connlisteners.lua
+++ b/net/connlisteners.lua
@@ -1,9 +1,22 @@
+-- Prosody IM
+-- 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.
+--
 
-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 tostring = tostring;
 
-local dofile, pcall, error = 
-       dofile, pcall, error
+local dofile, xpcall, error =
+      dofile, xpcall, error
+
+local debug_traceback = debug.traceback;
 
 module "connlisteners"
 
@@ -11,11 +24,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 +39,33 @@ end
 function get(name)
        local h = listeners[name];
        if not h then
-               pcall(dofile, "net/"..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;
+               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.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(interface, port, h, mode, autossl and ssl or nil);
 end
 
-return _M;
\ No newline at end of file
+return _M;