# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1268535660 0
# Node ID 305428b14f76364a1e923a59d1787548db53fdc9
# Parent  18d8009f06cb4641625c37222e43736ca27556bc
net.xmppclient_listener: Fix to correctly handle stream errors from clients

diff -r 18d8009f06cb -r 305428b14f76 net/xmppclient_listener.lua
--- a/net/xmppclient_listener.lua	Sun Mar 14 02:59:41 2010 +0000
+++ b/net/xmppclient_listener.lua	Sun Mar 14 03:01:00 2010 +0000
@@ -33,13 +33,32 @@
 local stream_callbacks = { default_ns = "jabber:client",
 		streamopened = sm_streamopened, streamclosed = sm_streamclosed, handlestanza = core_process_stanza };
 
+local xmlns_xmpp_streams = "urn:ietf:params:xml:ns:xmpp-streams";
+
 function stream_callbacks.error(session, error, data)
 	if error == "no-stream" then
 		session.log("debug", "Invalid opening stream header");
 		session:close("invalid-namespace");
-	elseif session.close then
-		(session.log or log)("debug", "Client XML parse error: %s", tostring(error));
+	elseif error == "parse-error" then
+		(session.log or log)("debug", "Client XML parse error: %s", tostring(data));
 		session:close("xml-not-well-formed");
+	elseif error == "stream-error" then
+		local condition, text = "undefined-condition";
+		for child in data:children() do
+			if child.attr.xmlns == xmlns_xmpp_streams then
+				if child.name ~= "text" then
+					condition = child.name;
+				else
+					text = child:get_text();
+				end
+				if condition ~= "undefined-condition" and text then
+					break;
+				end
+			end
+		end
+		text = condition .. (text and (" ("..text..")") or "");
+		session.log("info", "Session closed by remote with error: %s", text);
+		session:close(nil, text);
 	end
 end