Automated merge with http://waqas.ath.cx:8000/

[prosody.git] / core / xmlhandlers.lua

diff --git a/core/xmlhandlers.lua b/core/xmlhandlers.lua
index 2872a03656fa85480d9b18cbf563460873a5d867..d4d9e1416feff0795df40684df531b74f53d9712 100644 (file)
--- a/core/xmlhandlers.lua
+++ b/core/xmlhandlers.lua
@@ -1,4 +1,4 @@
--- Prosody IM v0.1
+-- Prosody IM v0.2
 -- Copyright (C) 2008 Matthew Wild
 -- Copyright (C) 2008 Waqas Hussain
 -- 
@@ -47,27 +47,27 @@ local ns_prefixes = {
 
 function init_xmlhandlers(session, stream_callbacks)
                local ns_stack = { "" };
-               local curr_ns = "";
+               local curr_ns, name = "";
                local curr_tag;
                local chardata = {};
                local xml_handlers = {};
                local log = session.log or default_log;
-
-               local send = session.send;
                
                local cb_streamopened = stream_callbacks.streamopened;
                local cb_streamclosed = stream_callbacks.streamclosed;
-               local cb_error = stream_callbacks.error or function (e) error("XML stream error: "..tostring(e)); end;
+               local cb_error = stream_callbacks.error or function (session, e) error("XML stream error: "..tostring(e)); end;
                local cb_handlestanza = stream_callbacks.handlestanza;
                
+               local stream_tag = stream_callbacks.stream_tag;
+               
                local stanza
-               function xml_handlers:StartElement(name, attr)
+               function xml_handlers:StartElement(tagname, attr)
                        if stanza and #chardata > 0 then
                                -- We have some character data in the buffer
                                stanza:text(t_concat(chardata));
                                chardata = {};
                        end
-                       curr_ns,name = name:match("^(.+)|([%w%-]+)$");
+                       local curr_ns,name = tagname:match("^(.+)|([%w%-]+)$");
                        if curr_ns ~= "jabber:server" then
                                attr.xmlns = curr_ns;
                        end
@@ -89,18 +89,18 @@ function init_xmlhandlers(session, stream_callbacks)
                        
                        if not stanza then --if we are not currently inside a stanza
                                if session.notopen then
-                                       if name == "stream" then
+                                       if tagname == stream_tag then
                                                if cb_streamopened then
                                                        cb_streamopened(session, attr);
                                                end
                                        else
                                                -- Garbage before stream?
-                                               cb_error("no-stream");
+                                               cb_error(session, "no-stream");
                                        end
                                        return;
                                end
                                if curr_ns == "jabber:client" and name ~= "iq" and name ~= "presence" and name ~= "message" then
-                                       cb_error("invalid-top-level-element");
+                                       cb_error(session, "invalid-top-level-element");
                                end
                                
                                stanza = st.stanza(name, attr);
@@ -118,18 +118,18 @@ function init_xmlhandlers(session, stream_callbacks)
                                t_insert(chardata, data);
                        end
                end
-               function xml_handlers:EndElement(name)
-                       curr_ns,name = name:match("^(.+)|([%w%-]+)$");
+               function xml_handlers:EndElement(tagname)
+                       curr_ns,name = tagname:match("^(.+)|([%w%-]+)$");
                        if (not stanza) or (#stanza.last_add > 0 and name ~= stanza.last_add[#stanza.last_add].name) then 
-                               if name == "stream" then
+                               if tagname == stream_tag then
                                        if cb_streamclosed then
                                                cb_streamclosed(session);
                                        end
                                        return;
                                elseif name == "error" then
-                                       cb_error("stream-error", stanza);
+                                       cb_error(session, "stream-error", stanza);
                                else
-                                       cb_error("parse-error", "unexpected-element-close", name);
+                                       cb_error(session, "parse-error", "unexpected-element-close", name);
                                end
                        end
                        if stanza and #chardata > 0 then