configmanager: nameprep VirtualHost and Component names

[prosody.git] / net / connlisteners.lua

diff --git a/net/connlisteners.lua b/net/connlisteners.lua
index a02dd2a62d03d2ebbd3e42c707737c63dc196a03..99ddc720aa570fb02765191ca6b1c47eaddaaee0 100644 (file)
--- a/net/connlisteners.lua
+++ b/net/connlisteners.lua
@@ -1,46 +1,15 @@
+-- COMPAT w/pre-0.9
+local log = require "util.logger".init("net.connlisteners");
+local traceback = debug.traceback;
 
-local listeners_dir = (CFG_SOURCEDIR or ".").."/net/";
-local server_add = require "net.server".add;
-local log = require "util.logger".init("connlisteners");
+module "httpserver"
 
-local dofile, pcall, error = 
-       dofile, pcall, error
-
-module "connlisteners"
-
-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);
-               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
-               pcall(dofile, listeners_dir..name:gsub("[^%w%-]", "_").."_listener.lua");
-               h = listeners[name];
-       end
-       return h;
+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
 
-function start(name, udata)
-       local h = get(name);
-       if not h then
-               error("No such connection module: "..name, 0);
-       end
-       return server_add(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 );
-end
+register, deregister = fail, fail;
+get, start = fail, fail, epic_fail;
 
 return _M;