* src/ejabberd_c2s.erl (process_presence_probe): Don't route a

presence probe to oneself (EJAB-498)

SVN Revision: 1275

diff --git a/ChangeLog b/ChangeLog
index d2e410e86ce008952e999aa946c138b06a5d3001..ed9311f25a1c870d07bcd7626d4f6534a03f60e3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-04-04  Badlop  <badlop@process-one.net>
+
+       * src/ejabberd_c2s.erl (process_presence_probe): Don't route a
+       presence probe to oneself (EJAB-498)
+
 2008-04-02  Christophe Romain <christophe.romain@process-one.net>
 
        * src/mod_pubsub/mod_pubsub.erl: add condition inclusion of pep in

diff --git a/src/ejabberd_c2s.erl b/src/ejabberd_c2s.erl
index 7239829e5e6642974af16ed6a159f298377ade62..54b56c98e2f4f0f776acc8a837193e7f0666879b 100644 (file)
--- 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,