X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=net%2Fconnlisteners.lua;h=ebb3cc18e2cec986ccfd888deacc83e777c35f36;hb=93c4db201b1dbd3f86bfd33f496e4740ba2334e1;hp=b2435f4460760743a3a851e5ab6df01f4004bacb;hpb=951963a336df716eca64ba162c725e4305c14f61;p=prosody.git

diff --git a/net/connlisteners.lua b/net/connlisteners.lua
index b2435f44..ebb3cc18 100644
--- a/net/connlisteners.lua
+++ b/net/connlisteners.lua
@@ -1,20 +1,9 @@
--- Prosody IM v0.2
--- Copyright (C) 2008 Matthew Wild
--- Copyright (C) 2008 Waqas Hussain
+-- Prosody IM
+-- 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.
 --
 
 
@@ -32,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
 
@@ -54,19 +43,23 @@ function get(name)
 	return h;
 end
 
-local wrapper_functions = { tcp = server.wraptcpclient, ssl = server.wrapsslclient, tls = server.wraptlsclient }
-
 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 wrapper_function = wrapper_functions[(udata and udata.type)] or wrapper_functions.tcp;
+	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, wrapper_function);
+				(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;