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

ip6/tunnel: Unify tclass printing 

Use @s2 buffer to store string representation of
tclass and get rid of extra SPRINT_BUF(): no
need to preserve @s2 contents for later.

Use print_string(PRINT_ANY, ...) with prepared by
snprintf() string for both PRINT_JSON and PRINT_FP
cases.

While there use __u32 for flowinfo in link_gre6.c
and check for IFLA_GRE_FLOWINFO attribute presense.

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:11 +02:00 committed by Stephen Hemminger
parent 4dc6665b6b
commit 090524f899
2 changed files with 10 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
ip/link_gre6.c
View File

@ -380,7 +380,7 @@ static void gre_print_opt(struct link_util *lu, FILE *f, struct rtattr *tb[])
unsigned int iflags = 0; unsigned int iflags = 0;
unsigned int oflags = 0; unsigned int oflags = 0;
unsigned int flags = 0; unsigned int flags = 0;
unsigned int flowinfo = 0; __u32 flowinfo = 0;
struct in6_addr in6_addr_any = IN6ADDR_ANY_INIT; struct in6_addr in6_addr_any = IN6ADDR_ANY_INIT;
if (!tb) if (!tb)
@ -471,17 +471,11 @@ static void gre_print_opt(struct link_util *lu, FILE *f, struct rtattr *tb[])
"ip6_tnl_f_use_orig_tclass", "ip6_tnl_f_use_orig_tclass",
"tclass inherit ", "tclass inherit ",
true); true);
} else { } else if (tb[IFLA_GRE_FLOWINFO]) {
if (is_json_context()) { __u32 val = ntohl(flowinfo & IP6_FLOWINFO_TCLASS) >> 20;
SPRINT_BUF(b1);
snprintf(b1, sizeof(b1), "0x%02x", snprintf(s2, sizeof(s2), "0x%02x", val);
ntohl(flowinfo & IP6_FLOWINFO_TCLASS) >> 20); print_string(PRINT_ANY, "tclass", "tclass %s ", s2);
print_string(PRINT_JSON, "tclass", NULL, b1);
} else {
fprintf(f, "tclass 0x%02x ",
ntohl(flowinfo & IP6_FLOWINFO_TCLASS) >> 20);
}
} }
if (flags & IP6_TNL_F_RCV_DSCP_COPY) if (flags & IP6_TNL_F_RCV_DSCP_COPY)

16
ip/link_ip6tnl.c
View File

@ -404,22 +404,16 @@ static void ip6tunnel_print_opt(struct link_util *lu, FILE *f, struct rtattr *tb
"hoplimit %u ", "hoplimit %u ",
rta_getattr_u8(tb[IFLA_IPTUN_TTL])); rta_getattr_u8(tb[IFLA_IPTUN_TTL]));
if (flags & IP6_TNL_F_USE_ORIG_TCLASS) if (flags & IP6_TNL_F_USE_ORIG_TCLASS) {
print_bool(PRINT_ANY, print_bool(PRINT_ANY,
"ip6_tnl_f_use_orig_tclass", "ip6_tnl_f_use_orig_tclass",
"tclass inherit ", "tclass inherit ",
true); true);
else if (tb[IFLA_IPTUN_FLOWINFO]) { } else if (tb[IFLA_IPTUN_FLOWINFO]) {
__u32 val = ntohl(flowinfo & IP6_FLOWINFO_TCLASS); __u32 val = ntohl(flowinfo & IP6_FLOWINFO_TCLASS) >> 20;
if (is_json_context()) { snprintf(s2, sizeof(s2), "0x%02x", val);
SPRINT_BUF(b1); print_string(PRINT_ANY, "tclass", "tclass %s ", s2);
snprintf(b1, sizeof(b1), "0x%02x", (__u8)(val >> 20));
print_string(PRINT_JSON, "tclass", NULL, b1);
} else {
printf("tclass 0x%02x ", (__u8)(val >> 20));
}
} }
if (flags & IP6_TNL_F_USE_ORIG_FLOWLABEL) { if (flags & IP6_TNL_F_USE_ORIG_FLOWLABEL) {