From 8a62a14e5da8c27202cc11a37243569ab8962f76 Mon Sep 17 00:00:00 2001 From: Kim Alvefur Date: Thu, 11 Oct 2018 15:48:30 +0200 Subject: net.server: Require IP address as argument to addclient (no DNS names) The net.connect API should be used to resolve DNS names first --- net/server_event.lua | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) (limited to 'net/server_event.lua') diff --git a/net/server_event.lua b/net/server_event.lua index 9fde558e..5a4dc1a4 100644 --- a/net/server_event.lua +++ b/net/server_event.lua @@ -50,9 +50,10 @@ local coroutine_yield = coroutine.yield local has_luasec, ssl = pcall ( require , "ssl" ) local socket = require "socket" local levent = require "luaevent.core" +local inet = require "util.net"; +local inet_pton = inet.pton; local socket_gettime = socket.gettime -local getaddrinfo = socket.dns.getaddrinfo local log = require ("util.logger").init("socket") @@ -728,15 +729,15 @@ local function addclient( addr, serverport, listener, pattern, sslctx, typ ) return nil, "luasec not found" end if not typ then - local addrinfo, err = getaddrinfo(addr) - if not addrinfo then return nil, err end - if addrinfo[1] and addrinfo[1].family == "inet6" then - typ = "tcp6" - else - typ = "tcp" + local n = inet_pton(addr); + if not n then return nil, "invalid-ip"; end + if #n == 16 then + typ = "tcp6"; + elseif #n == 4 then + typ = "tcp4"; end end - local create = socket[typ] + local create = socket[typ] or socket.tcp; if type( create ) ~= "function" then return nil, "invalid socket type" end -- cgit v1.2.3