diff options
| author | Kim Alvefur <zash@zash.se> | 2012-03-03 01:35:39 +0100 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2012-03-03 01:35:39 +0100 |
| commit | 71528cdc3726be326d6a0afb76f490b7d3c4fcc6 (patch) | |
| tree | 7cb9f1430765b87af8e34951d82f326bb892290e | |
| parent | f886be3d2c699f58a84b37c2ec51cdd14ebf6fe7 (diff) | |
| download | prosody-71528cdc3726be326d6a0afb76f490b7d3c4fcc6.tar.gz prosody-71528cdc3726be326d6a0afb76f490b7d3c4fcc6.zip | |
mod_s2s, mod_dialback: Event on pre-XMPP streams, so we can try dialback.
| -rw-r--r-- | plugins/mod_dialback.lua | 5 | ||||
| -rw-r--r-- | plugins/s2s/mod_s2s.lua | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/plugins/mod_dialback.lua b/plugins/mod_dialback.lua index eccfd3d6..5cb59fef 100644 --- a/plugins/mod_dialback.lua +++ b/plugins/mod_dialback.lua @@ -160,6 +160,11 @@ module:hook_stanza(xmlns_stream, "features", function (origin, stanza) end end, 100); +module:hook("s2s-no-stream-features", function (event) + initiate_dialback(event.origin); + return true; +end, 100); + -- Offer dialback to incoming hosts module:hook("s2s-stream-features", function (data) data.features:tag("dialback", { xmlns='urn:xmpp:features:dialback' }):up(); diff --git a/plugins/s2s/mod_s2s.lua b/plugins/s2s/mod_s2s.lua index de3ad4e1..9ab2ee0a 100644 --- a/plugins/s2s/mod_s2s.lua +++ b/plugins/s2s/mod_s2s.lua @@ -233,7 +233,7 @@ function stream_callbacks.streamopened(session, attr) if session.version < 1.0 then if not session.dialback_verifying then log("debug", "Initiating dialback..."); - initiate_dialback(session); + hosts[session.from_host].events.fire_event("s2s-no-stream-features", { origin = session }); else s2s_mark_connected(session); end |