From 54d05f64bad5a8624a9578704a75d18e6cac4de7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micka=C3=ABl=20R=C3=A9mond?=
 <mickael.remond@process-one.net>
Date: Tue, 26 Sep 2006 11:12:03 +0000
Subject: [PATCH] Improvement coming from trunk (SVN #633): *
 src/ejabberd_s2s.erl: Added incoming-s2s-number and outgoing-s2s-number
 ejabberdctl commands

SVN Revision: 643
---
 ChangeLog            |  3 +++
 src/ejabberd_s2s.erl | 20 +++++++++++++++++++-
 2 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index dd2b8da7c..e145e25b7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2006-09-26  Mickael Remond  <mickael.remond@process-one.net>
 
+	* src/ejabberd_s2s.erl: Added incoming-s2s-number and
+	outgoing-s2s-number ejabberdctl commands
+	
 	* src/mod_muc/mod_muc_room.erl: Minor english update.
 	* src/msgs/pl.msg: Likewise.
 	* src/msgs/uk.msg: Likewise.
diff --git a/src/ejabberd_s2s.erl b/src/ejabberd_s2s.erl
index f5aac6b8a..9b1177292 100644
--- a/src/ejabberd_s2s.erl
+++ b/src/ejabberd_s2s.erl
@@ -19,7 +19,9 @@
 	 get_key/1,
 	 try_register/1,
 	 remove_connection/1,
-	 dirty_get_connections/0]).
+	 dirty_get_connections/0,
+	 ctl_process/2
+	]).
 
 %% gen_server callbacks
 -export([init/1, handle_call/3, handle_cast/2, handle_info/2,
@@ -27,6 +29,7 @@
 
 -include("ejabberd.hrl").
 -include("jlib.hrl").
+-include("ejabberd_ctl.hrl").
 
 -record(s2s, {fromto, pid, key}).
 -record(state, {}).
@@ -112,6 +115,10 @@ init([]) ->
 			      {attributes, record_info(fields, s2s)}]),
     mnesia:add_table_copy(s2s, node(), ram_copies),
     mnesia:subscribe(system),
+    ejabberd_ctl:register_commands(
+      [{"incoming-s2s-number", "print number of incoming s2s connections on the node"},
+       {"outgoing-s2s-number", "print number of outgoing s2s connections on the node"}],
+      ?MODULE, ctl_process),
     {ok, #state{}}.
 
 %%--------------------------------------------------------------------
@@ -240,6 +247,17 @@ find_connection(From, To) ->
 send_element(Pid, El) ->
     Pid ! {send_element, El}.
 
+ctl_process(_Val, ["incoming-s2s-number"]) ->
+    N = length(supervisor:which_children(ejabberd_s2s_in_sup)),
+    io:format("~p~n", [N]),
+    {stop, ?STATUS_SUCCESS};
+ctl_process(_Val, ["outgoing-s2s-number"]) ->
+    N = length(supervisor:which_children(ejabberd_s2s_out_sup)),
+    io:format("~p~n", [N]),
+    {stop, ?STATUS_SUCCESS};
+ctl_process(Val, _Args) ->
+    Val.
+
 update_tables() ->
     case catch mnesia:table_info(s2s, attributes) of
 	[fromto, node, key] ->