Numerous BOSH improvements... handle client disconnects, either explicit or implicit...

[prosody.git] / net / connlisteners.lua

diff --git a/net/connlisteners.lua b/net/connlisteners.lua
index 2b95331c2a6a2d68f9c4f7e6891acb14dc458df6..336150be46a2164833c290f993580c976dbfc0a2 100644 (file)
--- a/net/connlisteners.lua
+++ b/net/connlisteners.lua
@@ -1,5 +1,26 @@
+-- Prosody IM v0.2
+-- Copyright (C) 2008 Matthew Wild
+-- Copyright (C) 2008 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.
+--
 
-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,7 +32,7 @@ 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("warn", "Listener %s is already registered, not registering any more", name);
                return false;
        end
        listeners[name] = listener;
@@ -26,20 +47,26 @@ 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
 
+local wrapper_functions = { tcp = server.wraptcpclient, ssl = server.wrapsslclient, tls = server.wraptlsclient }
+
 function start(name, udata)
        local h = get(name);
        if not h then
                error("No such connection module: "..name, 0);
        end
-       return server_add(h, 
+       
+       local wrapper_function = wrapper_functions[(udata and udata.type)] or wrapper_functions.tcp;
+       
+       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 );
+                               (udata and udata.interface) or "*", (udata and udata.mode) or h.default_mode or 1, (udata and udata.ssl) or nil, wrapper_function);
 end
 
-return _M;
\ No newline at end of file
+return _M;