util.sasl: Removed method:forbidden() and its side effects.

[prosody.git] / util / xmppstream.lua

diff --git a/util/xmppstream.lua b/util/xmppstream.lua
index a32bcdac37cc42dffa563472f38cf1cb57b1e2f7..aa2eb0ed2359a9ae7168d83ce53228d6745e735d 100644 (file)
--- a/util/xmppstream.lua
+++ b/util/xmppstream.lua
@@ -1,16 +1,15 @@
 -- Prosody IM
--- Copyright (C) 2008-2009 Matthew Wild
--- Copyright (C) 2008-2009 Waqas Hussain
+-- Copyright (C) 2008-2010 Matthew Wild
+-- Copyright (C) 2008-2010 Waqas Hussain
 -- 
 -- This project is MIT/X11 licensed. Please see the
 -- COPYING file in the source package for more information.
 --
 
 
+local lxp = require "lxp";
+local st = require "util.stanza";
 
-require "util.stanza"
-
-local st = stanza;
 local tostring = tostring;
 local t_insert = table.insert;
 local t_concat = table.concat;
@@ -21,6 +20,8 @@ local error = error;
 
 module "xmppstream"
 
+local new_parser = lxp.new;
+
 local ns_prefixes = {
        ["http://www.w3.org/XML/1998/namespace"] = "xml";
 };
@@ -30,9 +31,9 @@ local xmlns_streams = "http://etherx.jabber.org/streams";
 local ns_separator = "\1";
 local ns_pattern = "^([^"..ns_separator.."]*)"..ns_separator.."?(.*)$";
 
-function new(session, stream_callbacks)
-       local chardata = {};
+function new_sax_handlers(session, stream_callbacks)
        local xml_handlers = {};
+       
        local log = session.log or default_log;
        
        local cb_streamopened = stream_callbacks.streamopened;
@@ -46,7 +47,7 @@ function new(session, stream_callbacks)
        
        local stream_default_ns = stream_callbacks.default_ns;
        
-       local stanza;
+       local chardata, stanza = {};
        function xml_handlers:StartElement(tagname, attr)
                if stanza and #chardata > 0 then
                        -- We have some character data in the buffer
@@ -139,7 +140,35 @@ function new(session, stream_callbacks)
                        stanza, chardata = nil, {};
                end
        end
-       return xml_handlers;
+       
+       local function reset()
+               stanza, chardata = nil, {};
+       end
+       
+       local function set_session(stream, new_session)
+               session = new_session;
+               log = new_session.log or default_log;
+       end
+       
+       return xml_handlers, { reset = reset, set_session = set_session };
+end
+
+function new(session, stream_callbacks)
+       local handlers, meta = new_sax_handlers(session, stream_callbacks);
+       local parser = new_parser(handlers, ns_separator);
+       local parse = parser.parse;
+
+       return {
+               reset = function ()
+                       parser = new_parser(handlers, ns_separator);
+                       parse = parser.parse;
+                       meta.reset();
+               end,
+               feed = function (self, data)
+                       return parse(parser, data);
+               end,
+               set_session = meta.set_session;
+       };
 end
 
 return _M;