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

net.connect: Fix passing request table to new listener

Browse source 
This could be a return value from ondetach
This commit is contained in:
Kim Alvefur 2018-09-26 17:36:53 +02:00
parent 7f9c753df9
commit 7a86af343f
4 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
net/connect.lua
View file

@ -56,7 +56,7 @@ function pending_connection_listeners.onconnect(conn)
end
pending_connections_map[conn] = nil;
p:log("debug", "Successfully connected");
conn:setlistener(p.listeners);
conn:setlistener(p.listeners, p.data);
return p.listeners.onconnect(conn);
end

4
net/server_epoll.lua
View file

@ -136,10 +136,10 @@ function interface_mt:__tostring()
end
-- Replace the listener and tell the old one
function interface:setlistener(listeners)
function interface:setlistener(listeners, data)
self:on("detach");
self.listeners = listeners;
self:on("attach");
self:on("attach", data);
end
-- Call a listener callback

4
net/server_event.lua
View file

@ -415,7 +415,7 @@ function interface_mt:setoption(option, value)
return false, "setoption not implemented";
end
function interface_mt:setlistener(listener)
function interface_mt:setlistener(listener, data)
self:ondetach(); -- Notify listener that it is no longer responsible for this connection
self.onconnect = listener.onconnect;
self.ondisconnect = listener.ondisconnect;
@ -426,7 +426,7 @@ function interface_mt:setlistener(listener)
self.ondetach = listener.ondetach;
self.onattach = listener.onattach;
self.ondrain = listener.ondrain;
self:onattach();
self:onattach(data);
end
-- Stub handlers

4
net/server_select.lua
View file

@ -321,7 +321,7 @@ wrapconnection = function( server, listeners, socket, ip, serverport, clientport
end
handler.onreadtimeout = onreadtimeout;
handler.setlistener = function( self, listeners )
handler.setlistener = function( self, listeners, data )
if detach then
detach(self) -- Notify listener that it is no longer responsible for this connection
end
@ -332,7 +332,7 @@ wrapconnection = function( server, listeners, socket, ip, serverport, clientport
handler.onreadtimeout = listeners.onreadtimeout
detach = listeners.ondetach
if listeners.onattach then
listeners.onattach(self)
listeners.onattach(self, data)
end
end
handler.getstats = function( )