aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authordaurnimator <quae@daurnimator.com>2013-12-18 17:51:27 -0500
committerdaurnimator <quae@daurnimator.com>2013-12-18 17:51:27 -0500
commitc8183e66556b4d705eb34158f163a7e6a62e9207 (patch)
treef75fcd59e2a6a87ca23c2473925ca2caf15cd2a6 /net
parent63f8291d160b050741e804e5a58e392381555e14 (diff)
downloadprosody-c8183e66556b4d705eb34158f163a7e6a62e9207.tar.gz
prosody-c8183e66556b4d705eb34158f163a7e6a62e9207.zip
net/server_select: Check arguments to add_server correctly
Diffstat (limited to 'net')
-rw-r--r--net/server_select.lua7
1 files changed, 4 insertions, 3 deletions
diff --git a/net/server_select.lua b/net/server_select.lua
index 322c0b57..62c889e9 100644
--- a/net/server_select.lua
+++ b/net/server_select.lua
@@ -723,11 +723,13 @@ end
----------------------------------// PUBLIC //--
addserver = function( addr, port, listeners, pattern, sslctx ) -- this function provides a way for other scripts to reg a server
+ addr = addr or "*"
local err
if type( listeners ) ~= "table" then
err = "invalid listener table"
- end
- if type( port ) ~= "number" or not ( port >= 0 and port <= 65535 ) then
+ elseif type ( addr ) ~= "string" then
+ err = "invalid address"
+ elseif type( port ) ~= "number" or not ( port >= 0 and port <= 65535 ) then
err = "invalid port"
elseif _server[ addr..":"..port ] then
err = "listeners on '[" .. addr .. "]:" .. port .. "' already exist"
@@ -738,7 +740,6 @@ addserver = function( addr, port, listeners, pattern, sslctx ) -- this function
out_error( "server.lua, [", addr, "]:", port, ": ", err )
return nil, err
end
- addr = addr or "*"
local server, err = socket_bind( addr, port, _tcpbacklog )
if err then
out_error( "server.lua, [", addr, "]:", port, ": ", err )