diff options
| author | Waqas Hussain <waqas20@gmail.com> | 2009-06-25 08:11:05 +0500 |
|---|---|---|
| committer | Waqas Hussain <waqas20@gmail.com> | 2009-06-25 08:11:05 +0500 |
| commit | e1fbd456301352b2d56cde29ad5b12c69528f5c8 (patch) | |
| tree | e0e06a9aef78aa235762e87cfde326a64542de80 /core | |
| parent | b1b3a4052281c385807ab80ce6fe985cb672f2a4 (diff) | |
| download | prosody-e1fbd456301352b2d56cde29ad5b12c69528f5c8.tar.gz prosody-e1fbd456301352b2d56cde29ad5b12c69528f5c8.zip | |
stanza_router: Remove some more old routing code
Diffstat (limited to 'core')
| -rw-r--r-- | core/stanza_router.lua | 21 |
1 files changed, 5 insertions, 16 deletions
diff --git a/core/stanza_router.lua b/core/stanza_router.lua index 9bb58ad5..cd22cb6c 100644 --- a/core/stanza_router.lua +++ b/core/stanza_router.lua @@ -164,22 +164,11 @@ function core_post_stanza(origin, stanza) else if h.events.fire_event(stanza.name..to_type, event_data) then return; end -- do processing end - end - - if host and fire_event(host.."/"..stanza.name, event_data) then - -- event handled - elseif stanza.name == "presence" and origin.host and fire_event(origin.host.."/"..stanza.name, event_data) then - -- event handled - elseif not to then - modules_handle_stanza(host or origin.host or origin.to_host, origin, stanza); - elseif hosts[to] and hosts[to].type == "local" then -- directed at a local server - modules_handle_stanza(host or origin.host or origin.to_host, origin, stanza); - elseif hosts[to_bare] and hosts[to_bare].type == "component" then -- hack to allow components to handle node@server - component_handle_stanza(origin, stanza); - elseif hosts[host] and hosts[host].type == "component" then -- directed at a component - component_handle_stanza(origin, stanza); - elseif hosts[host] and hosts[host].type == "local" and stanza.name == "iq" and not resource then -- directed at bare JID - modules_handle_stanza(host or origin.host or origin.to_host, origin, stanza); + if not modules_handle_stanza(h.host, origin, stanza) then + if stanza.attr.xmlns == "jabber:client" and stanza.attr.type ~= "result" and stanza.attr.type ~= "error" then + origin.send(st.error_reply(stanza, "cancel", "service-unavailable")); + end + end else core_route_stanza(origin, stanza); end |