X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=net%2Fconnlisteners.lua;h=000bfa63effa2d85598ca02eb72652240bbc4928;hb=ca89661ee941cad918b19714a2b6d4d70be58b45;hp=a9b92a8c81a47a2ce1957a8fbe7267f00aee55d9;hpb=4e9ad86f42f78e32d5a983b62277a0552c853a9c;p=prosody.git

diff --git a/net/connlisteners.lua b/net/connlisteners.lua
index a9b92a8c..000bfa63 100644
--- a/net/connlisteners.lua
+++ b/net/connlisteners.lua
@@ -1,74 +1,18 @@
--- Prosody IM
--- Copyright (C) 2008-2009 Matthew Wild
--- Copyright (C) 2008-2009 Waqas Hussain
--- 
--- This project is MIT/X11 licensed. Please see the
--- COPYING file in the source package for more information.
---
+-- COMPAT w/pre-0.9
+local log = require "util.logger".init("net.connlisteners");
+local traceback = debug.traceback;
 
+local _ENV = nil;
 
-
-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
-
-module "connlisteners"
-
-local listeners = {};
-
-function register(name, listener)
-	if listeners[name] and listeners[name] ~= listener then
-		log("debug", "Listener %s is already registered, not registering any more", name);
-		return false;
-	end
-	listeners[name] = listener;
-	log("debug", "Registered connection listener %s", name);
-	return true;
-end
-
-function deregister(name)
-	listeners[name] = nil;
-end
-
-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
-			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, err = get(name);
-	if not h then
-		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
-	
-	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 maxclients = 99999999;
-	local autossl = udata and udata.type == "ssl";
-	
-	return server.addserver(interface, port, h, mode, ssl, autossl);
+local function fail()
+	log("error", "Attempt to use legacy connlisteners API. For more info see http://prosody.im/doc/developers/network");
+	log("error", "Legacy connlisteners API usage, %s", traceback("", 2));
 end
 
-return _M;
+return {
+	register = fail;
+	register = fail;
+	get = fail;
+	start = fail;
+	-- epic fail
+};