Merge with 0.4

[prosody.git] / net / server.lua

diff --git a/net/server.lua b/net/server.lua
index fd6459e849ec251001cb625b96a1cf0d2d5cbb05..9e42b8ff8006fe2d9b5d7c991b71dae905a4c20e 100644 (file)
--- a/net/server.lua
+++ b/net/server.lua
@@ -77,6 +77,7 @@ local idfalse
 local addtimer\r
 local closeall\r
 local addserver\r
+local getserver\r
 local wrapserver\r
 local getsettings\r
 local closesocket\r
@@ -670,6 +671,10 @@ addserver = function( listeners, port, addr, pattern, sslctx, maxconnections, st
     return handler\r
 end\r
 \r
+getserver = function ( port )\r
+       return _server[ port ];\r
+end\r
+\r
 removeserver = function( port )\r
     local handler = _server[ port ]\r
     if not handler then\r
@@ -728,7 +733,7 @@ stats = function( )
     return _readtraffic, _sendtraffic, _readlistlen, _sendlistlen, _timerlistlen\r
 end\r
 \r
-local dontstop = true;\r
+local dontstop = true; -- thinking about tomorrow, ...\r
 \r
 setquitting = function (quit)\r
        dontstop = not quit;\r
@@ -844,6 +849,7 @@ return {
     closeall = closeall,\r
     addtimer = addtimer,\r
     addserver = addserver,\r
+    getserver = getserver,\r
     getsettings = getsettings,\r
     setquitting = setquitting,\r
     removeserver = removeserver,\r