freetdm: ss7 - fixed bug in cic status, added activate/deactivate functions for mtp2/3

libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_cntrl.c

@@ -50,6 +50,17 @@ static int ftmod_ss7_enable_mtpLinkSet(int lnkSetId);
 
 int ftmod_ss7_inhibit_mtplink(uint32_t id);
 int ftmod_ss7_uninhibit_mtplink(uint32_t id);
+
+int ftmod_ss7_activate_mtplink(uint32_t id);
+int ftmod_ss7_deactivate_mtplink(uint32_t id);
+int ftmod_ss7_deactivate2_mtplink(uint32_t id);
+
+int ftmod_ss7_activate_mtplinkSet(uint32_t id);
+int ftmod_ss7_deactivate_mtplinkSet(uint32_t id);
+int ftmod_ss7_deactivate2_mtplinkSet(uint32_t id);
+
+int ftmod_ss7_lpo_mtplink(uint32_t id);
+int ftmod_ss7_lpr_mtplink(uint32_t id);
 /******************************************************************************/
 
 /* FUNCTIONS ******************************************************************/
@@ -271,6 +282,248 @@ int ftmod_ss7_uninhibit_mtplink(uint32_t id)
 	return (sng_cntrl_mtp3(&pst, &cntrl));
 }
 
+/******************************************************************************/
+int ftmod_ss7_activate_mtplink(uint32_t id)
+{
+	SnMngmt cntrl;
+	Pst pst;
+
+	/* initalize the post structure */
+	smPstInit(&pst);
+
+	/* insert the destination Entity */
+	pst.dstEnt = ENTSN;
+
+	/* initalize the control structure */
+	memset(&cntrl, 0x0, sizeof(SnMngmt));
+
+	/* initalize the control header */
+	smHdrInit(&cntrl.hdr);
+
+	cntrl.hdr.msgType			= TCNTRL;	/* this is a control request */
+	cntrl.hdr.entId.ent			= ENTSN;
+	cntrl.hdr.entId.inst		= S_INST;
+	cntrl.hdr.elmId.elmnt		= STDLSAP;
+	cntrl.hdr.elmId.elmntInst1	= g_ftdm_sngss7_data.cfg.mtpLink[id].id;
+
+	cntrl.t.cntrl.action		= AENA;		/* Activate */
+	cntrl.t.cntrl.subAction		= SAELMNT;	/* specificed element */
+
+	return (sng_cntrl_mtp3(&pst, &cntrl));
+}
+
+/******************************************************************************/
+int ftmod_ss7_deactivate_mtplink(uint32_t id)
+{
+	SnMngmt cntrl;
+	Pst pst;
+
+	/* initalize the post structure */
+	smPstInit(&pst);
+
+	/* insert the destination Entity */
+	pst.dstEnt = ENTSN;
+
+	/* initalize the control structure */
+	memset(&cntrl, 0x0, sizeof(SnMngmt));
+
+	/* initalize the control header */
+	smHdrInit(&cntrl.hdr);
+
+	cntrl.hdr.msgType			= TCNTRL;	/* this is a control request */
+	cntrl.hdr.entId.ent			= ENTSN;
+	cntrl.hdr.entId.inst		= S_INST;
+	cntrl.hdr.elmId.elmnt		= STDLSAP;
+	cntrl.hdr.elmId.elmntInst1	= g_ftdm_sngss7_data.cfg.mtpLink[id].id;
+
+	cntrl.t.cntrl.action		= ADISIMM;	/* Deactivate */
+	cntrl.t.cntrl.subAction		= SAELMNT;	/* specificed element */
+
+	return (sng_cntrl_mtp3(&pst, &cntrl));
+}
+
+/******************************************************************************/
+int ftmod_ss7_deactivate2_mtplink(uint32_t id)
+{
+	SnMngmt cntrl;
+	Pst pst;
+
+	/* initalize the post structure */
+	smPstInit(&pst);
+
+	/* insert the destination Entity */
+	pst.dstEnt = ENTSN;
+
+	/* initalize the control structure */
+	memset(&cntrl, 0x0, sizeof(SnMngmt));
+
+	/* initalize the control header */
+	smHdrInit(&cntrl.hdr);
+
+	cntrl.hdr.msgType			= TCNTRL;	/* this is a control request */
+	cntrl.hdr.entId.ent			= ENTSN;
+	cntrl.hdr.entId.inst		= S_INST;
+	cntrl.hdr.elmId.elmnt		= STDLSAP;
+	cntrl.hdr.elmId.elmntInst1	= g_ftdm_sngss7_data.cfg.mtpLink[id].id;
+
+	cntrl.t.cntrl.action		= ADISIMM_L2;	/* Deactivate...layer 2 only */
+	cntrl.t.cntrl.subAction		= SAELMNT;		/* specificed element */
+
+	return (sng_cntrl_mtp3(&pst, &cntrl));
+}
+
+/******************************************************************************/
+int ftmod_ss7_activate_mtplinkSet(uint32_t id)
+{
+	SnMngmt cntrl;
+	Pst pst;
+
+	/* initalize the post structure */
+	smPstInit(&pst);
+
+	/* insert the destination Entity */
+	pst.dstEnt = ENTSN;
+
+	/* initalize the control structure */
+	memset(&cntrl, 0x0, sizeof(SnMngmt));
+
+	/* initalize the control header */
+	smHdrInit(&cntrl.hdr);
+
+	cntrl.hdr.msgType			= TCNTRL;	/* this is a control request */
+	cntrl.hdr.entId.ent			= ENTSN;
+	cntrl.hdr.entId.inst		= S_INST;
+	cntrl.hdr.elmId.elmnt		= STLNKSET;
+	cntrl.hdr.elmId.elmntInst1	= g_ftdm_sngss7_data.cfg.mtpLinkSet[id].id;
+
+	cntrl.t.cntrl.action		= AACTLNKSET;	/* Activate */
+	cntrl.t.cntrl.subAction		= SAELMNT;		/* specificed element */
+
+	return (sng_cntrl_mtp3(&pst, &cntrl));
+}
+
+/******************************************************************************/
+int ftmod_ss7_deactivate_mtplinkSet(uint32_t id)
+{
+	SnMngmt cntrl;
+	Pst pst;
+
+	/* initalize the post structure */
+	smPstInit(&pst);
+
+	/* insert the destination Entity */
+	pst.dstEnt = ENTSN;
+
+	/* initalize the control structure */
+	memset(&cntrl, 0x0, sizeof(SnMngmt));
+
+	/* initalize the control header */
+	smHdrInit(&cntrl.hdr);
+
+	cntrl.hdr.msgType			= TCNTRL;	/* this is a control request */
+	cntrl.hdr.entId.ent			= ENTSN;
+	cntrl.hdr.entId.inst		= S_INST;
+	cntrl.hdr.elmId.elmnt		= STLNKSET;
+	cntrl.hdr.elmId.elmntInst1	= g_ftdm_sngss7_data.cfg.mtpLinkSet[id].id;
+
+	cntrl.t.cntrl.action		= ADEACTLNKSET;	/* Activate */
+	cntrl.t.cntrl.subAction		= SAELMNT;		/* specificed element */
+
+	return (sng_cntrl_mtp3(&pst, &cntrl));
+}
+
+/******************************************************************************/
+int ftmod_ss7_deactivate2_mtplinkSet(uint32_t id)
+{
+	SnMngmt cntrl;
+	Pst pst;
+
+	/* initalize the post structure */
+	smPstInit(&pst);
+
+	/* insert the destination Entity */
+	pst.dstEnt = ENTSN;
+
+	/* initalize the control structure */
+	memset(&cntrl, 0x0, sizeof(SnMngmt));
+
+	/* initalize the control header */
+	smHdrInit(&cntrl.hdr);
+
+	cntrl.hdr.msgType			= TCNTRL;	/* this is a control request */
+	cntrl.hdr.entId.ent			= ENTSN;
+	cntrl.hdr.entId.inst		= S_INST;
+	cntrl.hdr.elmId.elmnt		= STLNKSET;
+	cntrl.hdr.elmId.elmntInst1	= g_ftdm_sngss7_data.cfg.mtpLinkSet[id].id;
+
+	cntrl.t.cntrl.action		= ADEACTLNKSET_L2;	/* Activate */
+	cntrl.t.cntrl.subAction		= SAELMNT;			/* specificed element */
+
+	return (sng_cntrl_mtp3(&pst, &cntrl));
+}
+
+/******************************************************************************/
+int ftmod_ss7_lpo_mtplink(uint32_t id)
+{
+	SnMngmt cntrl;
+	Pst pst;
+
+	/* initalize the post structure */
+	smPstInit(&pst);
+
+	/* insert the destination Entity */
+	pst.dstEnt = ENTSN;
+
+	/* initalize the control structure */
+	memset(&cntrl, 0x0, sizeof(SnMngmt));
+
+	/* initalize the control header */
+	smHdrInit(&cntrl.hdr);
+
+	cntrl.hdr.msgType			= TCNTRL;	/* this is a control request */
+	cntrl.hdr.entId.ent			= ENTSN;
+	cntrl.hdr.entId.inst		= S_INST;
+	cntrl.hdr.elmId.elmnt		= STDLSAP;
+	cntrl.hdr.elmId.elmntInst1	= g_ftdm_sngss7_data.cfg.mtpLink[id].id;
+
+	cntrl.t.cntrl.action		= ACTION_LPO;	/* Activate */
+	cntrl.t.cntrl.subAction		= SAELMNT;			/* specificed element */
+
+	return (sng_cntrl_mtp3(&pst, &cntrl));
+}
+
+/******************************************************************************/
+int ftmod_ss7_lpr_mtplink(uint32_t id)
+{
+	SnMngmt cntrl;
+	Pst pst;
+
+	/* initalize the post structure */
+	smPstInit(&pst);
+
+	/* insert the destination Entity */
+	pst.dstEnt = ENTSN;
+
+	/* initalize the control structure */
+	memset(&cntrl, 0x0, sizeof(SnMngmt));
+
+	/* initalize the control header */
+	smHdrInit(&cntrl.hdr);
+
+	cntrl.hdr.msgType			= TCNTRL;	/* this is a control request */
+	cntrl.hdr.entId.ent			= ENTSN;
+	cntrl.hdr.entId.inst		= S_INST;
+	cntrl.hdr.elmId.elmnt		= STDLSAP;
+	cntrl.hdr.elmId.elmntInst1	= g_ftdm_sngss7_data.cfg.mtpLink[id].id;
+
+	cntrl.t.cntrl.action		= ACTION_LPR;	/* Activate */
+	cntrl.t.cntrl.subAction		= SAELMNT;			/* specificed element */
+
+	return (sng_cntrl_mtp3(&pst, &cntrl));
+}
+
+/******************************************************************************/
+
 /******************************************************************************/
 /* For Emacs:
  * Local Variables:

libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_handle.c

@@ -1123,21 +1123,10 @@ ftdm_status_t handle_pause(uint32_t suInstId, uint32_t spInstId, uint32_t circui
 			/* lock the channel */
 			ftdm_mutex_lock(ftdmchan->mutex);
 	
-			/* check if there is a pending state change, give it a bit to clear */
-			if (check_for_state_change(ftdmchan)) {
-				SS7_ERROR("Failed to wait for pending state change on CIC = %d\n", sngss7_info->circuit->cic);
-				ftdm_mutex_unlock(ftdmchan->mutex);
-				i++;
-				SS7_ASSERT;
-			};
-	
 			/* check if the circuit is fully started */
 			if (ftdm_test_flag(ftdmchan->span, FTDM_SPAN_IN_THREAD)) {
 				/* set the pause flag on the channel */
 				sngss7_set_flag(sngss7_info, FLAG_INFID_PAUSED);
-	
-				/* set the statet o SUSPENDED to bring the sig status down */ 
-				ftdm_set_state_locked(ftdmchan, FTDM_CHANNEL_STATE_SUSPENDED);
 			}
 	
 			/* unlock the channel again before we exit */
@@ -1185,14 +1174,6 @@ ftdm_status_t handle_resume(uint32_t suInstId, uint32_t spInstId, uint32_t circu
 			/* lock the channel */
 			ftdm_mutex_lock(ftdmchan->mutex);
 
-			/* check if there is a pending state change, give it a bit to clear */
-			if (check_for_state_change(ftdmchan)) {
-				SS7_ERROR("Failed to wait for pending state change on CIC = %d\n", sngss7_info->circuit->cic);
-				ftdm_mutex_unlock(ftdmchan->mutex);
-				i++;
-				SS7_ASSERT;
-			};
-
 			/* only resume if we are paused */
 			if (sngss7_test_flag(sngss7_info, FLAG_INFID_PAUSED)) {
 				/* set the resume flag on the channel */
@@ -1200,9 +1181,6 @@ ftdm_status_t handle_resume(uint32_t suInstId, uint32_t spInstId, uint32_t circu
 
 				/* clear the paused flag */
 				sngss7_clear_flag(sngss7_info, FLAG_INFID_PAUSED);
-
-				/* set the statet to SUSPENDED to bring the sig status up */ 
-				ftdm_set_state_locked(ftdmchan, FTDM_CHANNEL_STATE_SUSPENDED);
 			}
 			
 			/* unlock the channel again before we exit */

libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_main.c

@@ -347,6 +347,9 @@ static void *ftdm_sangoma_ss7_run(ftdm_thread_t * me, void *obj)
 			/* check if the rx_grs has cleared */
 			check_if_rx_grs_processed(ftdmspan);
 		} /* if (sngss7_span->rx_grs.range > 0) */
+
+		/* check each channel on the span to see if there is an un-procressed SUS/RES flag */
+		check_for_res_sus_flag(ftdmspan);
 	} /* master while loop */
 
 	/* clear the IN_THREAD flag so that we know the thread is done */
@@ -947,31 +950,6 @@ static void ftdm_sangoma_ss7_process_state_change (ftdm_channel_t * ftdmchan)
 
 		  SS7_DEBUG_CHAN(ftdmchan,"Current flags: 0x%X\n", sngss7_info->flags);
 
-		/**********************************************************************/
-		if (sngss7_test_flag (sngss7_info, FLAG_INFID_PAUSED)) 	{
-			SS7_DEBUG_CHAN(ftdmchan, "Processing PAUSE flag %s\n", "");
-			
-			/* bring the channel signaling status to down */
-			sigev.event_id = FTDM_SIGEVENT_SIGSTATUS_CHANGED;
-			sigev.sigstatus = FTDM_SIG_STATE_DOWN;
-			ftdm_span_send_signal (ftdmchan->span, &sigev);
-
-			/* check the last state and return to it to allow the call to finish */
-			goto suspend_goto_last;
-		}
-
-		if (sngss7_test_flag (sngss7_info, FLAG_INFID_RESUME)) {
-			SS7_DEBUG_CHAN(ftdmchan, "Processing RESUME flag %s\n", "");
-
-			/* the reset flag is set for the first channel in the span at handle_resume */
-
-			/* clear the resume flag */
-			sngss7_clear_flag(sngss7_info, FLAG_INFID_RESUME);
-
-			/* go to restart state */
-			goto suspend_goto_last;
-		}
-
 		/**********************************************************************/
 		if (sngss7_test_flag (sngss7_info, FLAG_CKT_MN_BLOCK_RX)) {
 			SS7_DEBUG_CHAN(ftdmchan, "Processing CKT_MN_BLOCK_RX flag %s\n", "");

libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_main.h

@@ -454,6 +454,14 @@ int ftmod_ss7_cc_isap_config(int id);
 
 int ftmod_ss7_inhibit_mtplink(uint32_t id);
 int ftmod_ss7_uninhibit_mtplink(uint32_t id);
+int ftmod_ss7_activate_mtplink(uint32_t id);
+int ftmod_ss7_deactivate_mtplink(uint32_t id);
+int ftmod_ss7_deactivate2_mtplink(uint32_t id);
+int ftmod_ss7_activate_mtplinkSet(uint32_t id);
+int ftmod_ss7_deactivate_mtplinkSet(uint32_t id);
+int ftmod_ss7_deactivate2_mtplinkSet(uint32_t id);
+int ftmod_ss7_lpo_mtplink(uint32_t id);
+int ftmod_ss7_lpr_mtplink(uint32_t id);
 
 int ftmod_ss7_mtplink_sta(uint32_t id, SnMngmt *cfm);
 int ftmod_ss7_mtplinkSet_sta(uint32_t id, SnMngmt *cfm);
@@ -539,6 +547,7 @@ void handle_isup_t35(void *userdata);
 ftdm_status_t ftdm_sngss7_handle_cli_cmd(ftdm_stream_handle_t *stream, const char *data);
 
 ftdm_status_t check_if_rx_grs_processed(ftdm_span_t *ftdmspan);
+ftdm_status_t check_for_res_sus_flag(ftdm_span_t *ftdmspan);
 /******************************************************************************/
 
 /* MACROS *********************************************************************/

libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_out.c

@@ -204,29 +204,29 @@ void ft_to_sngss7_acm (ftdm_channel_t * ftdmchan)
 	memset (&acm, 0x0, sizeof (acm));
 	
 	/* fill in the needed information for the ACM */
-	acm.bckCallInd.eh.pres = PRSNT_NODEF;
-	acm.bckCallInd.chrgInd.pres = PRSNT_NODEF;
-	acm.bckCallInd.chrgInd.val = 0x00;
-	acm.bckCallInd.cadPtyStatInd.pres = PRSNT_NODEF;
-	acm.bckCallInd.cadPtyStatInd.val = 0x01;
-	acm.bckCallInd.cadPtyCatInd.pres = PRSNT_NODEF;
-	acm.bckCallInd.cadPtyCatInd.val = 0x00;
-	acm.bckCallInd.end2EndMethInd.pres = PRSNT_NODEF;
-	acm.bckCallInd.end2EndMethInd.val = 0x00;
-	acm.bckCallInd.intInd.pres = PRSNT_NODEF;
-	acm.bckCallInd.intInd.val = 0x00;
-	acm.bckCallInd.end2EndInfoInd.pres = PRSNT_NODEF;
-	acm.bckCallInd.end2EndInfoInd.val = 0x00;
-	acm.bckCallInd.isdnUsrPrtInd.pres = PRSNT_NODEF;
-	acm.bckCallInd.isdnUsrPrtInd.val = 0x0;
-	acm.bckCallInd.holdInd.pres = PRSNT_NODEF;
-	acm.bckCallInd.holdInd.val = 0x00;
-	acm.bckCallInd.isdnAccInd.pres = PRSNT_NODEF;
-	acm.bckCallInd.isdnAccInd.val = 0x0;
-	acm.bckCallInd.echoCtrlDevInd.pres = PRSNT_NODEF;
-	acm.bckCallInd.echoCtrlDevInd.val = 0x0;
-	acm.bckCallInd.sccpMethInd.pres = PRSNT_NODEF;
-	acm.bckCallInd.sccpMethInd.val = 0x00;
+	acm.bckCallInd.eh.pres 				= PRSNT_NODEF;
+	acm.bckCallInd.chrgInd.pres			= PRSNT_NODEF;
+	acm.bckCallInd.chrgInd.val			= 0x00;
+	acm.bckCallInd.cadPtyStatInd.pres	= PRSNT_NODEF;
+	acm.bckCallInd.cadPtyStatInd.val	= 0x01;
+	acm.bckCallInd.cadPtyCatInd.pres	= PRSNT_NODEF;
+	acm.bckCallInd.cadPtyCatInd.val		= 0x00;
+	acm.bckCallInd.end2EndMethInd.pres	= PRSNT_NODEF;
+	acm.bckCallInd.end2EndMethInd.val	= 0x00;
+	acm.bckCallInd.intInd.pres			= PRSNT_NODEF;
+	acm.bckCallInd.intInd.val 			= 0x00;
+	acm.bckCallInd.end2EndInfoInd.pres	= PRSNT_NODEF;
+	acm.bckCallInd.end2EndInfoInd.val	= 0x00;
+	acm.bckCallInd.isdnUsrPrtInd.pres	= PRSNT_NODEF;
+	acm.bckCallInd.isdnUsrPrtInd.val	= 0x0;
+	acm.bckCallInd.holdInd.pres			= PRSNT_NODEF;
+	acm.bckCallInd.holdInd.val			= 0x00;
+	acm.bckCallInd.isdnAccInd.pres		= PRSNT_NODEF;
+	acm.bckCallInd.isdnAccInd.val		= 0x0;
+	acm.bckCallInd.echoCtrlDevInd.pres	= PRSNT_NODEF;
+	acm.bckCallInd.echoCtrlDevInd.val	= 0x1;	/* ec device present */
+	acm.bckCallInd.sccpMethInd.pres		= PRSNT_NODEF;
+	acm.bckCallInd.sccpMethInd.val		= 0x00;
 	
 	/* send the ACM request to LibSngSS7 */
 	sng_cc_con_status  (1,

libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_sta.c

@@ -68,7 +68,7 @@ int ftmod_ss7_mtplinkSet_sta(uint32_t id, SnMngmt *cfm)
 
 	sta.hdr.elmId.elmnt 		= STLNKSET;
 	sta.hdr.elmId.elmntInst1	= g_ftdm_sngss7_data.cfg.mtpLinkSet[id].id;
-	sta.hdr.elmId.elmntInst2	= 1;
+	sta.hdr.elmId.elmntInst2	= g_ftdm_sngss7_data.cfg.mtpLinkSet[id].links[0];
 
 	return(sng_sta_mtp3(&sta, cfm));
 }

libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_support.c

@@ -58,6 +58,7 @@ unsigned long get_unique_id(void);
 ftdm_status_t extract_chan_data(uint32_t circuit, sngss7_chan_data_t **sngss7_info, ftdm_channel_t **ftdmchan);
 
 ftdm_status_t check_if_rx_grs_processed(ftdm_span_t *ftdmspan);
+ftdm_status_t check_for_res_sus_flag(ftdm_span_t *ftdmspan);
 /******************************************************************************/
 
 /* FUNCTIONS ******************************************************************/
@@ -540,6 +541,64 @@ GRS_UNLOCK_ALL:
 	return FTDM_SUCCESS;
 }
 
+/******************************************************************************/
+ftdm_status_t check_for_res_sus_flag(ftdm_span_t *ftdmspan)
+{
+	ftdm_channel_t		*ftdmchan = NULL;
+	sngss7_chan_data_t	*sngss7_info = NULL;
+	ftdm_sigmsg_t 		sigev;
+	int 				x;
+
+	for (x = 1; x < (ftdmspan->chan_count + 1); x++) {
+
+		/* extract the channel structure and sngss7 channel data */
+		ftdmchan = ftdmspan->channels[x];
+		
+		/* if the call data is NULL move on */
+		if (ftdmchan->call_data == NULL) continue;
+
+		sngss7_info = ftdmchan->call_data;
+
+		/* lock the channel */
+		ftdm_mutex_lock(ftdmchan->mutex);
+
+		memset (&sigev, 0, sizeof (sigev));
+
+		sigev.chan_id = ftdmchan->chan_id;
+		sigev.span_id = ftdmchan->span_id;
+		sigev.channel = ftdmchan;
+
+		if ((sngss7_test_flag(sngss7_info, FLAG_INFID_PAUSED)) &&
+			(ftdm_test_flag(ftdmchan, FTDM_CHANNEL_SIG_UP))) {
+			
+			/* bring the sig status down */
+			sigev.event_id = FTDM_SIGEVENT_SIGSTATUS_CHANGED;
+			sigev.sigstatus = FTDM_SIG_STATE_DOWN;
+			ftdm_span_send_signal(ftdmchan->span, &sigev);	
+		}
+
+		if ((sngss7_test_flag(sngss7_info, FLAG_INFID_RESUME)) &&
+			!(ftdm_test_flag(ftdmchan, FTDM_CHANNEL_SIG_UP))) {
+			
+			/* bring the sig status back up */
+			sigev.event_id = FTDM_SIGEVENT_SIGSTATUS_CHANGED;
+			sigev.sigstatus = FTDM_SIG_STATE_UP;
+			ftdm_span_send_signal(ftdmchan->span, &sigev);
+
+			sngss7_clear_flag(sngss7_info, FLAG_INFID_RESUME);
+		}
+
+		/* unlock the channel */
+		ftdm_mutex_unlock(ftdmchan->mutex);
+
+	} /* for (x = 1; x < (span->chan_count + 1); x++) */
+
+	/* signal the core that sig events are queued for processing */
+	ftdm_span_trigger_signals(ftdmspan);
+
+	return FTDM_SUCCESS;
+}
+
 /******************************************************************************/
 
 

libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_xml.c

@@ -1600,11 +1600,10 @@ static int ftmod_ss7_fill_in_circuits(char *ch_map, int cicbase, int typeCntrl,
 				g_ftdm_sngss7_data.cfg.isupCkt[x].chan			= count;
 				if (timeslot.siglink) {
 					g_ftdm_sngss7_data.cfg.isupCkt[x].type		= SIG;
-				} else if (timeslot.hole) {
-					g_ftdm_sngss7_data.cfg.isupCkt[x].type		= HOLE;
 				} else {
-					g_ftdm_sngss7_data.cfg.isupCkt[x].type		= VOICE;
+					g_ftdm_sngss7_data.cfg.isupCkt[x].type		= HOLE;
 				}
+
 				if (timeslot.channel) {
 					g_ftdm_sngss7_data.cfg.isupCkt[x].cic		= cicbase;
 					cicbase++;
@@ -1625,6 +1624,10 @@ static int ftmod_ss7_fill_in_circuits(char *ch_map, int cicbase, int typeCntrl,
 				g_ftdm_sngss7_data.cfg.isupCkt[x].obj			= ss7_info;
 
 			} /* if (g_ftdm_sngss7_data.cfg.isupCkt[x].id == 0) */
+
+			/* increment the span channel count */
+			count++;
+
 		} else { /* if ((timeslot.siglink) || (timeslot.gap)) */
 			/* find the ftdm the channel structure for this channel*/
 			i = 1;