sysmocom
/
open5gs
forked from acouzens/open5gs
11
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

support relative path of freeDiameter

This commit is contained in:
Sukchan Lee 2017-11-06 13:02:36 +00:00
parent 1941c8b729
commit f4a47e30c7
11 changed files with 55 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
debian/rules vendored
View File

@ -29,9 +29,9 @@ override_dh_auto_test:
mongodb_exclude_list="-x s1setup_test attach_test volte_test handover_test"; \
fi; \
mkdir -p debian/test/db debian/test/etc/nextepc/freeDiameter debian/test/var/log/nextepc; \
sed -e 's?@SYSCONF_DIR@?'`pwd`'/debian/test/etc?g;s?@LOCALSTATE_DIR@?'`pwd`'/debian/test/var?g;'$$remove_db_uri_conf'' support/config/nextepc.conf.in > debian/test/etc/nextepc/nextepc.conf; \
sed -e 's?\([_a-z0-9]*\)\.conf?'`pwd`'/debian/test/etc/nextepc/freeDiameter/\1.conf?g;s?@LOCALSTATE_DIR@?'`pwd`'/debian/test/var?g;'$$remove_db_uri_conf'' support/config/nextepc.conf.in > debian/test/etc/nextepc/nextepc.conf; \
for i in `find support/freeDiameter -name '*.conf.in' -printf "%f\n" | sed 's/.in$$//g'`; do \
sed 's?@SYSCONF_DIR@/nextepc?'`pwd`'/support?g;s?@LIB_DIR@/nextepc/freeDiameter/\([_a-z0-9]*\)\.so?'`pwd`'/lib/freeDiameter-1.2.1/extensions/\1/.libs/\1.so?g' support/freeDiameter/$$i.in > debian/test/etc/nextepc/freeDiameter/$$i; \
sed 's?@SYSCONF_DIR@/nextepc?'`pwd`'/support?g;s?\([_a-z0-9]*\)\.so?'`pwd`'/lib/freeDiameter-1.2.1/extensions/\1/.libs/\1.so?g' support/freeDiameter/$$i.in > debian/test/etc/nextepc/freeDiameter/$$i; \
done; \
if ! cat /proc/net/protocols | grep SCTP > /dev/null; then \
sctp_exclude_list="-x testsctp s1setup_test attach_test volte_test handover_test"; \

18
lib/core/src/unix/net_lib.c
View File

@ -1550,7 +1550,11 @@ int net_link_promisc(net_link_t *net_link, int enable)
/** Close network interface */
int net_link_close(net_link_t *net_link)
{
d_assert(net_link,return -1, "net_link is NULL\n");
if (!net_link)
{
d_error("net_link is NULL");
return -1;
}
/* Disable promisc mode if enabled */
net_link_promisc(net_link, 0);
close(net_link->fd);
@ -1562,7 +1566,11 @@ int net_link_close(net_link_t *net_link)
/** Close network interface */
int net_raw_close(net_link_t *net_link)
{
d_assert(net_link,return -1, "net_link is NULL\n");
if (!net_link)
{
d_error("net_link is NULL");
return -1;
}
close(net_link->fd);
pool_free_node(&link_pool, net_link);
return 0;
@ -1570,7 +1578,11 @@ int net_raw_close(net_link_t *net_link)
int net_tun_close(net_link_t *net_link)
{
d_assert(net_link,return -1, "net_link is NULL\n");
if (!net_link)
{
d_error("net_link is NULL");
return -1;
}
close(net_link->fd);
pool_free_node(&link_pool, net_link);
return 0;

2
support/config/hss.conf.in
View File

@ -17,7 +17,7 @@
"HSS" :
{
"FD_CONF_PATH" : "@SYSCONF_DIR@/nextepc/freeDiameter/hss.conf"
"FD_CONF_PATH" : "hss.conf"
}
}

2
support/config/mme.conf.in
View File

@ -19,7 +19,7 @@
"MME" :
{
"FD_CONF_PATH" : "@SYSCONF_DIR@/nextepc/freeDiameter/mme.conf",
"FD_CONF_PATH" : "mme.conf",
"DEFAULT_PAGING_DRX" : "v64",
"NETWORK" :
{

8
support/config/nextepc.conf.in
View File

@ -27,7 +27,7 @@
"MME" :
{
"FD_CONF_PATH" : "@SYSCONF_DIR@/nextepc/freeDiameter/mme.conf",
"FD_CONF_PATH" : "mme.conf",
"DEFAULT_PAGING_DRX" : "v64",
"NETWORK" :
{
@ -66,7 +66,7 @@
"HSS" :
{
"FD_CONF_PATH" : "@SYSCONF_DIR@/nextepc/freeDiameter/hss.conf"
"FD_CONF_PATH" : "hss.conf"
},
"SGW" :
@ -82,7 +82,7 @@
"PGW" :
{
"FD_CONF_PATH" : "@SYSCONF_DIR@/nextepc/freeDiameter/pgw.conf",
"FD_CONF_PATH" : "pgw.conf",
"NETWORK" :
{
"GTPC_IPV4" : "127.76.0.3",
@ -104,7 +104,7 @@
"PCRF" :
{
"FD_CONF_PATH" : "@SYSCONF_DIR@/nextepc/freeDiameter/pcrf.conf"
"FD_CONF_PATH" : "pcrf.conf"
}
}

2
support/config/pcrf.conf.in
View File

@ -16,7 +16,7 @@
},
"PCRF" :
{
"FD_CONF_PATH" : "@SYSCONF_DIR@/nextepc/freeDiameter/pcrf.conf"
"FD_CONF_PATH" : "pcrf.conf"
}
}

2
support/config/pgw.conf.in
View File

@ -17,7 +17,7 @@
"PGW" :
{
"FD_CONF_PATH" : "@SYSCONF_DIR@/nextepc/freeDiameter/pgw.conf",
"FD_CONF_PATH" : "pgw.conf",
"NETWORK" :
{
"GTPC_IPV4" : "127.76.0.3",

16
support/freeDiameter/hss.conf.in
View File

@ -223,14 +223,14 @@ TLS_CA = "@SYSCONF_DIR@/nextepc/freeDiameter/cacert.pem";
# 4 - full - display the complete information on a single long line
# 8 - tree - display the complete information in an easier to read format spanning several lines.
LoadExtension = "@LIB_DIR@/nextepc/freeDiameter/dbg_msg_dumps.so" : "0x8888";
LoadExtension = "@LIB_DIR@/nextepc/freeDiameter/dict_rfc5777.so";
LoadExtension = "@LIB_DIR@/nextepc/freeDiameter/dict_mip6i.so";
LoadExtension = "@LIB_DIR@/nextepc/freeDiameter/dict_nasreq.so";
LoadExtension = "@LIB_DIR@/nextepc/freeDiameter/dict_nas_mipv6.so";
LoadExtension = "@LIB_DIR@/nextepc/freeDiameter/dict_dcca.so";
LoadExtension = "@LIB_DIR@/nextepc/freeDiameter/dict_dcca_3gpp.so";
LoadExtension = "@LIB_DIR@/nextepc/freeDiameter/dict_s6a.so";
LoadExtension = "dbg_msg_dumps.so" : "0x8888";
LoadExtension = "dict_rfc5777.so";
LoadExtension = "dict_mip6i.so";
LoadExtension = "dict_nasreq.so";
LoadExtension = "dict_nas_mipv6.so";
LoadExtension = "dict_dcca.so";
LoadExtension = "dict_dcca_3gpp.so";
LoadExtension = "dict_s6a.so";
##############################################################

16
support/freeDiameter/mme.conf.in
View File

@ -223,14 +223,14 @@ TLS_CA = "@SYSCONF_DIR@/nextepc/freeDiameter/cacert.pem";
# 4 - full - display the complete information on a single long line
# 8 - tree - display the complete information in an easier to read format spanning several lines.
LoadExtension = "@LIB_DIR@/nextepc/freeDiameter/dbg_msg_dumps.so" : "0x8888";
LoadExtension = "@LIB_DIR@/nextepc/freeDiameter/dict_rfc5777.so";
LoadExtension = "@LIB_DIR@/nextepc/freeDiameter/dict_mip6i.so";
LoadExtension = "@LIB_DIR@/nextepc/freeDiameter/dict_nasreq.so";
LoadExtension = "@LIB_DIR@/nextepc/freeDiameter/dict_nas_mipv6.so";
LoadExtension = "@LIB_DIR@/nextepc/freeDiameter/dict_dcca.so";
LoadExtension = "@LIB_DIR@/nextepc/freeDiameter/dict_dcca_3gpp.so";
LoadExtension = "@LIB_DIR@/nextepc/freeDiameter/dict_s6a.so";
LoadExtension = "dbg_msg_dumps.so" : "0x8888";
LoadExtension = "dict_rfc5777.so";
LoadExtension = "dict_mip6i.so";
LoadExtension = "dict_nasreq.so";
LoadExtension = "dict_nas_mipv6.so";
LoadExtension = "dict_dcca.so";
LoadExtension = "dict_dcca_3gpp.so";
LoadExtension = "dict_s6a.so";
##############################################################

14
support/freeDiameter/pcrf.conf.in
View File

@ -223,13 +223,13 @@ TLS_CA = "@SYSCONF_DIR@/nextepc/freeDiameter/cacert.pem";
# 4 - full - display the complete information on a single long line
# 8 - tree - display the complete information in an easier to read format spanning several lines.
LoadExtension = "@LIB_DIR@/nextepc/freeDiameter/dbg_msg_dumps.so" : "0x8888";
LoadExtension = "@LIB_DIR@/nextepc/freeDiameter/dict_rfc5777.so";
LoadExtension = "@LIB_DIR@/nextepc/freeDiameter/dict_mip6i.so";
LoadExtension = "@LIB_DIR@/nextepc/freeDiameter/dict_nasreq.so";
LoadExtension = "@LIB_DIR@/nextepc/freeDiameter/dict_nas_mipv6.so";
LoadExtension = "@LIB_DIR@/nextepc/freeDiameter/dict_dcca.so";
LoadExtension = "@LIB_DIR@/nextepc/freeDiameter/dict_dcca_3gpp.so";
LoadExtension = "dbg_msg_dumps.so" : "0x8888";
LoadExtension = "dict_rfc5777.so";
LoadExtension = "dict_mip6i.so";
LoadExtension = "dict_nasreq.so";
LoadExtension = "dict_nas_mipv6.so";
LoadExtension = "dict_dcca.so";
LoadExtension = "dict_dcca_3gpp.so";
##############################################################

14
support/freeDiameter/pgw.conf.in
View File

@ -223,13 +223,13 @@ TLS_CA = "@SYSCONF_DIR@/nextepc/freeDiameter/cacert.pem";
# 4 - full - display the complete information on a single long line
# 8 - tree - display the complete information in an easier to read format spanning several lines.
LoadExtension = "@LIB_DIR@/nextepc/freeDiameter/dbg_msg_dumps.so" : "0x8888";
LoadExtension = "@LIB_DIR@/nextepc/freeDiameter/dict_rfc5777.so";
LoadExtension = "@LIB_DIR@/nextepc/freeDiameter/dict_mip6i.so";
LoadExtension = "@LIB_DIR@/nextepc/freeDiameter/dict_nasreq.so";
LoadExtension = "@LIB_DIR@/nextepc/freeDiameter/dict_nas_mipv6.so";
LoadExtension = "@LIB_DIR@/nextepc/freeDiameter/dict_dcca.so";
LoadExtension = "@LIB_DIR@/nextepc/freeDiameter/dict_dcca_3gpp.so";
LoadExtension = "dbg_msg_dumps.so" : "0x8888";
LoadExtension = "dict_rfc5777.so";
LoadExtension = "dict_mip6i.so";
LoadExtension = "dict_nasreq.so";
LoadExtension = "dict_nas_mipv6.so";
LoadExtension = "dict_dcca.so";
LoadExtension = "dict_dcca_3gpp.so";
##############################################################