* src/ejabberd_s2s.erl: Added s2s_send_packet and s2s_receive_packet hooks (EJAB...

* src/ejabberd_s2s_in.erl: Likewise.

SVN Revision: 1342

diff --git a/ChangeLog b/ChangeLog
index 37a7a71127669b8e1a3f161f6cc89f8b6b8a5030..2931b60cd1f86fa72fbb46a727d7d9506ac79242 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2008-05-22  Mickael Remond  <mremond@process-one.net>
 
+       * src/ejabberd_s2s.erl: Added s2s_send_packet and s2s_receive_packet
+       hooks (EJAB-635).
+       * src/ejabberd_s2s_in.erl: Likewise.
+
        * src/ejabberd_c2s.erl: user_send_packet hook now called on all packets
        including presence packets (EJAB-634)
 

diff --git a/src/ejabberd_s2s.erl b/src/ejabberd_s2s.erl
index b500388c5f1642338baf18a0770b1893f0ed9ca0..cd878c1b2e9ce1bf7b6fc7ad70d7ed4d62e2ab3a 100644 (file)
--- a/src/ejabberd_s2s.erl
+++ b/src/ejabberd_s2s.erl
@@ -256,6 +256,11 @@ do_route(From, To, Packet) ->
            NewAttrs = jlib:replace_from_to_attrs(jlib:jid_to_string(From),
                                                  jlib:jid_to_string(To),
                                                  Attrs),
+           #jid{lserver = MyServer} = From,
+           ejabberd_hooks:run(
+             s2s_send_packet,
+             MyServer,
+             [From, To, Packet]),
            send_element(Pid, {xmlelement, Name, NewAttrs, Els}),
            ok;
        {aborted, _Reason} ->

diff --git a/src/ejabberd_s2s_in.erl b/src/ejabberd_s2s_in.erl
index cd57e3d1ecda6177d5326fe31c1e7b128ce0f64d..9827775d20b994ebe47911fcb39d55b846dd7f39 100644 (file)
--- a/src/ejabberd_s2s_in.erl
+++ b/src/ejabberd_s2s_in.erl
@@ -412,6 +412,10 @@ stream_established({xmlstreamelement, El}, StateData) ->
                                    if ((Name == "iq") or
                                        (Name == "message") or
                                        (Name == "presence")) ->
+                                           ejabberd_hooks:run(
+                                             s2s_receive_packet,
+                                             LFrom,
+                                             [From, To, NewEl]),
                                            ejabberd_router:route(
                                              From, To, NewEl);
                                       true ->
@@ -427,6 +431,10 @@ stream_established({xmlstreamelement, El}, StateData) ->
                                    if ((Name == "iq") or
                                        (Name == "message") or
                                        (Name == "presence")) ->
+                                           ejabberd_hooks:run(
+                                             s2s_receive_packet,
+                                             LFrom,
+                                             [From, To, NewEl]),
                                            ejabberd_router:route(
                                              From, To, NewEl);
                                       true ->