Software / code / prosody
Changeset
12681:16ea01745dbe
mod_s2s: Simplify conditionals since all sessions should have .host now
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Fri, 26 Aug 2022 19:10:15 +0200 |
| parents | 12680:ca4abc6ab208 |
| children | 12682:464a22f2751c |
| files | core/stanza_router.lua plugins/mod_s2s.lua |
| diffstat | 2 files changed, 3 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/core/stanza_router.lua Fri Aug 26 19:03:23 2022 +0200 +++ b/core/stanza_router.lua Fri Aug 26 19:10:15 2022 +0200 @@ -127,7 +127,7 @@ 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 @@ 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
--- a/plugins/mod_s2s.lua Fri Aug 26 19:03:23 2022 +0200 +++ b/plugins/mod_s2s.lua Fri Aug 26 19:10:15 2022 +0200 @@ -275,7 +275,7 @@ 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
