Merging more s2s

1 files changed, 34 insertions, 8 deletions

diff --git a/core/xmlhandlers.lua b/core/xmlhandlers.lua
index a6b1c18a..3037a848 100644
--- a/core/xmlhandlers.lua
+++ b/core/xmlhandlers.lua
@@ -15,6 +15,8 @@ local t_concat = table.concat;
 local t_concatall = function (t, sep) local tt = {}; for _, s in ipairs(t) do t_insert(tt, tostring(s)); end return t_concat(tt, sep); end
 local sm_destroy_session = import("core.sessionmanager", "destroy_session");
 
+local default_log = require "util.logger".init("xmlhandlers");
+
 local error = error;
 
 module "xmlhandlers"
@@ -29,8 +31,8 @@ function init_xmlhandlers(session, streamopened)
 		local curr_tag;
 		local chardata = {};
 		local xml_handlers = {};
-		local log = session.log;
-		local print = function (...) log("info", "xmlhandlers", t_concatall({...}, "\t")); end
+		local log = session.log or default_log;
+		--local print = function (...) log("info", "xmlhandlers", t_concatall({...}, "\t")); end
 		
 		local send = session.send;
 		
@@ -41,8 +43,27 @@ function init_xmlhandlers(session, streamopened)
 				stanza:text(t_concat(chardata));
 				chardata = {};
 			end
-			curr_ns,name = name:match("^(.+):(%w+)$");
-			if not stanza then
+			curr_ns,name = name:match("^(.+)|([%w%-]+)$");
+			if curr_ns ~= "jabber:server" then
+				attr.xmlns = curr_ns;
+			end
+			
+			-- FIXME !!!!!
+			for i, k in ipairs(attr) do
+				if type(k) == "string" then
+					local ns, nm = k:match("^([^|]+)|?([^|]-)$")
+					if ns and nm then
+						ns = ns_prefixes[ns]; 
+						if ns then 
+							attr[ns..":"..nm] = attr[k];
+							attr[i] = ns..":"..nm;
+							attr[k] = nil;
+						end
+					end
+				end
+			end
+			
+			if not stanza then --if we are not currently inside a stanza
 				if session.notopen then
 					if name == "stream" then
 						streamopened(session, attr);
@@ -53,11 +74,14 @@ function init_xmlhandlers(session, streamopened)
 				if curr_ns == "jabber:client" and name ~= "iq" and name ~= "presence" and name ~= "message" then
 					error("Client sent invalid top-level stanza");
 				end
-				attr.xmlns = curr_ns;
+				
 				stanza = st.stanza(name, attr); --{ to = attr.to, type = attr.type, id = attr.id, xmlns = curr_ns });
 				curr_tag = stanza;
-			else
-				attr.xmlns = curr_ns;
+			else -- we are inside a stanza, so add a tag
+				attr.xmlns = nil;
+				if curr_ns ~= "jabber:server" and curr_ns ~= "jabber:client" then
+					attr.xmlns = curr_ns;
+				end
 				stanza:tag(name, attr);
 			end
 		end
@@ -67,12 +91,14 @@ function init_xmlhandlers(session, streamopened)
 			end
 		end
 		function xml_handlers:EndElement(name)
-			curr_ns,name = name:match("^(.+):(%w+)$");
+			curr_ns,name = name:match("^(.+)|([%w%-]+)$");
 			if (not stanza) or #stanza.last_add < 0 or (#stanza.last_add > 0 and name ~= stanza.last_add[#stanza.last_add].name) then 
 				if name == "stream" then
 					log("debug", "Stream closed");
 					sm_destroy_session(session);
 					return;
+				elseif name == "error" then
+					error("Stream error: "..tostring(name)..": "..tostring(stanza));
 				else
 					error("XML parse error in client stream");
 				end