freetdm: ss7 - beta support for ANSI, added support for tx of cgb, cgu

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

@@ -915,12 +915,12 @@ ftdm_status_t handle_sta_ind(uint32_t suInstId, uint32_t spInstId, uint32_t circ
 	/**************************************************************************/
 	case SIT_STA_CGBRSP:			/* mntc. oriented CGB response */
 		SS7_MSG_TRACE(ftdmchan, sngss7_info, "Rx mntc CGB\n");
-		handle_cgb_req(suInstId, spInstId, circuit, globalFlg, evntType, siStaEvnt);
+		/*handle_cgb_req(suInstId, spInstId, circuit, globalFlg, evntType, siStaEvnt);*/
 		break;
 	/**************************************************************************/
 	case SIT_STA_CGURSP:			/* mntc. oriented CGU response */
 		SS7_MSG_TRACE(ftdmchan, sngss7_info, "Rx mntc CGU\n");
-		SS7_WARN(" %s indication not currently supported\n", DECODE_LCC_EVENT(evntType));
+		/*SS7_WARN(" %s indication not currently supported\n", DECODE_LCC_EVENT(evntType));*/
 		break;
 	/**************************************************************************/
 	case SIT_STA_GRSREQ:			/* circuit group reset request */
@@ -1020,7 +1020,7 @@ ftdm_status_t handle_sta_ind(uint32_t suInstId, uint32_t spInstId, uint32_t circ
 	/**************************************************************************/
 	case SIT_STA_LMCQMINFOREQ:	  /* when LM requests ckt grp query */
 		SS7_MSG_TRACE(ftdmchan, sngss7_info, "Rx LM CQM\n");
-		SS7_WARN(" %s indication not currently supported\n", DECODE_LCC_EVENT(evntType));
+// 		SS7_WARN(" %s indication not currently supported\n", DECODE_LCC_EVENT(evntType));
 		break;
 	/**************************************************************************/
 	case SIT_STA_CIRLOCGRS:		 /* group reset initiated locally by the software */
@@ -2073,7 +2073,7 @@ ftdm_status_t handle_cgb_req(uint32_t suInstId, uint32_t spInstId, uint32_t circ
 			SS7_ASSERT;
 		};
 
-#if 1
+#if 0
 		SS7_ERROR("KONRAD -> circuit=%d, byte=%d, bit=%d, status[byte]=%d, math=%d\n",
 					x,
 					byte,

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

@@ -471,6 +471,8 @@ void ft_to_sngss7_gra(ftdm_channel_t *ftdmchan);
 void ft_to_sngss7_grs(ftdm_channel_t *ftdmchan);
 void ft_to_sngss7_cgba(ftdm_channel_t * ftdmchan);
 void ft_to_sngss7_cgua(ftdm_channel_t * ftdmchan);
+void ft_to_sngss7_cgb(ftdm_channel_t * ftdmchan);
+void ft_to_sngss7_cgu(ftdm_channel_t * ftdmchan);
 
 void sngss7_sta_ind(uint32_t suInstId, uint32_t spInstId, uint32_t circuit, uint8_t globalFlg, uint8_t evntType, SiStaEvnt *siStaEvnt);
 void sngss7_con_ind(uint32_t suInstId, uint32_t spInstId, uint32_t circuit, SiConEvnt *siConEvnt);

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

@@ -61,6 +61,9 @@ void ft_to_sngss7_lpa(ftdm_channel_t * ftdmchan);
 void ft_to_sngss7_gra(ftdm_channel_t * ftdmchan);
 void ft_to_sngss7_grs(ftdm_channel_t * ftdmchan);
 
+void ft_to_sngss7_cgb(ftdm_channel_t * ftdmchan);
+void ft_to_sngss7_cgu(ftdm_channel_t * ftdmchan);
+
 void ft_to_sngss7_cgba(ftdm_channel_t * ftdmchan);
 void ft_to_sngss7_cgua(ftdm_channel_t * ftdmchan);
 /******************************************************************************/
@@ -121,6 +124,10 @@ void ft_to_sngss7_iam (ftdm_channel_t * ftdmchan)
 		(g_ftdm_sngss7_data.cfg.isupIntf[sngss7_info->circuit->infId].switchType == LSI_SW_ANS92) ||
 		(g_ftdm_sngss7_data.cfg.isupIntf[sngss7_info->circuit->infId].switchType == LSI_SW_ANS95)) {
 
+		/* include only if we're running ANSI */
+		iam.fwdCallInd.transCallNInd.pres   = PRSNT_NODEF;
+		iam.fwdCallInd.transCallNInd.val    = 0x0;
+
 		iam.usrServInfoA.eh.pres				= PRSNT_NODEF;
 
 		iam.usrServInfoA.infoTranCap.pres		= PRSNT_NODEF;
@@ -633,6 +640,106 @@ void ft_to_sngss7_cgua(ftdm_channel_t * ftdmchan)
 	SS7_FUNC_TRACE_EXIT (__FUNCTION__);
 	return;
 }
+
+/******************************************************************************/
+void ft_to_sngss7_cgb(ftdm_channel_t * ftdmchan)
+{
+	SS7_FUNC_TRACE_ENTER (__FUNCTION__);
+
+	sngss7_span_data_t 	*sngss7_span = ftdmchan->span->mod_data;
+	sngss7_chan_data_t	*sngss7_info = ftdmchan->call_data;
+	SiStaEvnt 			cgb;
+	int					x = 0;
+
+
+	memset (&cgb, 0x0, sizeof(cgb));
+
+	/* fill in the circuit group supervisory message */
+	cgb.cgsmti.eh.pres			= PRSNT_NODEF;
+	cgb.cgsmti.typeInd.pres		= PRSNT_NODEF;
+	cgb.cgsmti.typeInd.val		= sngss7_span->tx_cgb.type;
+
+	/* fill in the range */	
+	cgb.rangStat.eh.pres 		= PRSNT_NODEF;
+	cgb.rangStat.range.pres		= PRSNT_NODEF;
+	cgb.rangStat.range.val 		= sngss7_span->tx_cgb.range;
+
+	/* fill in the status */
+	cgb.rangStat.status.pres	= PRSNT_NODEF;
+	cgb.rangStat.status.len 	= ((sngss7_span->tx_cgb.range + 1) >> 3) + (((sngss7_span->tx_cgb.range + 1) & 0x07) ? 1 : 0);
+	for(x = 0; x < cgb.rangStat.status.len; x++){
+		cgb.rangStat.status.val[x] = sngss7_span->tx_cgb.status[x];
+	}
+
+	sng_cc_sta_request (1,
+						0,
+						0,
+						sngss7_span->tx_cgb.circuit,
+						0,
+						SIT_STA_CGBREQ,
+						&cgb);
+	
+	SS7_INFO_CHAN(ftdmchan, "Tx CGB (%d:%d)\n",
+							sngss7_info->circuit->cic,
+							(sngss7_info->circuit->cic + sngss7_span->tx_cgb.range));
+
+	/* clean out the saved data */
+	memset(&sngss7_span->tx_cgb, 0x0, sizeof(sngss7_group_data_t));
+
+	SS7_FUNC_TRACE_EXIT (__FUNCTION__);
+	return;
+}
+
+/******************************************************************************/
+void ft_to_sngss7_cgu(ftdm_channel_t * ftdmchan)
+{
+	SS7_FUNC_TRACE_ENTER (__FUNCTION__);
+
+	sngss7_span_data_t 	*sngss7_span = ftdmchan->span->mod_data;
+	sngss7_chan_data_t	*sngss7_info = ftdmchan->call_data;
+	SiStaEvnt 			cgu;
+	int					x = 0;
+
+
+	memset (&cgu, 0x0, sizeof(cgu));
+
+	/* fill in the circuit group supervisory message */
+	cgu.cgsmti.eh.pres			= PRSNT_NODEF;
+	cgu.cgsmti.typeInd.pres		= PRSNT_NODEF;
+	cgu.cgsmti.typeInd.val		= sngss7_span->tx_cgu.type;
+
+	/* fill in the range */	
+	cgu.rangStat.eh.pres 		= PRSNT_NODEF;
+	cgu.rangStat.range.pres		= PRSNT_NODEF;
+	cgu.rangStat.range.val 		= sngss7_span->tx_cgu.range;
+
+	/* fill in the status */
+	cgu.rangStat.status.pres	= PRSNT_NODEF;
+	cgu.rangStat.status.len 	= ((sngss7_span->tx_cgu.range + 1) >> 3) + (((sngss7_span->tx_cgu.range + 1) & 0x07) ? 1 : 0);
+	for(x = 0; x < cgu.rangStat.status.len; x++){
+		cgu.rangStat.status.val[x] = sngss7_span->tx_cgu.status[x];
+	}
+
+	sng_cc_sta_request (1,
+						0,
+						0,
+						sngss7_span->tx_cgu.circuit,
+						0,
+						SIT_STA_CGUREQ,
+						&cgu);
+	
+	SS7_INFO_CHAN(ftdmchan, "Tx CGU (%d:%d)\n",
+							sngss7_info->circuit->cic,
+							(sngss7_info->circuit->cic + sngss7_span->tx_cgu.range));
+
+	/* clean out the saved data */
+	memset(&sngss7_span->tx_cgu, 0x0, sizeof(sngss7_group_data_t));
+
+	SS7_FUNC_TRACE_EXIT (__FUNCTION__);
+	return;
+}
+
+
 /******************************************************************************/
 /* For Emacs:
  * Local Variables:

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

@@ -458,6 +458,9 @@ ftdm_status_t check_if_rx_grs_processed(ftdm_span_t *ftdmspan)
 	sngss7_chan_data_t  *sngss7_info = NULL;
 	sngss7_span_data_t	*sngss7_span = (sngss7_span_data_t *)ftdmspan->mod_data;
 	int 				i;
+	int					byte = 0;
+	int					bit = 0;
+
 
 	ftdm_log(FTDM_LOG_DEBUG, "Found Rx GRS on span %d...checking circuits\n", ftdmspan->span_id);
 
@@ -505,6 +508,21 @@ ftdm_status_t check_if_rx_grs_processed(ftdm_span_t *ftdmspan)
 			/* move the channel to the down state */
 			ftdm_set_state_locked(ftdmchan, FTDM_CHANNEL_STATE_DOWN);
 
+			/* update the status map if the ckt is in blocked state */
+			if ((sngss7_test_flag(sngss7_info, FLAG_CKT_MN_BLOCK_RX)) ||
+				(sngss7_test_flag(sngss7_info, FLAG_CKT_MN_BLOCK_TX)) ||
+				(sngss7_test_flag(sngss7_info, FLAG_GRP_MN_BLOCK_RX)) ||
+				(sngss7_test_flag(sngss7_info, FLAG_GRP_MN_BLOCK_RX))) {
+			
+				sngss7_span->rx_grs.status[byte] = (sngss7_span->rx_grs.status[byte] | (1 << bit));
+			} /* if blocked */
+			
+			/* update the bit and byte counter*/
+			bit ++;
+			if (bit == 8) {
+				byte++;
+				bit = 0;
+			}
 		} /* for ( i = circuit; i < (circuit + range + 1); i++) */
 
 GRS_UNLOCK_ALL:

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

@@ -1472,7 +1472,7 @@ static int ftmod_ss7_fill_in_isap(sng_isap_t *sng_isap)
 	if (sng_isap->tex != 0) {
 		g_ftdm_sngss7_data.cfg.isap[i].tex		= sng_isap->tex;
 	} else {
-		g_ftdm_sngss7_data.cfg.isap[i].tex		= 10;
+		g_ftdm_sngss7_data.cfg.isap[i].tex		= 1000;
 	}
 	if (sng_isap->tcrm != 0) {
 		g_ftdm_sngss7_data.cfg.isap[i].tcrm		= sng_isap->tcrm;