diff options
| author | Kim Alvefur <zash@zash.se> | 2022-08-26 19:10:15 +0200 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2022-08-26 19:10:15 +0200 |
| commit | a018497a27dea6d379d7772b36c4ba5593d67ecb (patch) | |
| tree | 0152ace35fd1232589603354f491acf3dc69220f | |
| parent | de4b0b6de21dd260c8d3ab39d51bfc551a33c693 (diff) | |
| download | prosody-a018497a27dea6d379d7772b36c4ba5593d67ecb.tar.gz prosody-a018497a27dea6d379d7772b36c4ba5593d67ecb.zip | |
mod_s2s: Simplify conditionals since all sessions should have .host now
| -rw-r--r-- | core/stanza_router.lua | 4 | ||||
| -rw-r--r-- | plugins/mod_s2s.lua | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/core/stanza_router.lua b/core/stanza_router.lua index b54ea1ab..89a02c02 100644 --- a/core/stanza_router.lua +++ b/core/stanza_router.lua @@ -127,7 +127,7 @@ function core_process_stanza(origin, stanza) end core_post_stanza(origin, stanza, origin.full_jid); else - local h = hosts[stanza.attr.to or origin.host or origin.to_host]; + local h = hosts[stanza.attr.to or origin.host]; if h then local event; if xmlns == nil then @@ -143,7 +143,7 @@ function core_process_stanza(origin, stanza) if h.events.fire_event(event, {origin = origin, stanza = stanza}) then return; end end if host and not hosts[host] then host = nil; end -- COMPAT: workaround for a Pidgin bug which sets 'to' to the SRV result - handle_unhandled_stanza(host or origin.host or origin.to_host, origin, stanza); + handle_unhandled_stanza(host or origin.host, origin, stanza); end end diff --git a/plugins/mod_s2s.lua b/plugins/mod_s2s.lua index 1df3d5ad..7eae9043 100644 --- a/plugins/mod_s2s.lua +++ b/plugins/mod_s2s.lua @@ -275,7 +275,7 @@ function module.add_host(module) function module.unload() if module.reloading then return end for _, session in pairs(sessions) do - if session.to_host == module.host or session.from_host == module.host then + if session.host == module.host then session:close("host-gone"); end end |