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

YAML project is done

This commit is contained in:
Sukchan Lee 2017-11-29 14:44:14 +09:00
parent e7d3d2f4da
commit dd15dacb18
12 changed files with 96 additions and 346 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
src/app/context.c
View File

@ -32,8 +32,6 @@ status_t context_final()
d_assert(context_initialized == 1, return CORE_ERROR,
"Context already has been finalized");
if (self.config.bson)
bson_destroy(self.config.bson);
if (self.config.document)
{
yaml_document_delete(self.config.document);
@ -81,48 +79,6 @@ status_t context_read_file()
return CORE_OK;
}
status_t context_read_old_file()
{
char buf[MAX_ERROR_STRING_LEN];
config_t *config = &self.config;
status_t rv;
file_t *file;
bson_error_t error;
size_t json_len;
d_assert(config->old_path, return CORE_ERROR,);
rv = file_open(&file, config->old_path, FILE_READ, FILE_OS_DEFAULT);
if (rv != CORE_OK)
{
d_fatal("Can't open configuration file '%s' (errno = %d, %s)",
config->old_path, rv, core_strerror(rv, buf, MAX_ERROR_STRING_LEN));
return rv;
}
json_len = MAX_CONFIG_FILE_SIZE;
rv = file_read(file, config->json, &json_len);
if (rv != CORE_OK)
{
d_fatal("Can't read configuration file '%s' (errno = %d, %s)",
config->old_path, rv, core_strerror(rv, buf, MAX_ERROR_STRING_LEN));
return rv;
}
file_close(file);
config->bson = bson_new_from_json((const uint8_t *)config->json, -1, &error);;
if (config->bson == NULL)
{
d_fatal("Failed to parse configuration file '%s'", config->old_path);
return CORE_ERROR;
}
d_print(" Config '%s'\n", config->old_path);
return CORE_OK;
}
static status_t context_prepare()
{
self.logger.console = -1;
@ -217,7 +173,7 @@ status_t context_parse_config()
else if (!strcmp(trace_key, "diameter"))
{
const char *v = yaml_iter_value(&trace_iter);
if (v) self.logger.trace.fd = atoi(v);
if (v) self.logger.trace.diameter = atoi(v);
}
else if (!strcmp(trace_key, "gtp"))
{

7
src/app/context.h
View File

@ -12,10 +12,7 @@ extern "C" {
#define MAX_NUM_OF_CONFIG_TOKEN 256
typedef struct _config_t {
const char *old_path;
const char *path;
char json[MAX_CONFIG_FILE_SIZE+1];
void *bson;
void *document;
} config_t;
@ -43,7 +40,7 @@ typedef struct _context_t {
int s1ap;
int nas;
int gtp;
int fd;
int diameter;
int others;
} trace;
} logger;
@ -70,8 +67,6 @@ CORE_DECLARE(context_t*) context_self(void);
CORE_DECLARE(status_t) context_read_file(void);
CORE_DECLARE(status_t) context_parse_config(void);
CORE_DECLARE(status_t) context_read_old_file(void);
CORE_DECLARE(status_t) context_db_init(const char *db_uri);
CORE_DECLARE(status_t) context_db_final(void);

12
src/app/init.c
View File

@ -8,7 +8,6 @@
#include "app.h"
#define DEFAULT_CONFIG_FILE_PATH_JSON SYSCONF_DIR PACKAGE "/nextepc.json"
#define DEFAULT_CONFIG_FILE_PATH SYSCONF_DIR PACKAGE "/nextepc.conf"
#define DEFAULT_RUNTIME_DIR_PATH LOCALSTATE_DIR "run/"
@ -24,21 +23,10 @@ status_t app_will_initialize(const char *config_path, const char *log_path)
context_init();
context_self()->config.old_path = config_path;
context_self()->config.path = config_path;
if (context_self()->config.old_path == NULL)
context_self()->config.old_path = DEFAULT_CONFIG_FILE_PATH_JSON;
if (context_self()->config.path == NULL)
context_self()->config.path = DEFAULT_CONFIG_FILE_PATH;
rv = context_read_old_file();
if (rv != CORE_OK) return rv;
#if 0
rv = context_parse_old_config();
if (rv != CORE_OK) return rv;
#endif
rv = context_read_file();
if (rv != CORE_OK) return rv;

18
src/hss/hss_context.c
View File

@ -60,7 +60,7 @@ static status_t hss_context_validation()
{
if (self.fd_conf_path == NULL)
{
d_error("No HSS.FD_CONF_PATH in '%s'",
d_error("No hss.freeDiameter in '%s'",
context_self()->config.path);
return CORE_ERROR;
}
@ -113,22 +113,22 @@ status_t hss_context_parse_config()
status_t hss_context_setup_trace_module()
{
int fd = context_self()->logger.trace.fd;
int diameter = context_self()->logger.trace.diameter;
int others = context_self()->logger.trace.others;
if (fd)
if (diameter)
{
if (fd <= 1) fd_g_debug_lvl = FD_LOG_ERROR;
else if (fd <= 3) fd_g_debug_lvl = FD_LOG_NOTICE;
else if (fd <= 5) fd_g_debug_lvl = FD_LOG_DEBUG;
if (diameter <= 1) fd_g_debug_lvl = FD_LOG_ERROR;
else if (diameter <= 3) fd_g_debug_lvl = FD_LOG_NOTICE;
else if (diameter <= 5) fd_g_debug_lvl = FD_LOG_DEBUG;
else fd_g_debug_lvl = FD_LOG_ANNOYING;
extern int _hss_fd_path;
d_trace_level(&_hss_fd_path, fd);
d_trace_level(&_hss_fd_path, diameter);
extern int _fd_init;
d_trace_level(&_fd_init, fd);
d_trace_level(&_fd_init, diameter);
extern int _fd_logger;
d_trace_level(&_fd_logger, fd);
d_trace_level(&_fd_logger, diameter);
}
if (others)

38
src/mme/mme_context.c
View File

@ -127,19 +127,19 @@ static status_t mme_context_validation()
{
if (self.fd_conf_path == NULL)
{
d_error("No MME.FD_CONF_PATH in '%s'",
d_error("No mme.freeDiameter in '%s'",
context_self()->config.path);
return CORE_ERROR;
}
if (mme_s1ap_first() == NULL)
{
d_error("No MME.S1AP in '%s'",
d_error("No mme.s1ap in '%s'",
context_self()->config.path);
return CORE_ERROR;
}
if (self.gtpc_addr == 0)
{
d_error("No MME.NEWORK.GTPC_IPV4 in '%s'",
d_error("No mme.gtpc in '%s'",
context_self()->config.path);
return CORE_ERROR;
}
@ -147,7 +147,7 @@ static status_t mme_context_validation()
mme_sgw_t *sgw = mme_sgw_first();
if (sgw == NULL)
{
d_error("No SGW.NEWORK in '%s'",
d_error("No sgw.gtpc in '%s'",
context_self()->config.path);
return CORE_ERROR;
}
@ -167,48 +167,48 @@ static status_t mme_context_validation()
if (self.max_num_of_served_gummei == 0)
{
d_error("No MME.GUMMEI in '%s'",
d_error("No mme.gummei in '%s'",
context_self()->config.path);
return CORE_ERROR;
}
if (self.served_gummei[0].num_of_plmn_id == 0)
{
d_error("No MME.GUMMEI.PLMN_ID in '%s'",
d_error("No mme.gummei.plmn_id in '%s'",
context_self()->config.path);
return CORE_ERROR;
}
if (self.served_gummei[0].num_of_mme_gid == 0)
{
d_error("No MME.GUMMEI.MME_GID in '%s'",
d_error("No mme.gummei.mme_gid in '%s'",
context_self()->config.path);
return CORE_ERROR;
}
if (self.served_gummei[0].num_of_mme_code == 0)
{
d_error("No MME.GUMMEI.MME_CODE in '%s'",
d_error("No mme.gummei.mme_code in '%s'",
context_self()->config.path);
return CORE_ERROR;
}
if (self.max_num_of_served_tai == 0)
{
d_error("No MME.TAI(PLMN_ID.MCC.MNC|TAC) in '%s'",
d_error("No mme.tai in '%s'",
context_self()->config.path);
return CORE_ERROR;
}
if (self.num_of_integrity_order == 0)
{
d_error("No MME.SECURITY.INTEGRITY_ORDER in '%s'",
d_error("No mme.security.integrity_order in '%s'",
context_self()->config.path);
return CORE_ERROR;
}
if (self.num_of_ciphering_order == 0)
{
d_error("No MME.SECURITY.CIPHERING_ORDER in '%s'",
d_error("no mme.security.ciphering_order in '%s'",
context_self()->config.path);
return CORE_ERROR;
}
@ -944,7 +944,7 @@ status_t mme_context_setup_trace_module()
{
int s1ap = context_self()->logger.trace.s1ap;
int nas = context_self()->logger.trace.nas;
int fd = context_self()->logger.trace.fd;
int diameter = context_self()->logger.trace.diameter;
int gtp = context_self()->logger.trace.gtp;
int others = context_self()->logger.trace.others;
@ -988,19 +988,19 @@ status_t mme_context_setup_trace_module()
d_trace_level(&_nas_ies, nas);
}
if (fd)
if (diameter)
{
if (fd <= 1) fd_g_debug_lvl = FD_LOG_ERROR;
else if (fd <= 3) fd_g_debug_lvl = FD_LOG_NOTICE;
else if (fd <= 5) fd_g_debug_lvl = FD_LOG_DEBUG;
if (diameter <= 1) fd_g_debug_lvl = FD_LOG_ERROR;
else if (diameter <= 3) fd_g_debug_lvl = FD_LOG_NOTICE;
else if (diameter <= 5) fd_g_debug_lvl = FD_LOG_DEBUG;
else fd_g_debug_lvl = FD_LOG_ANNOYING;
extern int _mme_fd_path;
d_trace_level(&_mme_fd_path, fd);
d_trace_level(&_mme_fd_path, diameter);
extern int _fd_init;
d_trace_level(&_fd_init, fd);
d_trace_level(&_fd_init, diameter);
extern int _fd_logger;
d_trace_level(&_fd_logger, fd);
d_trace_level(&_fd_logger, diameter);
}
if (gtp)

18
src/pcrf/pcrf_context.c
View File

@ -61,7 +61,7 @@ static status_t pcrf_context_validation()
{
if (self.fd_conf_path == NULL)
{
d_error("No PCRF.FD_CONF_PATH in '%s'",
d_error("No pcrf.freeDiameter in '%s'",
context_self()->config.path);
return CORE_ERROR;
}
@ -114,22 +114,22 @@ status_t pcrf_context_parse_config()
status_t pcrf_context_setup_trace_module()
{
int fd = context_self()->logger.trace.fd;
int diameter = context_self()->logger.trace.diameter;
int others = context_self()->logger.trace.others;
if (fd)
if (diameter)
{
if (fd <= 1) fd_g_debug_lvl = FD_LOG_ERROR;
else if (fd <= 3) fd_g_debug_lvl = FD_LOG_NOTICE;
else if (fd <= 5) fd_g_debug_lvl = FD_LOG_DEBUG;
if (diameter <= 1) fd_g_debug_lvl = FD_LOG_ERROR;
else if (diameter <= 3) fd_g_debug_lvl = FD_LOG_NOTICE;
else if (diameter <= 5) fd_g_debug_lvl = FD_LOG_DEBUG;
else fd_g_debug_lvl = FD_LOG_ANNOYING;
extern int _pcrf_fd_path;
d_trace_level(&_pcrf_fd_path, fd);
d_trace_level(&_pcrf_fd_path, diameter);
extern int _fd_init;
d_trace_level(&_fd_init, fd);
d_trace_level(&_fd_init, diameter);
extern int _fd_logger;
d_trace_level(&_fd_logger, fd);
d_trace_level(&_fd_logger, diameter);
}
if (others)

275
src/pgw/pgw_context.c
View File

@ -109,233 +109,37 @@ static status_t pgw_context_validation()
{
if (self.fd_conf_path == NULL)
{
d_error("No PGW.FD_CONF_PATH in '%s'",
d_error("No pgw.freeDiameter in '%s'",
context_self()->config.path);
return CORE_ERROR;
}
if (self.gtpc_addr == 0)
{
d_error("No PGW.NEWORK.GTPC_IPV4 in '%s'",
d_error("No pgw.gtpc in '%s'",
context_self()->config.path);
return CORE_ERROR;
}
if (self.gtpu_addr == 0)
{
d_error("No PGW.NEWORK.GTPU_IPV4 in '%s'",
d_error("No pgw.gtpu in '%s'",
context_self()->config.path);
return CORE_ERROR;
}
if (self.num_of_ue_network == 0)
{
d_error("No PGW.UE_NETWORK.IPV4_POOL in '%s'",
d_error("No pgw.pdn.addr in '%s'",
context_self()->config.path);
return CORE_ERROR;
}
if (self.primary_dns_addr == 0)
if (self.dns.primary == 0)
{
d_error("No PGW.DNS.PRIMARY_IPV4 in '%s'",
d_error("No pgw.dns in '%s'",
context_self()->config.path);
return CORE_ERROR;
}
return CORE_OK;
}
status_t pgw_context_parse_old_config()
{
status_t rv;
config_t *config = &context_self()->config;
bson_iter_t iter;
c_uint32_t length = 0;
d_assert(config, return CORE_ERROR, );
rv = pgw_context_prepare();
if (rv != CORE_OK) return rv;
if (!bson_iter_init(&iter, config->bson))
{
d_error("bson_iter_init failed in this document");
return CORE_ERROR;
}
while(bson_iter_next(&iter))
{
const char *key = bson_iter_key(&iter);
if (!strcmp(key, "PGW") && BSON_ITER_HOLDS_DOCUMENT(&iter))
{
bson_iter_t pgw_iter;
bson_iter_recurse(&iter, &pgw_iter);
while(bson_iter_next(&pgw_iter))
{
const char *pgw_key = bson_iter_key(&pgw_iter);
if (!strcmp(pgw_key, "FD_CONF_PATH") &&
BSON_ITER_HOLDS_UTF8(&pgw_iter))
{
self.fd_conf_path = bson_iter_utf8(&pgw_iter, &length);
}
#if 0
else if (!strcmp(pgw_key, "NETWORK"))
{
bson_iter_t network_iter;
if (BSON_ITER_HOLDS_ARRAY(&pgw_iter))
{
bson_iter_t array_iter;
bson_iter_recurse(&pgw_iter, &array_iter);
if (bson_iter_next(&array_iter))
{
/* We will pick only first item of SGW.NETWORK
* if the type is an array */
bson_iter_recurse(&array_iter, &network_iter);
}
}
else if (BSON_ITER_HOLDS_DOCUMENT(&pgw_iter))
{
bson_iter_recurse(&pgw_iter, &network_iter);
}
else
d_assert(0, return CORE_ERROR,);
while(bson_iter_next(&network_iter))
{
const char *network_key = bson_iter_key(&network_iter);
if (!strcmp(network_key, "GTPC_IPV4") &&
BSON_ITER_HOLDS_UTF8(&network_iter))
{
const char *v =
bson_iter_utf8(&network_iter, &length);
if (v) self.gtpc_addr = inet_addr(v);
}
else if (!strcmp(network_key, "GTPC_PORT") &&
BSON_ITER_HOLDS_INT32(&network_iter))
{
self.gtpc_port = bson_iter_int32(&network_iter);
}
else if (!strcmp(network_key, "GTPU_IPV4") &&
BSON_ITER_HOLDS_UTF8(&network_iter))
{
const char *v =
bson_iter_utf8(&network_iter, &length);
if (v) self.gtpu_addr = inet_addr(v);
}
else if (!strcmp(network_key, "GTPU_PORT") &&
BSON_ITER_HOLDS_UTF8(&network_iter))
{
self.gtpu_port = bson_iter_int32(&network_iter);
}
}
}
#endif
else if (!strcmp(pgw_key, "UE_NETWORK"))
{
#if 0
int ue_network_index = 0;
bson_iter_t ue_network_array;
if (BSON_ITER_HOLDS_ARRAY(&pgw_iter))
{
bson_iter_recurse(&pgw_iter, &ue_network_array);
d_assert(bson_iter_next(&ue_network_array),
return CORE_ERROR,);
}
else if (BSON_ITER_HOLDS_DOCUMENT(&pgw_iter))
{
memcpy(&ue_network_array, &pgw_iter,
sizeof(ue_network_array));
}
else
d_assert(0, return CORE_ERROR,);
do
{
bson_iter_t ue_network_iter;
const char *ue_network_index_key =
bson_iter_key(&ue_network_array);
const char *if_name = NULL;
c_uint32_t addr = 0;
c_uint8_t bits = 0;
d_assert(ue_network_index_key, return CORE_ERROR,);
if (BSON_ITER_HOLDS_ARRAY(&pgw_iter))
ue_network_index = atoi(ue_network_index_key);
d_assert(ue_network_index < MAX_NUM_OF_GTP_CLIENT,
return CORE_ERROR,
"GTP NODE Overflow : %d", ue_network_index);
bson_iter_recurse(&ue_network_array, &ue_network_iter);
while(bson_iter_next(&ue_network_iter))
{
const char *ue_network_key =
bson_iter_key(&ue_network_iter);
if (!strcmp(ue_network_key, "IF_NAME") &&
BSON_ITER_HOLDS_UTF8(&ue_network_iter))
{
if_name =
bson_iter_utf8(&ue_network_iter, &length);
}
else if (!strcmp(ue_network_key, "IPV4_POOL") &&
BSON_ITER_HOLDS_UTF8(&ue_network_iter))
{
char *v = (char *)bson_iter_utf8(
&ue_network_iter, &length);
if (v)
{
char *str = strsep(&v, "/");
if (str)
{
addr = inet_addr(str);
bits = atoi(v);
}
}
}
}
if (addr && bits)
{
self.ue_network[self.num_of_ue_network].if_name =
if_name;
self.ue_network[self.num_of_ue_network].ipv4.addr =
addr;
self.ue_network[self.num_of_ue_network].ipv4.bits =
bits;
self.num_of_ue_network++;
}
} while(
BSON_ITER_HOLDS_ARRAY(&pgw_iter) &&
bson_iter_next(&ue_network_array));
#endif
}
else if (!strcmp(pgw_key, "DNS") &&
BSON_ITER_HOLDS_DOCUMENT(&pgw_iter))
{
bson_iter_t dns_iter;
bson_iter_recurse(&pgw_iter, &dns_iter);
while(bson_iter_next(&dns_iter))
{
const char *dns_key = bson_iter_key(&dns_iter);
if (!strcmp(dns_key, "PRIMARY_IPV4") &&
BSON_ITER_HOLDS_UTF8(&dns_iter))
{
const char *v = bson_iter_utf8(&dns_iter, &length);
if (v) self.primary_dns_addr = inet_addr(v);
}
else if (!strcmp(dns_key, "SECONDARY_IPV4") &&
BSON_ITER_HOLDS_UTF8(&dns_iter))
{
const char *v = bson_iter_utf8(&dns_iter, &length);
if (v) self.secondary_dns_addr = inet_addr(v);
}
}
}
}
}
}
return CORE_OK;
}
status_t pgw_context_parse_config()
{
status_t rv;
@ -503,10 +307,10 @@ status_t pgw_context_parse_config()
} while(yaml_iter_type(&gtpu_array) == YAML_SEQUENCE_NODE);
}
else if (!strcmp(pgw_key, "pdn"))
else if (!strcmp(pgw_key, "ue_network"))
{
yaml_iter_t pdn_array, pdn_iter;
yaml_iter_recurse(&pgw_iter, &pdn_array);
yaml_iter_t ue_network_array, ue_network_iter;
yaml_iter_recurse(&pgw_iter, &ue_network_array);
do
{
c_uint32_t addr = 0;
@ -516,27 +320,31 @@ status_t pgw_context_parse_config()
d_assert(self.num_of_ue_network <=
MAX_NUM_OF_UE_NETWORK, return CORE_ERROR,);
if (yaml_iter_type(&pdn_array) == YAML_MAPPING_NODE)
if (yaml_iter_type(&ue_network_array) ==
YAML_MAPPING_NODE)
{
memcpy(&pdn_iter, &pdn_array, sizeof(yaml_iter_t));
memcpy(&ue_network_iter, &ue_network_array,
sizeof(yaml_iter_t));
}
else if (yaml_iter_type(&pdn_array) ==
else if (yaml_iter_type(&ue_network_array) ==
YAML_SEQUENCE_NODE)
{
if (!yaml_iter_next(&pdn_array))
if (!yaml_iter_next(&ue_network_array))
break;
yaml_iter_recurse(&pdn_array, &pdn_iter);
yaml_iter_recurse(&ue_network_array,
&ue_network_iter);
}
while(yaml_iter_next(&pdn_iter))
while(yaml_iter_next(&ue_network_iter))
{
const char *pdn_key = yaml_iter_key(&pdn_iter);
d_assert(pdn_key,
const char *ue_network_key =
yaml_iter_key(&ue_network_iter);
d_assert(ue_network_key,
return CORE_ERROR,);
if (!strcmp(pdn_key, "addr"))
if (!strcmp(ue_network_key, "addr"))
{
yaml_iter_t addr_iter;
yaml_iter_recurse(&pdn_iter, &addr_iter);
yaml_iter_recurse(&ue_network_iter, &addr_iter);
d_assert(yaml_iter_type(&addr_iter) !=
YAML_MAPPING_NODE, return CORE_ERROR,);
@ -545,7 +353,7 @@ status_t pgw_context_parse_config()
char *v = NULL;
#if 0
d_assert(pdn->num_of_addr <=
d_assert(ue_network->num_of_addr <=
MAX_NUM_OF_PDN_ADDR,
return CORE_ERROR,);
#endif
@ -571,17 +379,17 @@ status_t pgw_context_parse_config()
yaml_iter_type(&addr_iter) ==
YAML_SEQUENCE_NODE);
}
else if (!strcmp(pdn_key, "dev"))
else if (!strcmp(ue_network_key, "dev"))
{
dev = yaml_iter_value(&pdn_iter);
dev = yaml_iter_value(&ue_network_iter);
}
else if (!strcmp(pdn_key, "apn"))
else if (!strcmp(ue_network_key, "apn"))
{
apn = yaml_iter_value(&pdn_iter);
apn = yaml_iter_value(&ue_network_iter);
d_warn("Not implemented");
}
else
d_warn("unknown key `%s`", pdn_key);
d_warn("unknown key `%s`", ue_network_key);
}
if (addr && bits)
@ -596,10 +404,11 @@ status_t pgw_context_parse_config()
}
else
{
d_warn("Ignore pdn : addr(0x%x), bits(%d)",
d_warn("Ignore ue_network : addr(0x%x), bits(%d)",
addr, bits);
}
} while(yaml_iter_type(&pdn_array) == YAML_SEQUENCE_NODE);
} while(yaml_iter_type(&ue_network_array) ==
YAML_SEQUENCE_NODE);
}
else if (!strcmp(pgw_key, "dns"))
{
@ -625,11 +434,11 @@ status_t pgw_context_parse_config()
{
if (count == 0)
{
self.primary_dns_addr = inet_addr(v);
self.dns.primary = inet_addr(v);
}
else if (count == 1)
{
self.secondary_dns_addr = inet_addr(v);
self.dns.secondary = inet_addr(v);
}
else
d_warn("Ignored %d DNS(%s)", count, v);
@ -692,23 +501,23 @@ status_t pgw_context_parse_config()
status_t pgw_context_setup_trace_module()
{
int fd = context_self()->logger.trace.fd;
int diameter = context_self()->logger.trace.diameter;
int gtp = context_self()->logger.trace.gtp;
int others = context_self()->logger.trace.others;
if (fd)
if (diameter)
{
if (fd <= 1) fd_g_debug_lvl = FD_LOG_ERROR;
else if (fd <= 3) fd_g_debug_lvl = FD_LOG_NOTICE;
else if (fd <= 5) fd_g_debug_lvl = FD_LOG_DEBUG;
if (diameter <= 1) fd_g_debug_lvl = FD_LOG_ERROR;
else if (diameter <= 3) fd_g_debug_lvl = FD_LOG_NOTICE;
else if (diameter <= 5) fd_g_debug_lvl = FD_LOG_DEBUG;
else fd_g_debug_lvl = FD_LOG_ANNOYING;
extern int _pgw_fd_path;
d_trace_level(&_pgw_fd_path, fd);
d_trace_level(&_pgw_fd_path, diameter);
extern int _fd_init;
d_trace_level(&_fd_init, fd);
d_trace_level(&_fd_init, diameter);
extern int _fd_logger;
d_trace_level(&_fd_logger, fd);
d_trace_level(&_fd_logger, diameter);
}
if (gtp)

6
src/pgw/pgw_context.h
View File

@ -44,8 +44,10 @@ typedef struct _pgw_context_t {
} ue_network[MAX_NUM_OF_UE_NETWORK];
c_uint8_t num_of_ue_network;
c_uint32_t primary_dns_addr;
c_uint32_t secondary_dns_addr;
struct {
c_uint32_t primary;
c_uint32_t secondary;
} dns;
list_t sgw_list; /* SGW GTP Node List */
list_t ip_pool_list;

8
src/pgw/pgw_s5c_build.c
View File

@ -362,12 +362,12 @@ static c_int16_t pgw_pco_build(c_uint8_t *pco_buf, tlv_pco_t *tlv_pco)
/* Primary DNS Server IP Address */
pco_ipcp.options[0].type = 129;
pco_ipcp.options[0].len = 6;
pco_ipcp.options[0].addr = pgw_self()->primary_dns_addr;
pco_ipcp.options[0].addr = pgw_self()->dns.primary;
/* Secondary DNS Server IP Address */
pco_ipcp.options[1].type = 131;
pco_ipcp.options[1].len = 6;
pco_ipcp.options[1].addr = pgw_self()->secondary_dns_addr;
pco_ipcp.options[1].addr = pgw_self()->dns.secondary;
pgw.ids[pgw.num_of_id].id = ue.ids[i].id;
pgw.ids[pgw.num_of_id].len = len;
@ -381,12 +381,12 @@ static c_int16_t pgw_pco_build(c_uint8_t *pco_buf, tlv_pco_t *tlv_pco)
{
pgw.ids[pgw.num_of_id].id = ue.ids[i].id;
pgw.ids[pgw.num_of_id].len = 4;
pgw.ids[pgw.num_of_id].data = &pgw_self()->primary_dns_addr;
pgw.ids[pgw.num_of_id].data = &pgw_self()->dns.primary;
pgw.num_of_id++;
pgw.ids[pgw.num_of_id].id = ue.ids[i].id;
pgw.ids[pgw.num_of_id].len = 4;
pgw.ids[pgw.num_of_id].data = &pgw_self()->secondary_dns_addr;
pgw.ids[pgw.num_of_id].data = &pgw_self()->dns.secondary;
pgw.num_of_id++;
break;

4
src/sgw/sgw_context.c
View File

@ -93,13 +93,13 @@ static status_t sgw_context_validation()
{
if (self.gtpc_addr == 0)
{
d_error("No SGW.NEWORK.GTPC_IPV4 in '%s'",
d_error("No sgw.gtpc in '%s'",
context_self()->config.path);
return CORE_ERROR;
}
if (self.gtpu_addr == 0)
{
d_error("No SGW.NEWORK.GTPU_IPV4 in '%s'",
d_error("No sgw.gtpu in '%s'",
context_self()->config.path);
return CORE_ERROR;
}

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

@ -61,7 +61,7 @@ pgw:
gtpu:
- hostname: 127.0.0.3
pdn:
ue_network:
- addr: 45.45.0.1/16
dev: pgwtun

8
support/config/nextepc.yaml
View File

@ -231,13 +231,13 @@ pgw:
# <Example>
#
# o Multiple IPv4 Pool
# pdn:
# ue_network:
# addr:
# - 45.45.0.1/16
# - 46.46.0.1/16
#
# o Multiple Interface
# pdn:
# ue_network:
# - addr: 45.45.0.1/16
# dev: pgwtun1
# - addr:
@ -246,7 +246,7 @@ pgw:
# dev: pgwtun2
#
# o Pool allocated per-APN
# pdn:
# ue_network:
# - addr: 45.45.0.1/16
# dev: pgwtun1
# apn : internet
@ -256,7 +256,7 @@ pgw:
# dev: pgwtun2
# apn : volte
#
pdn:
ue_network:
addr: 45.45.0.1/16
dns: