Merge branch 'nsg-4.3' of ssh://git.sangoma.com/smg_freeswitch into nsg-4.3

libs/freetdm/configure.ac

@@ -316,7 +316,7 @@ if test "${HAVE_SNG_SS7}" = "yes"; then
 		case "${host}" in
 		x86_64-*)
 			# X86_64 machines need additional flags when compiling against libsng_isdn
-			CFLAGS="$CFLAGS -DBIT_64 -DALIGN_64BIT -DDEBUGP"
+			CFLAGS="$CFLAGS -DBIT_64 -DALIGN_64BIT"
 			;;
 		esac
 	fi

libs/freetdm/mod_freetdm/mod_freetdm.c

@@ -3061,7 +3061,6 @@ static ftdm_conf_node_t *_get_ss7_config_node(switch_xml_t cfg, const char *conf
 		return NULL;
 	}
 
-	/* If ISUP is operating mode then only include mtp3_links/isup links */
 	if(is_isup) {
 		/* add mtp3 links */
 		if (add_config_list_nodes(isup, rootnode, "mtp3_links", "mtp3_link", NULL, NULL)) {
@@ -3097,10 +3096,9 @@ static ftdm_conf_node_t *_get_ss7_config_node(switch_xml_t cfg, const char *conf
 			ftdm_conf_node_destroy(rootnode);
 			return NULL;
 		}
-	}
-	else {
+	} else {
 		/* add sctp links */
-		if (add_config_list_nodes(isup, rootnode, "sng_sctp_interfaces", "sng_sctp_interface", NULL, NULL)) {
+		if (add_config_nodes(isup, rootnode, "sng_sctp_interfaces", "sng_sctp_interface",  "sng_source_addresses")) {
 			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "failed to process sng_sctp_interface for sng_isup config %s\n", confname);
 			ftdm_conf_node_destroy(rootnode);
 			return NULL;
@@ -3124,13 +3122,11 @@ static ftdm_conf_node_t *_get_ss7_config_node(switch_xml_t cfg, const char *conf
 			return NULL;
 		}
 
-
 		if (add_config_nodes(isup, rootnode, "sng_m2ua_cluster_interfaces", "sng_m2ua_cluster_interface", "sng_m2ua_peers")) {
 			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "failed to process sng_m2ua_cluster_interfaces for sng_isup config %s\n", confname);
 			ftdm_conf_node_destroy(rootnode);
 			return NULL;
 		}
-
 	}
 
 	switch_core_hash_insert(globals.ss7_configs, confname, rootnode);

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

@@ -209,6 +209,13 @@ int  ft_to_sngss7_cfg_all(void)
 			}
 		} /* if (sngss7_test_flag(&g_ftdm_sngss7_data.cfg, SNGSS7_MTP2)) */
 
+		if(SNG_SS7_OPR_MODE_M2UA_SG == g_ftdm_operating_mode){
+			if(FTDM_SUCCESS != ftmod_ss7_m2ua_init()){
+				ftdm_log (FTDM_LOG_ERROR, "ftmod_ss7_m2ua_init FAILED \n");
+				return FTDM_FAIL;
+			}
+		}
+
 		g_ftdm_sngss7_data.gen_config = SNG_GEN_CFG_STATUS_DONE;
 
 	} /* if (!(g_ftdm_sngss7_data.gen_config)) */

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

@@ -60,6 +60,7 @@ typedef struct sng_m2ua_cfg{
 	uint32_t    		 flags;
 	uint32_t    		 id;		/* ID */
 	uint8_t    		 nodeType; 	/*Node Type SG/ASP */
+	uint8_t    		 end_point_opened; /* flag to check is end-point already opened */	
 	uint16_t    		 clusterId;	/* idx to m2ua_cluster profile */
 }sng_m2ua_cfg_t;
 
@@ -122,6 +123,7 @@ int ftmod_ss7_m2ua_start(void);
 void ftmod_ss7_m2ua_free(void);
 
 ftdm_status_t ftmod_ss7_m2ua_cfg(void);
+ftdm_status_t ftmod_ss7_m2ua_init(void);
 
 int ftmod_sctp_ssta_req(int elemt, int id, SbMgmt* cfm);
 int ftmod_m2ua_ssta_req(int elemt, int id, MwMgmt* cfm);

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

@@ -146,9 +146,6 @@ static int ftmod_ss7_parse_nif_interface(ftdm_conf_node_t *nif_interface)
 	/**************************************************************************/
 	} /* for (i = 0; i < num_parms; i++) */
 
-	/* default the interface to paused state */
-	sngss7_set_flag(&sng_nif, SNGSS7_PAUSED);
-
 	/* fill in the nif interface */
 	ftmod_ss7_fill_in_nif_interface(&sng_nif);
 
@@ -259,9 +256,6 @@ static int ftmod_ss7_parse_m2ua_interface(ftdm_conf_node_t *m2ua_interface)
 
 	sng_m2ua.nodeType = SNG_M2UA_NODE_TYPE_SGP;
 
-	/* default the interface to paused state */
-	sngss7_set_flag(&sng_m2ua, SNGSS7_PAUSED);
-
 	/* fill in the nif interface */
 	ftmod_ss7_fill_in_m2ua_interface(&sng_m2ua);
 
@@ -421,9 +415,6 @@ static int ftmod_ss7_parse_m2ua_peer_interface(ftdm_conf_node_t *m2ua_peer_inter
 	/**************************************************************************/
 	} /* for (i = 0; i < num_parms; i++) */
 
-	/* default the interface to paused state */
-	sngss7_set_flag(&sng_m2ua_peer, SNGSS7_PAUSED);
-
 	/* fill in the sng_m2ua_peer interface */
 	ftmod_ss7_fill_in_m2ua_peer_interface(&sng_m2ua_peer);
 
@@ -576,9 +567,6 @@ static int ftmod_ss7_parse_m2ua_clust_interface(ftdm_conf_node_t *m2ua_cluster_i
 	/**************************************************************************/
 	} /* for (i = 0; i < num_parms; i++) */
 
-	/* default the interface to paused state */
-	sngss7_set_flag(&sng_m2ua_cluster, SNGSS7_PAUSED);
-
 	/* fill in the sng_m2ua_peer interface */
 	ftmod_ss7_fill_in_m2ua_clust_interface(&sng_m2ua_cluster);
 
@@ -663,7 +651,7 @@ static int ftmod_ss7_parse_sctp_link(ftdm_conf_node_t *node)
 			t_link.id = atoi(param->val);
 			SS7_DEBUG("SCTP - Parsing <sng_sctp_interface> with id = %s\n", param->val);
 		}
-		else if (!strcasecmp(param->var, "src-addr")) {
+		else if (!strcasecmp(param->var, "address")) {
 			if (t_link.numSrcAddr < SCT_MAX_NET_ADDRS) {
 				t_link.srcAddrList[t_link.numSrcAddr+1] = iptoul (param->val);
 				t_link.numSrcAddr++;
@@ -671,7 +659,7 @@ static int ftmod_ss7_parse_sctp_link(ftdm_conf_node_t *node)
 			} else {
 				SS7_ERROR("SCTP - too many source address configured. dropping %s \n", param->val);
 			}
-		} else if (!strcasecmp(param->var, "src-port")) {
+		} else if (!strcasecmp(param->var, "source-port")) {
 			t_link.port = atoi(param->val);
 			SS7_DEBUG("SCTP - Parsing <sng_sctp_interface> with port = %s\n", param->val);
 		}
@@ -683,7 +671,6 @@ static int ftmod_ss7_parse_sctp_link(ftdm_conf_node_t *node)
 	g_ftdm_sngss7_data.cfg.sctpCfg.linkCfg[t_link.id].id 		= t_link.id;
 	g_ftdm_sngss7_data.cfg.sctpCfg.linkCfg[t_link.id].port   	= t_link.port;
 	strncpy((char*)g_ftdm_sngss7_data.cfg.sctpCfg.linkCfg[t_link.id].name, t_link.name, strlen(t_link.name) );
-	g_ftdm_sngss7_data.cfg.sctpCfg.linkCfg[t_link.id].flags		= 0;
 	g_ftdm_sngss7_data.cfg.sctpCfg.linkCfg[t_link.id].numSrcAddr = t_link.numSrcAddr;
 	for (i=1; i<=t_link.numSrcAddr; i++) {
 		g_ftdm_sngss7_data.cfg.sctpCfg.linkCfg[t_link.id].srcAddrList[i] = t_link.srcAddrList[i];

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

@@ -768,9 +768,10 @@ typedef enum {
 	SNGSS7_M2UA_PRESENT	 = (1 << 18),
 	SNGSS7_M2UA_STARTED      = (1 << 19),
 	SNGSS7_M2UA_EP_OPENED    = (1 << 20),
+	SNGSS7_M2UA_INIT_ASSOC_DONE    = (1 << 21),
 
-	SNGSS7_NIF_PRESENT	 = (1 << 21),
-	SNGSS7_NIF_STARTED       = (1 << 22),
+	SNGSS7_NIF_PRESENT	 = (1 << 22),
+	SNGSS7_NIF_STARTED       = (1 << 23),
 
 } sng_task_flag_t;
 /******************************************************************************/

src/mod/endpoints/mod_media_gateway/mod_media_gateway.c

@@ -12,9 +12,9 @@
 struct megaco_globals megaco_globals;
 static sng_mg_event_interface_t sng_event;
 
-SWITCH_MODULE_LOAD_FUNCTION(mod_megaco_load);
-SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_megaco_shutdown);
-SWITCH_MODULE_DEFINITION(mod_megaco, mod_megaco_load, mod_megaco_shutdown, NULL);
+SWITCH_MODULE_LOAD_FUNCTION(mod_media_gateway_load);
+SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_media_gateway_shutdown);
+SWITCH_MODULE_DEFINITION(mod_media_gateway, mod_media_gateway_load, mod_media_gateway_shutdown, NULL);
 
 SWITCH_STANDARD_API(megaco_function)
 {
@@ -51,7 +51,7 @@ static switch_status_t list_profiles(const char *line, const char *cursor, switc
 	return status;
 }
 
-SWITCH_MODULE_LOAD_FUNCTION(mod_megaco_load)
+SWITCH_MODULE_LOAD_FUNCTION(mod_media_gateway_load)
 {
 	switch_api_interface_t *api_interface;
 	
@@ -93,7 +93,7 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_megaco_load)
 	return sng_mgco_init(&sng_event);
 }
 
-SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_megaco_shutdown)
+SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_media_gateway_shutdown)
 {
 	sng_mgco_stack_shutdown();