mirrors/prosody
1
0
Fork 0
mirror of https://github.com/bjc/prosody.git synced 2025-04-05 14:17:37 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

net.server_epoll: Move call to refresh remote IP address out of wrapper

Browse source 
Reduces the side effects of wrapsocket()
This commit is contained in:
Kim Alvefur 2021-07-16 00:56:45 +02:00
parent 575b997d1d
commit 269acd6847
1 changed files with 3 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
net/server_epoll.lua
View file

@ -765,7 +765,6 @@ local function wrapsocket(client, server, read_size, listeners, tls_ctx, extra)
end end
end end
conn:updatenames();
return conn; return conn;
end end
@ -791,6 +790,7 @@ function interface:onacceptable()
return; return;
end end
local client = wrapsocket(conn, self, nil, self.listeners); local client = wrapsocket(conn, self, nil, self.listeners);
client:updatenames();
client:debug("New connection %s on server %s", client, self); client:debug("New connection %s on server %s", client, self);
client:defaultoptions(); client:defaultoptions();
client._writable = cfg.opportunistic_writes; client._writable = cfg.opportunistic_writes;
@ -935,6 +935,7 @@ end
-- COMPAT -- COMPAT
local function wrapclient(conn, addr, port, listeners, read_size, tls_ctx, extra) local function wrapclient(conn, addr, port, listeners, read_size, tls_ctx, extra)
local client = wrapsocket(conn, nil, read_size, listeners, tls_ctx, extra); local client = wrapsocket(conn, nil, read_size, listeners, tls_ctx, extra);
client:updatenames();
if not client.peername then if not client.peername then
client.peername, client.peerport = addr, port; client.peername, client.peerport = addr, port;
end end
@ -974,6 +975,7 @@ local function addclient(addr, port, listeners, read_size, tls_ctx, typ, extra)
local ok, err = conn:setpeername(addr, port); local ok, err = conn:setpeername(addr, port);
if not ok and err ~= "timeout" then return ok, err; end if not ok and err ~= "timeout" then return ok, err; end
local client = wrapsocket(conn, nil, read_size, listeners, tls_ctx, extra) local client = wrapsocket(conn, nil, read_size, listeners, tls_ctx, extra)
client:updatenames();
local ok, err = client:init(); local ok, err = client:init();
if not client.peername then if not client.peername then
-- otherwise not set until connected -- otherwise not set until connected