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

configuration changed 

_ADDR => _IPV4
This commit is contained in:
Sukchan Lee 2017-09-22 21:54:01 +09:00
parent c7fb169cb3
commit 4b359000c0
4 changed files with 32 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/mme/mme_context.c
View File

@ -117,13 +117,13 @@ static status_t mme_context_validation()
}
if (self.s1ap_addr == 0)
{
d_error("No MME.NEWORK.S1AP_ADDR in '%s'",
d_error("No MME.NEWORK.S1AP_IPV4 in '%s'",
context_self()->config.path);
return CORE_ERROR;
}
if (self.s11_addr == 0)
{
d_error("No MME.NEWORK.S11_ADDR in '%s'",
d_error("No MME.NEWORK.S11_IPV4 in '%s'",
context_self()->config.path);
return CORE_ERROR;
}
@ -139,7 +139,7 @@ static status_t mme_context_validation()
{
if (sgw->addr == 0)
{
d_error("No SGW.NEWORK.S11_ADDR in '%s'",
d_error("No SGW.NEWORK.S11_IPV4 in '%s'",
context_self()->config.path);
return CORE_ERROR;
}
@ -302,7 +302,7 @@ status_t mme_context_parse_config()
{
n += (t+m)->size;
if (jsmntok_equal(json, t+m, "S1AP_ADDR") == 0)
if (jsmntok_equal(json, t+m, "S1AP_IPV4") == 0)
{
char *v = jsmntok_to_string(json, t+m+1);
if (v) self.s1ap_addr = inet_addr(v);
@ -312,7 +312,7 @@ status_t mme_context_parse_config()
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)
else if (jsmntok_equal(json, t+m, "S11_IPV4") == 0)
{
char *v = jsmntok_to_string(json, t+m+1);
if (v) self.s11_addr = inet_addr(v);
@ -645,7 +645,7 @@ status_t mme_context_parse_config()
{
n += (t+m)->size;
if (jsmntok_equal(json, t+m, "S11_ADDR") == 0)
if (jsmntok_equal(json, t+m, "S11_IPV4") == 0)
{
char *v = jsmntok_to_string(json, t+m+1);
if (v) sgw->addr = inet_addr(v);
@ -693,7 +693,7 @@ status_t mme_context_parse_config()
{
n += (t+m)->size;
if (jsmntok_equal(json, t+m, "S5C_ADDR") == 0)
if (jsmntok_equal(json, t+m, "S5C_IPV4") == 0)
{
char *v = jsmntok_to_string(json, t+m+1);
if (v) self.s5c_addr = inet_addr(v);

14
src/pgw/pgw_context.c
View File

@ -118,13 +118,13 @@ static status_t pgw_context_validation()
}
if (self.s5c_addr == 0)
{
d_error("No PGW.NEWORK.S5C_ADDR in '%s'",
d_error("No PGW.NEWORK.S5C_IPV4 in '%s'",
context_self()->config.path);
return CORE_ERROR;
}
if (self.s5u_addr == 0)
{
d_error("No PGW.NEWORK.S5U_ADDR in '%s'",
d_error("No PGW.NEWORK.S5U_IPV4 in '%s'",
context_self()->config.path);
return CORE_ERROR;
}
@ -142,7 +142,7 @@ static status_t pgw_context_validation()
}
if (self.primary_dns_addr == 0)
{
d_error("No PGW.DNS.PRIMARY_ADDR in '%s'",
d_error("No PGW.DNS.PRIMARY_IPV4 in '%s'",
context_self()->config.path);
return CORE_ERROR;
}
@ -235,7 +235,7 @@ status_t pgw_context_parse_config()
{
n += (t+m)->size;
if (jsmntok_equal(json, t+m, "S5C_ADDR") == 0)
if (jsmntok_equal(json, t+m, "S5C_IPV4") == 0)
{
char *v = jsmntok_to_string(json, t+m+1);
if (v) self.s5c_addr = inet_addr(v);
@ -245,7 +245,7 @@ status_t pgw_context_parse_config()
char *v = jsmntok_to_string(json, t+m+1);
if (v) self.s5c_port = atoi(v);
}
else if (jsmntok_equal(json, t+m, "S5U_ADDR") == 0)
else if (jsmntok_equal(json, t+m, "S5U_IPV4") == 0)
{
char *v = jsmntok_to_string(json, t+m+1);
if (v) self.s5u_addr = inet_addr(v);
@ -324,13 +324,13 @@ status_t pgw_context_parse_config()
for (m = 1, n = 1; n > 0; m++, n--)
{
n += (t+m)->size;
if (jsmntok_equal(json, t+m, "PRIMARY_ADDR") == 0)
if (jsmntok_equal(json, t+m, "PRIMARY_IPV4") == 0)
{
char *v = jsmntok_to_string(json, t+m+1);
if (v) self.primary_dns_addr = inet_addr(v);
}
else if (jsmntok_equal(
json, t+m, "SECONDARY_ADDR") == 0)
json, t+m, "SECONDARY_IPV4") == 0)
{
char *v = jsmntok_to_string(json, t+m+1);
if (v) self.secondary_dns_addr = inet_addr(v);

16
src/sgw/sgw_context.c
View File

@ -92,25 +92,25 @@ static status_t sgw_context_validation()
{
if (self.s11_addr == 0)
{
d_error("No SGW.NEWORK.S11_ADDR in '%s'",
d_error("No SGW.NEWORK.S11_IPV4 in '%s'",
context_self()->config.path);
return CORE_ERROR;
}
if (self.s5c_addr == 0)
{
d_error("No SGW.NEWORK.S5C_ADDR in '%s'",
d_error("No SGW.NEWORK.S5C_IPV4 in '%s'",
context_self()->config.path);
return CORE_ERROR;
}
if (self.s1u_addr == 0)
{
d_error("No SGW.NEWORK.S1U_ADDR in '%s'",
d_error("No SGW.NEWORK.S1U_IPV4 in '%s'",
context_self()->config.path);
return CORE_ERROR;
}
if (self.s5u_addr == 0)
{
d_error("No SGW.NEWORK.S5U_ADDR in '%s'",
d_error("No SGW.NEWORK.S5U_IPV4 in '%s'",
context_self()->config.path);
return CORE_ERROR;
}
@ -199,7 +199,7 @@ status_t sgw_context_parse_config()
{
n += (t+m)->size;
if (jsmntok_equal(json, t+m, "S11_ADDR") == 0)
if (jsmntok_equal(json, t+m, "S11_IPV4") == 0)
{
char *v = jsmntok_to_string(json, t+m+1);
if (v) self.s11_addr = inet_addr(v);
@ -209,7 +209,7 @@ status_t sgw_context_parse_config()
char *v = jsmntok_to_string(json, t+m+1);
if (v) self.s11_port = atoi(v);
}
else if (jsmntok_equal(json, t+m, "S5C_ADDR") == 0)
else if (jsmntok_equal(json, t+m, "S5C_IPV4") == 0)
{
char *v = jsmntok_to_string(json, t+m+1);
if (v) self.s5c_addr = inet_addr(v);
@ -219,7 +219,7 @@ status_t sgw_context_parse_config()
char *v = jsmntok_to_string(json, t+m+1);
if (v) self.s5c_port = atoi(v);
}
else if (jsmntok_equal(json, t+m, "S1U_ADDR") == 0)
else if (jsmntok_equal(json, t+m, "S1U_IPV4") == 0)
{
char *v = jsmntok_to_string(json, t+m+1);
if (v) self.s1u_addr = inet_addr(v);
@ -229,7 +229,7 @@ status_t sgw_context_parse_config()
char *v = jsmntok_to_string(json, t+m+1);
if (v) self.s1u_port = atoi(v);
}
else if (jsmntok_equal(json, t+m, "S5U_ADDR") == 0)
else if (jsmntok_equal(json, t+m, "S5U_IPV4") == 0)
{
char *v = jsmntok_to_string(json, t+m+1);
if (v) self.s5u_addr = inet_addr(v);

20
support/nextepc.conf.in
View File

@ -19,8 +19,8 @@
NETWORK :
{
S1AP_ADDR : "10.1.35.215",
S11_ADDR: "10.1.35.215",
S1AP_IPV4 : "10.1.35.215",
S11_IPV4: "10.1.35.215",
}
GUMMEI:
{
@ -58,11 +58,11 @@
NETWORK :
[
{
S11_ADDR: "10.1.35.216",
S1U_ADDR: "10.1.35.216",
S11_IPV4: "10.1.35.216",
S1U_IPV4: "10.1.35.216",
S5C_ADDR: "10.1.35.217",
S5U_ADDR: "10.1.35.217"
S5C_IPV4: "10.1.35.217",
S5U_IPV4: "10.1.35.217"
}
]
}
@ -73,8 +73,8 @@
NETWORK :
{
S5C_ADDR: "10.1.35.219",
S5U_ADDR: "10.1.35.219"
S5C_IPV4: "10.1.35.219",
S5U_IPV4: "10.1.35.219"
}
TUNNEL:
@ -89,8 +89,8 @@
DNS :
{
PRIMARY_ADDR: "8.8.8.8",
SECONDARY_ADDR: "4.4.4.4"
PRIMARY_IPV4: "8.8.8.8",
SECONDARY_IPV4: "4.4.4.4"
}
}