From 283aa52b3127f83b68b6094edd84f90f549ad131 Mon Sep 17 00:00:00 2001 From: Pablo Polvorin Date: Fri, 4 Sep 2009 21:33:30 +0000 Subject: [PATCH] Port #2583 from trunk Use the local (target) domain for firing the s2s_receive_packet hook. It was using the external server domain (LFrom) instead of the local domain (LTo). This might have impact on mod_caps in s2s scenarios, needs further attention. SVN Revision: 2584 --- src/ejabberd_s2s_in.erl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/ejabberd_s2s_in.erl b/src/ejabberd_s2s_in.erl index 590b322f8..5ba3ecb49 100644 --- a/src/ejabberd_s2s_in.erl +++ b/src/ejabberd_s2s_in.erl @@ -399,7 +399,7 @@ stream_established({xmlstreamelement, El}, StateData) -> (Name == 'presence')) -> ejabberd_hooks:run( s2s_receive_packet, - exmpp_jid:prep_domain(From), + exmpp_jid:prep_domain(To), [From, To, El]), ejabberd_router:route( From, To, El); @@ -419,7 +419,7 @@ stream_established({xmlstreamelement, El}, StateData) -> (Name == 'presence')) -> ejabberd_hooks:run( s2s_receive_packet, - exmpp_jid:prep_domain(From), + exmpp_jid:prep_domain(To), [From, To, El]), ejabberd_router:route( From, To, El);