diff options
| author | Matthew Wild <mwild1@gmail.com> | 2014-08-29 11:39:56 +0100 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2014-08-29 11:39:56 +0100 |
| commit | 972f29756d18c945f9c1d5df219a89fd6962bcf3 (patch) | |
| tree | f91c70d4e33f77f4ef3a178624d15109f7568374 | |
| parent | 84a056c50b3e39b3b715d14786bf39808057f344 (diff) | |
| download | prosody-972f29756d18c945f9c1d5df219a89fd6962bcf3.tar.gz prosody-972f29756d18c945f9c1d5df219a89fd6962bcf3.zip | |
net.server_{select,event}: Add 'ondetach' callback for listener objects, to notify them when another listener is being assigned to a connection
| -rw-r--r-- | net/server_event.lua | 10 | ||||
| -rw-r--r-- | net/server_select.lua | 5 |
2 files changed, 13 insertions, 2 deletions
diff --git a/net/server_event.lua b/net/server_event.lua index b05d1688..45938a13 100644 --- a/net/server_event.lua +++ b/net/server_event.lua @@ -438,8 +438,11 @@ do end function interface_mt:setlistener(listener) - self.onconnect, self.ondisconnect, self.onincoming, self.ontimeout, self.onstatus - = listener.onconnect, listener.ondisconnect, listener.onincoming, listener.ontimeout, listener.onstatus; + self:ondetach(); -- Notify listener that it is no longer responsible for this connection + self.onconnect, self.ondisconnect, self.onincoming, + self.ontimeout, self.onstatus, self.ondetach + = listener.onconnect, listener.ondisconnect, listener.onincoming, + listener.ontimeout, listener.onstatus, listener.ondetach; end -- Stub handlers @@ -453,6 +456,8 @@ do end function interface_mt:ondrain() end + function interface_mt:ondetach() + end function interface_mt:onstatus() end end @@ -479,6 +484,7 @@ do onincoming = listener.onincoming; -- will be called when client sends data ontimeout = listener.ontimeout; -- called when fatal socket timeout occurs ondrain = listener.ondrain; -- called when writebuffer is empty + ondetach = listener.ondetach; -- called when disassociating this listener from this connection onstatus = listener.onstatus; -- called for status changes (e.g. of SSL/TLS) eventread = false, eventwrite = false, eventclose = false, eventhandshake = false, eventstarthandshake = false; -- event handler diff --git a/net/server_select.lua b/net/server_select.lua index e8964518..2b23b4f0 100644 --- a/net/server_select.lua +++ b/net/server_select.lua @@ -284,6 +284,7 @@ wrapconnection = function( server, listeners, socket, ip, serverport, clientport local status = listeners.onstatus local disconnect = listeners.ondisconnect local drain = listeners.ondrain + local detach = listener.ondetach local bufferqueue = { } -- buffer array local bufferqueuelen = 0 -- end of buffer array @@ -313,10 +314,14 @@ wrapconnection = function( server, listeners, socket, ip, serverport, clientport return disconnect end handler.setlistener = function( self, listeners ) + if detach then + detach(self) -- Notify listener that it is no longer responsible for this connection + end dispatch = listeners.onincoming disconnect = listeners.ondisconnect status = listeners.onstatus drain = listeners.ondrain + detach = listeners.ondetach end handler.getstats = function( ) return readtraffic, sendtraffic |