kenmirrors
/
freeswitch
mirror of https://github.com/signalwire/freeswitch.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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

This commit is contained in:
kapil 2012-06-18 17:42:02 +05:30
parent 3b4c725b1c af39d4c9d2
commit 9ba7dfe7b8
2 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/mod/applications/mod_rad_auth/Makefile
View File

@ -1,7 +1,14 @@
switch_srcdir=../../../.. switch_srcdir=../../../..
FREERADIUSLA=/usr/local/lib/libfreeradius-client.so RADCLIENT_VERSION=1.1.6
LOCAL_LIBADD=$(FREERADIUSLA) RADCLIENT=freeradius-client-$(RADCLIENT_VERSION)
RADCLIENT_DIR=$(switch_srcdir)/libs/$(RADCLIENT)
RADCLIENT_BUILDDIR=$(switch_builddir)/libs/$(RADCLIENT)
RADCLIENT_LIBDIR=$(RADCLIENT_BUILDDIR)/lib
RADCLIENT_LA=${RADCLIENT_LIBDIR}/libfreeradius-client.la
LOCAL_CFLAGS=-I$(RADCLIENT_DIR)/include
LOCAL_LIBADD=$(RADCLIENT_LA)
include $(switch_srcdir)/build/modmake.rules include $(switch_srcdir)/build/modmake.rules

10
src/mod/endpoints/mod_media_gateway/mod_media_gateway.c
View File

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