diff options
author | Tobias Markmann <tm@ayena.de> | 2009-11-29 21:33:37 +0100 |
---|---|---|
committer | Tobias Markmann <tm@ayena.de> | 2009-11-29 21:33:37 +0100 |
commit | f91009f78a46ad74aa62ff487fa297c06a1ae6a3 (patch) | |
tree | 8ef6302fc66fdc48b4f34f58c3bea877d7ee6bee /net/xmppserver_listener.lua | |
parent | 8db68f17623ad29b25c6b5d757a2fb0b3d3005c6 (diff) | |
parent | 8fcbba4b0fccb299121083d97cab065e51fba9d1 (diff) | |
download | prosody-f91009f78a46ad74aa62ff487fa297c06a1ae6a3.tar.gz prosody-f91009f78a46ad74aa62ff487fa297c06a1ae6a3.zip |
Merge with tip.
Diffstat (limited to 'net/xmppserver_listener.lua')
-rw-r--r-- | net/xmppserver_listener.lua | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/net/xmppserver_listener.lua b/net/xmppserver_listener.lua index c7e02ec5..53a9d354 100644 --- a/net/xmppserver_listener.lua +++ b/net/xmppserver_listener.lua @@ -100,18 +100,18 @@ local function session_close(session, reason) end end session.sends2s("</stream:stream>"); - if session.notopen or not session.conn.close() then - session.conn.close(true); -- Force FIXME: timer? + if session.notopen or not session.conn:close() then + session.conn:close(true); -- Force FIXME: timer? end - session.conn.close(); - xmppserver.disconnect(session.conn, "stream error"); + session.conn:close(); + xmppserver.ondisconnect(session.conn, "stream error"); end end -- End of session methods -- -function xmppserver.listener(conn, data) +function xmppserver.onincoming(conn, data) local session = sessions[conn]; if not session then session = s2s_new_incoming(conn); @@ -148,7 +148,7 @@ function xmppserver.status(conn, status) end end -function xmppserver.disconnect(conn, err) +function xmppserver.ondisconnect(conn, err) local session = sessions[conn]; if session then if err and err ~= "closed" and session.srv_hosts then @@ -162,7 +162,6 @@ function xmppserver.disconnect(conn, err) s2s_destroy_session(session); sessions[conn] = nil; session = nil; - collectgarbage("collect"); end end |