X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=net%2Fconnlisteners.lua;h=e13f85deb71cd55c38a867b7b9aecfda79c4435a;hb=c65679cbdff89c90699b7706dec4826d2a5ac9c4;hp=48101752ee5441cdeee43de002974e31c4aeb163;hpb=b96085fc14b30915a8ff45b80b65a32a896a395d;p=prosody.git

diff --git a/net/connlisteners.lua b/net/connlisteners.lua
index 48101752..e13f85de 100644
--- a/net/connlisteners.lua
+++ b/net/connlisteners.lua
@@ -1,6 +1,6 @@
--- Prosody IM v0.4
--- Copyright (C) 2008-2009 Matthew Wild
--- Copyright (C) 2008-2009 Waqas Hussain
+-- 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.
@@ -11,9 +11,10 @@
 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, pcall, error =
+      dofile, pcall, error
 
 module "connlisteners"
 
@@ -21,11 +22,11 @@ local listeners = {};
 
 function register(name, listener)
 	if listeners[name] and listeners[name] ~= listener then
-		log("warn", "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
 
@@ -37,7 +38,10 @@ function get(name)
 	local h = listeners[name];
 	if not h then
 		local ok, ret = pcall(dofile, listeners_dir..name:gsub("[^%w%-]", "_").."_listener.lua");
-		if not ok then return nil, ret; end
+		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;
@@ -49,17 +53,17 @@ function start(name, udata)
 		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
+	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.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");
+	return server.addserver(interface, port, h, mode, autossl and ssl or nil);
 end
 
 return _M;