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

port configuration update [#217]

This commit is contained in:
Sukchan Lee 2020-05-19 15:35:41 -04:00
parent 1fd3f48860
commit dbf3e17fda
5 changed files with 18 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/mme/mme-context.c
View File

@ -508,10 +508,7 @@ int mme_context_parse_config()
YAML_SEQUENCE_NODE);
} else if (!strcmp(s1ap_key, "port")) {
const char *v = ogs_yaml_iter_value(&s1ap_iter);
if (v) {
port = atoi(v);
self.s1ap_port = port;
}
if (v) port = atoi(v);
} else if (!strcmp(s1ap_key, "dev")) {
dev = ogs_yaml_iter_value(&s1ap_iter);
} else
@ -541,7 +538,7 @@ int mme_context_parse_config()
NULL : &self.s1ap_list,
ogs_config()->parameter.no_ipv6 ?
NULL : &self.s1ap_list6,
dev, self.s1ap_port);
dev, port);
ogs_assert(rv == OGS_OK);
}
@ -622,10 +619,7 @@ int mme_context_parse_config()
YAML_SEQUENCE_NODE);
} else if (!strcmp(gtpc_key, "port")) {
const char *v = ogs_yaml_iter_value(&gtpc_iter);
if (v) {
port = atoi(v);
self.gtpc_port = port;
}
if (v) port = atoi(v);
} else if (!strcmp(gtpc_key, "dev")) {
dev = ogs_yaml_iter_value(&gtpc_iter);
} else
@ -655,7 +649,7 @@ int mme_context_parse_config()
NULL : &self.gtpc_list,
ogs_config()->parameter.no_ipv6 ?
NULL : &self.gtpc_list6,
dev, self.gtpc_port);
dev, port);
ogs_assert(rv == OGS_OK);
}
} while (ogs_yaml_iter_type(&gtpc_array) ==
@ -1437,7 +1431,8 @@ int mme_context_parse_config()
if (v) family = atoi(v);
if (family != AF_UNSPEC &&
family != AF_INET && family != AF_INET6) {
ogs_warn("Ignore family(%d) : AF_UNSPEC(%d), "
ogs_warn("Ignore family(%d) : "
"AF_UNSPEC(%d), "
"AF_INET(%d), AF_INET6(%d) ",
family, AF_UNSPEC, AF_INET, AF_INET6);
family = AF_UNSPEC;

14
src/pgw/pgw-context.c
View File

@ -397,10 +397,7 @@ int pgw_context_parse_config(void)
YAML_SEQUENCE_NODE);
} else if (!strcmp(gtpc_key, "port")) {
const char *v = ogs_yaml_iter_value(&gtpc_iter);
if (v) {
port = atoi(v);
self.gtpc_port = port;
}
if (v) port = atoi(v);
} else if (!strcmp(gtpc_key, "dev")) {
dev = ogs_yaml_iter_value(&gtpc_iter);
} else if (!strcmp(gtpc_key, "apn")) {
@ -432,7 +429,7 @@ int pgw_context_parse_config(void)
NULL : &self.gtpc_list,
ogs_config()->parameter.no_ipv6 ?
NULL : &self.gtpc_list6,
dev, self.gtpc_port);
dev, port);
ogs_assert(rv == OGS_OK);
}
@ -513,10 +510,7 @@ int pgw_context_parse_config(void)
YAML_SEQUENCE_NODE);
} else if (!strcmp(gtpu_key, "port")) {
const char *v = ogs_yaml_iter_value(&gtpu_iter);
if (v) {
port = atoi(v);
self.gtpu_port = port;
}
if (v) port = atoi(v);
} else if (!strcmp(gtpu_key, "dev")) {
dev = ogs_yaml_iter_value(&gtpu_iter);
} else
@ -546,7 +540,7 @@ int pgw_context_parse_config(void)
NULL : &self.gtpu_list,
ogs_config()->parameter.no_ipv6 ?
NULL : &self.gtpu_list6,
dev, self.gtpu_port);
dev, port);
ogs_assert(rv == OGS_OK);
}

14
src/sgw/sgw-context.c
View File

@ -213,10 +213,7 @@ int sgw_context_parse_config(void)
YAML_SEQUENCE_NODE);
} else if (!strcmp(gtpc_key, "port")) {
const char *v = ogs_yaml_iter_value(&gtpc_iter);
if (v) {
port = atoi(v);
self.gtpc_port = port;
}
if (v) port = atoi(v);
} else if (!strcmp(gtpc_key, "dev")) {
dev = ogs_yaml_iter_value(&gtpc_iter);
} else
@ -246,7 +243,7 @@ int sgw_context_parse_config(void)
NULL : &self.gtpc_list,
ogs_config()->parameter.no_ipv6 ?
NULL : &self.gtpc_list6,
dev, self.gtpc_port);
dev, port);
ogs_assert(rv == OGS_OK);
}
@ -330,10 +327,7 @@ int sgw_context_parse_config(void)
YAML_SEQUENCE_NODE);
} else if (!strcmp(gtpu_key, "port")) {
const char *v = ogs_yaml_iter_value(&gtpu_iter);
if (v) {
port = atoi(v);
self.gtpu_port = port;
}
if (v) port = atoi(v);
} else if (!strcmp(gtpu_key, "dev")) {
dev = ogs_yaml_iter_value(&gtpu_iter);
} else if (!strcmp(gtpu_key, "advertise_addr") ||
@ -386,7 +380,7 @@ int sgw_context_parse_config(void)
NULL : &self.gtpu_list,
ogs_config()->parameter.no_ipv6 ?
NULL : &self.gtpu_list6,
dev, self.gtpu_port);
dev, port);
ogs_assert(rv == OGS_OK);
}

7
src/smf/context.c
View File

@ -366,10 +366,7 @@ int smf_context_parse_config(void)
YAML_SEQUENCE_NODE);
} else if (!strcmp(gtpc_key, "port")) {
const char *v = ogs_yaml_iter_value(&gtpc_iter);
if (v) {
port = atoi(v);
self.gtpc_port = port;
}
if (v) port = atoi(v);
} else if (!strcmp(gtpc_key, "dev")) {
dev = ogs_yaml_iter_value(&gtpc_iter);
} else if (!strcmp(gtpc_key, "apn")) {
@ -401,7 +398,7 @@ int smf_context_parse_config(void)
NULL : &self.gtpc_list,
ogs_config()->parameter.no_ipv6 ?
NULL : &self.gtpc_list6,
dev, self.gtpc_port);
dev, port);
ogs_assert(rv == OGS_OK);
}

7
src/upf/context.c
View File

@ -221,10 +221,7 @@ int upf_context_parse_config(void)
YAML_SEQUENCE_NODE);
} else if (!strcmp(gtpu_key, "port")) {
const char *v = ogs_yaml_iter_value(&gtpu_iter);
if (v) {
port = atoi(v);
self.gtpu_port = port;
}
if (v) port = atoi(v);
} else if (!strcmp(gtpu_key, "dev")) {
dev = ogs_yaml_iter_value(&gtpu_iter);
} else if (!strcmp(gtpu_key,
@ -268,7 +265,7 @@ int upf_context_parse_config(void)
rv = ogs_socknode_probe(
ogs_config()->parameter.no_ipv4 ? NULL : &list,
ogs_config()->parameter.no_ipv6 ? NULL : &list6,
dev, self.gtpu_port);
dev, port);
ogs_assert(rv == OGS_OK);
}