Don't send version 1.0. Who cares about Gmail?

[prosody.git] / net / xmppserver_listener.lua

diff --git a/net/xmppserver_listener.lua b/net/xmppserver_listener.lua
index 4564eee18be882bcffd5eccecc2f07a006aacfdc..51116a5ee048fdbf1251e6027674c48a379e584d 100644 (file)
--- a/net/xmppserver_listener.lua
+++ b/net/xmppserver_listener.lua
@@ -5,7 +5,7 @@ local init_xmlhandlers = require "core.xmlhandlers"
 local sm_new_session = require "core.sessionmanager".new_session;
 local s2s_new_incoming = require "core.s2smanager".new_incoming;
 local s2s_streamopened = require "core.s2smanager".streamopened;
-local s2s_streamclosed = require "core.s2smanager".streamopened;
+local s2s_streamclosed = require "core.s2smanager".streamclosed;
 local s2s_destroy_session = require "core.s2smanager".destroy_session;
 
 local stream_callbacks = { streamopened = s2s_streamopened, streamclosed = s2s_streamclosed };
@@ -40,7 +40,7 @@ end
 
 
 local stream_xmlns_attr = {xmlns='urn:ietf:params:xml:ns:xmpp-streams'};
-local function session_disconnect(session, reason)
+local function session_close(session, reason)
        local log = session.log or log;
        if session.conn then
                if reason then
@@ -92,7 +92,7 @@ function xmppserver.listener(conn, data)
                print("Incoming s2s connection");
                
                session.reset_stream = session_reset_stream;
-               session.disconnect = session_disconnect;
+               session.close = session_close;
                
                session_reset_stream(session); -- Initialise, ready for use
                
@@ -112,6 +112,7 @@ end
 function xmppserver.disconnect(conn)
        local session = sessions[conn];
        if session then
+               (session.log or log)("info", "s2s disconnected: %s->%s", tostring(session.from_host), tostring(session.to_host));
                s2s_destroy_session(session);
                sessions[conn]  = nil;
                session = nil;