diff options
Diffstat (limited to 'core')
| -rw-r--r-- | core/componentmanager.lua | 3 | ||||
| -rw-r--r-- | core/eventmanager2.lua | 6 | ||||
| -rw-r--r-- | core/stanza_router.lua | 13 |
3 files changed, 16 insertions, 6 deletions
diff --git a/core/componentmanager.lua b/core/componentmanager.lua index 93e2ae7b..d76b7849 100644 --- a/core/componentmanager.lua +++ b/core/componentmanager.lua @@ -80,8 +80,7 @@ end function create_component(host, component) -- TODO check for host well-formedness - local session = session or { type = "component", host = host, connected = true, s2sout = {} }; - return session; + return { type = "component", host = host, connected = true, s2sout = {} }; end function register_component(host, component, session) diff --git a/core/eventmanager2.lua b/core/eventmanager2.lua new file mode 100644 index 00000000..4783d0a9 --- /dev/null +++ b/core/eventmanager2.lua @@ -0,0 +1,6 @@ +
+local events = require "util.events".new();
+
+module "eventmanager"
+
+return events;
diff --git a/core/stanza_router.lua b/core/stanza_router.lua index 29840d76..eb5bf410 100644 --- a/core/stanza_router.lua +++ b/core/stanza_router.lua @@ -10,6 +10,8 @@ local log = require "util.logger".init("stanzarouter") +local hosts = _G.hosts; + local st = require "util.stanza"; local send_s2s = require "core.s2smanager".send_to_host; local user_exists = require "core.usermanager".user_exists; @@ -24,9 +26,9 @@ local s2s_make_authenticated = require "core.s2smanager".make_authenticated; local modules_handle_stanza = require "core.modulemanager".handle_stanza; local component_handle_stanza = require "core.componentmanager".handle_stanza; -local handle_outbound_presence_subscriptions_and_probes = require "core.presencemanager".handle_outbound_presence_subscriptions_and_probes; -local handle_inbound_presence_subscriptions_and_probes = require "core.presencemanager".handle_inbound_presence_subscriptions_and_probes; -local handle_normal_presence = require "core.presencemanager".handle_normal_presence; +local handle_outbound_presence_subscriptions_and_probes = function()end;--require "core.presencemanager".handle_outbound_presence_subscriptions_and_probes; +local handle_inbound_presence_subscriptions_and_probes = function()end;--require "core.presencemanager".handle_inbound_presence_subscriptions_and_probes; +local handle_normal_presence = function()end;--require "core.presencemanager".handle_normal_presence; local format = string.format; local tostring = tostring; @@ -40,6 +42,7 @@ local ipairs = ipairs; local jid_split = require "util.jid".split; local jid_prepped_split = require "util.jid".prepped_split; local print = print; +local fire_event = require "core.eventmanager2".fire_event; local function checked_error_reply(origin, stanza) if (stanza.attr.xmlns == "jabber:client" or stanza.attr.xmlns == "jabber:server") and stanza.attr.type ~= "error" and stanza.attr.type ~= "result" then origin.send(st.error_reply(stanza, "cancel", "service-unavailable")); -- FIXME correct error? @@ -105,6 +108,8 @@ function core_process_stanza(origin, stanza) -- FIXME do stanzas not of jabber:client get handled by components? if (origin.type == "s2sin" or origin.type == "c2s" or origin.type == "component") and (not xmlns or xmlns == "jabber:server" or xmlns == "jabber:client") then + local event_data = {origin=origin, stanza=stanza}; + fire_event(tostring(host or origin.host).."/"..stanza.name, event_data); 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? @@ -145,7 +150,7 @@ end -- that is, they are handled by this server function core_handle_stanza(origin, stanza) -- Handlers - if modules_handle_stanza(select(2, jid_split(stanza.attr.to)) or origin.host, origin, stanza) then return; end + if modules_handle_stanza(select(2, jid_split(stanza.attr.to)) or origin.host or origin.to_host, origin, stanza) then return; end if origin.type == "c2s" or origin.type == "s2sin" then if origin.type == "c2s" then if stanza.name == "presence" and origin.roster then |