chlog: freetdm: ss7 - added support to check isup stack circuit state via cli…

chlog: freetdm: ss7 - added support to check isup stack circuit state via cli (ftdm ss7 show status isup ckt X)
       freetdm: ss7 - updated module to support latest changes to freetdm core

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

@@ -76,6 +76,17 @@ typedef enum {
 	SNGSS7_SSP_STA_CFM_EVENT
 } sng_event_type_t;
 
+typedef enum {
+	SNG_BIT_A	= (1 << 0),
+	SNG_BIT_B	= (1 << 1),
+	SNG_BIT_C	= (1 << 2),
+	SNG_BIT_D	= (1 << 3),
+	SNG_BIT_E	= (1 << 4),
+	SNG_BIT_F	= (1 << 5),
+	SNG_BIT_G	= (1 << 6),
+	SNG_BIT_H	= (1 << 7)
+} sng_bit_enums_t;
+
 typedef enum {
 	VOICE = 0,
 	SIG,
@@ -294,7 +305,6 @@ typedef struct sng_isup_intf {
 typedef struct sng_isup_ckt {
 	uint32_t		options;
 	uint32_t		flags;
-	uint32_t		ckt_flags;
 	uint32_t		procId;
 	uint32_t		id;
 	uint32_t		ccSpanId;
@@ -431,6 +441,10 @@ typedef struct sngss7_chan_data {
 	uint32_t				spId;
 	uint8_t					globalFlg;
 	uint32_t				ckt_flags;
+	uint32_t				blk_flags;
+	ftdm_hash_t*			variables;		/* send on next sigevent */
+	ftdm_size_t				raw_data_len;
+	void					*raw_data;		/* send on next sigevent */
 	sngss7_glare_data_t		glare;
 	sngss7_timer_data_t		t35;
 }sngss7_chan_data_t;
@@ -489,23 +503,41 @@ typedef enum {
 	FLAG_GLARE				= (1 << 13),
 	FLAG_INFID_RESUME		= (1 << 14),
 	FLAG_INFID_PAUSED		= (1 << 15),
-	FLAG_CKT_UCIC_BLOCK		= (1 << 16),
-	FLAG_CKT_UCIC_UNBLK		= (1 << 17),
-	FLAG_CKT_LC_BLOCK_RX	= (1 << 18),
-	FLAG_CKT_LC_UNBLK_RX	= (1 << 19),
-	FLAG_CKT_MN_BLOCK_RX	= (1 << 20),
-	FLAG_CKT_MN_UNBLK_RX	= (1 << 21),
-	FLAG_CKT_MN_BLOCK_TX	= (1 << 22),
-	FLAG_CKT_MN_UNBLK_TX	= (1 << 23),
-	FLAG_GRP_HW_BLOCK_RX	= (1 << 24),
-	FLAG_GRP_HW_BLOCK_TX	= (1 << 25),
-	FLAG_GRP_MN_BLOCK_RX	= (1 << 26),
-	FLAG_GRP_MN_BLOCK_TX	= (1 << 27),
-	FLAG_GRP_HW_UNBLK_TX	= (1 << 28),
-	FLAG_GRP_MN_UNBLK_TX	= (1 << 29),
 	FLAG_RELAY_DOWN			= (1 << 30)
 } sng_ckt_flag_t;
 
+/* ckt blocking flags */
+typedef enum {
+	FLAG_CKT_UCIC_BLOCK		= (1 << 0),
+	FLAG_CKT_UCIC_BLOCK_DN	= (1 << 1),
+	FLAG_CKT_UCIC_UNBLK		= (1 << 2),
+	FLAG_CKT_UCIC_UNBLK_DN	= (1 << 3),
+	FLAG_CKT_LC_BLOCK_RX	= (1 << 4),
+	FLAG_CKT_LC_BLOCK_RX_DN	= (1 << 5),
+	FLAG_CKT_LC_UNBLK_RX	= (1 << 6),
+	FLAG_CKT_LC_UNBLK_RX_DN	= (1 << 7),
+	FLAG_CKT_MN_BLOCK_RX	= (1 << 8),
+	FLAG_CKT_MN_BLOCK_RX_DN	= (1 << 9),
+	FLAG_CKT_MN_UNBLK_RX	= (1 << 10),
+	FLAG_CKT_MN_UNBLK_RX_DN	= (1 << 11),
+	FLAG_CKT_MN_BLOCK_TX	= (1 << 12),
+	FLAG_CKT_MN_BLOCK_TX_DN	= (1 << 13),
+	FLAG_CKT_MN_UNBLK_TX	= (1 << 14),
+	FLAG_CKT_MN_UNBLK_TX_DN	= (1 << 15),
+	FLAG_GRP_HW_BLOCK_RX	= (1 << 16),
+	FLAG_GRP_HW_BLOCK_RX_DN	= (1 << 17),
+	FLAG_GRP_HW_BLOCK_TX	= (1 << 18),
+	FLAG_GRP_HW_BLOCK_TX_DN	= (1 << 19),
+	FLAG_GRP_MN_BLOCK_RX	= (1 << 20),
+	FLAG_GRP_MN_BLOCK_RX_DN	= (1 << 21),
+	FLAG_GRP_MN_BLOCK_TX	= (1 << 22),
+	FLAG_GRP_MN_BLOCK_TX_DN	= (1 << 23),
+	FLAG_GRP_HW_UNBLK_TX	= (1 << 24),
+	FLAG_GRP_HW_UNBLK_TX_DN	= (1 << 25),
+	FLAG_GRP_MN_UNBLK_TX	= (1 << 26),
+	FLAG_GRP_MN_UNBLK_TX_DN	= (1 << 27)
+} sng_ckt_block_flag_t;
+
 /* valid for every cfg array except circuits */
 typedef enum {
 	SNGSS7_CONFIGURED		= (1 << 0),
@@ -607,6 +639,7 @@ int ftmod_ss7_mtp3link_sta(uint32_t id, SnMngmt *cfm);
 int ftmod_ss7_mtplinkSet_sta(uint32_t id, SnMngmt *cfm);
 int ftmod_ss7_isup_intf_sta(uint32_t id, uint8_t *status);
 int ftmod_ss7_relay_status(uint32_t id, RyMngmt *cfm);
+int ftmod_ss7_isup_ckt_sta(uint32_t id, unsigned char *state);
 
 
 /* in ftmod_sangoma_ss7_out.c */
@@ -724,6 +757,11 @@ int find_cic_cntrl_in_map(const char *cntrlType);
 
 ftdm_status_t check_status_of_all_isup_intf(void);
 
+void sngss7_send_signal(sngss7_chan_data_t *sngss7_info, ftdm_signal_event_t event_id);
+void sngss7_set_sig_status(sngss7_chan_data_t *sngss7_info, ftdm_signaling_status_t status);
+ftdm_status_t sngss7_add_var(sngss7_chan_data_t *ss7_info, const char* var, const char* val);
+ftdm_status_t sngss7_add_raw_data(sngss7_chan_data_t *sngss7_info, uint8_t* data, ftdm_size_t data_len);
+
 /* in ftmod_sangoma_ss7_timers.c */
 void handle_isup_t35(void *userdata);
 /******************************************************************************/
@@ -860,6 +898,10 @@ void handle_isup_t35(void *userdata);
 #define sngss7_clear_ckt_flag(obj, flag) ((obj)->ckt_flags &= ~(flag))
 #define sngss7_set_ckt_flag(obj, flag)   ((obj)->ckt_flags |= (flag))
 
+#define sngss7_test_ckt_blk_flag(obj, flag)  ((obj)->blk_flags & flag)
+#define sngss7_clear_ckt_blk_flag(obj, flag) ((obj)->blk_flags &= ~(flag))
+#define sngss7_set_ckt_blk_flag(obj, flag)   ((obj)->blk_flags |= (flag))
+
 #define sngss7_test_options(obj, option) ((obj)->options & option)
 #define sngss7_clear_options(obj, option) ((obj)->options &= ~(option))
 #define sngss7_set_options(obj, option)   ((obj)->options |= (option))

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

@@ -187,7 +187,7 @@ void ft_to_sngss7_iam (ftdm_channel_t * ftdmchan)
 	copy_cgPtyNum_to_sngss7 (&ftdmchan->caller_data, &iam.cgPtyNum);
 
 	/* check if the user would like a custom NADI value for the calling Pty Num */
-	clg_nadi = ftdm_call_get_var(&ftdmchan->caller_data, "ss7_clg_nadi");
+	clg_nadi = ftdm_usrmsg_get_var(ftdmchan->usrmsg, "ss7_clg_nadi");
 	if ((clg_nadi != NULL) && (*clg_nadi)) {
 		SS7_DEBUG_CHAN(ftdmchan,"Found user supplied Calling NADI value \"%s\"\n", clg_nadi);
 		iam.cgPtyNum.natAddrInd.val	= atoi(clg_nadi);
@@ -196,7 +196,7 @@ void ft_to_sngss7_iam (ftdm_channel_t * ftdmchan)
 		SS7_DEBUG_CHAN(ftdmchan,"No user supplied NADI value found for CLG, using \"%d\"\n", iam.cgPtyNum.natAddrInd.val);
 	}
 
-	cld_nadi = ftdm_call_get_var(&ftdmchan->caller_data, "ss7_cld_nadi");
+	cld_nadi = ftdm_usrmsg_get_var(ftdmchan->usrmsg, "ss7_cld_nadi");
 	if ((cld_nadi != NULL) && (*cld_nadi)) {
 		SS7_DEBUG_CHAN(ftdmchan,"Found user supplied Called NADI value \"%s\"\n", cld_nadi);
 		iam.cdPtyNum.natAddrInd.val	= atoi(cld_nadi);
@@ -206,7 +206,7 @@ void ft_to_sngss7_iam (ftdm_channel_t * ftdmchan)
 	}
 
 	/* check if the user would like us to send a clg_sub-address */
-	clg_subAddr = ftdm_call_get_var(&ftdmchan->caller_data, "ss7_clg_subaddr");
+	clg_subAddr = ftdm_usrmsg_get_var(ftdmchan->usrmsg, "ss7_clg_subaddr");
 	if ((clg_subAddr != NULL) && (*clg_subAddr)) {
 		SS7_DEBUG_CHAN(ftdmchan,"Found user supplied Calling Sub-Address value \"%s\"\n", clg_subAddr);
 		
@@ -245,7 +245,7 @@ void ft_to_sngss7_iam (ftdm_channel_t * ftdmchan)
 	}
 
 	/* check if the user would like us to send a cld_sub-address */
-	cld_subAddr = ftdm_call_get_var(&ftdmchan->caller_data, "ss7_cld_subaddr");
+	cld_subAddr = ftdm_usrmsg_get_var(ftdmchan->usrmsg, "ss7_cld_subaddr");
 	if ((cld_subAddr != NULL) && (*cld_subAddr)) {
 		SS7_DEBUG_CHAN(ftdmchan,"Found user supplied Called Sub-Address value \"%s\"\n", cld_subAddr);
 		
@@ -282,9 +282,6 @@ void ft_to_sngss7_iam (ftdm_channel_t * ftdmchan)
 		} /* if (subAddrIE[0] != '0') */
 	} /* if ((cld_subAddr != NULL) && (*cld_subAddr)) */
 
-
-
-
 	sng_cc_con_request (sngss7_info->spId,
 						sngss7_info->suInstId,
 						sngss7_info->spInstId,
@@ -299,7 +296,7 @@ void ft_to_sngss7_iam (ftdm_channel_t * ftdmchan)
 							ftdmchan->caller_data.dnis.digits,
 							iam.cdPtyNum.natAddrInd.val);
 
-	ftdm_call_clear_data(&ftdmchan->caller_data);
+
 	SS7_FUNC_TRACE_EXIT (__FUNCTION__);
 	return;
 }
@@ -379,7 +376,7 @@ void ft_to_sngss7_acm (ftdm_channel_t * ftdmchan)
 						ADDRCMPLT);
 	
 	SS7_INFO_CHAN(ftdmchan,"[CIC:%d]Tx ACM\n", sngss7_info->circuit->cic);
-	ftdm_call_clear_data(&ftdmchan->caller_data);
+
 	SS7_FUNC_TRACE_EXIT (__FUNCTION__);
 	return;
 }
@@ -403,7 +400,7 @@ void ft_to_sngss7_anm (ftdm_channel_t * ftdmchan)
 						5);
 
   SS7_INFO_CHAN(ftdmchan,"[CIC:%d]Tx ANM\n", sngss7_info->circuit->cic);
-  ftdm_call_clear_data(&ftdmchan->caller_data);
+
   SS7_FUNC_TRACE_EXIT (__FUNCTION__);
   return;
 }
@@ -438,7 +435,7 @@ void ft_to_sngss7_rel (ftdm_channel_t * ftdmchan)
 	SS7_INFO_CHAN(ftdmchan,"[CIC:%d]Tx REL cause=%d \n",
 							sngss7_info->circuit->cic,
 							ftdmchan->caller_data.hangup_cause );
-	ftdm_call_clear_data(&ftdmchan->caller_data);
+
 	SS7_FUNC_TRACE_EXIT (__FUNCTION__);
 	return;
 }
@@ -461,7 +458,7 @@ void ft_to_sngss7_rlc (ftdm_channel_t * ftdmchan)
 						&rlc);
 	
 	SS7_INFO_CHAN(ftdmchan,"[CIC:%d]Tx RLC\n", sngss7_info->circuit->cic);
-	ftdm_call_clear_data(&ftdmchan->caller_data);
+
 	SS7_FUNC_TRACE_EXIT (__FUNCTION__);
 	return;
 }
@@ -482,7 +479,7 @@ void ft_to_sngss7_rsc (ftdm_channel_t * ftdmchan)
 						NULL);
 	
 	SS7_INFO_CHAN(ftdmchan,"[CIC:%d]Tx RSC\n", sngss7_info->circuit->cic);
-	ftdm_call_clear_data(&ftdmchan->caller_data);
+
 	SS7_FUNC_TRACE_EXIT (__FUNCTION__);
 	return;
 }
@@ -503,7 +500,7 @@ void ft_to_sngss7_rsca (ftdm_channel_t * ftdmchan)
 						NULL);
 	
 	SS7_INFO_CHAN(ftdmchan,"[CIC:%d]Tx RSC-RLC\n", sngss7_info->circuit->cic);
-	ftdm_call_clear_data(&ftdmchan->caller_data);
+
 	SS7_FUNC_TRACE_EXIT (__FUNCTION__);
   return;
 }
@@ -524,7 +521,7 @@ void ft_to_sngss7_blo (ftdm_channel_t * ftdmchan)
 						NULL);
 	
 	SS7_INFO_CHAN(ftdmchan,"[CIC:%d]Tx BLO\n", sngss7_info->circuit->cic);
-	ftdm_call_clear_data(&ftdmchan->caller_data);
+
 	SS7_FUNC_TRACE_EXIT (__FUNCTION__);
 	return;
 }
@@ -545,7 +542,7 @@ void ft_to_sngss7_bla (ftdm_channel_t * ftdmchan)
 						NULL);
 	
 	SS7_INFO_CHAN(ftdmchan,"[CIC:%d]Tx BLA\n", sngss7_info->circuit->cic);
-	ftdm_call_clear_data(&ftdmchan->caller_data);
+
 	SS7_FUNC_TRACE_EXIT (__FUNCTION__);
 	return;
 }
@@ -567,7 +564,7 @@ ft_to_sngss7_ubl (ftdm_channel_t * ftdmchan)
 						NULL);
 	
 	SS7_INFO_CHAN(ftdmchan,"[CIC:%d]Tx UBL\n", sngss7_info->circuit->cic);
-	ftdm_call_clear_data(&ftdmchan->caller_data);
+
 	SS7_FUNC_TRACE_EXIT (__FUNCTION__);
 	return;
 }
@@ -588,7 +585,7 @@ void ft_to_sngss7_uba (ftdm_channel_t * ftdmchan)
 						NULL);
 	
 	SS7_INFO_CHAN(ftdmchan,"[CIC:%d]Tx UBA\n", sngss7_info->circuit->cic);
-	ftdm_call_clear_data(&ftdmchan->caller_data);
+
 	SS7_FUNC_TRACE_EXIT (__FUNCTION__);
 	return;
 }
@@ -609,7 +606,7 @@ void ft_to_sngss7_lpa (ftdm_channel_t * ftdmchan)
 						NULL);
 	
 	SS7_INFO_CHAN(ftdmchan,"[CIC:%d]Tx LPA\n", sngss7_info->circuit->cic);
-	ftdm_call_clear_data(&ftdmchan->caller_data);
+
 	SS7_FUNC_TRACE_EXIT (__FUNCTION__);
 return;
 }
@@ -654,7 +651,7 @@ void ft_to_sngss7_gra (ftdm_channel_t * ftdmchan)
 							sngss7_info->circuit->cic,
 							(sngss7_info->circuit->cic + sngss7_span->rx_grs.range));
 	
-	ftdm_call_clear_data(&ftdmchan->caller_data);
+
 	SS7_FUNC_TRACE_EXIT (__FUNCTION__);
 	return;
 }
@@ -688,7 +685,7 @@ void ft_to_sngss7_grs (ftdm_channel_t * ftdmchan)
 							sngss7_info->circuit->cic,
 							(sngss7_info->circuit->cic + sngss7_span->tx_grs.range));
 
-	ftdm_call_clear_data(&ftdmchan->caller_data);
+
 	SS7_FUNC_TRACE_EXIT (__FUNCTION__);
 return;
 }
@@ -737,7 +734,7 @@ void ft_to_sngss7_cgba(ftdm_channel_t * ftdmchan)
 
 	/* clean out the saved data */
 	memset(&sngss7_span->rx_cgb, 0x0, sizeof(sngss7_group_data_t));
-	ftdm_call_clear_data(&ftdmchan->caller_data);
+
 	SS7_FUNC_TRACE_EXIT (__FUNCTION__);
 	return;
 }
@@ -787,7 +784,7 @@ void ft_to_sngss7_cgua(ftdm_channel_t * ftdmchan)
 	/* clean out the saved data */
 	memset(&sngss7_span->rx_cgu, 0x0, sizeof(sngss7_group_data_t));
 
-	ftdm_call_clear_data(&ftdmchan->caller_data);
+
 	SS7_FUNC_TRACE_EXIT (__FUNCTION__);
 	return;
 }
@@ -838,7 +835,7 @@ void ft_to_sngss7_cgb(ftdm_channel_t * ftdmchan)
 	/* clean out the saved data */
 	memset(&sngss7_span->tx_cgb, 0x0, sizeof(sngss7_group_data_t));
 
-	ftdm_call_clear_data(&ftdmchan->caller_data);
+
 	SS7_FUNC_TRACE_EXIT (__FUNCTION__);
 	return;
 }
@@ -889,7 +886,7 @@ void ft_to_sngss7_cgu(ftdm_channel_t * ftdmchan)
 	/* clean out the saved data */
 	memset(&sngss7_span->tx_cgu, 0x0, sizeof(sngss7_group_data_t));
 
-	ftdm_call_clear_data(&ftdmchan->caller_data);
+
 	SS7_FUNC_TRACE_EXIT (__FUNCTION__);
 	return;
 }

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

@@ -207,7 +207,7 @@ ftdm_status_t enable_all_ckts_for_relay(void)
 				SS7_DEBUG_CHAN(ftdmchan, "ISUP interface (%d) set to resume, resuming channel\n", sngIntf->id);
 				/* throw the channel infId status flags to PAUSED ... they will be executed next process cycle */
 				sngss7_set_ckt_flag(sngss7_info, FLAG_INFID_RESUME);
-				sngss7_set_ckt_flag(sngss7_info, FLAG_INFID_PAUSED);
+				sngss7_clear_ckt_flag(sngss7_info, FLAG_INFID_PAUSED);
 			}
 		} /* if (g_ftdm_sngss7_data.cfg.isupCkt[x].type == VOICE) */
 

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

@@ -48,6 +48,7 @@ int ftmod_ss7_mtp3link_sta(uint32_t id, SnMngmt *cfm);
 int ftmod_ss7_mtplinkSet_sta(uint32_t id, SnMngmt *cfm);
 int ftmod_ss7_isup_intf_sta(uint32_t id, uint8_t *status);
 int ftmod_ss7_relay_status(uint32_t id, RyMngmt *cfm);
+int ftmod_ss7_isup_ckt_sta(uint32_t id, unsigned char *state);
 /******************************************************************************/
 
 /* FUNCTIONS ******************************************************************/
@@ -188,6 +189,43 @@ int ftmod_ss7_relay_status(uint32_t id, RyMngmt *cfm)
 	return(sng_sta_relay(&pst, &sta, cfm));
 }
 
+/******************************************************************************/
+int ftmod_ss7_isup_ckt_sta(uint32_t id, unsigned char *state)
+{
+	SiMngmt	sta;
+	SiMngmt cfm;
+	Pst		pst;
+	int		ret;
+
+	memset(&sta, 0x0, sizeof(sta));
+
+	/* initalize the post structure */
+	smPstInit(&pst);
+
+	/* insert the destination Entity */
+	pst.dstEnt = ENTSI;
+
+	/* check the for the correct ProcId and make sure it goes to the right system */
+	if (g_ftdm_sngss7_data.cfg.procId != 1) {
+		pst.dstProcId = 1;
+	}
+
+	/* request the status of an inftId */
+	sta.hdr.entId.ent			= ENTSI;
+	sta.hdr.entId.inst			= S_INST;
+	sta.hdr.msgType				= TSSTA;
+	sta.hdr.elmId.elmnt 		= SI_STCIRGRP;
+
+	sta.t.ssta.elmntId.circuit = id;
+	sta.t.ssta.param.cirgr.range = 1;
+
+	ret = sng_sta_isup(&pst, &sta, &cfm);
+
+	*state = cfm.t.ssta.cfm.s.cir.state[0];
+
+	return(ret);
+}
+
 /******************************************************************************/
 /* For Emacs:
  * Local Variables:

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

@@ -83,6 +83,11 @@ int find_ssf_type_in_map(const char *ssfType);
 int find_cic_cntrl_in_map(const char *cntrlType);
 
 ftdm_status_t check_status_of_all_isup_intf(void);
+
+void sngss7_send_signal(sngss7_chan_data_t *sngss7_info, ftdm_signal_event_t event_id);
+void sngss7_set_sig_status(sngss7_chan_data_t *sngss7_info, ftdm_signaling_status_t status);
+ftdm_status_t sngss7_add_var(sngss7_chan_data_t *ss7_info, const char* var, const char* val);
+ftdm_status_t sngss7_add_raw_data(sngss7_chan_data_t *sngss7_info, uint8_t* data, ftdm_size_t data_len);
 /******************************************************************************/
 
 /* FUNCTIONS ******************************************************************/
@@ -560,14 +565,14 @@ ftdm_status_t check_if_rx_grs_started(ftdm_span_t *ftdmspan)
 		case FTDM_CHANNEL_STATE_RESTART:
 
 			/* go to idle so that we can redo the restart state*/
-			ftdm_set_state_locked(ftdmchan, FTDM_CHANNEL_STATE_IDLE);
+			ftdm_set_state(ftdmchan, FTDM_CHANNEL_STATE_IDLE);
 
 			break;
 		/**************************************************************************/
 		default:
 
 			/* set the state of the channel to restart...the rest is done by the chan monitor */
-			ftdm_set_state_locked(ftdmchan, FTDM_CHANNEL_STATE_RESTART);
+			ftdm_set_state(ftdmchan, FTDM_CHANNEL_STATE_RESTART);
 			break;
 		/**************************************************************************/
 		} /* switch (ftdmchan->state) */
@@ -638,13 +643,13 @@ ftdm_status_t check_if_rx_grs_processed(ftdm_span_t *ftdmspan)
 		sngss7_set_ckt_flag(sngss7_info, FLAG_GRP_RESET_RX_CMPLT);
 
 		/* move the channel to the down state */
-		ftdm_set_state_locked(ftdmchan, FTDM_CHANNEL_STATE_DOWN);
+		ftdm_set_state(ftdmchan, FTDM_CHANNEL_STATE_DOWN);
 
 		/* update the status map if the ckt is in blocked state */
-		if ((sngss7_test_ckt_flag(sngss7_info, FLAG_CKT_MN_BLOCK_RX)) ||
-			(sngss7_test_ckt_flag(sngss7_info, FLAG_CKT_MN_BLOCK_TX)) ||
-			(sngss7_test_ckt_flag(sngss7_info, FLAG_GRP_MN_BLOCK_RX)) ||
-			(sngss7_test_ckt_flag(sngss7_info, FLAG_GRP_MN_BLOCK_RX))) {
+		if ((sngss7_test_ckt_blk_flag(sngss7_info, FLAG_CKT_MN_BLOCK_RX)) ||
+			(sngss7_test_ckt_blk_flag(sngss7_info, FLAG_CKT_MN_BLOCK_TX)) ||
+			(sngss7_test_ckt_blk_flag(sngss7_info, FLAG_GRP_MN_BLOCK_RX)) ||
+			(sngss7_test_ckt_blk_flag(sngss7_info, FLAG_GRP_MN_BLOCK_RX))) {
 		
 			sngss7_span->rx_grs.status[byte] = (sngss7_span->rx_grs.status[byte] | (1 << bit));
 		} /* if blocked */
@@ -714,7 +719,7 @@ ftdm_status_t check_if_rx_gra_started(ftdm_span_t *ftdmspan)
 			sngss7_set_ckt_flag(sngss7_info, FLAG_GRP_RESET_TX_RSP);
 
 			/* go to DOWN */
-			ftdm_set_state_locked(ftdmchan, FTDM_CHANNEL_STATE_DOWN);
+			ftdm_set_state(ftdmchan, FTDM_CHANNEL_STATE_DOWN);
 
 			break;
 		/**********************************************************************/
@@ -743,7 +748,7 @@ ftdm_status_t check_if_rx_gra_started(ftdm_span_t *ftdmspan)
 			}
 
 			/* go to terminating to hang up the call */
-			ftdm_set_state_locked(ftdmchan, FTDM_CHANNEL_STATE_TERMINATING);
+			ftdm_set_state(ftdmchan, FTDM_CHANNEL_STATE_TERMINATING);
 			break;
 		/**********************************************************************/
 		}
@@ -795,7 +800,7 @@ ftdm_status_t check_for_res_sus_flag(ftdm_span_t *ftdmspan)
 			
 			/* throw the channel into SUSPENDED to process the flag */
 			/* after doing this once the sig status will be down */
-			ftdm_set_state_locked (ftdmchan, FTDM_CHANNEL_STATE_SUSPENDED);
+			ftdm_set_state (ftdmchan, FTDM_CHANNEL_STATE_SUSPENDED);
 		}
 
 		/* if the RESUME flag is up go to SUSPENDED to process the flag */
@@ -808,7 +813,7 @@ ftdm_status_t check_for_res_sus_flag(ftdm_span_t *ftdmspan)
 			}
 
 			/* got SUSPENDED state to clear the flag */
-			ftdm_set_state_locked (ftdmchan, FTDM_CHANNEL_STATE_SUSPENDED);
+			ftdm_set_state (ftdmchan, FTDM_CHANNEL_STATE_SUSPENDED);
 		}
 
 		/* unlock the channel */
@@ -849,10 +854,10 @@ ftdm_status_t process_span_ucic(ftdm_span_t *ftdmspan)
 		}
 
 		/* throw the ckt block flag */
-		sngss7_set_ckt_flag(sngss7_info, FLAG_CKT_UCIC_BLOCK);
+		sngss7_set_ckt_blk_flag(sngss7_info, FLAG_CKT_UCIC_BLOCK);
 
 		/* set the channel to suspended state */
-		ftdm_set_state_locked(ftdmchan, FTDM_CHANNEL_STATE_SUSPENDED);
+		ftdm_set_state(ftdmchan, FTDM_CHANNEL_STATE_SUSPENDED);
 
 		/* unlock the channel again before we exit */
 		ftdm_mutex_unlock(ftdmchan->mutex);
@@ -1348,6 +1353,107 @@ ftdm_status_t check_status_of_all_isup_intf(void)
 	return FTDM_SUCCESS;
 }
 
+/******************************************************************************/
+ftdm_status_t sngss7_add_var(sngss7_chan_data_t *sngss7_info, const char* var, const char* val)
+{
+	char	*t_name = 0;
+	char	*t_val = 0;
+
+	/* confirm the user has sent us a value */
+	if (!var || !val) {
+		return FTDM_FAIL;
+	}
+
+	if (!sngss7_info->variables) {
+		/* initialize on first use */
+		sngss7_info->variables = create_hashtable(16, ftdm_hash_hashfromstring, ftdm_hash_equalkeys);
+		ftdm_assert_return(sngss7_info->variables, FTDM_FAIL, "Failed to create hash table\n");
+	}
+
+	t_name = ftdm_strdup(var);
+	t_val = ftdm_strdup(val);
+
+	hashtable_insert(sngss7_info->variables, t_name, t_val, HASHTABLE_FLAG_FREE_KEY | HASHTABLE_FLAG_FREE_VALUE);
+
+	return FTDM_SUCCESS;
+}
+
+/******************************************************************************/
+ftdm_status_t sngss7_add_raw_data(sngss7_chan_data_t *sngss7_info, uint8_t* data, ftdm_size_t data_len)
+{
+	ftdm_assert_return(!sngss7_info->raw_data, FTDM_FAIL, "Overwriting existing raw data\n");
+	
+	sngss7_info->raw_data = ftdm_calloc(1, data_len);
+	ftdm_assert_return(sngss7_info->raw_data, FTDM_FAIL, "Failed to allocate raw data\n");
+
+	memcpy(sngss7_info->raw_data, data, data_len);
+	sngss7_info->raw_data_len = data_len;
+	return FTDM_SUCCESS;
+}
+
+/******************************************************************************/
+void sngss7_send_signal(sngss7_chan_data_t *sngss7_info, ftdm_signal_event_t event_id)
+{
+	ftdm_sigmsg_t	sigev;
+	ftdm_channel_t	*ftdmchan = sngss7_info->ftdmchan;
+
+	memset(&sigev, 0, sizeof(sigev));
+
+	sigev.chan_id = ftdmchan->chan_id;
+	sigev.span_id = ftdmchan->span_id;
+	sigev.channel = ftdmchan;
+	sigev.event_id = event_id;
+
+	if (sngss7_info->variables) {
+		/*
+		* variables now belongs to the ftdm core, and
+		* will be cleared after sigev is processed by user. Set
+		* local pointer to NULL so we do not attempt to
+		* destroy it */
+		sigev.variables = sngss7_info->variables;
+		sngss7_info->variables = NULL;
+	}
+
+	if (sngss7_info->raw_data) {
+		/*
+		* raw_data now belongs to the ftdm core, and
+		* will be cleared after sigev is processed by user. Set
+		* local pointer to NULL so we do not attempt to
+		* destroy it */
+		
+		sigev.raw.data = sngss7_info->raw_data;
+		sigev.raw.len = sngss7_info->raw_data_len;
+		
+		sngss7_info->raw_data = NULL;
+		sngss7_info->raw_data_len = 0;
+	}
+	ftdm_span_send_signal(ftdmchan->span, &sigev);
+}
+
+/******************************************************************************/
+void sngss7_set_sig_status(sngss7_chan_data_t *sngss7_info, ftdm_signaling_status_t status)
+{
+	ftdm_sigmsg_t	sig;
+	ftdm_channel_t	*ftdmchan = sngss7_info->ftdmchan;
+
+	SS7_DEBUG_CHAN(ftdmchan, "Signalling link status changed to %s\n", 
+								ftdm_signaling_status2str(status));
+	
+	memset(&sig, 0, sizeof(sig));
+
+	sig.chan_id = ftdmchan->chan_id;
+	sig.span_id = ftdmchan->span_id;
+	sig.channel = ftdmchan;
+	sig.event_id = FTDM_SIGEVENT_SIGSTATUS_CHANGED;
+	sig.ev_data.sigstatus.status = status;
+
+	if (ftdm_span_send_signal(ftdmchan->span, &sig) != FTDM_SUCCESS) {
+		SS7_ERROR_CHAN(ftdmchan, "Failed to change channel status to %s\n", 
+									ftdm_signaling_status2str(status));
+	}
+	return;
+}
+
 /******************************************************************************/
 /* For Emacs:
  * Local Variables:

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

@@ -67,7 +67,7 @@ void handle_isup_t35(void *userdata)
     ftdmchan->caller_data.hangup_cause = 28;
 
     /* end the call */
-    ftdm_set_state_locked(ftdmchan, FTDM_CHANNEL_STATE_CANCEL);
+    ftdm_set_state(ftdmchan, FTDM_CHANNEL_STATE_CANCEL);
 
     /*unlock*/
     ftdm_mutex_unlock(ftdmchan->mutex);