mirrors/prosody
1
0
Fork 0
mirror of https://github.com/bjc/prosody.git synced 2025-04-05 22:27:38 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

mod_s2s: Use module API to fire events

Browse source 
These direct accesses are probably more optimized, but weird when the
module API has methods for these things.
This commit is contained in:
Kim Alvefur 2021-07-11 12:36:08 +02:00
parent d258cd5054
commit f9912b0dd7
1 changed files with 8 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

17
plugins/mod_s2s.lua
View file

@ -25,7 +25,6 @@ local s2s_new_incoming = require "core.s2smanager".new_incoming;
local s2s_new_outgoing = require "core.s2smanager".new_outgoing; local s2s_new_outgoing = require "core.s2smanager".new_outgoing;
local s2s_destroy_session = require "core.s2smanager".destroy_session; local s2s_destroy_session = require "core.s2smanager".destroy_session;
local uuid_gen = require "util.uuid".generate; local uuid_gen = require "util.uuid".generate;
local fire_global_event = prosody.events.fire_event;
local runner = require "util.async".runner; local runner = require "util.async".runner;
local connect = require "net.connect".connect; local connect = require "net.connect".connect;
local service = require "net.resolvers.service"; local service = require "net.resolvers.service";
@ -272,12 +271,12 @@ function mark_connected(session)
local event_data = { session = session }; local event_data = { session = session };
if session.type == "s2sout" then if session.type == "s2sout" then
fire_global_event("s2sout-established", event_data); module:fire_event("s2sout-established", event_data);
hosts[from].events.fire_event("s2sout-established", event_data); module:context(from):fire_event("s2sout-established", event_data);
if session.incoming then if session.incoming then
session.send = function(stanza) session.send = function(stanza)
return hosts[from].events.fire_event("route/remote", { from_host = from, to_host = to, stanza = stanza }); return module:context(from):fire_event("route/remote", { from_host = from, to_host = to, stanza = stanza });
end; end;
end end
@ -291,8 +290,8 @@ function mark_connected(session)
return host_session.events.fire_event("route/remote", { from_host = to, to_host = from, stanza = stanza }); return host_session.events.fire_event("route/remote", { from_host = to, to_host = from, stanza = stanza });
end; end;
fire_global_event("s2sin-established", event_data); module:fire_event("s2sin-established", event_data);
hosts[to].events.fire_event("s2sin-established", event_data); module:context(to):fire_event("s2sin-established", event_data);
end end
if session.direction == "outgoing" then if session.direction == "outgoing" then
@ -471,10 +470,10 @@ function stream_callbacks._streamopened(session, attr)
local features = st.stanza("stream:features"); local features = st.stanza("stream:features");
if to then if to then
hosts[to].events.fire_event("s2s-stream-features", { origin = session, features = features }); module:context(to):fire_event("s2s-stream-features", { origin = session, features = features });
else else
(session.log or log)("warn", "No 'to' on stream header from %s means we can't offer any features", from or session.ip or "unknown host"); (session.log or log)("warn", "No 'to' on stream header from %s means we can't offer any features", from or session.ip or "unknown host");
fire_global_event("s2s-stream-features-legacy", { origin = session, features = features }); module:fire_event("s2s-stream-features-legacy", { origin = session, features = features });
end end
if ( session.type == "s2sin" or session.type == "s2sout" ) or features.tags[1] then if ( session.type == "s2sin" or session.type == "s2sout" ) or features.tags[1] then
@ -503,7 +502,7 @@ function stream_callbacks._streamopened(session, attr)
-- If server is pre-1.0, don't wait for features, just do dialback -- If server is pre-1.0, don't wait for features, just do dialback
if session.version < 1.0 then if session.version < 1.0 then
if not session.dialback_verifying then if not session.dialback_verifying then
hosts[session.from_host].events.fire_event("s2sout-authenticate-legacy", { origin = session }); module:context(session.from_host):fire_event("s2sout-authenticate-legacy", { origin = session });
else else
mark_connected(session); mark_connected(session);
end end