Renamed mod_megaco to mod_media_gateway

src/mod/endpoints/mod_media_gateway/Makefile

@@ -7,6 +7,6 @@ ifeq ($(ARCH),x86_64)
 endif
 
 BASE=../../../..
-LOCAL_OBJS=megaco.o megaco_stack.o megaco_xml.o megaco_cli.o megaco_stack_alarms.o
+LOCAL_OBJS=media_gateway.o media_gateway_stack.o media_gateway_xml.o media_gateway_cli.o media_gateway_stack_alarms.o
-LOCAL_LDFLAGS=-lsng_megaco
+LOCAL_LDFLAGS=-lsng_mg
 include $(BASE)/build/modmake.rules

src/mod/endpoints/mod_media_gateway/media_gateway.c

@@ -6,7 +6,7 @@
 * <Insert license here>
 */
 
-#include "mod_megaco.h"
+#include "mod_media_gateway.h"
 
 megaco_profile_t *megaco_profile_locate(const char *name)
 {

src/mod/endpoints/mod_media_gateway/media_gateway_cli.c

@@ -7,8 +7,8 @@
 */
 
 /* INCLUDES *******************************************************************/
-#include "mod_megaco.h"
+#include "mod_media_gateway.h"
-#include "megaco_stack.h"
+#include "media_gateway_stack.h"
 /******************************************************************************/
 
 /* FUNCTION PROTOTYPES ********************************************************/

src/mod/endpoints/mod_media_gateway/media_gateway_stack.c

@@ -7,8 +7,8 @@
 */
 
 /* INCLUDES *******************************************************************/
-#include "mod_megaco.h"
+#include "mod_media_gateway.h"
-#include "megaco_stack.h"
+#include "media_gateway_stack.h"
 /******************************************************************************/
 
 /* DEFINES ********************************************************************/
@@ -47,42 +47,42 @@ sng_mg_protocol_types_e  mg_get_proto_type_from_str(char* proto_type);
 
 /* FUNCTIONS ******************************************************************/
 
-switch_status_t sng_mgco_init(sng_isup_event_interface_t* event)
+switch_status_t sng_mgco_init(sng_mg_event_interface_t* event)
 {
 	uint32_t major, minor, build;
 
 	switch_assert(event);
 
 	/* initalize sng_mg library */
-	sng_isup_init_gen(event);
+	sng_mg_init_gen(event);
 
 	/* print the version of the library being used */
-	sng_isup_version(&major, &minor, &build);
+	sng_mg_version(&major, &minor, &build);
 	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO,"Loaded LibSng-MEGACO %d.%d.%d\n", major, minor, build);
 
 	/* start up the stack manager */
-	if (sng_isup_init_sm()) {
+	if (sng_mg_init_sm()) {
 		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO,"Failed to start Stack Manager\n");
 		return SWITCH_STATUS_FALSE;
 	} else {
 		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO,"Started Stack Manager!\n");
 	}
 
-	if (sng_isup_init_tucl()) {
+	if (sng_mg_init_tucl()) {
 		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR,"Failed to start TUCL\n");
 		return SWITCH_STATUS_FALSE;
 	} else {
 		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO,"Started TUCL!\n");
 	}
 
-	if (sng_isup_init_mg()) {
+	if (sng_mg_init_mg()) {
 		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR,"Failed to start MG\n");
 		return SWITCH_STATUS_FALSE;
 	} else {
 		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO,"Started MG!\n");
 	}
 
-	if (sng_isup_init_mu()) {
+	if (sng_mg_init_mu()) {
 		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR,"Failed to start MU\n");
 		return SWITCH_STATUS_FALSE;
 	} else {
@@ -104,19 +104,19 @@ switch_status_t sng_mgco_stack_shutdown()
 	sng_mgco_tucl_shutdown();
 
 	/* free MEGACO Application */
-	sng_isup_free_mu();
+	sng_mg_free_mu();
 
 	/* free MEGACO */
-	sng_isup_free_mg();
+	sng_mg_free_mg();
 
 	/* free TUCL */
-	sng_isup_free_tucl();
+	sng_mg_free_tucl();
 
 	/* free SM */
-	sng_isup_free_sm();
+	sng_mg_free_sm();
 
 	/* free gen */
-	sng_isup_free_gen();
+	sng_mg_free_gen();
 
 	return SWITCH_STATUS_SUCCESS;
 }
@@ -638,7 +638,7 @@ int mgco_tucl_gen_config(void)
 	cfg.t.cfg.s.hiGen.poolDropThr           = HI_MEM_POOL_DROP_THRESHOLD;
 	cfg.t.cfg.s.hiGen.poolStopThr           = HI_MEM_POOL_STOP_THRESHOLD;
 
-	cfg.t.cfg.s.hiGen.timeRes               = SI_PERIOD;        /* time resolution */
+	cfg.t.cfg.s.hiGen.timeRes               = HI_PERIOD;        /* time resolution */
 
 #ifdef HI_SPECIFY_GENSOCK_ADDR
 	cfg.t.cfg.s.hiGen.ipv4GenSockAddr.address = CM_INET_INADDR_ANY;

src/mod/endpoints/mod_media_gateway/media_gateway_stack.h

@@ -6,7 +6,7 @@
 * <Insert license here>
 */
 
-#include "mod_megaco.h"
+#include "mod_media_gateway.h"
 
 #ifndef _MEGACO_STACK_H_
 #define _MEGACO_STACK_H_
@@ -56,7 +56,7 @@ void handle_tucl_alarm(Pst *pst, HiMngmt *sta);
 
 
 switch_status_t sng_mgco_cfg(megaco_profile_t* profile);
-switch_status_t sng_mgco_init(sng_isup_event_interface_t* event);
+switch_status_t sng_mgco_init(sng_mg_event_interface_t* event);
 switch_status_t sng_mgco_stack_shutdown(void);
 int sng_mgco_mg_get_status(int elemId, MgMngmt* cfm, megaco_profile_t* mg_cfg, mg_peer_profile_t* mg_peer);
 

src/mod/endpoints/mod_media_gateway/media_gateway_stack_alarms.c

@@ -7,8 +7,8 @@
 */
 
 /* INCLUDES *******************************************************************/
-#include "mod_megaco.h"
+#include "mod_media_gateway.h"
-#include "megaco_stack.h"
+#include "media_gateway_stack.h"
 /******************************************************************************/
 
 /* FUNCTION PROTOTYPES ********************************************************/

src/mod/endpoints/mod_media_gateway/media_gateway_xml.c

@@ -5,8 +5,8 @@
 * 
 * <Insert license here>
 */
-#include "mod_megaco.h"
+#include "mod_media_gateway.h"
-#include "megaco_stack.h"
+#include "media_gateway_stack.h"
 
 /****************************************************************************************************************************/
 static switch_xml_config_item_t *get_instructions(megaco_profile_t *profile) ;

src/mod/endpoints/mod_media_gateway/mod_media_gateway.c

@@ -6,11 +6,11 @@
 * <Insert license here>
 */
 
-#include "mod_megaco.h"
+#include "mod_media_gateway.h"
-#include "megaco_stack.h"
+#include "media_gateway_stack.h"
 
 struct megaco_globals megaco_globals;
-static sng_isup_event_interface_t sng_event;
+static sng_mg_event_interface_t sng_event;
 
 SWITCH_MODULE_LOAD_FUNCTION(mod_megaco_load);
 SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_megaco_shutdown);

src/mod/endpoints/mod_media_gateway/mod_media_gateway.h

@@ -10,7 +10,7 @@
 #ifndef MOD_MEGACO_H
 #define MOD_MEGACO_H
 
-#include "sng_megaco/sng_ss7.h"
+#include "sng_mg/sng_mg.h"
 #include <switch.h>
 
 #define MG_MAX_PEERS    5