aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBadlop <badlop@process-one.net>2008-04-03 22:35:26 +0000
committerBadlop <badlop@process-one.net>2008-04-03 22:35:26 +0000
commit2c8cc8ae2de4d4917634b601dc4a2b8f5dcd0650 (patch)
treeb17d64213df2757ad605796026b617df5e4900c7 /src
parent* src/ejabberd_config.erl: Add support to include additional (diff)
* src/ejabberd_c2s.erl (process_presence_probe): Don't route a
presence probe to oneself (EJAB-498) SVN Revision: 1275
Diffstat (limited to 'src')
-rw-r--r--src/ejabberd_c2s.erl8
1 files changed, 7 insertions, 1 deletions
diff --git a/src/ejabberd_c2s.erl b/src/ejabberd_c2s.erl
index 7239829e5..54b56c98e 100644
--- a/src/ejabberd_c2s.erl
+++ b/src/ejabberd_c2s.erl
@@ -1419,7 +1419,13 @@ process_presence_probe(From, To, StateData) ->
allow ->
Pid=element(2, StateData#state.sid),
ejabberd_hooks:run(presence_probe_hook, StateData#state.server, [From, To, Pid]),
- ejabberd_router:route(To, From, Packet)
+ %% Don't route a presence probe to oneself
+ case From == To of
+ false ->
+ ejabberd_router:route(To, From, Packet);
+ true ->
+ ok
+ end
end;
Cond2 ->
ejabberd_router:route(To, From,