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

fix indentation (#367)

This commit is contained in:
Sukchan Lee 2020-02-13 10:58:10 +09:00
parent 4f29b912e8
commit c3627e6852
2 changed files with 21 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -192,7 +192,8 @@ int sgw_context_parse_config(void)
} else if (!strcmp(gtpc_key, "addr") ||
!strcmp(gtpc_key, "name")) {
ogs_yaml_iter_t hostname_iter;
ogs_yaml_iter_recurse(&gtpc_iter, &hostname_iter);
ogs_yaml_iter_recurse(&gtpc_iter,
&hostname_iter);
ogs_assert(ogs_yaml_iter_type(&hostname_iter) !=
YAML_MAPPING_NODE);
@ -309,7 +310,8 @@ int sgw_context_parse_config(void)
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;
@ -317,7 +319,8 @@ int sgw_context_parse_config(void)
} else if (!strcmp(gtpu_key, "addr") ||
!strcmp(gtpu_key, "name")) {
ogs_yaml_iter_t hostname_iter;
ogs_yaml_iter_recurse(&gtpu_iter, &hostname_iter);
ogs_yaml_iter_recurse(&gtpu_iter,
&hostname_iter);
ogs_assert(ogs_yaml_iter_type(&hostname_iter) !=
YAML_MAPPING_NODE);
@ -345,18 +348,22 @@ int sgw_context_parse_config(void)
} else if (!strcmp(gtpu_key, "advertise_addr") ||
!strcmp(gtpu_key, "advertise_name")) {
ogs_yaml_iter_t adv_hostname_iter;
ogs_yaml_iter_recurse(&gtpu_iter, &adv_hostname_iter);
ogs_assert(ogs_yaml_iter_type(&adv_hostname_iter) !=
YAML_MAPPING_NODE);
ogs_yaml_iter_recurse(&gtpu_iter,
&adv_hostname_iter);
ogs_assert(ogs_yaml_iter_type(
&adv_hostname_iter) != YAML_MAPPING_NODE);
do {
if (ogs_yaml_iter_type(&adv_hostname_iter) ==
YAML_SEQUENCE_NODE) {
if (!ogs_yaml_iter_next(&adv_hostname_iter))
if (ogs_yaml_iter_type(
&adv_hostname_iter) ==
YAML_SEQUENCE_NODE) {
if (!ogs_yaml_iter_next(
&adv_hostname_iter))
break;
}
ogs_assert(adv_num <= OGS_MAX_NUM_OF_HOSTNAME);
ogs_assert(adv_num <=
OGS_MAX_NUM_OF_HOSTNAME);
adv_hostname[adv_num++] =
ogs_yaml_iter_value(&adv_hostname_iter);
} while (

6
src/sgw/sgw-context.h
View File

@ -49,8 +49,10 @@ typedef struct sgw_context_s {
ogs_list_t gtpu_list6; /* SGW GTPU IPv6 Server List */
ogs_list_t adv_gtpu_list; /* Advertised SGW GTPU IPv4 Server List */
ogs_list_t adv_gtpu_list6; /* Advertised SGW GTPU IPv6 Server List */
ogs_hash_t *adv_gtpu_hash; /* Hashtable (SGW GTPU : Advertised SGW GTPU) IPv4 */
ogs_hash_t *adv_gtpu_hash6;/* Hashtable (SGW GTPU : Advertised SGW GTPU) IPv6 */
/* Hashtable (SGW GTPU : Advertised SGW GTPU) IPv4 */
ogs_hash_t *adv_gtpu_hash;
/* Hashtable (SGW GTPU : Advertised SGW GTPU) IPv6 */
ogs_hash_t *adv_gtpu_hash6;
ogs_sock_t *gtpu_sock; /* SGW GTPU IPv4 Socket */
ogs_sock_t *gtpu_sock6; /* SGW GTPU IPv6 Socket */
ogs_sockaddr_t *gtpu_addr; /* SGW GTPU IPv4 Address */