Merge branch 'master' of git.sangoma.com:smg_freeswitch

libs/freetdm/mod_freetdm/mod_freetdm.c

@@ -3548,7 +3548,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 };

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;
 }
 

libs/freetdm/src/ftmod/ftmod_sangoma_boost/sangoma_boost_client.c

@@ -31,6 +31,8 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#define _GNU_SOURCE
+
 #if HAVE_NETDB_H
 #include <netdb.h>
 #endif

libs/freetdm/src/include/private/ftdm_types.h

@@ -238,41 +238,41 @@ typedef enum {
 		"HANGUP", "HANGUP_COMPLETE", "IN_LOOP", "RESET", "INVALID"
 FTDM_STR2ENUM_P(ftdm_str2ftdm_channel_state, ftdm_channel_state2str, ftdm_channel_state_t)
 
-/*!< Channel flags. This used to be an enum but we reached the 32bit limit for enums */
-#define FTDM_CHANNEL_CONFIGURED    (1UL << 0)
-#define FTDM_CHANNEL_READY         (1UL << 1)
-#define FTDM_CHANNEL_OPEN          (1UL << 2)
-#define FTDM_CHANNEL_DTMF_DETECT   (1UL << 3)
-#define FTDM_CHANNEL_SUPRESS_DTMF  (1UL << 4)
-#define FTDM_CHANNEL_TRANSCODE     (1UL << 5)
-#define FTDM_CHANNEL_BUFFER        (1UL << 6)
-#define FTDM_CHANNEL_EVENT         (1UL << 7)
-#define FTDM_CHANNEL_INTHREAD      (1UL << 8)
-#define FTDM_CHANNEL_WINK          (1UL << 9)
-#define FTDM_CHANNEL_FLASH         (1UL << 10)
-#define FTDM_CHANNEL_STATE_CHANGE  (1UL << 11)
-#define FTDM_CHANNEL_HOLD          (1UL << 12)
-#define FTDM_CHANNEL_INUSE         (1UL << 13)
-#define FTDM_CHANNEL_OFFHOOK       (1UL << 14)
-#define FTDM_CHANNEL_RINGING       (1UL << 15)
-#define FTDM_CHANNEL_PROGRESS_DETECT (1UL << 16)
-#define FTDM_CHANNEL_CALLERID_DETECT (1UL << 17)
-#define FTDM_CHANNEL_OUTBOUND        (1UL << 18)
-#define FTDM_CHANNEL_SUSPENDED       (1UL << 19)
-#define FTDM_CHANNEL_3WAY            (1UL << 20)
-#define FTDM_CHANNEL_PROGRESS        (1UL << 21)
-#define FTDM_CHANNEL_MEDIA           (1UL << 22)
-#define FTDM_CHANNEL_ANSWERED        (1UL << 23)
-#define FTDM_CHANNEL_MUTE            (1UL << 24)
-#define FTDM_CHANNEL_USE_RX_GAIN     (1UL << 25)
-#define FTDM_CHANNEL_USE_TX_GAIN     (1UL << 26)
-#define FTDM_CHANNEL_IN_ALARM        (1UL << 27)
-#define FTDM_CHANNEL_SIG_UP          (1UL << 28)
-#define FTDM_CHANNEL_USER_HANGUP     (1UL << 29)
-#define FTDM_CHANNEL_RX_DISABLED     (1UL << 30)
-#define FTDM_CHANNEL_TX_DISABLED     (1UL << 31)
+/*!< Channel flags. This used to be an enum but we reached the 32bit limit for enums, is safer this way */
+#define FTDM_CHANNEL_CONFIGURED    (1ULL << 0)
+#define FTDM_CHANNEL_READY         (1ULL << 1)
+#define FTDM_CHANNEL_OPEN          (1ULL << 2)
+#define FTDM_CHANNEL_DTMF_DETECT   (1ULL << 3)
+#define FTDM_CHANNEL_SUPRESS_DTMF  (1ULL << 4)
+#define FTDM_CHANNEL_TRANSCODE     (1ULL << 5)
+#define FTDM_CHANNEL_BUFFER        (1ULL << 6)
+#define FTDM_CHANNEL_EVENT         (1ULL << 7)
+#define FTDM_CHANNEL_INTHREAD      (1ULL << 8)
+#define FTDM_CHANNEL_WINK          (1ULL << 9)
+#define FTDM_CHANNEL_FLASH         (1ULL << 10)
+#define FTDM_CHANNEL_STATE_CHANGE  (1ULL << 11)
+#define FTDM_CHANNEL_HOLD          (1ULL << 12)
+#define FTDM_CHANNEL_INUSE         (1ULL << 13)
+#define FTDM_CHANNEL_OFFHOOK       (1ULL << 14)
+#define FTDM_CHANNEL_RINGING       (1ULL << 15)
+#define FTDM_CHANNEL_PROGRESS_DETECT (1ULL << 16)
+#define FTDM_CHANNEL_CALLERID_DETECT (1ULL << 17)
+#define FTDM_CHANNEL_OUTBOUND        (1ULL << 18)
+#define FTDM_CHANNEL_SUSPENDED       (1ULL << 19)
+#define FTDM_CHANNEL_3WAY            (1ULL << 20)
+#define FTDM_CHANNEL_PROGRESS        (1ULL << 21)
+#define FTDM_CHANNEL_MEDIA           (1ULL << 22)
+#define FTDM_CHANNEL_ANSWERED        (1ULL << 23)
+#define FTDM_CHANNEL_MUTE            (1ULL << 24)
+#define FTDM_CHANNEL_USE_RX_GAIN     (1ULL << 25)
+#define FTDM_CHANNEL_USE_TX_GAIN     (1ULL << 26)
+#define FTDM_CHANNEL_IN_ALARM        (1ULL << 27)
+#define FTDM_CHANNEL_SIG_UP          (1ULL << 28)
+#define FTDM_CHANNEL_USER_HANGUP     (1ULL << 29)
+#define FTDM_CHANNEL_RX_DISABLED     (1ULL << 30)
+#define FTDM_CHANNEL_TX_DISABLED     (1ULL << 31)
 /*!< The user knows about a call in this channel */
-#define FTDM_CHANNEL_CALL_STARTED    (1UL << 32)
+#define FTDM_CHANNEL_CALL_STARTED    (1ULL << 32)
 
 typedef enum {
 	ZSM_NONE,