util.muc: Fix location of <x> element on error replies

[prosody.git] / net / xmppclient_listener.lua

diff --git a/net/xmppclient_listener.lua b/net/xmppclient_listener.lua
index cc65ff75d930504699be8e7a3faa6f7c2c03d9ba..6cea43f2ecd7c75226f66b16dc3c54b7493e5da5 100644 (file)
--- a/net/xmppclient_listener.lua
+++ b/net/xmppclient_listener.lua
@@ -61,6 +61,7 @@ local function session_reset_stream(session)
                function session.data(conn, data)
                        local ok, err = parser:parse(data);
                        if ok then return; end
+                       log("debug", "Received invalid XML (%s) %d bytes: %s", tostring(err), #data, data:sub(1, 300):gsub("[\r\n]+", " "));
                        session:close("xml-not-well-formed");
                end
                
@@ -69,9 +70,14 @@ 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 function session_close(session, reason)
        local log = session.log or log;
        if session.conn then
+               if session.notopen then
+                       session.send("<?xml version='1.0'?>");
+                       session.send(st.stanza("stream:stream", default_stream_attr):top_tag());
+               end
                if reason then
                        if type(reason) == "string" then -- assume stream error
                                log("info", "Disconnecting client, <stream:error> is: %s", reason);
@@ -108,11 +114,6 @@ function xmppclient.listener(conn, data)
                session = sm_new_session(conn);
                sessions[conn] = session;
 
-               -- Logging functions --
-
-               local conn_name = "c2s"..tostring(conn):match("[a-f0-9]+$");
-               session.log = logger.init(conn_name);
-               
                session.log("info", "Client connected");
                
                -- Client is using legacy SSL (otherwise mod_tls sets this flag)