Merge 0.9->0.10

[prosody.git] / plugins / mod_s2s / mod_s2s.lua

diff --git a/plugins/mod_s2s/mod_s2s.lua b/plugins/mod_s2s/mod_s2s.lua
index f177bf8261dc002cd7a3e667b4fefb62d28be62e..8614b8570933085a79dc5dfaeb251e9bf042862e 100644 (file)
--- a/plugins/mod_s2s/mod_s2s.lua
+++ b/plugins/mod_s2s/mod_s2s.lua
@@ -347,7 +347,9 @@ function stream_callbacks.streamopened(session, attr)
                        log("debug", "Sending stream features: %s", tostring(features));
                        send(features);
                end
+               session.notopen = nil;
        elseif session.direction == "outgoing" then
+               session.notopen = nil;
                -- If we are just using the connection for verifying dialback keys, we won't try and auth it
                if not attr.id then error("stream response did not give us a streamid!!!"); end
                session.streamid = attr.id;
@@ -381,7 +383,6 @@ function stream_callbacks.streamopened(session, attr)
                        end
                end
        end
-       session.notopen = nil;
 end
 
 function stream_callbacks.streamclosed(session)
@@ -391,6 +392,7 @@ end
 
 function stream_callbacks.error(session, error, data)
        if error == "no-stream" then
+               session.log("debug", "Invalid opening stream header (%s)", (data:gsub("^([^\1]+)\1", "{%1}")));
                session:close("invalid-namespace");
        elseif error == "parse-error" then
                session.log("debug", "Server-to-server XML parse error: %s", tostring(error));
@@ -501,6 +503,7 @@ local function initialize_session(session)
 
        function session.reset_stream()
                session.notopen = true;
+               session.streamid = nil;
                session.stream:reset();
        end