feat(socket): automatically detects the IP address type for connect

The `ipv6` parameter do not required previously used to indicate use IPv6 connection.

Signed-off-by: Jianhui Zhao <[email protected]>

Author: zhaojh329

socket.lua

@@ -268,10 +268,22 @@ function M.listen_tcp(ipaddr, port, options)
     return sock:listen(options.backlog)
 end
 
+local function ipaddr_to_family(ipaddr)
+    if socket.is_ipv4_address(ipaddr) then
+        return socket.AF_INET
+    elseif socket.is_ipv6_address(ipaddr) then
+        return socket.AF_INET6
+    else
+        return nil
+    end
+end
+
 function M.connect_tcp(ipaddr, port, options)
     options = options or {}
 
-    local family = options.ipv6 and socket.AF_INET6 or socket.AF_INET
+    local family = ipaddr_to_family(ipaddr)
+
+    assert(family, 'not a valid IP address')
 
     local sock, err = M.socket(family, socket.SOCK_STREAM, nil, options)
     if not sock then
@@ -297,7 +309,9 @@ end
 function M.connect_udp(ipaddr, port, options)
     options = options or {}
 
-    local family = options.ipv6 and socket.AF_INET6 or socket.AF_INET
+    local family = ipaddr_to_family(ipaddr)
+
+    assert(family, 'not a valid IP address')
 
     local sock, err = M.socket(family, socket.SOCK_DGRAM, nil, options)
     if not sock then

ssh.lua

@@ -424,7 +424,7 @@ function M.new(ipaddr, port, username, password)
         return nil, 'invalid ipaddr: ' .. ipaddr
     end
 
-    local sock, err = socket.connect_tcp(ipaddr, port, { ipv6 = socket.is_ipv6_address(ipaddr) })
+    local sock, err = socket.connect_tcp(ipaddr, port)
     if not sock then
         return nil, err
     end