Skip to content

Commit

Permalink
refactor(socket): remove some wrap methods for inet6
Browse files Browse the repository at this point in the history
Signed-off-by: Jianhui Zhao <zhaojh329@gmail.com>
  • Loading branch information
zhaojh329 committed Mar 13, 2024
1 parent 30c34c4 commit 7f583f5
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 39 deletions.
32 changes: 0 additions & 32 deletions socket.lua
Original file line number Diff line number Diff line change
Expand Up @@ -264,14 +264,6 @@ function M.listen_tcp(ipaddr, port, options)
return sock:listen(options.backlog)
end

function M.listen_tcp6(ipaddr, port, options)
options = options or {}

options.ipv6 = true

return M.listen_tcp(ipaddr, port, options)
end

function M.connect_tcp(ipaddr, port, options)
options = options or {}

Expand All @@ -285,14 +277,6 @@ function M.connect_tcp(ipaddr, port, options)
return sock:connect(ipaddr, port)
end

function M.connect_tcp6(ipaddr, port, options)
options = options or {}

options.ipv6 = true

return M.connect_tcp(ipaddr, port, options)
end

function M.listen_udp(ipaddr, port, options)
options = options or {}

Expand All @@ -306,14 +290,6 @@ function M.listen_udp(ipaddr, port, options)
return sock:bind(ipaddr, port)
end

function M.listen_udp6(ipaddr, port, options)
options = options or {}

options.ipv6 = true

return M.listen_udp(ipaddr, port, options)
end

function M.connect_udp(ipaddr, port, options)
options = options or {}

Expand All @@ -327,14 +303,6 @@ function M.connect_udp(ipaddr, port, options)
return sock:connect(ipaddr, port)
end

function M.connect_udp6(ipaddr, port, options)
options = options or {}

options.ipv6 = true

return M.connect_udp(ipaddr, port, options)
end

function M.listen_unix(path, options)
local sock, err = M.unix()
if not sock then
Expand Down
9 changes: 2 additions & 7 deletions ssh.lua
Original file line number Diff line number Diff line change
Expand Up @@ -420,16 +420,11 @@ local session_metatable = {
}

function M.new(ipaddr, port, username, password)
local sock, err

if socket.is_ipv4_address(ipaddr) then
sock, err = socket.connect_tcp(ipaddr, port)
elseif socket.is_ipv6_address(ipaddr) then
sock, err = socket.connect_tcp6(ipaddr, port)
else
if not socket.is_ipv4_address(ipaddr) and not socket.is_ipv6_address(ipaddr) then
return nil, 'invalid ipaddr: ' .. ipaddr
end

local sock, err = socket.connect_tcp(ipaddr, port, { ipv6 = socket.is_ipv6_address(ipaddr) })
if not sock then
return nil, err
end
Expand Down

0 comments on commit 7f583f5

Please sign in to comment.