adding signaling FTDM_SIGTYPE_M2UA type

diff --git a/libs/freetdm/src/ftdm_io.c b/libs/freetdm/src/ftdm_io.c
index 6bc5471e5a126be86a9a57b6244abe4bc46252b3..5f890673045fe824f036b0679bdacb3302fc8af9 100644 (file)
--- a/libs/freetdm/src/ftdm_io.c
+++ b/libs/freetdm/src/ftdm_io.c
@@ -1470,7 +1470,8 @@ FT_DECLARE(ftdm_status_t) ftdm_group_channel_use_count(ftdm_group_t *group, uint
 
 static __inline__ int chan_is_avail(ftdm_channel_t *check)
 {
-       if (check->span->signal_type == FTDM_SIGTYPE_NONE) {
+       if ((check->span->signal_type == FTDM_SIGTYPE_M2UA) || 
+                       (check->span->signal_type == FTDM_SIGTYPE_NONE)) {
                if (!ftdm_test_flag(check, FTDM_CHANNEL_READY) ||
                        ftdm_test_flag(check, FTDM_CHANNEL_INUSE) ||
                        ftdm_test_flag(check, FTDM_CHANNEL_SUSPENDED) ||

diff --git a/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_main.c b/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_main.c
index fbc74d66cb7da264c0d6fe8513d754fa56ab0fe3..55b95f6acfc6c70e7d690c18dfdd0b7db1020b91 100644 (file)
--- a/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_main.c
+++ b/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_main.c
@@ -2552,6 +2552,11 @@ static FIO_CONFIGURE_SPAN_SIGNALING_FUNCTION(ftdm_sangoma_ss7_span_config)
                return FTDM_FAIL;
        }
 
+       if(SNG_SS7_OPR_MODE_M2UA_SG == g_ftdm_operating_mode){
+               ftdm_log (FTDM_LOG_INFO, "FreeTDM running as M2UA_SG mode, Setting Span type to FTDM_SIGTYPE_M2UA\n"); 
+               span->signal_type = FTDM_SIGTYPE_M2UA;
+       }
+
        if (ft_to_sngss7_cfg_all()) {   /* configure libsngss7 */
                ftdm_log (FTDM_LOG_CRIT, "Failed to configure LibSngSS7!\n");
                ftdm_sleep (100);

diff --git a/libs/freetdm/src/include/private/ftdm_types.h b/libs/freetdm/src/include/private/ftdm_types.h
index 8a0a2238de122d735120df7d6a581296332f7d51..c92164dd8c2ec3b63c68715740a58e86d29e0937 100755 (executable)
--- a/libs/freetdm/src/include/private/ftdm_types.h
+++ b/libs/freetdm/src/include/private/ftdm_types.h
@@ -162,6 +162,7 @@ typedef enum {
        FTDM_SIGTYPE_ANALOG,
        FTDM_SIGTYPE_SANGOMABOOST,
        FTDM_SIGTYPE_M3UA,
+       FTDM_SIGTYPE_M2UA,
        FTDM_SIGTYPE_R2,
        FTDM_SIGTYPE_SS7,
        FTDM_SIGTYPE_GSM