From db450adf9e7f6dbb96cddb15a8b929f367435981 Mon Sep 17 00:00:00 2001 From: Kim Alvefur Date: Fri, 29 Sep 2017 10:50:27 +0200 Subject: net.server_epoll: Add interface:server() method to match server_event (fixes c2s:show traceback in telnet console) --- net/server_epoll.lua | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'net') diff --git a/net/server_epoll.lua b/net/server_epoll.lua index 5342ca9d..a88aad12 100644 --- a/net/server_epoll.lua +++ b/net/server_epoll.lua @@ -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); -- cgit v1.2.3