net.server: Require IP address as argument to addclient (no DNS names) The net.connect API should be used to resolve DNS names first

author: Kim Alvefur <zash@zash.se>
date: Thu, 11 Oct 2018 15:48:30 +0200
parent: 9387:33e52f727f0f
child: 9495:89e05b118f6e
--- a/net/server_select.lua	Thu Oct 11 14:18:38 2018 +0100
+++ b/net/server_select.lua	Thu Oct 11 15:48:30 2018 +0200
@@ -50,7 +50,8 @@
 local has_luasec, luasec = pcall ( require , "ssl" )
 local luasocket = use "socket" or require "socket"
 local luasocket_gettime = luasocket.gettime
-local getaddrinfo = luasocket.dns.getaddrinfo
+local inet = require "util.net";
+local inet_pton = inet.pton;
 
 --// extern lib methods //--
 
@@ -1007,14 +1008,16 @@
 	elseif sslctx and not has_luasec then
 		err = "luasec not found"
 	end
-	if getaddrinfo and not typ then
-		local addrinfo, err = getaddrinfo(address)
-		if not addrinfo then return nil, err end
-		if addrinfo[1] and addrinfo[1].family == "inet6" then
-			typ = "tcp6"
+	if not typ then
+		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 = luasocket[typ or "tcp"]
+	local create = luasocket[typ] or luasocket.tcp;
 	if type( create ) ~= "function"  then
 		err = "invalid socket type"
 	end