M2UA xml configuration parsing code

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

@@ -114,7 +114,7 @@ int ftmod_ss7_parse_nif_interfaces(ftdm_conf_node_t *nif_interfaces);
 int ftmod_ss7_parse_m2ua_interfaces(ftdm_conf_node_t *m2ua_interfaces);
 int ftmod_ss7_parse_m2ua_peer_interfaces(ftdm_conf_node_t *m2ua_peer_interfaces);
 int ftmod_ss7_parse_m2ua_clust_interfaces(ftdm_conf_node_t *m2ua_clust_interfaces);
-ftdm_status_t ftmod_m3ua_parse_sctp_links(ftdm_conf_node_t *node);
+int ftmod_ss7_parse_sctp_links(ftdm_conf_node_t *node);
 uint32_t iptoul(const char *ip);
 
 int ftmod_ss7_m2ua_start(void);

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

@@ -510,15 +510,6 @@ static int ftmod_ss7_parse_sng_isup(ftdm_conf_node_t *sng_isup)
 		return FTDM_FAIL;
 	}
 
-	if (ftmod_ss7_parse_mtp_linksets(mtp_linksets)) {
-		SS7_ERROR("Failed to parse \"mtp_linksets\"!\n");
-		return FTDM_FAIL;
-	}
-
-	if (ftmod_ss7_parse_mtp_routes(mtp_routes)) {	
-		SS7_ERROR("Failed to parse \"mtp_routes\"!\n");
-		return FTDM_FAIL;
-	}
 
 	switch(g_ftdm_operating_mode)
 	{
@@ -529,6 +520,16 @@ static int ftmod_ss7_parse_sng_isup(ftdm_conf_node_t *sng_isup)
 					return FTDM_FAIL;
 				}
 
+				if (ftmod_ss7_parse_mtp_linksets(mtp_linksets)) {
+					SS7_ERROR("Failed to parse \"mtp_linksets\"!\n");
+					return FTDM_FAIL;
+				}
+
+				if (ftmod_ss7_parse_mtp_routes(mtp_routes)) {	
+					SS7_ERROR("Failed to parse \"mtp_routes\"!\n");
+					return FTDM_FAIL;
+				}
+
 				if (isup_interfaces && ftmod_ss7_parse_isup_interfaces(isup_interfaces)) {
 					SS7_ERROR("Failed to parse \"isup_interfaces\"!\n");
 					return FTDM_FAIL;
@@ -542,11 +543,20 @@ static int ftmod_ss7_parse_sng_isup(ftdm_conf_node_t *sng_isup)
 			}
 		case SNG_SS7_OPR_MODE_M2UA_SG: 
 			{
-				if (ftmod_m3ua_parse_sctp_links(sctp_ifaces) != FTDM_SUCCESS) {
+				if (ftmod_ss7_parse_mtp_linksets(mtp_linksets)) {
+					SS7_ERROR("Failed to parse \"mtp_linksets\"!\n");
+					return FTDM_FAIL;
+				}
+
+				if (ftmod_ss7_parse_mtp_routes(mtp_routes)) {	
+					SS7_ERROR("Failed to parse \"mtp_routes\"!\n");
+					return FTDM_FAIL;
+				}
+
+				if (ftmod_ss7_parse_sctp_links(sctp_ifaces) != FTDM_SUCCESS) {
 					SS7_ERROR("Failed to parse <sctp_links>!\n");
 					return FTDM_FAIL;
 				}
-				SS7_INFO("Finished ftmod_m3ua_parse_sctp_links!\n");
 
 				if (nif_ifaces && ftmod_ss7_parse_nif_interfaces(nif_ifaces)) {
 					SS7_ERROR("Failed to parse \"nif_ifaces\"!\n");