s2smanager: Send reply stream header only after checking we serve this host (sorry...

[prosody.git] / net / xmppserver_listener.lua

diff --git a/net/xmppserver_listener.lua b/net/xmppserver_listener.lua
index 0b887b87800b83377efff89983fc0e7485936502..37f2470c20317ec9f30f4aadf7219e74c00a9c1a 100644 (file)
--- a/net/xmppserver_listener.lua
+++ b/net/xmppserver_listener.lua
@@ -17,7 +17,7 @@ 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", 
+local stream_callbacks = { stream_tag = "http://etherx.jabber.org/streams\1stream", 
                default_ns = "jabber:server",
                streamopened = s2s_streamopened, streamclosed = s2s_streamclosed, handlestanza =  core_process_stanza };
 
@@ -53,7 +53,7 @@ local xmppserver = { default_port = 5269, default_mode = "*a" };
 
 local function session_reset_stream(session)
        -- Reset stream
-               local parser = lxp.new(init_xmlhandlers(session, stream_callbacks), "|");
+               local parser = lxp.new(init_xmlhandlers(session, stream_callbacks), "\1");
                session.parser = parser;
                
                session.notopen = true;
@@ -61,15 +61,16 @@ local function session_reset_stream(session)
                function session.data(conn, data)
                        local ok, err = parser:parse(data);
                        if ok then return; end
+                       (session.log or log)("warn", "Received invalid XML: %s", data);
+                       (session.log or log)("warn", "Problem was: %s", err);
                        session:close("xml-not-well-formed");
                end
                
                return true;
 end
 
-
 local stream_xmlns_attr = {xmlns='urn:ietf:params:xml:ns:xmpp-streams'};
-local default_stream_attr = { ["xmlns:stream"] = stream_callbacks.stream_tag:gsub("%|[^|]+$", ""), xmlns = stream_callbacks.default_ns, version = "1.0", id = "" };
+local default_stream_attr = { ["xmlns:stream"] = stream_callbacks.stream_tag:match("[^\1]*"), xmlns = stream_callbacks.default_ns, version = "1.0", id = "" };
 local function session_close(session, reason)
        local log = session.log or log;
        if session.conn then
@@ -99,7 +100,7 @@ local function session_close(session, reason)
                        end
                end
                session.sends2s("</stream:stream>");
-               if sesson.notopen or not session.conn.close() then
+               if session.notopen or not session.conn.close() then
                        session.conn.close(true); -- Force FIXME: timer?
                end
                session.conn.close();
@@ -136,13 +137,24 @@ function xmppserver.listener(conn, data)
        end
 end
        
+function xmppserver.status(conn, status)
+       if status == "ssl-handshake-complete" then
+               local session = sessions[conn];
+               if session and session.direction == "outgoing" then
+                       local format, to_host, from_host = string.format, session.to_host, session.from_host;
+                       session.log("debug", "Sending stream header...");
+                       session.sends2s(format([[<stream:stream xmlns='jabber:server' xmlns:db='jabber:server:dialback' xmlns:stream='http://etherx.jabber.org/streams' from='%s' to='%s' version='1.0'>]], from_host, to_host));
+               end
+       end
+end
+
 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");
+                       (session.log or log)("debug", "s2s connection attempt failed: %s", err);
                        if s2s_attempt_connect(session, err) then
-                               (session.log or log)("debug", "...so we're going to try again");
+                               (session.log or log)("debug", "...so we're going to try another target");
                                return; -- Session lives for now
                        end
                end