diff options
| author | Matthew Wild <mwild1@gmail.com> | 2010-03-30 19:48:04 +0100 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2010-03-30 19:48:04 +0100 |
| commit | af3bc714626c4e7b5299ef675bb244e963c1cfaa (patch) | |
| tree | 05a514961ba273cda5c75bca8aa60fc278c6befc /core/stanza_router.lua | |
| parent | 3d22f29cfab86c8a1ae34400df258a3e9b47d9ac (diff) | |
| parent | 3dbf4c9e57cec2baa98f8864263a3cd11d608707 (diff) | |
| download | prosody-af3bc714626c4e7b5299ef675bb244e963c1cfaa.tar.gz prosody-af3bc714626c4e7b5299ef675bb244e963c1cfaa.zip | |
Merge 0.7->trunk
Diffstat (limited to 'core/stanza_router.lua')
| -rw-r--r-- | core/stanza_router.lua | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/core/stanza_router.lua b/core/stanza_router.lua index 0e04a4e5..d6dd5306 100644 --- a/core/stanza_router.lua +++ b/core/stanza_router.lua @@ -23,9 +23,6 @@ local bare_sessions = _G.prosody.bare_sessions; function core_process_stanza(origin, stanza) (origin.log or log)("debug", "Received[%s]: %s", origin.type, stanza:top_tag()) - -- Currently we guarantee every stanza to have an xmlns, should we keep this rule? - if not stanza.attr.xmlns then stanza.attr.xmlns = "jabber:client"; end - -- TODO verify validity of stanza (as well as JID validity) if stanza.attr.type == "error" and #stanza.tags == 0 then return; end -- TODO invalid stanza, log if stanza.name == "iq" then @@ -36,7 +33,7 @@ function core_process_stanza(origin, stanza) end end - if origin.type == "c2s" and stanza.attr.xmlns == "jabber:client" then + if origin.type == "c2s" and not stanza.attr.xmlns then if not origin.full_jid and not(stanza.name == "iq" and stanza.attr.type == "set" and stanza.tags[1] and stanza.tags[1].name == "bind" and stanza.tags[1].attr.xmlns == "urn:ietf:params:xml:ns:xmpp-bind") then @@ -92,7 +89,7 @@ function core_process_stanza(origin, stanza) return; -- FIXME what should we do here? end]] -- FIXME - if (origin.type == "s2sin" or origin.type == "c2s" or origin.type == "component") and xmlns == "jabber:client" then + if (origin.type == "s2sin" or origin.type == "c2s" or origin.type == "component") and xmlns == nil then if origin.type == "s2sin" and not origin.dummy then local host_status = origin.hosts[from_host]; if not host_status or not host_status.authed then -- remote server trying to impersonate some other server? @@ -105,14 +102,14 @@ function core_process_stanza(origin, stanza) local h = hosts[stanza.attr.to or origin.host or origin.to_host]; if h then local event; - if stanza.attr.xmlns == "jabber:client" then + if xmlns == nil then if stanza.name == "iq" and (stanza.attr.type == "set" or stanza.attr.type == "get") then event = "stanza/iq/"..stanza.tags[1].attr.xmlns..":"..stanza.tags[1].name; else event = "stanza/"..stanza.name; end else - event = "stanza/"..stanza.attr.xmlns..":"..stanza.name; + event = "stanza/"..xmlns..":"..stanza.name; end if h.events.fire_event(event, {origin = origin, stanza = stanza}) then return; end end |