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

freetdm: Cancel ISUP T6 timer when using native bridge (Spirou certification fix)

This commit is contained in:
Moises Silva 2012-01-27 18:54:06 +01:00
parent 3199513c96
commit 8476d66465
2 changed files with 61 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -40,6 +40,13 @@
/* INCLUDE ********************************************************************/
#include "ftmod_sangoma_ss7_main.h"
#include <sng_ss7/ci_db.h>
#include <sng_ss7/cm_hash.h>
#include <sng_ss7/cm_hash.x>
#include <sng_ss7/si.h>
#include <sng_ss7/si_mf.h>
#include <sng_ss7/si_mf.x>
#include <sng_ss7/si.x>
/******************************************************************************/
/* DEFINES ********************************************************************/
@ -567,6 +574,33 @@ static void ftdm_sangoma_ss7_process_stack_event (sngss7_event_data_t *sngss7_ev
sngss7_info->peer_data = NULL;
}
if (ftdm_test_flag(ftdmchan, FTDM_CHANNEL_NATIVE_SIGBRIDGE)) {
if (sngss7_event->event_id == SNGSS7_SUSP_IND_EVENT) {
sngss7_set_ckt_flag(sngss7_info, FLAG_SUS_RECVD);
sngss7_clear_ckt_flag(sngss7_info, FLAG_T6_CANCELED);
}
if (sngss7_test_ckt_flag(sngss7_info, FLAG_SUS_RECVD) &&
!sngss7_test_ckt_flag(sngss7_info, FLAG_T6_CANCELED)) {
/* SPIROU cert, disable ISUP T6 when bridged natively */
int trc = 0;
SiCon *siCon = NULL;
if (siFindSuInstId(sngss7_info->suInstId, &siCon) != RFAILED) {
if (siCon) {
trc = siStopConTmr(siCon, TMR_T6I);
SS7_INFO_CHAN(ftdmchan,"[CIC:%d]Stopped T6 timer (%d)\n", sngss7_info->circuit->cic, trc);
sngss7_set_ckt_flag(sngss7_info, FLAG_T6_CANCELED);
} else {
SS7_ERROR_CHAN(ftdmchan,"[CIC:%d]siCon is null!\n", sngss7_info->circuit->cic);
}
} else {
SS7_ERROR_CHAN(ftdmchan,"[CIC:%d]could not find siCon\n", sngss7_info->circuit->cic);
}
}
}
/* clone the event and save it for later usage, we do not clone RLC messages */
if (sngss7_event->event_id != SNGSS7_REL_CFM_EVENT) {
event_clone = ftdm_calloc(1, sizeof(*sngss7_event));
@ -955,6 +989,29 @@ static void ftdm_sangoma_ss7_process_peer_stack_event (ftdm_channel_t *ftdmchan,
/**************************************************************************/
}
if ((sngss7_event->event_id == SNGSS7_SUSP_IND_EVENT)) {
sngss7_set_ckt_flag(sngss7_info, FLAG_SUS_RECVD);
}
if (sngss7_test_ckt_flag(sngss7_info, FLAG_SUS_RECVD) &&
!sngss7_test_ckt_flag(sngss7_info, FLAG_T6_CANCELED)) {
/* SPIROU cert, disable ISUP T6 when bridged natively */
int trc = 0;
SiCon *siCon = NULL;
if (siFindSuInstId(sngss7_info->suInstId, &siCon) != RFAILED) {
if (siCon) {
trc = siStopConTmr(siCon, TMR_T6I);
SS7_INFO_CHAN(ftdmchan,"[CIC:%d]Stopped T6 timer (%d)\n", sngss7_info->circuit->cic, trc);
sngss7_set_ckt_flag(sngss7_info, FLAG_T6_CANCELED);
} else {
SS7_ERROR_CHAN(ftdmchan,"[CIC:%d]siCon is null!\n", sngss7_info->circuit->cic);
}
} else {
SS7_ERROR_CHAN(ftdmchan,"[CIC:%d]could not find siCon\n", sngss7_info->circuit->cic);
}
}
}
static ftdm_status_t ftdm_sangoma_ss7_native_bridge_state_change(ftdm_channel_t *ftdmchan);
@ -969,6 +1026,8 @@ static ftdm_status_t ftdm_sangoma_ss7_native_bridge_state_change(ftdm_channel_t
case FTDM_CHANNEL_STATE_DOWN:
{
ftdm_channel_t *close_chan = ftdmchan;
sngss7_clear_ckt_flag(sngss7_info, FLAG_SUS_RECVD);
sngss7_clear_ckt_flag(sngss7_info, FLAG_T6_CANCELED);
ftdm_channel_close (&close_chan);
}
break;

2
libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_main.h
View File

@ -550,6 +550,8 @@ typedef enum {
FLAG_INFID_PAUSED = (1 << 15),
FLAG_SENT_ACM = (1 << 16),
FLAG_SENT_CPG = (1 << 17),
FLAG_SUS_RECVD = (1 << 18),
FLAG_T6_CANCELED = (1 << 19),
FLAG_RELAY_DOWN = (1 << 30),
FLAG_CKT_RECONFIG = (1 << 31)
} sng_ckt_flag_t;