freetdm: ss7 - bug fixes in configuration

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 */
@@ -925,7 +925,6 @@ int ftmod_ss7_mtp3_linkset_config(int id)
 {
 	Pst				pst;
 	SnMngmt			cfg;
-	U16				c;
 	sng_link_set_t	*k = &g_ftdm_sngss7_data.cfg.mtpLinkSet[id];
 
 	/* initalize the post structure */
@@ -953,10 +952,9 @@ int ftmod_ss7_mtp3_linkset_config(int id)
 	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 */
-	for (c = 0; c < LSN_MAXCMBLNK; c++) {
-		cfg.t.cfg.s.snLnkSet.cmbLnkSet[c].cmbLnkSetId = c+1;
-		cfg.t.cfg.s.snLnkSet.cmbLnkSet[c].lnkSetPrior = 0;
-	}
+	cfg.t.cfg.s.snLnkSet.cmbLnkSet[0].cmbLnkSetId = k->cmbLinkSetId;
+	cfg.t.cfg.s.snLnkSet.cmbLnkSet[0].lnkSetPrior = 0;
+
 
 	return(sng_cfg_mtp3(&pst, &cfg));
 }

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

@@ -162,6 +162,7 @@ typedef struct sng_link_set {
 	uint32_t		flags;
 	uint32_t		apc;
 	uint32_t		linkType;
+	uint32_t		cmbLinkSetId;
 	uint32_t 		minActive;
 	uint32_t		numLinks;
 	uint32_t		links[16];
@@ -176,6 +177,7 @@ typedef struct sng_route {
 	uint32_t		linkType;
 	uint32_t		switchType;
 	uint32_t		ssf;
+	uint32_t		nwId;
 	uint32_t		isSTP;
 	uint32_t		t6;
 	uint32_t		t8;