Merge 0.10->trunk

[prosody.git] / net / connlisteners.lua

diff --git a/net/connlisteners.lua b/net/connlisteners.lua
index 48101752ee5441cdeee43de002974e31c4aeb163..38cf8f08268ad5fa1940980907571018444c2bca 100644 (file)
--- a/net/connlisteners.lua
+++ b/net/connlisteners.lua
@@ -1,65 +1,18 @@
--- Prosody IM v0.4
--- 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 dofile, pcall, error = 
-       dofile, pcall, error
-
-module "connlisteners"
-
-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);
-               return false;
-       end
-       listeners[name] = listener;
-       log("info", "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 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
-       
-       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");
+local function fail()
+       log("error", "Attempt to use legacy connlisteners API. For more info see https://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
+};