kenmirrors
/
freeswitch
mirror of https://github.com/signalwire/freeswitch.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'nsg-4.3' of ssh://git.sangoma.com/smg_freeswitch into nsg-4.3

This commit is contained in:
Kapil 2012-08-20 09:40:19 -04:00
parent 946d45fa8e 12e61692dd
commit e3e07569e2
3 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libs/freetdm/src/ftdm_io.c
View File

@ -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) 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) || if (!ftdm_test_flag(check, FTDM_CHANNEL_READY) ||
ftdm_test_flag(check, FTDM_CHANNEL_INUSE) || ftdm_test_flag(check, FTDM_CHANNEL_INUSE) ||
ftdm_test_flag(check, FTDM_CHANNEL_SUSPENDED) || ftdm_test_flag(check, FTDM_CHANNEL_SUSPENDED) ||

5
libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_main.c
View File

@ -2552,6 +2552,11 @@ static FIO_CONFIGURE_SPAN_SIGNALING_FUNCTION(ftdm_sangoma_ss7_span_config)
return FTDM_FAIL; 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 */ if (ft_to_sngss7_cfg_all()) { /* configure libsngss7 */
ftdm_log (FTDM_LOG_CRIT, "Failed to configure LibSngSS7!\n"); ftdm_log (FTDM_LOG_CRIT, "Failed to configure LibSngSS7!\n");
ftdm_sleep (100); ftdm_sleep (100);

1
libs/freetdm/src/include/private/ftdm_types.h
View File

@ -162,6 +162,7 @@ typedef enum {
FTDM_SIGTYPE_ANALOG, FTDM_SIGTYPE_ANALOG,
FTDM_SIGTYPE_SANGOMABOOST, FTDM_SIGTYPE_SANGOMABOOST,
FTDM_SIGTYPE_M3UA, FTDM_SIGTYPE_M3UA,
FTDM_SIGTYPE_M2UA,
FTDM_SIGTYPE_R2, FTDM_SIGTYPE_R2,
FTDM_SIGTYPE_SS7, FTDM_SIGTYPE_SS7,
FTDM_SIGTYPE_GSM FTDM_SIGTYPE_GSM