ejabberdsql2prosody: Initial commit

[prosody.git] / net / xmppserver_listener.lua

diff --git a/net/xmppserver_listener.lua b/net/xmppserver_listener.lua
index a6f5eb737c1d3e15bb0e32246eb26a06c780cfc1..3cfcfe86a2bd319296acaa01d2b8e7a89d619395 100644 (file)
--- a/net/xmppserver_listener.lua
+++ b/net/xmppserver_listener.lua
@@ -1,6 +1,6 @@
--- Prosody IM v0.2
--- Copyright (C) 2008 Matthew Wild
--- Copyright (C) 2008 Waqas Hussain
+-- Prosody IM
+-- Copyright (C) 2008-2009 Matthew Wild
+-- Copyright (C) 2008-2009 Waqas Hussain
 -- 
 -- This project is MIT/X11 licensed. Please see the
 -- COPYING file in the source package for more information.
@@ -9,15 +9,17 @@
 
 
 local logger = require "logger";
+local log = logger.init("xmppserver_listener");
 local lxp = require "lxp"
 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".streamclosed;
 local s2s_destroy_session = require "core.s2smanager".destroy_session;
 local s2s_attempt_connect = require "core.s2smanager".attempt_connection;
-local stream_callbacks = { stream_tag = "http://etherx.jabber.org/streams|stream", streamopened = s2s_streamopened, streamclosed = s2s_streamclosed, handlestanza =  core_process_stanza };
+local stream_callbacks = { stream_tag = "http://etherx.jabber.org/streams|stream", 
+               default_ns = "jabber:server",
+               streamopened = s2s_streamopened, streamclosed = s2s_streamclosed, handlestanza =  core_process_stanza };
 
 function stream_callbacks.error(session, error, data)
        if error == "no-stream" then
@@ -40,8 +42,9 @@ local t_concat = table.concat;
 local t_concatall = function (t, sep) local tt = {}; for _, s in ipairs(t) do t_insert(tt, tostring(s)); end return t_concat(tt, sep); end
 local m_random = math.random;
 local format = string.format;
-local sm_new_session, sm_destroy_session = sessionmanager.new_session, sessionmanager.destroy_session; --import("core.sessionmanager", "new_session", "destroy_session");
-local st = stanza;
+local sessionmanager = require "core.sessionmanager";
+local sm_new_session, sm_destroy_session = sessionmanager.new_session, sessionmanager.destroy_session;
+local st = require "util.stanza";
 
 local sessions = {};
 local xmppserver = { default_port = 5269, default_mode = "*a" };
@@ -129,7 +132,9 @@ function xmppserver.disconnect(conn, err)
        local session = sessions[conn];
        if session then
                if err and err ~= "closed" and session.srv_hosts then
+                       (session.log or log)("debug", "s2s connection closed unexpectedly");
                        if s2s_attempt_connect(session, err) then
+                               (session.log or log)("debug", "...so we're going to try again");
                                return; -- Session lives for now
                        end
                end
@@ -145,7 +150,8 @@ function xmppserver.register_outgoing(conn, session)
        session.direction = "outgoing";
        sessions[conn] = session;
        
-       session.reset_stream = session_reset_stream;    
+       session.reset_stream = session_reset_stream;
+       session.close = session_close;
        session_reset_stream(session); -- Initialise, ready for use
        
        --local function handleerr(err) print("Traceback:", err, debug.traceback()); end