Making the best attempt out of a bad merge from waqas

2 files changed, 12 insertions, 6 deletions

diff --git a/net/connlisteners.lua b/net/connlisteners.lua
index a5c8755f..f7321cdc 100644
--- a/net/connlisteners.lua
+++ b/net/connlisteners.lua
@@ -23,14 +23,20 @@ function deregister(name)
 	listeners[name] = nil;
 end
 
-function start(name, udata)
-	local h = listeners[name]
+function get(name)
+	local h = listeners[name];
 	if not h then
 		pcall(dofile, "net/"..name:gsub("[^%w%-]", "_").."_listener.lua");
 		h = listeners[name];
-		if not h then
-			error("No such connection module: "..name, 0);
-		end
+		
+	end
+	return h;
+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.port or h.default_port or error("Can't start listener "..name.." because no port was specified, and it has no default port", 0), 
diff --git a/net/server.lua b/net/server.lua
index 1661ba00..40cc6dc8 100644
--- a/net/server.lua
+++ b/net/server.lua
@@ -827,5 +827,5 @@ return {
 	stats = stats,

 	closeall = closeall,

 	addtimer = addtimer,

-

+	wraptlsclient = wraptlsclient,

 }