--- Prosody IM v0.1
+-- Prosody IM v0.2
-- Copyright (C) 2008 Matthew Wild
-- Copyright (C) 2008 Waqas Hussain
--
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 print = function (...) log("info", "xmlhandlers", t_concatall({...}, "\t")); end
-
- local send = session.send;
local cb_streamopened = stream_callbacks.streamopened;
local cb_streamclosed = stream_callbacks.streamclosed;
+ 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
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
- return;
+ else
+ -- Garbage before stream?
+ cb_error(session, "no-stream");
end
- error("Client failed to open stream successfully");
+ return;
end
if curr_ns == "jabber:client" and name ~= "iq" and name ~= "presence" and name ~= "message" then
- error("Client sent invalid top-level stanza");
+ cb_error(session, "invalid-top-level-element");
end
stanza = st.stanza(name, attr);
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
- log("debug", "Stream closed");
+ if tagname == stream_tag then
if cb_streamclosed then
cb_streamclosed(session);
end
return;
elseif name == "error" then
- error("Stream error: "..tostring(name)..": "..tostring(stanza));
+ cb_error(session, "stream-error", stanza);
else
- error("XML parse error in client stream with element: "..name);
+ cb_error(session, "parse-error", "unexpected-element-close", name);
end
end
if stanza and #chardata > 0 then
end
-- Complete stanza
if #stanza.last_add == 0 then
- session.stanza_dispatch(stanza);
+ cb_handlestanza(session, stanza);
stanza = nil;
else
stanza:up();