matthias
/
iproute2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

ip6/tunnel: Unify encap_limit printing 

Use %u format specifier to print it in link_gre6.c and
make code more readable.

Signed-off-by: Serhey Popovych <serhe.popovych@gmail.com>
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
This commit is contained in:
Serhey Popovych 2018-01-10 17:53:13 +02:00 committed by Stephen Hemminger
parent a0fd0c3a30
commit e3945d92b0
2 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ip/link_gre6.c
View File

@ -433,18 +433,15 @@ static void gre_print_opt(struct link_util *lu, FILE *f, struct rtattr *tb[])
print_int(PRINT_JSON, "ttl", NULL, ttl); print_int(PRINT_JSON, "ttl", NULL, ttl);
} }
if (flags & IP6_TNL_F_IGN_ENCAP_LIMIT) if (flags & IP6_TNL_F_IGN_ENCAP_LIMIT) {
print_bool(PRINT_ANY, print_bool(PRINT_ANY,
"ip6_tnl_f_ign_encap_limit", "ip6_tnl_f_ign_encap_limit",
"encaplimit none ", "encaplimit none ",
true); true);
else if (tb[IFLA_GRE_ENCAP_LIMIT]) { } else if (tb[IFLA_GRE_ENCAP_LIMIT]) {
int encap_limit = rta_getattr_u8(tb[IFLA_GRE_ENCAP_LIMIT]); __u8 val = rta_getattr_u8(tb[IFLA_GRE_ENCAP_LIMIT]);
print_int(PRINT_ANY, print_uint(PRINT_ANY, "encap_limit", "encaplimit %u ", val);
"encap_limit",
"encaplimit %d ",
encap_limit);
} }
if (flags & IP6_TNL_F_USE_ORIG_FLOWLABEL) { if (flags & IP6_TNL_F_USE_ORIG_FLOWLABEL) {

12
ip/link_ip6tnl.c
View File

@ -387,16 +387,16 @@ static void ip6tunnel_print_opt(struct link_util *lu, FILE *f, struct rtattr *tb
print_uint(PRINT_ANY, "link_index", "dev %u ", link); print_uint(PRINT_ANY, "link_index", "dev %u ", link);
} }
if (flags & IP6_TNL_F_IGN_ENCAP_LIMIT) if (flags & IP6_TNL_F_IGN_ENCAP_LIMIT) {
print_bool(PRINT_ANY, print_bool(PRINT_ANY,
"ip6_tnl_f_ign_encap_limit", "ip6_tnl_f_ign_encap_limit",
"encaplimit none ", "encaplimit none ",
true); true);
else if (tb[IFLA_IPTUN_ENCAP_LIMIT]) } else if (tb[IFLA_IPTUN_ENCAP_LIMIT]) {
print_uint(PRINT_ANY, __u8 val = rta_getattr_u8(tb[IFLA_IPTUN_ENCAP_LIMIT]);
"encap_limit",
"encaplimit %u ", print_uint(PRINT_ANY, "encap_limit", "encaplimit %u ", val);
rta_getattr_u8(tb[IFLA_IPTUN_ENCAP_LIMIT])); }
if (tb[IFLA_IPTUN_TTL]) if (tb[IFLA_IPTUN_TTL])
print_uint(PRINT_ANY, print_uint(PRINT_ANY,