diff options
| author | Waqas Hussain <waqas20@gmail.com> | 2010-11-10 02:51:36 +0500 |
|---|---|---|
| committer | Waqas Hussain <waqas20@gmail.com> | 2010-11-10 02:51:36 +0500 |
| commit | e75ae6d76d77c2337f3dadfe667ecd517dbbad36 (patch) | |
| tree | b14a9c0dafba246858b550b540f226d1b7a48d84 | |
| parent | 3efbb4f224e49abf6767d8a6386617fda4c2fb10 (diff) | |
| download | prosody-e75ae6d76d77c2337f3dadfe667ecd517dbbad36.tar.gz prosody-e75ae6d76d77c2337f3dadfe667ecd517dbbad36.zip | |
componentmanager, stanza_router: Get rid of componentmanager.handle_stanza().
| -rw-r--r-- | core/componentmanager.lua | 16 | ||||
| -rw-r--r-- | core/stanza_router.lua | 6 |
2 files changed, 0 insertions, 22 deletions
diff --git a/core/componentmanager.lua b/core/componentmanager.lua index ea1fe868..f2f64a7d 100644 --- a/core/componentmanager.lua +++ b/core/componentmanager.lua @@ -57,22 +57,6 @@ if prosody and prosody.events then prosody.events.add_handler("server-starting", load_enabled_components); end -function handle_stanza(origin, stanza) - local node, host = jid_split(stanza.attr.to); - local component = nil; - if host then - if node then component = components[node.."@"..host]; end -- hack to allow hooking node@server - if not component then component = components[host]; end - end - if component then - log("debug", "%s stanza being handled by component: %s", stanza.name, host); - component(origin, stanza, hosts[host]); - else - log("error", "Component manager recieved a stanza for a non-existing component: "..tostring(stanza)); - default_component_handler(origin, stanza); - end -end - function create_component(host, component, events) -- TODO check for host well-formedness return { type = "component", host = host, connected = true, s2sout = {}, diff --git a/core/stanza_router.lua b/core/stanza_router.lua index e2610769..97d328a1 100644 --- a/core/stanza_router.lua +++ b/core/stanza_router.lua @@ -12,7 +12,6 @@ local hosts = _G.prosody.hosts; local tostring = tostring; local st = require "util.stanza"; local send_s2s = require "core.s2smanager".send_to_host; -local component_handle_stanza = require "core.componentmanager".handle_stanza; local jid_split = require "util.jid".split; local jid_prepped_split = require "util.jid".prepped_split; @@ -172,11 +171,6 @@ function core_post_stanza(origin, stanza, preevents) if h then if h.events.fire_event(stanza.name..to_type, event_data) then return; end -- do processing if to_self and h.events.fire_event(stanza.name..'/self', event_data) then return; end -- do processing - - if h.type == "component" then - component_handle_stanza(origin, stanza); - return; - end handle_unhandled_stanza(h.host, origin, stanza); else core_route_stanza(origin, stanza); |