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.popov...@gmail.com>
---
ip/link_gre6.c | 16 +++++-----------
ip/link_ip6tnl.c | 16 +++++-----------
2 files changed, 10 insertions(+), 22 deletions(-)
diff --git a/ip/link_gre6.c b/ip/link_gre6.c
index 87c313c..a02dd4a 100644
--- a/ip/link_gre6.c
+++ b/ip/link_gre6.c
@@ -380,7 +380,7 @@ static void gre_print_opt(struct link_util *lu, FILE *f,
struct rtattr *tb[])
unsigned int iflags = 0;
unsigned int oflags = 0;
unsigned int flags = 0;
- unsigned int flowinfo = 0;
+ __u32 flowinfo = 0;
struct in6_addr in6_addr_any = IN6ADDR_ANY_INIT;
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",
"tclass inherit ",
true);
- } else {
- if (is_json_context()) {
- SPRINT_BUF(b1);
+ } else if (tb[IFLA_GRE_FLOWINFO]) {
+ __u32 val = ntohl(flowinfo & IP6_FLOWINFO_TCLASS) >> 20;
- snprintf(b1, sizeof(b1), "0x%02x",
- ntohl(flowinfo & IP6_FLOWINFO_TCLASS) >> 20);
- print_string(PRINT_JSON, "tclass", NULL, b1);
- } else {
- fprintf(f, "tclass 0x%02x ",
- ntohl(flowinfo & IP6_FLOWINFO_TCLASS) >> 20);
- }
+ snprintf(s2, sizeof(s2), "0x%02x", val);
+ print_string(PRINT_ANY, "tclass", "tclass %s ", s2);
}
if (flags & IP6_TNL_F_RCV_DSCP_COPY)
diff --git a/ip/link_ip6tnl.c b/ip/link_ip6tnl.c
index e084975..05322fd 100644
--- a/ip/link_ip6tnl.c
+++ b/ip/link_ip6tnl.c
@@ -404,22 +404,16 @@ static void ip6tunnel_print_opt(struct link_util *lu,
FILE *f, struct rtattr *tb
"hoplimit %u ",
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,
"ip6_tnl_f_use_orig_tclass",
"tclass inherit ",
true);
- else if (tb[IFLA_IPTUN_FLOWINFO]) {
- __u32 val = ntohl(flowinfo & IP6_FLOWINFO_TCLASS);
+ } else if (tb[IFLA_IPTUN_FLOWINFO]) {
+ __u32 val = ntohl(flowinfo & IP6_FLOWINFO_TCLASS) >> 20;
- if (is_json_context()) {
- SPRINT_BUF(b1);
-
- snprintf(b1, sizeof(b1), "0x%02x", (__u8)(val >> 20));
- print_string(PRINT_JSON, "tclass", NULL, b1);
- } else {
- printf("tclass 0x%02x ", (__u8)(val >> 20));
- }
+ snprintf(s2, sizeof(s2), "0x%02x", val);
+ print_string(PRINT_ANY, "tclass", "tclass %s ", s2);
}
if (flags & IP6_TNL_F_USE_ORIG_FLOWLABEL) {
--
1.7.10.4
