Merge branch 'master' into smgmaster

libs/freetdm/mod_freetdm/mod_freetdm.c

@@ -1404,6 +1404,7 @@ ftdm_status_t ftdm_channel_from_event(ftdm_sigmsg_t *sigmsg, switch_core_session
 	private_t *tech_pvt = NULL;
 	switch_channel_t *channel = NULL;
 	ftdm_iterator_t *iter = NULL;
+	ftdm_iterator_t *curr = NULL;
 	const char *var_name = NULL;
 	const char *var_value = NULL;
 	uint32_t spanid, chanid;
@@ -1515,12 +1516,13 @@ ftdm_status_t ftdm_channel_from_event(ftdm_sigmsg_t *sigmsg, switch_core_session
 		switch_channel_set_variable_printf(channel, "freetdm_custom_call_data", "%s", channel_caller_data->raw_data);
 	}
 	/* Add any channel variable to the dial plan */
-	iter = ftdm_channel_get_var_iterator(sigmsg->channel);
+	iter = ftdm_channel_get_var_iterator(sigmsg->channel, NULL);
-	for ( ; iter; iter = ftdm_iterator_next(iter)) {
+	for (curr = iter ; curr; curr = ftdm_iterator_next(curr)) {
-		ftdm_channel_get_current_var(iter, &var_name, &var_value);
+		ftdm_channel_get_current_var(curr, &var_name, &var_value);
 		snprintf(name, sizeof(name), FREETDM_VAR_PREFIX "%s", var_name);
 		switch_channel_set_variable_printf(channel, name, "%s", var_value);
 	}
+	ftdm_iterator_free(iter);
 
 	switch_channel_set_state(channel, CS_INIT);
 	if (switch_core_session_thread_launch(session) != SWITCH_STATUS_SUCCESS) {
@@ -2496,7 +2498,8 @@ static switch_status_t load_config(void)
 	unsigned boosti = 0;
 	unsigned int i = 0;
 	ftdm_channel_t *fchan = NULL;
-	unsigned int chancount = 0;
+	ftdm_iterator_t *chaniter = NULL;
+	ftdm_iterator_t *curr = NULL;
 
 	memset(boost_spans, 0, sizeof(boost_spans));
 	memset(&globals, 0, sizeof(globals));
@@ -2780,11 +2783,13 @@ static switch_status_t load_config(void)
 			switch_set_string(SPAN_CONFIG[span_id].dialplan, dialplan);
 			SPAN_CONFIG[span_id].analog_options = analog_options | globals.analog_options;
 			
-			chancount = ftdm_span_get_chan_count(span);
+			chaniter = ftdm_span_get_chan_iterator(span, NULL);
-			for (i = 1; i <= chancount; i++) {
+			curr = chaniter;
-				fchan = ftdm_span_get_channel(span, i);
+			for (curr = chaniter; curr; curr = ftdm_iterator_next(curr)) {
+				fchan = ftdm_iterator_current(curr);
 				ftdm_channel_set_private(fchan, &SPAN_CONFIG[span_id].pvts[i]);
 			}
+			ftdm_iterator_free(chaniter);
 			
 			if (dial_regex) {
 				switch_set_string(SPAN_CONFIG[span_id].dial_regex, dial_regex);

libs/freetdm/src/ftdm_io.c

@@ -3524,16 +3524,48 @@ done:
 	return var;
 }
 
-FT_DECLARE(ftdm_iterator_t *) ftdm_channel_get_var_iterator(const ftdm_channel_t *ftdmchan)
+static ftdm_iterator_t *get_iterator(ftdm_iterator_type_t type, ftdm_iterator_t *iter)
 {
-	ftdm_hash_iterator_t *iter = NULL;
+	int allocated = 0;
+	if (iter) {
+		if (iter->type != type) {
+			ftdm_log(FTDM_LOG_ERROR, "Cannot switch iterator types\n");
+			return NULL;
+		}
+		allocated = iter->allocated;
+		memset(iter, 0, sizeof(*iter));
+		iter->type = type;
+		iter->allocated = allocated;
+		return iter;
+	}
 
+	iter = ftdm_calloc(1, sizeof(*iter));
+	if (!iter) {
+		return NULL;
+	}
+	iter->type = type;
+	iter->allocated = 1;
+	return iter;
+}
+
+FT_DECLARE(ftdm_iterator_t *) ftdm_channel_get_var_iterator(const ftdm_channel_t *ftdmchan, ftdm_iterator_t *iter)
+{
+	if (!(iter = get_iterator(FTDM_ITERATOR_VARS, iter))) {
+		return NULL;
+	}
 	ftdm_channel_lock(ftdmchan);
-
+	iter->pvt.hashiter = ftdmchan->variable_hash == NULL ? NULL : hashtable_first(ftdmchan->variable_hash);
-	iter = ftdmchan->variable_hash == NULL ? NULL : hashtable_first(ftdmchan->variable_hash);
-
 	ftdm_channel_unlock(ftdmchan);
+	return iter;
+}
 
+FT_DECLARE(ftdm_iterator_t *) ftdm_span_get_chan_iterator(const ftdm_span_t *span, ftdm_iterator_t *iter)
+{
+	if (!(iter = get_iterator(FTDM_ITERATOR_CHANS, iter))) {
+		return NULL;
+	}
+	iter->pvt.chaniter.index = 1;
+	iter->pvt.chaniter.span = span;
 	return iter;
 }
 
@@ -3545,11 +3577,9 @@ FT_DECLARE(ftdm_status_t) ftdm_channel_get_current_var(ftdm_iterator_t *iter, co
 	*var_name = NULL;
 	*var_val = NULL;
 
-	if (!iter) {
+	ftdm_assert_return(iter && (iter->type == FTDM_ITERATOR_CHANS) && iter->pvt.hashiter, FTDM_FAIL, "Cannot get variable from invalid iterator!\n");
-		return FTDM_FAIL;
-	}
 
-	hashtable_this(iter, &key, NULL, &val);
+	hashtable_this(iter->pvt.hashiter, &key, NULL, &val);
 
 	*var_name = key;
 	*var_val = val;
@@ -3559,10 +3589,72 @@ FT_DECLARE(ftdm_status_t) ftdm_channel_get_current_var(ftdm_iterator_t *iter, co
 
 FT_DECLARE(ftdm_iterator_t *) ftdm_iterator_next(ftdm_iterator_t *iter)
 {
-	if (!iter) {
+	ftdm_assert_return(iter && iter->type, NULL, "Invalid iterator\n");
+
+	switch (iter->type) {
+	case FTDM_ITERATOR_VARS:
+		if (!iter->pvt.hashiter) {
 			return NULL;
 		}
-	return hashtable_next(iter);
+		iter->pvt.hashiter = hashtable_next(iter->pvt.hashiter);
+		if (!iter->pvt.hashiter) {
+			return NULL;
+		}
+		return iter;
+	case FTDM_ITERATOR_CHANS:
+		if (iter->pvt.chaniter.index == iter->pvt.chaniter.span->chan_count) {
+			return NULL;
+		}
+		iter->pvt.chaniter.index++;
+		return iter;
+	default:
+		break;
+	}
+
+	ftdm_assert_return(0, NULL, "Unknown iterator type\n");
+	return NULL;
+}
+
+FT_DECLARE(void *) ftdm_iterator_current(ftdm_iterator_t *iter)
+{
+	const void *key = NULL;
+	void *val = NULL;
+
+	ftdm_assert_return(iter && iter->type, NULL, "Invalid iterator\n");
+
+	switch (iter->type) {
+	case FTDM_ITERATOR_VARS:
+		hashtable_this(iter->pvt.hashiter, &key, NULL, &val);
+		/* I decided to return the key instead of the value since the value can be retrieved using the key */
+		return (void *)key;
+	case FTDM_ITERATOR_CHANS:
+		ftdm_assert_return(iter->pvt.chaniter.index, NULL, "channel iterator index cannot be zero!\n");
+		ftdm_assert_return(iter->pvt.chaniter.index > iter->pvt.chaniter.span->chan_count, NULL, "channel iterator index bigger than span chan count!\n");
+		return iter->pvt.chaniter.span->channels[iter->pvt.chaniter.index];
+	default:
+		break;
+	}
+
+	ftdm_assert_return(0, NULL, "Unknown iterator type\n");
+	return NULL;
+}
+
+FT_DECLARE(ftdm_status_t) ftdm_iterator_free(ftdm_iterator_t *iter)
+{
+	/* it's valid to pass a NULL iterator, do not return failure  */
+	if (!iter) {
+		return FTDM_SUCCESS;
+	}
+
+	if (!iter->allocated) {
+		memset(iter, 0, sizeof(*iter));
+		return FTDM_SUCCESS;
+	}
+
+	ftdm_assert_return(iter->type, FTDM_FAIL, "Cannot free invalid iterator\n");
+	ftdm_safe_free(iter);
+
+	return FTDM_SUCCESS;
 }
 
 static struct {

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

@@ -213,7 +213,7 @@ int  ft_to_sngss7_cfg_all(void)
 				SS7_CRITICAL("MTP3 ROUTE %d configuration FAILED!\n", x);
 				SS7_ASSERT
 			} else {
-				SS7_INFO("MTP3 ROUTE %d configuration DONE!\n");
+				SS7_INFO("MTP3 ROUTE %d configuration DONE!\n",x);
 			}
 
 			/* set the CONFIGURED flag */
@@ -229,7 +229,7 @@ int  ft_to_sngss7_cfg_all(void)
 			SS7_CRITICAL("MTP3 ROUTE 0 configuration FAILED!\n");
 			SS7_ASSERT
 		} else {
-			SS7_INFO("MTP3 ROUTE %d configuration DONE!\n");
+			SS7_INFO("MTP3 ROUTE 0 configuration DONE!\n");
 		}
 
 		/* set the CONFIGURED flag */
@@ -644,7 +644,7 @@ int ftmod_ss7_mtp2_dlsap_config(int id)
 	cfg.t.cfg.s.sdDLSAP.memMac.region	= S_REG;					/* memory region and pool id for MAC */
 	cfg.t.cfg.s.sdDLSAP.memMac.pool		= S_POOL;
 	cfg.t.cfg.s.sdDLSAP.maxOutsFrms		= MAX_SD_OUTSTANDING;		/* maximum outstanding frames */
-	cfg.t.cfg.s.sdDLSAP.errType			= SD_ERR_NRM;
+	cfg.t.cfg.s.sdDLSAP.errType			= k->mtp2.errorType;
 	cfg.t.cfg.s.sdDLSAP.t1.enb			= TRUE;						/* timer 1 - Alignment Ready Timer */
 	cfg.t.cfg.s.sdDLSAP.t1.val			= k->mtp2.t1;
 	cfg.t.cfg.s.sdDLSAP.t2.enb			= TRUE;						/* timer 2 - Not Aligned Timer */
@@ -925,7 +925,7 @@ int ftmod_ss7_mtp3_linkset_config(int id)
 {
 	Pst				pst;
 	SnMngmt			cfg;
-	U16				c;
+	int				c;
 	sng_link_set_t	*k = &g_ftdm_sngss7_data.cfg.mtpLinkSet[id];
 
 	/* initalize the post structure */
@@ -952,12 +952,13 @@ int ftmod_ss7_mtp3_linkset_config(int id)
 	cfg.t.cfg.s.snLnkSet.lnkSetType		= k->linkType;		/* link type */
 	cfg.t.cfg.s.snLnkSet.adjDpc			= k->apc;			/* adjacent DPC */
 	cfg.t.cfg.s.snLnkSet.nmbActLnkReqd	= k->minActive;		/* minimum number of active links */
-	cfg.t.cfg.s.snLnkSet.nmbCmbLnkSet	= 1;				/* number of combined link sets */
+	cfg.t.cfg.s.snLnkSet.nmbCmbLnkSet	= k->numLinks;				/* number of combined link sets */
-	for (c = 0; c < LSN_MAXCMBLNK; c++) {
+	for(c = 0; c < k->numLinks;c++) {
-		cfg.t.cfg.s.snLnkSet.cmbLnkSet[c].cmbLnkSetId = c+1;
+		cfg.t.cfg.s.snLnkSet.cmbLnkSet[c].cmbLnkSetId = k->links[c];
 		cfg.t.cfg.s.snLnkSet.cmbLnkSet[c].lnkSetPrior = 0;
 	}
 
+
 	return(sng_cfg_mtp3(&pst, &cfg));
 }
 

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

@@ -1715,6 +1715,7 @@ ftdm_status_t handle_grs_req(uint32_t suInstId, uint32_t spInstId, uint32_t circ
 
 	/* loop over the cics starting from circuit until range+1 */
 	for (x = circuit; x < (circuit + range + 1); x++) {
+		if (g_ftdm_sngss7_data.cfg.isupCkt[x].type != VOICE) continue;
 		/* grab the circuit in question */
 		if (extract_chan_data(x, &sngss7_info, &ftdmchan)) {
 			SS7_ERROR("Failed to extract channel data for circuit = %d!\n", x);
@@ -2057,6 +2058,7 @@ ftdm_status_t handle_cgb_req(uint32_t suInstId, uint32_t spInstId, uint32_t circ
 
 	/* loop over the cics starting from circuit until range+1 */
 	for (x = circuit; x < (circuit + range + 1); x++) {
+		if (g_ftdm_sngss7_data.cfg.isupCkt[x].type != VOICE) continue;
 		/* grab the circuit in question */
 		if (extract_chan_data(x, &sngss7_info, &ftdmchan)) {
 			SS7_ERROR("Failed to extract channel data for circuit = %d!\n", x);
@@ -2191,6 +2193,7 @@ ftdm_status_t handle_cgu_req(uint32_t suInstId, uint32_t spInstId, uint32_t circ
 
 	/* loop over the cics starting from circuit until range+1 */
 	for (x = circuit; x < (circuit + range + 1); x++) {
+		if (g_ftdm_sngss7_data.cfg.isupCkt[x].type != VOICE) continue;
 		/* grab the circuit in question */
 		if (extract_chan_data(x, &sngss7_info, &ftdmchan)) {
 			SS7_ERROR("Failed to extract channel data for circuit = %d!\n", x);

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

@@ -109,6 +109,10 @@ void handle_sng_mtp1_alarm(Pst *pst, L1Mngmt *sta)
 /******************************************************************************/
 void handle_sng_mtp2_alarm(Pst *pst, SdMngmt *sta)
 {
+	char	buf[50];
+	int		x = 1;
+
+	memset(buf, '\0', sizeof(buf));
 
 	switch (sta->t.usta.alarm.category) {
 	/**************************************************************************/
@@ -126,23 +130,39 @@ void handle_sng_mtp2_alarm(Pst *pst, SdMngmt *sta)
 		case (LSD_EVENT_REMOTE_CONG_END):
 		case (LSD_EVENT_RX_REMOTE_SIPO):
 
+			/* find the name for the sap in question */
+			x = 1;
+			while (g_ftdm_sngss7_data.cfg.mtpLink[x].id != 0) {
+				if (g_ftdm_sngss7_data.cfg.mtpLink[x].id == sta->t.usta.evntParm[0]) {
+					break;
+				}
+				x++;
+			}
+
+			if (g_ftdm_sngss7_data.cfg.mtpLink[x].id == 0) {
+				sprintf(buf, "[SAPID:%d]", sta->t.usta.evntParm[0]);
+			} else {
+				sprintf(buf, "[%s]", g_ftdm_sngss7_data.cfg.mtpLink[x].name);
+			}
+					
+
 			switch (sta->t.usta.alarm.cause) {
 			/******************************************************************/
 			case (LCM_CAUSE_UNKNOWN):
-				ftdm_log(FTDM_LOG_ERROR,"[MTP2][SAPID:%d] %s\n",
+				ftdm_log(FTDM_LOG_ERROR,"[MTP2]%s %s\n",
-											sta->t.usta.evntParm[0],
+											buf,
 											DECODE_LSD_EVENT(sta->t.usta.alarm.event));
 				break;
 			/******************************************************************/
 			case (LCM_CAUSE_MGMT_INITIATED):
-				ftdm_log(FTDM_LOG_ERROR,"[MTP2][SAPID:%d][MGMT] %s\n",
+				ftdm_log(FTDM_LOG_ERROR,"[MTP2]%s[MGMT] %s\n",
-											sta->t.usta.evntParm[0],
+											buf,
 											DECODE_LSD_EVENT(sta->t.usta.alarm.event));
 				break;
 			/******************************************************************/
 			default:
-				ftdm_log(FTDM_LOG_ERROR,"[MTP2][SAPID:%d] %s (***unknown cause***)\n",
+				ftdm_log(FTDM_LOG_ERROR,"[MTP2]%s %s (***unknown cause***)\n",
-											sta->t.usta.evntParm[0],
+											buf,
 											DECODE_LSD_EVENT(sta->t.usta.alarm.event));
 				break;
 			/******************************************************************/
@@ -150,23 +170,71 @@ void handle_sng_mtp2_alarm(Pst *pst, SdMngmt *sta)
 			break;
 		/**********************************************************************/
 		case (LSD_EVENT_PROT_ERR):
-			ftdm_log(FTDM_LOG_ERROR,"[MTP2][SAPID:%d] %s : %s\n",
+			
-										sta->t.usta.evntParm[0],
+			/* find the name for the sap in question */
+			x = 1;
+			while (g_ftdm_sngss7_data.cfg.mtpLink[x].id != 0) {
+				if (g_ftdm_sngss7_data.cfg.mtpLink[x].id == sta->t.usta.evntParm[0]) {
+					break;
+				}
+				x++;
+			}
+
+			if (g_ftdm_sngss7_data.cfg.mtpLink[x].id == 0) {
+				sprintf(buf, "[SAPID:%d]", sta->t.usta.evntParm[0]);
+			} else {
+				sprintf(buf, "[%s]", g_ftdm_sngss7_data.cfg.mtpLink[x].name);
+			}
+
+			ftdm_log(FTDM_LOG_ERROR,"[MTP2]%s %s : %s\n",
+										buf,
 										DECODE_LSD_EVENT(sta->t.usta.alarm.event),
 										DECODE_LSD_CAUSE(sta->t.usta.alarm.cause));
 			break;
 		/**********************************************************************/
 		case (LSD_EVENT_ALIGN_LOST):
-			ftdm_log(FTDM_LOG_ERROR,"[MTP2][SAPID:%d] %s : %s\n",
+			
-										sta->t.usta.evntParm[0],
+			/* find the name for the sap in question */
+			x = 1;
+			while (g_ftdm_sngss7_data.cfg.mtpLink[x].id != 0) {
+				if (g_ftdm_sngss7_data.cfg.mtpLink[x].id == sta->t.usta.evntParm[0]) {
+					break;
+				}
+				x++;
+			}
+
+			if (g_ftdm_sngss7_data.cfg.mtpLink[x].id == 0) {
+				sprintf(buf, "[SAPID:%d]", sta->t.usta.evntParm[0]);
+			} else {
+				sprintf(buf, "[%s]", g_ftdm_sngss7_data.cfg.mtpLink[x].name);
+			}
+
+			ftdm_log(FTDM_LOG_ERROR,"[MTP2]%s %s : %s\n",
+										buf,
 										DECODE_LSD_EVENT(sta->t.usta.alarm.event),
 										DECODE_DISC_REASON(sta->t.usta.evntParm[1]));
 			break;
 		/**********************************************************************/
 		case (LSD_EVENT_RTB_FULL):
 		case (LSD_EVENT_RTB_FULL_OVER):
-			ftdm_log(FTDM_LOG_ERROR,"[MTP2][SAPID:%d] %s : RTB Queue Len(%d)|Oldest BSN(%d)|Tx Queue Len(%d)|Outstanding Frames(%d)\n",
+
-										sta->t.usta.evntParm[0],
+			/* find the name for the sap in question */
+			x = 1;
+			while (g_ftdm_sngss7_data.cfg.mtpLink[x].id != 0) {
+				if (g_ftdm_sngss7_data.cfg.mtpLink[x].id == sta->t.usta.evntParm[0]) {
+					break;
+				}
+				x++;
+			}
+
+			if (g_ftdm_sngss7_data.cfg.mtpLink[x].id == 0) {
+				sprintf(buf, "[SAPID:%d]", sta->t.usta.evntParm[0]);
+			} else {
+				sprintf(buf, "[%s]", g_ftdm_sngss7_data.cfg.mtpLink[x].name);
+			}
+
+			ftdm_log(FTDM_LOG_ERROR,"[MTP2]%s %s : RTB Queue Len(%d)|Oldest BSN(%d)|Tx Queue Len(%d)|Outstanding Frames(%d)\n",
+										buf,
 										DECODE_LSD_EVENT(sta->t.usta.alarm.event),
 										sta->t.usta.evntParm[1],
 										sta->t.usta.evntParm[2],
@@ -175,15 +243,47 @@ void handle_sng_mtp2_alarm(Pst *pst, SdMngmt *sta)
 			break;
 		/**********************************************************************/
 		case (LSD_EVENT_NEG_ACK):
-			ftdm_log(FTDM_LOG_ERROR,"[MTP2][SAPID:%d] %s : RTB Queue Len(%d)\n",
+
-										sta->t.usta.evntParm[0],
+			/* find the name for the sap in question */
+			x = 1;
+			while (g_ftdm_sngss7_data.cfg.mtpLink[x].id != 0) {
+				if (g_ftdm_sngss7_data.cfg.mtpLink[x].id == sta->t.usta.evntParm[0]) {
+					break;
+				}
+				x++;
+			}
+
+			if (g_ftdm_sngss7_data.cfg.mtpLink[x].id == 0) {
+				sprintf(buf, "[SAPID:%d]", sta->t.usta.evntParm[0]);
+			} else {
+				sprintf(buf, "[%s]", g_ftdm_sngss7_data.cfg.mtpLink[x].name);
+			}
+
+			ftdm_log(FTDM_LOG_ERROR,"[MTP2]%s %s : RTB Queue Len(%d)\n",
+										buf,
 										DECODE_LSD_EVENT(sta->t.usta.alarm.event),
 										sta->t.usta.evntParm[1]);
 			break;
 		/**********************************************************************/
 		case (LSD_EVENT_DAT_CFM_SDT):
-			ftdm_log(FTDM_LOG_ERROR,"[MTP2][SAPID:%d] %s : %d\n",
+
-										sta->t.usta.evntParm[0],
+			/* find the name for the sap in question */
+			x = 1;
+			while (g_ftdm_sngss7_data.cfg.mtpLink[x].id != 0) {
+				if (g_ftdm_sngss7_data.cfg.mtpLink[x].id == sta->t.usta.evntParm[0]) {
+					break;
+				}
+				x++;
+			}
+
+			if (g_ftdm_sngss7_data.cfg.mtpLink[x].id == 0) {
+				sprintf(buf, "[SAPID:%d]", sta->t.usta.evntParm[0]);
+			} else {
+				sprintf(buf, "[%s]", g_ftdm_sngss7_data.cfg.mtpLink[x].name);
+			}
+
+			ftdm_log(FTDM_LOG_ERROR,"[MTP2]%s %s : %d\n",
+										buf,
 										DECODE_LSD_EVENT(sta->t.usta.alarm.event),
 										DECODE_DISC_REASON(sta->t.usta.evntParm[1]));
 			break;
@@ -251,15 +351,35 @@ void handle_sng_mtp2_alarm(Pst *pst, SdMngmt *sta)
 /******************************************************************************/
 void handle_sng_mtp3_alarm(Pst *pst, SnMngmt *sta)
 {
+	char	buf[50];
+	int		x = 1;
+
+	memset(buf, '\0', sizeof(buf));
 
 	switch (sta->hdr.elmId.elmnt) {
 	/**************************************************************************/
 	case (STDLSAP):
+
+			/* find the name for the sap in question */
+			x = 1;
+			while (g_ftdm_sngss7_data.cfg.mtpLink[x].id != 0) {
+				if (g_ftdm_sngss7_data.cfg.mtpLink[x].id == sta->hdr.elmId.elmntInst1) {
+					break;
+				}
+				x++;
+			}
+
+			if (g_ftdm_sngss7_data.cfg.mtpLink[x].id == 0) {
+				sprintf(buf, "[SAPID:%d]", sta->hdr.elmId.elmntInst1);
+			} else {
+				sprintf(buf, "[%s]", g_ftdm_sngss7_data.cfg.mtpLink[x].name);
+			}
+
 		switch (sta->t.usta.alarm.event) {
 		/**********************************************************************/
 		case (LSN_EVENT_INV_OPC_OTHER_END):
-			ftdm_log(FTDM_LOG_ERROR,"[MTP3][SAPID:%d] %s : %s : OPC(0x%X%X%X%X)\n",
+			ftdm_log(FTDM_LOG_ERROR,"[MTP3]%s %s : %s : OPC(0x%X%X%X%X)\n",
-										sta->hdr.elmId.elmntInst1,
+										buf,
 										DECODE_LSN_EVENT(sta->t.usta.alarm.event),
 										DECODE_LSN_CAUSE(sta->t.usta.alarm.cause),
 										sta->t.usta.evntParm[3],
@@ -269,16 +389,16 @@ void handle_sng_mtp3_alarm(Pst *pst, SnMngmt *sta)
 			break;
 		/**********************************************************************/
 		case (LSN_EVENT_INV_SLC_OTHER_END):
-			ftdm_log(FTDM_LOG_ERROR,"[MTP3][SAPID:%d] %s : %s : SLC(%d)\n",
+			ftdm_log(FTDM_LOG_ERROR,"[MTP3]%s %s : %s : SLC(%d)\n",
-										sta->hdr.elmId.elmntInst1,
+										buf,
 										DECODE_LSN_EVENT(sta->t.usta.alarm.event),
 										DECODE_LSN_CAUSE(sta->t.usta.alarm.cause),
 										sta->t.usta.evntParm[0]);
 			break;
 		/**********************************************************************/
 		default:
-			ftdm_log(FTDM_LOG_ERROR,"[MTP3][SAPID:%d] %s(%d) : %s(%d)\n",
+			ftdm_log(FTDM_LOG_ERROR,"[MTP3]%s %s(%d) : %s(%d)\n",
-										sta->hdr.elmId.elmntInst1,
+										buf,
 										DECODE_LSN_EVENT(sta->t.usta.alarm.event),
 										sta->t.usta.alarm.event,
 										DECODE_LSN_CAUSE(sta->t.usta.alarm.cause),

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

@@ -1240,6 +1240,7 @@ static ftdm_status_t ftdm_sangoma_ss7_start(ftdm_span_t * span)
 	for (x = 1; x < (span->chan_count + 1); x++) {
 		/* extract the channel structure and sngss7 channel data */
 		ftdmchan = span->channels[x];
+		if (ftdmchan->call_data == NULL) continue;
 		sngss7_info = ftdmchan->call_data;
 		sngss7_span = ftdmchan->span->mod_data;
 
@@ -1390,6 +1391,8 @@ static FIO_SIG_LOAD_FUNCTION(ftdm_sangoma_ss7_init)
 
 	sngss7_id = 0;
 
+	cmbLinkSetId = 1;
+
 	/* initalize the global gen_config flag */
 	g_ftdm_sngss7_data.gen_config = 0;
 

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

@@ -162,6 +162,8 @@ typedef struct sng_link_set {
 	uint32_t		flags;
 	uint32_t		apc;
 	uint32_t		linkType;
+	uint32_t		switchType;
+	uint32_t		ssf;
 	uint32_t 		minActive;
 	uint32_t		numLinks;
 	uint32_t		links[16];
@@ -173,9 +175,11 @@ typedef struct sng_route {
 	uint32_t		flags;
 	uint32_t		dpc;
 	uint32_t		cmbLinkSetId;
+	uint32_t		linkSetId;
 	uint32_t		linkType;
 	uint32_t		switchType;
 	uint32_t		ssf;
+	uint32_t		nwId;
 	uint32_t		isSTP;
 	uint32_t		t6;
 	uint32_t		t8;
@@ -419,6 +423,7 @@ typedef enum {
 extern ftdm_sngss7_data_t   g_ftdm_sngss7_data;
 extern uint32_t			 sngss7_id;
 extern ftdm_sched_t		 *sngss7_sched;
+extern int				cmbLinkSetId;
 /******************************************************************************/
 
 /* PROTOTYPES *****************************************************************/

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

@@ -46,6 +46,8 @@ typedef struct sng_timeslot
 	int	 gap;
 	int	 hole;
 }sng_timeslot_t;
+
+int cmbLinkSetId;
 /******************************************************************************/
 
 /* PROTOTYPES *****************************************************************/
@@ -343,11 +345,11 @@ static int ftmod_ss7_parse_mtp_linkset(ftdm_conf_node_t *mtp_linkset)
 		/**********************************************************************/
 		} else if (!strcasecmp(parm->var, "apc")) {
 			mtpLinkSet.apc = atoi(parm->val);
-			SS7_DEBUG("\tFoundmtpLinkSet->apc = %d\n", mtpLinkSet.apc);
+			SS7_DEBUG("\tFound mtpLinkSet->apc = %d\n", mtpLinkSet.apc);
 		/**********************************************************************/
 		} else if (!strcasecmp(parm->var, "minActive")) {
 			mtpLinkSet.minActive = atoi(parm->val);
-			SS7_DEBUG("\tFoundmtpLinkSet->minActive = %d\n", mtpLinkSet.minActive);
+			SS7_DEBUG("\tFound mtpLinkSet->minActive = %d\n", mtpLinkSet.minActive);
 		/**********************************************************************/
 		} else {
 			SS7_ERROR("\tFound an invalid parameter \"%s\"!\n", parm->val);
@@ -385,8 +387,6 @@ static int ftmod_ss7_parse_mtp_linkset(ftdm_conf_node_t *mtp_linkset)
 	if (count < 1 || count > 15 ) {
 		SS7_ERROR("Invalid number of mtp_links found (%d)\n", count);
 		return FTDM_FAIL;
-	} else {
-		mtpLinkSet.numLinks = count;
 	}
 
 	/* now we need to see if this linkset exists already or not and grab an Id */
@@ -418,8 +418,7 @@ static int ftmod_ss7_parse_mtp_linkset(ftdm_conf_node_t *mtp_linkset)
 		mtpLink[i].mtp3.apc			= mtpLinkSet.apc;
 		mtpLink[i].mtp3.linkSetId	= mtpLinkSet.id;
 
-		/* fill in the mtplink structure */
+		ftmod_ss7_fill_in_mtpLink(&mtpLink[i]);
-		mtpLinkSet.links[count] = ftmod_ss7_fill_in_mtpLink(&mtpLink[i]);
 
 		/* increment the links counter */
 		count++;
@@ -428,6 +427,10 @@ static int ftmod_ss7_parse_mtp_linkset(ftdm_conf_node_t *mtp_linkset)
 		i++;
 	}
 
+	mtpLinkSet.linkType		= mtpLink[0].mtp3.linkType;
+	mtpLinkSet.switchType	= mtpLink[0].mtp3.switchType;
+	mtpLinkSet.ssf			= mtpLink[0].mtp3.ssf;
+
 	ftmod_ss7_fill_in_mtpLinkSet(&mtpLinkSet);
 
 	return FTDM_SUCCESS;
@@ -497,27 +500,27 @@ static int ftmod_ss7_parse_mtp_link(ftdm_conf_node_t *mtp_link, sng_mtp_link_t *
 			if (!strcasecmp(parm->val, "itu92")) {
 				mtpLink->mtp2.linkType = LSD_SW_ITU92;
 				mtpLink->mtp3.linkType = LSN_SW_ITU;
-				SS7_DEBUG("\tFoundmtpLink->linkType = \"ITU92\"\n");
+				SS7_DEBUG("\tFound mtpLink->linkType = \"ITU92\"\n");
 			} else if (!strcasecmp(parm->val, "itu88")) {
 				mtpLink->mtp2.linkType = LSD_SW_ITU88;
 				mtpLink->mtp3.linkType = LSN_SW_ITU;
-				SS7_DEBUG("\tFoundmtpLink->linkType = \"ITU88\"\n");
+				SS7_DEBUG("\tFound mtpLink->linkType = \"ITU88\"\n");
 			} else if (!strcasecmp(parm->val, "ansi96")) {
 				mtpLink->mtp2.linkType = LSD_SW_ANSI92;
 				mtpLink->mtp3.linkType = LSN_SW_ANS96;
-				SS7_DEBUG("\tFoundmtpLink->linkType = \"ANSI96\"\n");
+				SS7_DEBUG("\tFound mtpLink->linkType = \"ANSI96\"\n");
 			} else if (!strcasecmp(parm->val, "ansi92")) {
 				mtpLink->mtp2.linkType = LSD_SW_ANSI92;
 				mtpLink->mtp3.linkType = LSN_SW_ANS;
-				SS7_DEBUG("\tFoundmtpLink->linkType = \"ANSI92\"\n");
+				SS7_DEBUG("\tFound mtpLink->linkType = \"ANSI92\"\n");
 			} else if (!strcasecmp(parm->val, "ansi88")) {
 				mtpLink->mtp2.linkType = LSD_SW_ANSI88;
 				mtpLink->mtp3.linkType = LSN_SW_ANS;
-				SS7_DEBUG("\tFoundmtpLink->linkType = \"ANSI88\"\n");
+				SS7_DEBUG("\tFound mtpLink->linkType = \"ANSI88\"\n");
 			} else if (!strcasecmp(parm->val, "etsi")) {
 				mtpLink->mtp2.linkType = LSD_SW_ITU92;
 				mtpLink->mtp3.linkType = LSN_SW_ITU;
-				SS7_DEBUG("\tFoundmtpLink->linkType = \"ETSI\"\n");
+				SS7_DEBUG("\tFound mtpLink->linkType = \"ETSI\"\n");
 			} else {
 				SS7_ERROR("\tFound an invalid linktype of \"%s\"!\n", parm->val);
 				return FTDM_FAIL;
@@ -526,40 +529,40 @@ static int ftmod_ss7_parse_mtp_link(ftdm_conf_node_t *mtp_link, sng_mtp_link_t *
 		} else if (!strcasecmp(parm->var, "switchType")) {
 			if (!strcasecmp(parm->val, "itu97")) {
 				mtpLink->mtp3.switchType = LSI_SW_ITU97;
-				SS7_DEBUG("\tFoundmtpLink->switchType = \"ITU97\"\n");
+				SS7_DEBUG("\tFound mtpLink->switchType = \"ITU97\"\n");
 			} else if (!strcasecmp(parm->val, "itu88")) {
 				mtpLink->mtp3.switchType = LSI_SW_ITU;
-				SS7_DEBUG("\tFoundmtpLink->switchType = \"ITU88\"\n");
+				SS7_DEBUG("\tFound mtpLink->switchType = \"ITU88\"\n");
 			} else if (!strcasecmp(parm->val, "itu92")) {
 				mtpLink->mtp3.switchType = LSI_SW_ITU;
-				SS7_DEBUG("\tFoundmtpLink->switchType = \"ITU92\"\n");
+				SS7_DEBUG("\tFound mtpLink->switchType = \"ITU92\"\n");
 			} else if (!strcasecmp(parm->val, "itu00")) {
 				mtpLink->mtp3.switchType = LSI_SW_ITU2000;
-				SS7_DEBUG("\tFoundmtpLink->switchType = \"ITU00\"\n");
+				SS7_DEBUG("\tFound mtpLink->switchType = \"ITU00\"\n");
 			} else if (!strcasecmp(parm->val, "ETSIV2")) {
 				mtpLink->mtp3.switchType = LSI_SW_ETSI;
-				SS7_DEBUG("\tFoundmtpLink->switchType = \"ETSIV2\"\n");
+				SS7_DEBUG("\tFound mtpLink->switchType = \"ETSIV2\"\n");
 			} else if (!strcasecmp(parm->val, "ETSIV3")) {
 				mtpLink->mtp3.switchType = LSI_SW_ETSIV3;
-				SS7_DEBUG("\tFoundmtpLink->switchType = \"ETSIV3\"\n");
+				SS7_DEBUG("\tFound mtpLink->switchType = \"ETSIV3\"\n");
 			} else if (!strcasecmp(parm->val, "UK")) {
 				mtpLink->mtp3.switchType = LSI_SW_UK;
-				SS7_DEBUG("\tFoundmtpLink->switchType = \"UK\"\n");
+				SS7_DEBUG("\tFound mtpLink->switchType = \"UK\"\n");
 			} else if (!strcasecmp(parm->val, "RUSSIA")) {
 				mtpLink->mtp3.switchType = LSI_SW_RUSSIA;
-				SS7_DEBUG("\tFoundmtpLink->switchType = \"RUSSIA\"\n");
+				SS7_DEBUG("\tFound mtpLink->switchType = \"RUSSIA\"\n");
 			} else if (!strcasecmp(parm->val, "INDIA")) {
 				mtpLink->mtp3.switchType = LSI_SW_INDIA;
-				SS7_DEBUG("\tFoundmtpLink->switchType = \"INDIA\"\n");
+				SS7_DEBUG("\tFound mtpLink->switchType = \"INDIA\"\n");
 			} else if (!strcasecmp(parm->val, "ansi88")) {
 				mtpLink->mtp3.switchType = LSI_SW_ANS88;
-				SS7_DEBUG("\tFoundmtpLink->switchType = \"ANSI88\"\n");
+				SS7_DEBUG("\tFound mtpLink->switchType = \"ANSI88\"\n");
 			} else if (!strcasecmp(parm->val, "ansi92")) {
 				mtpLink->mtp3.switchType = LSI_SW_ANS92;
-				SS7_DEBUG("\tFoundmtpLink->switchType = \"ANSI92\"\n");
+				SS7_DEBUG("\tFound mtpLink->switchType = \"ANSI92\"\n");
 			} else if (!strcasecmp(parm->val, "ansi95")) {
 				mtpLink->mtp3.switchType = LSI_SW_ANS95;
-				SS7_DEBUG("\tFoundmtpLink->switchType = \"ANSI95\"\n");
+				SS7_DEBUG("\tFound mtpLink->switchType = \"ANSI95\"\n");
 			} else {
 				SS7_ERROR("\tFound an invalid linktype of \"%s\"!\n", parm->val);
 				return FTDM_FAIL;
@@ -577,7 +580,7 @@ static int ftmod_ss7_parse_mtp_link(ftdm_conf_node_t *mtp_link, sng_mtp_link_t *
 		/**********************************************************************/
 		} else if (!strcasecmp(parm->var, "slc")) {
 			mtpLink->mtp3.slc = atoi(parm->val);
-			SS7_DEBUG("\tFoundmtpLink->slc = \"%d\"\n",mtpLink->mtp3.slc);
+			SS7_DEBUG("\tFound mtpLink->slc = \"%d\"\n",mtpLink->mtp3.slc);
 		/**********************************************************************/
 		} else {
 			SS7_ERROR("\tFound an invalid parameter \"%s\"!\n", parm->val);
@@ -658,14 +661,17 @@ static int ftmod_ss7_parse_mtp_route(ftdm_conf_node_t *mtp_route)
 				/* check if the name matches */
 				if (!strcasecmp((char *)g_ftdm_sngss7_data.cfg.mtpLinkSet[x].name, parm->val)) {
 
-					/* grab the mtpLink id value first*/
-					int id = g_ftdm_sngss7_data.cfg.mtpLinkSet[x].links[0];
-
 					/* now, harvest the required infomormation from the global structure */
-					mtpRoute.linkType		= g_ftdm_sngss7_data.cfg.mtpLink[id].mtp3.linkType;
+					mtpRoute.linkType		= g_ftdm_sngss7_data.cfg.mtpLinkSet[x].linkType;
-					mtpRoute.switchType		= g_ftdm_sngss7_data.cfg.mtpLink[id].mtp3.switchType;
+					mtpRoute.switchType		= g_ftdm_sngss7_data.cfg.mtpLinkSet[x].switchType;
-					mtpRoute.ssf			= g_ftdm_sngss7_data.cfg.mtpLink[id].mtp3.ssf;
+					mtpRoute.ssf			= g_ftdm_sngss7_data.cfg.mtpLinkSet[x].ssf;
-					mtpRoute.cmbLinkSetId	= g_ftdm_sngss7_data.cfg.mtpLinkSet[x].id;
+					mtpRoute.linkSetId		= g_ftdm_sngss7_data.cfg.mtpLinkSet[x].id;
+					cmbLinkSetId++;
+					mtpRoute.cmbLinkSetId	= cmbLinkSetId;
+
+					/* update the linkset with the new cmbLinkSet value */
+					g_ftdm_sngss7_data.cfg.mtpLinkSet[x].numLinks++;
+					g_ftdm_sngss7_data.cfg.mtpLinkSet[x].links[g_ftdm_sngss7_data.cfg.mtpLinkSet[x].numLinks-1] = mtpRoute.cmbLinkSetId;
 					break;
 				}
 				x++;
@@ -701,9 +707,11 @@ static int ftmod_ss7_parse_mtp_route(ftdm_conf_node_t *mtp_route)
 		parm = parm + 1;
 	}
 
+	ftmod_ss7_fill_in_nsap(&mtpRoute);
+
 	ftmod_ss7_fill_in_mtp3_route(&mtpRoute);
 
-	ftmod_ss7_fill_in_nsap(&mtpRoute);
+
 
 	return FTDM_SUCCESS;
 }
@@ -747,7 +755,6 @@ static int ftmod_ss7_parse_isup_interface(ftdm_conf_node_t *isup_interface)
 	int						num_parms = isup_interface->n_parameters;
 	int						i;
 	int						linkSetId;
-	int						linkId;
 
 	memset(&sng_isup, 0x0, sizeof(sng_isup));
 	memset(&sng_isap, 0x0, sizeof(sng_isap));
@@ -781,36 +788,25 @@ static int ftmod_ss7_parse_isup_interface(ftdm_conf_node_t *isup_interface)
 
 				/* check if the name matches */
 				if (!strcasecmp((char *)g_ftdm_sngss7_data.cfg.mtpRoute[x].name, parm->val)) {
-
 					/* now, harvest the required information from the global structure */
 					sng_isup.mtpRouteId		= g_ftdm_sngss7_data.cfg.mtpRoute[x].id;
 					sng_isup.dpc			= g_ftdm_sngss7_data.cfg.mtpRoute[x].dpc;
 					sng_isup.switchType	 	= g_ftdm_sngss7_data.cfg.mtpRoute[x].switchType;
 					sng_isap.switchType		= g_ftdm_sngss7_data.cfg.mtpRoute[x].switchType;
 
-					/* find the nwID from the nsap */
+					/* find the NSAP corresponding to this switchType and SSF */
-					int y = 1;
+					int z = 1;
-					while (g_ftdm_sngss7_data.cfg.nsap[y].id != 0) {
+					while (g_ftdm_sngss7_data.cfg.nsap[z].id != 0) {
-
+						if ((g_ftdm_sngss7_data.cfg.nsap[z].linkType == g_ftdm_sngss7_data.cfg.mtpRoute[x].linkType) &&
-						if ((g_ftdm_sngss7_data.cfg.nsap[y].linkType == g_ftdm_sngss7_data.cfg.mtpRoute[x].linkType) &&
+							(g_ftdm_sngss7_data.cfg.nsap[z].switchType == g_ftdm_sngss7_data.cfg.mtpRoute[x].switchType) &&
-							(g_ftdm_sngss7_data.cfg.nsap[y].switchType == g_ftdm_sngss7_data.cfg.mtpRoute[x].switchType) &&
+							(g_ftdm_sngss7_data.cfg.nsap[z].ssf == g_ftdm_sngss7_data.cfg.mtpRoute[x].ssf)) {
-							(g_ftdm_sngss7_data.cfg.nsap[y].ssf == g_ftdm_sngss7_data.cfg.mtpRoute[x].ssf)) {
+								sng_isup.nwId 	= g_ftdm_sngss7_data.cfg.nsap[z].nwId;
-
 							/* we have a match so break out of this loop */
 							break;
 						}
 						/* move on to the next one */
-						y++;
+						z++;
-					} /* while (g_ftdm_sngss7_data.cfg.mtp3_isup[y].id != 0) */
-
-					/* check how we exited the last while loop */
-					if (g_ftdm_sngss7_data.cfg.nsap[y].id == 0) {
-						SS7_ERROR("\tFailed to find the nwID for = \"%s\"!\n", parm->val);
-						return FTDM_FAIL;
-					} else {
-						sng_isup.nwId = g_ftdm_sngss7_data.cfg.nsap[y].nwId;
 					}
-
 					break;
 				}
 				x++;
@@ -855,10 +851,15 @@ static int ftmod_ss7_parse_isup_interface(ftdm_conf_node_t *isup_interface)
 	}
 
 	/* trickle down the SPC to all sub entities */
-	linkSetId = g_ftdm_sngss7_data.cfg.mtpRoute[sng_isup.mtpRouteId].cmbLinkSetId;
+	linkSetId = g_ftdm_sngss7_data.cfg.mtpRoute[sng_isup.mtpRouteId].linkSetId;
-	for (i = 0; i < g_ftdm_sngss7_data.cfg.mtpLinkSet[linkSetId].numLinks; i ++) {
+
-		linkId = g_ftdm_sngss7_data.cfg.mtpLinkSet[linkSetId].links[i];
+	i = 1;
-		g_ftdm_sngss7_data.cfg.mtpLink[linkId].mtp3.spc = g_ftdm_sngss7_data.cfg.spc;
+	while (g_ftdm_sngss7_data.cfg.mtpLink[i].id != 0) {
+		if (g_ftdm_sngss7_data.cfg.mtpLink[i].mtp3.linkSetId == linkSetId) {
+			g_ftdm_sngss7_data.cfg.mtpLink[i].mtp3.spc = g_ftdm_sngss7_data.cfg.spc;
+		}
+
+		i++;
 	}
 
 	ftmod_ss7_fill_in_isap(&sng_isap);
@@ -867,8 +868,6 @@ static int ftmod_ss7_parse_isup_interface(ftdm_conf_node_t *isup_interface)
 
 	ftmod_ss7_fill_in_isup_interface(&sng_isup);
 
-	g_ftdm_sngss7_data.cfg.isap[sng_isap.id].spId = sng_isup.id;
-
 	return FTDM_SUCCESS;
 }
 
@@ -966,7 +965,7 @@ static int ftmod_ss7_fill_in_mtpLink(sng_mtp_link_t *mtpLink)
 	if ( mtpLink->mtp2.t7 != 0 ) {
 		g_ftdm_sngss7_data.cfg.mtpLink[i].mtp2.t7		= mtpLink->mtp2.t7;
 	}else {
-		g_ftdm_sngss7_data.cfg.mtpLink[i].mtp2.t7		= 20;
+		g_ftdm_sngss7_data.cfg.mtpLink[i].mtp2.t7		= 40;
 	}
 
 	if (mtpLink->mtp3.t1 != 0) {
@@ -1066,21 +1065,19 @@ static int ftmod_ss7_fill_in_mtpLink(sng_mtp_link_t *mtpLink)
 /******************************************************************************/
 static int ftmod_ss7_fill_in_mtpLinkSet(sng_link_set_t *mtpLinkSet)
 {
-	int	count;
 	int	i = mtpLinkSet->id;
 
 	strcpy((char *)g_ftdm_sngss7_data.cfg.mtpLinkSet[i].name, (char *)mtpLinkSet->name);
 
 	g_ftdm_sngss7_data.cfg.mtpLinkSet[i].id			= mtpLinkSet->id;
 	g_ftdm_sngss7_data.cfg.mtpLinkSet[i].apc		= mtpLinkSet->apc;
-	g_ftdm_sngss7_data.cfg.mtpLinkSet[i].linkType	= g_ftdm_sngss7_data.cfg.mtpLink[1].mtp3.linkType; /* KONRAD FIX ME */
+	g_ftdm_sngss7_data.cfg.mtpLinkSet[i].linkType	= mtpLinkSet->linkType;
+	g_ftdm_sngss7_data.cfg.mtpLinkSet[i].switchType	= mtpLinkSet->switchType;
+	g_ftdm_sngss7_data.cfg.mtpLinkSet[i].ssf		= mtpLinkSet->ssf;
+
+	/* these values are filled in as we find routes and start allocating cmbLinkSetIds */
 	g_ftdm_sngss7_data.cfg.mtpLinkSet[i].minActive	= mtpLinkSet->minActive;
-	g_ftdm_sngss7_data.cfg.mtpLinkSet[i].numLinks	= mtpLinkSet->numLinks;
+	g_ftdm_sngss7_data.cfg.mtpLinkSet[i].numLinks	= 0;
-
-	for (count = 0; count < mtpLinkSet->numLinks; count++) {
-		g_ftdm_sngss7_data.cfg.mtpLinkSet[i].links[count]	= mtpLinkSet->links[count];
-	}
-
 	return 0;
 }
 
@@ -1092,8 +1089,7 @@ static int ftmod_ss7_fill_in_mtp3_route(sng_route_t *mtp3_route)
 	/* go through all the existing routes and see if we find a match */
 	i = 1;
 	while (g_ftdm_sngss7_data.cfg.mtpRoute[i].id != 0) {
-			if (g_ftdm_sngss7_data.cfg.mtpRoute[i].dpc == mtp3_route->dpc) {
+		if (!strcasecmp(g_ftdm_sngss7_data.cfg.mtpRoute[i].name, mtp3_route->name)) {
-
 			/* we have a match so break out of this loop */
 			break;
 		}
@@ -1115,8 +1111,10 @@ static int ftmod_ss7_fill_in_mtp3_route(sng_route_t *mtp3_route)
 	g_ftdm_sngss7_data.cfg.mtpRoute[i].dpc			= mtp3_route->dpc;
 	g_ftdm_sngss7_data.cfg.mtpRoute[i].linkType		= mtp3_route->linkType;
 	g_ftdm_sngss7_data.cfg.mtpRoute[i].switchType	= mtp3_route->switchType;
-	g_ftdm_sngss7_data.cfg.mtpRoute[i].cmbLinkSetId	= 1; /* mtp3_route->cmbLinkSetId;*/
+	g_ftdm_sngss7_data.cfg.mtpRoute[i].cmbLinkSetId	= mtp3_route->cmbLinkSetId;
 	g_ftdm_sngss7_data.cfg.mtpRoute[i].isSTP		= mtp3_route->isSTP;
+	g_ftdm_sngss7_data.cfg.mtpRoute[i].nwId			= mtp3_route->nwId;
+	g_ftdm_sngss7_data.cfg.mtpRoute[i].linkSetId	= mtp3_route->linkSetId;
 	g_ftdm_sngss7_data.cfg.mtpRoute[i].ssf			= mtp3_route->ssf;
 	if (mtp3_route->t6 != 0) {
 		g_ftdm_sngss7_data.cfg.mtpRoute[i].t6		= mtp3_route->t6;
@@ -1198,15 +1196,17 @@ static int ftmod_ss7_fill_in_nsap(sng_route_t *mtp3_route)
 
 	if (g_ftdm_sngss7_data.cfg.nsap[i].id == 0) {
 		g_ftdm_sngss7_data.cfg.nsap[i].id = i;
+		 mtp3_route->nwId = i;
 		SS7_DEBUG("found new mtp3_isup interface, id is = %d\n", g_ftdm_sngss7_data.cfg.nsap[i].id);
 	} else {
 		g_ftdm_sngss7_data.cfg.nsap[i].id = i;
+		 mtp3_route->nwId = i;
 		SS7_DEBUG("found existing mtp3_isup interface, id is = %d\n", g_ftdm_sngss7_data.cfg.nsap[i].id);
 	}
 	
 	g_ftdm_sngss7_data.cfg.nsap[i].spId			= g_ftdm_sngss7_data.cfg.nsap[i].id;
 	g_ftdm_sngss7_data.cfg.nsap[i].suId			= g_ftdm_sngss7_data.cfg.nsap[i].id;
-	g_ftdm_sngss7_data.cfg.nsap[i].nwId			= g_ftdm_sngss7_data.cfg.nsap[i].id;
+	g_ftdm_sngss7_data.cfg.nsap[i].nwId			= mtp3_route->nwId;
 	g_ftdm_sngss7_data.cfg.nsap[i].linkType		= mtp3_route->linkType;
 	g_ftdm_sngss7_data.cfg.nsap[i].switchType	= mtp3_route->switchType;
 	g_ftdm_sngss7_data.cfg.nsap[i].ssf			= mtp3_route->ssf;
@@ -1222,7 +1222,7 @@ static int ftmod_ss7_fill_in_isup_interface(sng_isup_inf_t *sng_isup)
 	/* go through all the existing interfaces and see if we find a match */
 	i = 1;
 	while (g_ftdm_sngss7_data.cfg.isupIntf[i].id != 0) {
-		if (g_ftdm_sngss7_data.cfg.isupIntf[i].nwId == sng_isup->nwId) {
+		if (!strcasecmp(g_ftdm_sngss7_data.cfg.isupIntf[i].name, sng_isup->name)) {
 
 			/* we have a match so break out of this loop */
 			break;
@@ -1395,7 +1395,8 @@ static int ftmod_ss7_fill_in_isap(sng_isap_t *sng_isap)
 	}
 
 	g_ftdm_sngss7_data.cfg.isap[i].id 			= sng_isap->id;
-	g_ftdm_sngss7_data.cfg.isap[i].suId			= 1; /*KONRAD FIX ME */
+	g_ftdm_sngss7_data.cfg.isap[i].suId			= sng_isap->id;
+	g_ftdm_sngss7_data.cfg.isap[i].spId			= sng_isap->id;
 	g_ftdm_sngss7_data.cfg.isap[i].switchType	= sng_isap->switchType;
 	g_ftdm_sngss7_data.cfg.isap[i].ssf			= sng_isap->ssf;
 
@@ -1513,7 +1514,9 @@ static int ftmod_ss7_fill_in_self_route(int spc, int linkType, int switchType, i
 		SS7_DEBUG("found existing mtp3 self route\n");
 		return FTDM_SUCCESS;
 	} else {
-		SS7_ERROR("found new mtp3 self route but it does not much the route already configured\n");
+		SS7_ERROR("found new mtp3 self route but it does not match the route already configured (dpc=%d:spc=%d)\n",
+					g_ftdm_sngss7_data.cfg.mtpRoute[0].dpc,
+					spc);
 		return FTDM_FAIL;
 	}
 

libs/freetdm/src/include/freetdm.h

@@ -386,7 +386,7 @@ typedef struct ftdm_conf_parameter {
 } ftdm_conf_parameter_t;
 
 /*! \brief Opaque general purpose iterator */
-typedef void ftdm_iterator_t;
+typedef struct ftdm_iterator ftdm_iterator_t;
 
 /*! \brief Channel commands that can be executed through ftdm_channel_command() */
 typedef enum {
@@ -1032,8 +1032,19 @@ FT_DECLARE(ftdm_status_t) ftdm_channel_add_var(ftdm_channel_t *ftdmchan, const c
 FT_DECLARE(const char *) ftdm_channel_get_var(ftdm_channel_t *ftdmchan, const char *var_name);
 
 /*! \brief Get an iterator to iterate over the channel variables
- *  \note The iterator pointer returned is only valid while the channel is open and it'll be destroyed when the channel is closed. */
+ *  \param ftdmchan The channel structure containing the variables
-FT_DECLARE(ftdm_iterator_t *) ftdm_channel_get_var_iterator(const ftdm_channel_t *ftdmchan);
+ *  \param iter Optional iterator. You can reuse an old iterator (not previously freed) to avoid the extra allocation of a new iterator.
+ *  \note The iterator pointer returned is only valid while the channel is open and it'll be destroyed when the channel is closed. 
+ *        This iterator is completely non-thread safe, if you are adding variables or removing variables while iterating 
+ *        results are unpredictable
+ */
+FT_DECLARE(ftdm_iterator_t *) ftdm_channel_get_var_iterator(const ftdm_channel_t *ftdmchan, ftdm_iterator_t *iter);
+
+/*! \brief Get iterator current value (depends on the iterator type)
+ *  \note Channel iterators return a pointer to ftdm_channel_t
+ *        Variable iterators return a pointer to the variable name (not the variable value)
+ */
+FT_DECLARE(void *) ftdm_iterator_current(ftdm_iterator_t *iter);
 
 /*! \brief Get variable name and value for the current iterator position */
 FT_DECLARE(ftdm_status_t) ftdm_channel_get_current_var(ftdm_iterator_t *iter, const char **var_name, const char **var_val);
@@ -1041,6 +1052,11 @@ FT_DECLARE(ftdm_status_t) ftdm_channel_get_current_var(ftdm_iterator_t *iter, co
 /*! \brief Advance iterator */
 FT_DECLARE(ftdm_iterator_t *) ftdm_iterator_next(ftdm_iterator_t *iter);
 
+/*! \brief Free iterator 
+ *  \note You must free an iterator after using it unless you plan to reuse it
+ */
+FT_DECLARE(ftdm_status_t) ftdm_iterator_free(ftdm_iterator_t *iter);
+
 /*! \brief Get the span pointer associated to the channel */
 FT_DECLARE(ftdm_span_t *) ftdm_channel_get_span(const ftdm_channel_t *ftdmchan);
 
@@ -1144,6 +1160,12 @@ FT_DECLARE(uint32_t) ftdm_span_get_id(const ftdm_span_t *span);
 /*! \brief Get the span name */
 FT_DECLARE(const char *) ftdm_span_get_name(const ftdm_span_t *span);
 
+/*! \brief Get iterator for the span channels
+ *  \param span The span containing the channels
+ *  \param iter Optional iterator. You can reuse an old iterator (not previously freed) to avoid the extra allocation of a new iterator.
+ */
+FT_DECLARE(ftdm_iterator_t *) ftdm_span_get_chan_iterator(const ftdm_span_t *span, ftdm_iterator_t *iter);
+
 /*! 
  * \brief Execute a text command. The text command output will be returned and must be free'd 
  *

libs/freetdm/src/include/private/ftdm_core.h

@@ -619,6 +619,9 @@ FT_DECLARE(ftdm_status_t) ftdm_span_trigger_signals(const ftdm_span_t *span);
 #define ftdm_log_chan(fchan, level, format, ...) ftdm_log(level, "[s%dc%d][%d:%d] " format, fchan->span_id, fchan->chan_id, fchan->physical_span_id, fchan->physical_chan_id, __VA_ARGS__)
 #define ftdm_log_chan_msg(fchan, level, msg) ftdm_log(level, "[s%dc%d][%d:%d] " msg, fchan->span_id, fchan->chan_id, fchan->physical_span_id, fchan->physical_chan_id)
 
+#define ftdm_span_lock(span) ftdm_mutex_lock(span->mutex)
+#define ftdm_span_unlock(span) ftdm_mutex_unlock(span->mutex)
+
 FT_DECLARE_DATA extern const char *FTDM_LEVEL_NAMES[9];
 
 static __inline__ void ftdm_abort(void)

libs/freetdm/src/include/private/ftdm_types.h

@@ -366,6 +366,23 @@ typedef ftdm_status_t (*ftdm_span_start_t)(ftdm_span_t *span);
 typedef ftdm_status_t (*ftdm_span_stop_t)(ftdm_span_t *span);
 typedef ftdm_status_t (*ftdm_channel_sig_read_t)(ftdm_channel_t *ftdmchan, void *data, ftdm_size_t size);
 
+typedef enum {
+	FTDM_ITERATOR_VARS = 1,
+	FTDM_ITERATOR_CHANS, 
+} ftdm_iterator_type_t;
+
+struct ftdm_iterator {
+	ftdm_iterator_type_t type;
+	unsigned int allocated:1;
+	union {
+		struct {
+			int32_t index;
+			const ftdm_span_t *span;
+		} chaniter;
+		ftdm_hash_iterator_t *hashiter;
+	} pvt;
+};
+
 #ifdef __cplusplus
 }
 #endif