From f2d9638627e4a4f03953ee30c2166c81e778b9c6 Mon Sep 17 00:00:00 2001 From: Kim Alvefur Date: Fri, 12 Oct 2018 16:26:19 +0200 Subject: net.server_epoll: Add support for the conn_type argument to addclient --- net/server_epoll.lua | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) (limited to 'net/server_epoll.lua') diff --git a/net/server_epoll.lua b/net/server_epoll.lua index 7a9bd7a3..75a8883c 100644 --- a/net/server_epoll.lua +++ b/net/server_epoll.lua @@ -625,14 +625,22 @@ local function wrapclient(conn, addr, port, listeners, read_size, tls_ctx) end -- New outgoing TCP connection -local function addclient(addr, port, listeners, read_size, tls_ctx) - local n = inet_pton(addr); - if not n then return nil, "invalid-ip"; end - local create - if #n == 16 then - create = socket.tcp6 or socket.tcp; - else - create = socket.tcp4 or socket.tcp; +local function addclient(addr, port, listeners, read_size, tls_ctx, typ) + local create; + if not typ then + local n = inet_pton(addr); + if not n then return nil, "invalid-ip"; end + if #n == 16 then + typ = "tcp6"; + else + typ = "tcp4"; + end + end + if typ then + create = socket[typ]; + end + if type(create) ~= "function" then + return nil, "invalid socket type"; end local conn, err = create(); conn:settimeout(0); -- cgit v1.2.3