util.pluginloader: Return full file path from internal file loader on success, not...

[prosody.git] / util / xmppstream.lua

diff --git a/util/xmppstream.lua b/util/xmppstream.lua
index 29095e41a80e0e876c38769afa32d890580ef1b9..a13e9d3268e87a8ab3ff58754c87c262510bb028 100644 (file)
--- a/util/xmppstream.lua
+++ b/util/xmppstream.lua
@@ -9,12 +9,15 @@
 
 local lxp = require "lxp";
 local st = require "util.stanza";
+local stanza_mt = st.stanza_mt;
 
 local tostring = tostring;
 local t_insert = table.insert;
 local t_concat = table.concat;
+local t_remove = table.remove;
+local setmetatable = setmetatable;
 
-local default_log = require "util.logger".init("xmlhandlers");
+local default_log = require "util.logger".init("xmppstream");
 
 local error = error;
 
@@ -31,6 +34,9 @@ local xmlns_streams = "http://etherx.jabber.org/streams";
 local ns_separator = "\1";
 local ns_pattern = "^([^"..ns_separator.."]*)"..ns_separator.."?(.*)$";
 
+_M.ns_separator = ns_separator;
+_M.ns_pattern = ns_pattern;
+
 function new_sax_handlers(session, stream_callbacks)
        local xml_handlers = {};
        
@@ -42,17 +48,21 @@ function new_sax_handlers(session, stream_callbacks)
        local cb_handlestanza = stream_callbacks.handlestanza;
        
        local stream_ns = stream_callbacks.stream_ns or xmlns_streams;
-       local stream_tag = stream_ns..ns_separator..(stream_callbacks.stream_tag or "stream");
+       local stream_tag = stream_callbacks.stream_tag or "stream";
+       if stream_ns ~= "" then
+               stream_tag = stream_ns..ns_separator..stream_tag;
+       end
        local stream_error_tag = stream_ns..ns_separator..(stream_callbacks.error_tag or "error");
        
        local stream_default_ns = stream_callbacks.default_ns;
        
+       local stack = {};
        local chardata, stanza = {};
        local non_streamns_depth = 0;
        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));
+                       t_insert(stanza, t_concat(chardata));
                        chardata = {};
                end
                local curr_ns,name = tagname:match(ns_pattern);
@@ -96,9 +106,13 @@ function new_sax_handlers(session, stream_callbacks)
                                cb_error(session, "invalid-top-level-element");
                        end
                        
-                       stanza = st.stanza(name, attr);
+                       stanza = setmetatable({ name = name, attr = attr, tags = {} }, stanza_mt);
                else -- we are inside a stanza, so add a tag
-                       stanza:tag(name, attr);
+                       t_insert(stack, stanza);
+                       local oldstanza = stanza;
+                       stanza = setmetatable({ name = name, attr = attr, tags = {} }, stanza_mt);
+                       t_insert(oldstanza, stanza);
+                       t_insert(oldstanza.tags, stanza);
                end
        end
        function xml_handlers:CharacterData(data)
@@ -113,12 +127,11 @@ function new_sax_handlers(session, stream_callbacks)
                if stanza then
                        if #chardata > 0 then
                                -- We have some character data in the buffer
-                               stanza:text(t_concat(chardata));
+                               t_insert(stanza, t_concat(chardata));
                                chardata = {};
                        end
                        -- Complete stanza
-                       local last_add = stanza.last_add;
-                       if not last_add or #last_add == 0 then
+                       if #stack == 0 then
                                if tagname ~= stream_error_tag then
                                        cb_handlestanza(session, stanza);
                                else
@@ -126,7 +139,7 @@ function new_sax_handlers(session, stream_callbacks)
                                end
                                stanza = nil;
                        else
-                               stanza:up();
+                               stanza = t_remove(stack);
                        end
                else
                        if tagname == stream_tag then
@@ -141,11 +154,13 @@ function new_sax_handlers(session, stream_callbacks)
                                cb_error(session, "parse-error", "unexpected-element-close", name);
                        end
                        stanza, chardata = nil, {};
+                       stack = {};
                end
        end
        
        local function reset()
                stanza, chardata = nil, {};
+               stack = {};
        end
        
        local function set_session(stream, new_session)