acouzens
/
open5gs
1
0
Fork 1
Code Issues Pull Requests 1 Projects Releases Wiki Activity

update it

This commit is contained in:
Sukchan Lee 2017-07-14 20:04:11 +09:00
parent 020602b42d
commit 1fe12dae1c
5 changed files with 81 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
lib/base/context.c
View File

@ -118,14 +118,14 @@ status_t context_read_file(char *file_path)
size_t json_len;
int result;
char *path = file_path;
if (path == NULL) path = DEFAULT_CONFIG_FILE_PATH;
config->path = file_path;
if (config->path == NULL) config->path = DEFAULT_CONFIG_FILE_PATH;
rv = file_open(&file, path, FILE_READ, FILE_OS_DEFAULT);
rv = file_open(&file, config->path, FILE_READ, FILE_OS_DEFAULT);
if (rv != CORE_OK)
{
d_fatal("Can't open configuration file '%s' (errno = %d, %s)",
path, rv, core_strerror(rv, buf, MAX_ERROR_STRING_LEN));
config->path, rv, core_strerror(rv, buf, MAX_ERROR_STRING_LEN));
return rv;
}
@ -134,7 +134,7 @@ status_t context_read_file(char *file_path)
if (rv != CORE_OK)
{
d_fatal("Can't read configuration file '%s' (errno = %d, %s)",
path, rv, core_strerror(rv, buf, MAX_ERROR_STRING_LEN));
config->path, rv, core_strerror(rv, buf, MAX_ERROR_STRING_LEN));
return rv;
}
file_close(file);
@ -145,18 +145,18 @@ status_t context_read_file(char *file_path)
if (result < 0)
{
d_fatal("Failed to parse configuration file '%s' (jsmnerr = %d)",
path, result);
config->path, result);
return CORE_ERROR;
}
if (result < 1 || config->token[0].type != JSMN_OBJECT)
{
d_fatal("Failed to parse configuration file '%s' (OBJECT expected)",
path);
config->path);
return CORE_ERROR;
}
d_print(" Config '%s'\n", path);
d_print(" Config '%s'\n", config->path);
return CORE_OK;
}

5
lib/base/context.h
View File

@ -13,8 +13,9 @@ extern "C" {
#define MAX_NUM_OF_CONFIG_TOKEN 256
typedef struct _config_t {
char json[MAX_CONFIG_FILE_SIZE+1];
jsmntok_t token[MAX_NUM_OF_CONFIG_TOKEN];
char *path;
char json[MAX_CONFIG_FILE_SIZE+1];
jsmntok_t token[MAX_NUM_OF_CONFIG_TOKEN];
} config_t;
#define MAX_DB_URI_LEN 256

100
src/mme/mme_context.c
View File

@ -32,15 +32,6 @@ pool_declare(mme_pdn_pool, pdn_t, MAX_NUM_OF_UE_PDN);
static int context_initialized = 0;
/* FIXME : Global IP information and port.
* This should be read from configuration file or arguments
*/
static char g_mme_ip_addr[20] = "10.1.35.215";
static unsigned int g_mme_gtp_c_port = GTPV2_C_UDP_PORT;
static char g_sgw_s11_ip_addr[20] = "10.1.35.216";
static unsigned int g_sgw_s11_port = GTPV2_C_UDP_PORT;
status_t mme_context_init()
{
@ -62,25 +53,10 @@ status_t mme_context_init()
index_init(&mme_bearer_pool, MAX_NUM_OF_UE_BEARER);
pool_init(&mme_pdn_pool, MAX_NUM_OF_UE_PDN);
self.mme_addr = inet_addr(g_mme_ip_addr);
self.mme_ue_s1ap_id_hash = hash_make();
self.imsi_ue_hash = hash_make();
self.guti_ue_hash = hash_make();
self.s1ap_addr = self.mme_addr;
self.s1ap_port = S1AP_SCTP_PORT;
mme_sgw_t *sgw = mme_sgw_add();
d_assert(sgw, return CORE_ERROR, "Can't add SGW context");
self.s11_addr = self.mme_addr;
self.s11_port = g_mme_gtp_c_port;
/* FIXME : It should be removed : Peer SGW ?*/
sgw->gnode.addr = inet_addr(g_sgw_s11_ip_addr);
sgw->gnode.port = g_sgw_s11_port;
/* MCC : 001, MNC : 01 */
plmn_id_build(&self.plmn_id, 1, 1, 2);
self.tracking_area_code = 12345;
@ -104,8 +80,53 @@ status_t mme_context_init()
return CORE_OK;
}
static status_t mme_context_prepare()
{
self.s1ap_port = S1AP_SCTP_PORT;
self.s11_port = GTPV2_C_UDP_PORT;
return CORE_OK;
}
static status_t mme_context_validation()
{
if (self.s1ap_addr == 0)
{
d_error("No MME.NEWORK.S1AP_ADDR in '%s'",
context_self()->config.path);
return CORE_ERROR;
}
if (self.s11_addr == 0)
{
d_error("No MME.NEWORK.S11_ADDR in '%s'",
context_self()->config.path);
return CORE_ERROR;
}
mme_sgw_t *sgw = mme_sgw_first();
if (sgw == NULL)
{
d_error("No SGW.NEWORK in '%s'",
context_self()->config.path);
return CORE_ERROR;
}
while(sgw)
{
if (sgw->gnode.addr == 0)
{
d_error("No SGW.NEWORK.S11_ADDR in '%s'",
context_self()->config.path);
return CORE_ERROR;
}
sgw = mme_sgw_next(sgw);
}
return CORE_OK;
}
status_t mme_context_parse_config()
{
status_t rv;
config_t *config = &context_self()->config;
char *json = config->json;
@ -127,6 +148,9 @@ status_t mme_context_parse_config()
int i, j, m, n, p;
int arr, size;
rv = mme_context_prepare();
if (rv != CORE_OK) return rv;
for (i = 0, j = 1; j > 0; i++, j--)
{
jsmntok_t *t = &token[i];
@ -144,7 +168,6 @@ status_t mme_context_parse_config()
}
case ROOT:
{
printf("root key = %s\n", jsmntok_to_string(json, t));
if (jsmntok_equal(json, t, "MME") == 0)
{
state = MME_START;
@ -199,19 +222,23 @@ status_t mme_context_parse_config()
if (jsmntok_equal(json, t+m, "S1AP_ADDR") == 0)
{
printf("s1ap_addr : %s\n", jsmntok_to_string(json, t+m+1));
char *v = jsmntok_to_string(json, t+m+1);
if (v) self.s1ap_addr = inet_addr(v);
}
else if (jsmntok_equal(json, t+m, "S1AP_PORT") == 0)
{
printf("s1ap_port : %s\n", jsmntok_to_string(json, t+m+1));
char *v = jsmntok_to_string(json, t+m+1);
if (v) self.s1ap_port = atoi(v);
}
else if (jsmntok_equal(json, t+m, "S11_ADDR") == 0)
{
printf("s11_addr : %s\n", jsmntok_to_string(json, t+m+1));
char *v = jsmntok_to_string(json, t+m+1);
if (v) self.s11_addr = inet_addr(v);
}
else if (jsmntok_equal(json, t+m, "S11_PORT") == 0)
{
printf("s11_port : %s\n", jsmntok_to_string(json, t+m+1));
char *v = jsmntok_to_string(json, t+m+1);
if (v) self.s11_port = atoi(v);
}
}
}
@ -345,7 +372,6 @@ status_t mme_context_parse_config()
}
case SGW_ROOT:
{
printf("sgw key = %s\n", jsmntok_to_string(json, t));
if (jsmntok_equal(json, t, "NETWORK") == 0)
{
m = 1;
@ -359,17 +385,24 @@ status_t mme_context_parse_config()
for (arr = 0; arr < size; arr++)
{
mme_sgw_t *sgw = mme_sgw_add();
d_assert(sgw, return CORE_ERROR,
"Can't add SGW context");
sgw->gnode.port = GTPV2_C_UDP_PORT;
for (n = 1; n > 0; m++, n--)
{
n += (t+m)->size;
if (jsmntok_equal(json, t+m, "S11_ADDR") == 0)
{
printf("s11_addr : %s\n", jsmntok_to_string(json, t+m+1));
char *v = jsmntok_to_string(json, t+m+1);
if (v) sgw->gnode.addr = inet_addr(v);
}
else if (jsmntok_equal(json, t+m, "S11_PORT") == 0)
{
printf("s11_port : %s\n", jsmntok_to_string(json, t+m+1));
char *v = jsmntok_to_string(json, t+m+1);
if (v) sgw->gnode.port = atoi(v);
}
}
}
@ -405,6 +438,9 @@ status_t mme_context_parse_config()
}
}
rv = mme_context_validation();
if (rv != CORE_OK) return rv;
return CORE_OK;
}

2
src/mme/mme_context.h
View File

@ -36,8 +36,6 @@ typedef struct _served_gummei {
} srvd_gummei_t;
typedef struct _mme_context_t {
c_uint32_t mme_addr; /* MME local address */
c_uint32_t s1ap_addr; /* MME S1AP local address */
c_uint16_t s1ap_port; /* MME S1AP local port */
net_sock_t *s1ap_sock; /* MME S1AP local listen socket */

2
src/mme/mme_init.c
View File

@ -21,6 +21,8 @@ status_t mme_initialize()
rv = mme_context_parse_config();
if (rv != CORE_OK) return rv;
printf("port = %d\n", mme_self()->s1ap_port);
ret = mme_s6a_init();
if (ret != 0) return -1;