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

net.server_epoll: Add interface:server() method to match server_event (fixes c2s:show traceback in telnet console)

Browse source
This commit is contained in:
Kim Alvefur 2017-09-29 10:50:27 +02:00
parent 5e5c698a93
commit db450adf9e
1 changed files with 7 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

10
net/server_epoll.lua
View file

@ -167,6 +167,10 @@ function interface:getfd()
return _SOCKETINVALID;
end
function interface:server()
return self._server or self;
end
-- Get IP address
function interface:ip()
return self.peername or self.sockname;
@ -186,8 +190,8 @@ end
function interface:serverport()
if self.sockport then
return self.sockport;
elseif self.server then
self.server:port();
elseif self._server then
self._server:port();
end
end
@ -465,7 +469,7 @@ local function wrapsocket(client, server, pattern, listeners, tls) -- luasocket
client:settimeout(0);
local conn = setmetatable({
conn = client;
server = server;
_server = server;
created = gettime();
listeners = listeners;
_pattern = pattern or (server and server._pattern);