--- Prosody IM v0.1
--- Copyright (C) 2008 Matthew Wild
--- Copyright (C) 2008 Waqas Hussain
+-- Prosody IM v0.3
+-- Copyright (C) 2008-2009 Matthew Wild
+-- Copyright (C) 2008-2009 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 dofile, pcall, error =
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;
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 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,
+
+ 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 "*", (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, 99999999, udata and udata.type == "ssl");
end
return _M;