+-- 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.
+--
+
+
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",
+ 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
+ session:close("invalid-namespace");
+ else
+ session.log("debug", "Server-to-server XML parse error: %s", tostring(error));
+ session:close("xml-not-well-formed");
+ end
+end
-local stream_callbacks = { streamopened = s2s_streamopened, streamclosed = s2s_streamclosed };
+local function handleerr(err) log("error", "Traceback[s2s]: %s: %s", tostring(err), debug.traceback()); end
+function stream_callbacks.handlestanza(a, b)
+ xpcall(function () core_process_stanza(a, b) end, handleerr);
+end
local connlisteners_register = require "net.connlisteners".register;
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 };
+local xmppserver = { default_port = 5269, default_mode = "*a" };
-- These are session methods --
session.notopen = true;
function session.data(conn, data)
- parser:parse(data);
+ local ok, err = parser:parse(data);
+ if ok then return; end
+ session:close("xml-not-well-formed");
end
+
return true;
end
-- Logging functions --
- local mainlog, log = log;
- do
- local conn_name = "s2sin"..tostring(conn):match("[a-f0-9]+$");
- log = logger.init(conn_name);
- end
- local print = function (...) log("info", t_concatall({...}, "\t")); end
- session.log = log;
-
- print("Incoming s2s connection");
+
+ local conn_name = "s2sin"..tostring(conn):match("[a-f0-9]+$");
+ session.log = logger.init(conn_name);
+
+ session.log("info", "Incoming s2s connection");
session.reset_stream = session_reset_stream;
session.close = session_close;
session_reset_stream(session); -- Initialise, ready for use
- -- FIXME: Below function should be session,stanza - and xmlhandlers should use :method() notation to call,
- -- this will avoid the useless indirection we have atm
- -- (I'm on a mission, no time to fix now)
-
- -- Debug version --
- local function handleerr(err) print("Traceback:", err, debug.traceback()); end
- session.stanza_dispatch = function (stanza) return select(2, xpcall(function () return core_process_stanza(session, stanza); end, handleerr)); end
+ session.dispatch_stanza = stream_callbacks.handlestanza;
end
if data then
session.data(conn, data);
end
end
-function xmppserver.disconnect(conn)
+function xmppserver.disconnect(conn, err)
local session = sessions[conn];
if session then
- (session.log or log)("info", "s2s disconnected: %s->%s", tostring(session.from_host), tostring(session.to_host));
+ 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
+ (session.log or log)("info", "s2s disconnected: %s->%s (%s)", tostring(session.from_host), tostring(session.to_host), tostring(err));
s2s_destroy_session(session);
sessions[conn] = nil;
session = nil;
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
- -- FIXME: Below function should be session,stanza - and xmlhandlers should use :method() notation to call,
- -- this will avoid the useless indirection we have atm
- -- (I'm on a mission, no time to fix now)
- session.stanza_dispatch = function (stanza) return core_process_stanza(session, stanza); end
+ --local function handleerr(err) print("Traceback:", err, debug.traceback()); end
+ --session.stanza_dispatch = function (stanza) return select(2, xpcall(function () return core_process_stanza(session, stanza); end, handleerr)); end
end
connlisteners_register("xmppserver", xmppserver);