X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=net%2Fxmppclient_listener.lua;h=dcc561f373dd844af220b04382a3d472b7dc06b6;hb=7b9f5dde4cdb0661198660080428e862df55bc01;hp=dbb87b912e934ff22631250f164bb7da78c1494a;hpb=5dd6384aa54a7245faa18b685dce6544f9cb66d7;p=prosody.git

diff --git a/net/xmppclient_listener.lua b/net/xmppclient_listener.lua
index dbb87b91..dcc561f3 100644
--- a/net/xmppclient_listener.lua
+++ b/net/xmppclient_listener.lua
@@ -1,4 +1,4 @@
--- Prosody IM v0.4
+-- Prosody IM
 -- Copyright (C) 2008-2009 Matthew Wild
 -- Copyright (C) 2008-2009 Waqas Hussain
 -- 
@@ -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);
@@ -95,7 +101,7 @@ local function session_close(session, reason)
 		end
 		session.send("</stream:stream>");
 		session.conn.close();
-		xmppclient.disconnect(session.conn, "stream error");
+		xmppclient.disconnect(session.conn, (reason and (reason.text or reason.condition)) or reason or "session closed");
 	end
 end
 
@@ -115,6 +121,11 @@ function xmppclient.listener(conn, data)
 		
 		session.log("info", "Client connected");
 		
+		-- Client is using legacy SSL (otherwise mod_tls sets this flag)
+		if conn.ssl() then
+			session.secure = true;
+		end
+		
 		session.reset_stream = session_reset_stream;
 		session.close = session_close;
 		
@@ -131,7 +142,7 @@ function xmppclient.disconnect(conn, err)
 	local session = sessions[conn];
 	if session then
 		(session.log or log)("info", "Client disconnected: %s", err);
-		sm_destroy_session(session);
+		sm_destroy_session(session, err);
 		sessions[conn]  = nil;
 		session = nil;
 		collectgarbage("collect");