From f5c36acfe2437835254210061030f179050f62b2 Mon Sep 17 00:00:00 2001
From: Arnaldo Pereira <arnaldo@sangoma.com>
Date: Tue, 21 Dec 2010 13:31:21 -0200
Subject: [PATCH] freetdm: mod_freetdm - updated api commands help         
 ftmod_r2 - updated api help and removed references to threads per channel,   
                  not used anymore

---
 libs/freetdm/mod_freetdm/mod_freetdm.c     | 14 ++++++++++++-
 libs/freetdm/src/ftmod/ftmod_r2/ftmod_r2.c | 24 ++++++++--------------
 2 files changed, 22 insertions(+), 16 deletions(-)

diff --git a/libs/freetdm/mod_freetdm/mod_freetdm.c b/libs/freetdm/mod_freetdm/mod_freetdm.c
index 7e099853a6..66bc532cbc 100755
--- a/libs/freetdm/mod_freetdm/mod_freetdm.c
+++ b/libs/freetdm/mod_freetdm/mod_freetdm.c
@@ -3536,7 +3536,19 @@ void dump_chan_xml(ftdm_span_t *span, uint32_t chan_id, switch_stream_handle_t *
 						   switch_channel_cause2str(caller_data->hangup_cause));
 }
 
-#define FT_SYNTAX "list || dump <span_id> [<chan_id>] || q931_pcap <span_id> on|off [pcapfilename without suffix] || gains <txgain> <rxgain> <span_id> [<chan_id>] || dtmf on|off <span_id> [<chan_id>]" 
+#define FT_SYNTAX "USAGE:\n" \
+"--------------------------------------------------------------------------------\n" \
+"ftdm list\n" \
+"ftdm start|stop <span_name|span_id>\n" \
+"ftdm restart <span_id|span_name> <chan_id>\n" \
+"ftdm dump <span_id|span_name> [<chan_id>]\n" \
+"ftdm sigstatus get|set [<span_id|span_name>] [<channel>] [<sigstatus>]\n" \
+"ftdm trace <path> <span_id|span_name> [<chan_id>]\n" \
+"ftdm notrace <span_id|span_name> [<chan_id>]\n" \
+"ftdm q931_pcap <span_id> on|off [pcapfilename without suffix]\n" \
+"ftdm gains <txgain> <rxgain> <span_id> [<chan_id>]\n" \
+"ftdm dtmf on|off <span_id> [<chan_id>]\n" \
+"--------------------------------------------------------------------------------\n"
 SWITCH_STANDARD_API(ft_function)
 {
 	char *mycmd = NULL, *argv[10] = { 0 };
diff --git a/libs/freetdm/src/ftmod/ftmod_r2/ftmod_r2.c b/libs/freetdm/src/ftmod/ftmod_r2/ftmod_r2.c
index d178de53cd..e3ae0cf4c5 100644
--- a/libs/freetdm/src/ftmod/ftmod_r2/ftmod_r2.c
+++ b/libs/freetdm/src/ftmod/ftmod_r2/ftmod_r2.c
@@ -50,10 +50,6 @@
 #include "freetdm.h"
 #include "private/ftdm_core.h"
 
-/* debug thread count for r2 legs */
-static ftdm_mutex_t* g_thread_count_mutex;
-static int32_t g_thread_count = 0;
-
 typedef int openr2_call_status_t;
 
 /* when the user stops a span, we clear FTDM_R2_SPAN_STARTED, so that the signaling thread
@@ -2023,6 +2019,14 @@ static void __inline__ unblock_channel(ftdm_channel_t *fchan, ftdm_stream_handle
 	ftdm_mutex_unlock(fchan->mutex);
 }
 
+#define FT_SYNTAX "USAGE:\n" \
+"--------------------------------------------------------------------------------\n" \
+"ftdm r2 status <span_id|span_name>\n" \
+"ftdm r2 loopstats <span_id|span_name>\n" \
+"ftdm r2 block|unblock <span_id|span_name> [<chan_id>]\n" \
+"ftdm r2 version\n" \
+"ftdm r2 variants\n" \
+"--------------------------------------------------------------------------------\n"
 static FIO_API_FUNCTION(ftdm_r2_api)
 {
 	ftdm_span_t *span = NULL;
@@ -2206,14 +2210,6 @@ static FIO_API_FUNCTION(ftdm_r2_api)
 	}
 
 	if (argc == 1) {
-		if (!strcasecmp(argv[0], "threads")) {
-			ftdm_mutex_lock(g_thread_count_mutex);
-			stream->write_function(stream, "%d R2 channel threads up\n", g_thread_count);
-			ftdm_mutex_unlock(g_thread_count_mutex);
-			stream->write_function(stream, "+OK.\n");
-			goto done;
-		}
-
 		if (!strcasecmp(argv[0], "version")) {
 			stream->write_function(stream, "OpenR2 version: %s, revision: %s\n", openr2_get_version(), openr2_get_revision());
 			stream->write_function(stream, "+OK.\n");
@@ -2239,7 +2235,7 @@ static FIO_API_FUNCTION(ftdm_r2_api)
 		}
 	}
 
-	stream->write_function(stream, "-ERR invalid command.\n");
+	stream->write_function(stream, "%s", FT_SYNTAX);
 
 done:
 
@@ -2268,7 +2264,6 @@ static FIO_SIG_LOAD_FUNCTION(ftdm_r2_init)
 	if (!g_mod_data_hash) {
 		return FTDM_FAIL;
 	}
-	ftdm_mutex_create(&g_thread_count_mutex);
 	return FTDM_SUCCESS;
 }
 
@@ -2288,7 +2283,6 @@ static FIO_SIG_UNLOAD_FUNCTION(ftdm_r2_destroy)
 		}
 	}
 	hashtable_destroy(g_mod_data_hash);
-	ftdm_mutex_destroy(&g_thread_count_mutex);
 	return FTDM_SUCCESS;
 }