Software / code / prosody
Diff
core/xmlhandlers.lua @ 331:830fd67f9378
Quite some changes, to:
- Small logging fix for s2smanager
- Send a stream error if an incoming s2s connection is to an unrecognised hostname (fixes #11)
- init_xmlhandlers now takes a table of callbacks (includes changes to net/xmpp*_listener for this)
- Move sending of unavailable presence to where it should be, sessionmanager.destroy_session
- Fix sending of stream errors to wrong connection
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Tue, 18 Nov 2008 17:52:33 +0000 |
| parent | 166:d4ee015fcee4 |
| child | 334:bffd80e8c7a3 |
line wrap: on
line diff
--- a/core/xmlhandlers.lua Tue Nov 18 14:42:45 2008 +0000 +++ b/core/xmlhandlers.lua Tue Nov 18 17:52:33 2008 +0000 @@ -25,7 +25,7 @@ ["http://www.w3.org/XML/1998/namespace"] = "xml"; } -function init_xmlhandlers(session, streamopened) +function init_xmlhandlers(session, stream_callbacks) local ns_stack = { "" }; local curr_ns = ""; local curr_tag; @@ -36,6 +36,9 @@ local send = session.send; + local cb_streamopened = stream_callbacks.streamopened; + local cb_streamclosed = stream_callbacks.streamclosed; + local stanza function xml_handlers:StartElement(name, attr) if stanza and #chardata > 0 then @@ -65,8 +68,9 @@ if not stanza then --if we are not currently inside a stanza if session.notopen then - if name == "stream" then - streamopened(session, attr); + print("client opening with "..tostring(name)); + if name == "stream" and cb_streamopened then + cb_streamopened(session, attr); return; end error("Client failed to open stream successfully"); @@ -75,7 +79,7 @@ error("Client sent invalid top-level stanza"); end - stanza = st.stanza(name, attr); --{ to = attr.to, type = attr.type, id = attr.id, xmlns = curr_ns }); + stanza = st.stanza(name, attr); curr_tag = stanza; else -- we are inside a stanza, so add a tag attr.xmlns = nil; @@ -93,9 +97,9 @@ function xml_handlers:EndElement(name) 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 + if name == "stream" and cb_streamclosed then log("debug", "Stream closed"); - sm_destroy_session(session); + cb_streamclosed(session); return; elseif name == "error" then error("Stream error: "..tostring(name)..": "..tostring(stanza));
