Use @s2 buffer to store string representation of
flowlabel 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.
Omit flowlabel from output if no flowinfo attribute
is given and IP6_TNL_F_USE_ORIG_FLOWLABEL isn't set.
Signed-off-by: Serhey Popovych <serhe.popov...@gmail.com>
---
ip/link_gre6.c | 15 ++++-----------
ip/link_ip6tnl.c | 14 ++++----------
2 files changed, 8 insertions(+), 21 deletions(-)
diff --git a/ip/link_gre6.c b/ip/link_gre6.c
index a02dd4a..1205946 100644
--- a/ip/link_gre6.c
+++ b/ip/link_gre6.c
@@ -452,18 +452,11 @@ static void gre_print_opt(struct link_util *lu, FILE *f,
struct rtattr *tb[])
"ip6_tnl_f_use_orig_flowlabel",
"flowlabel inherit ",
true);
- } else {
- if (is_json_context()) {
- SPRINT_BUF(b1);
-
- snprintf(b1, sizeof(b1), "0x%05x",
- ntohl(flowinfo & IP6_FLOWINFO_FLOWLABEL));
- print_string(PRINT_JSON, "flowlabel", NULL, b1);
+ } else if (tb[IFLA_GRE_FLOWINFO]) {
+ __u32 val = ntohl(flowinfo & IP6_FLOWINFO_FLOWLABEL);
- } else {
- fprintf(f, "flowlabel 0x%05x ",
- ntohl(flowinfo & IP6_FLOWINFO_FLOWLABEL));
- }
+ snprintf(s2, sizeof(s2), "0x%05x", val);
+ print_string(PRINT_ANY, "flowlabel", "flowlabel %s ", s2);
}
if (flags & IP6_TNL_F_USE_ORIG_TCLASS) {
diff --git a/ip/link_ip6tnl.c b/ip/link_ip6tnl.c
index 05322fd..7000056 100644
--- a/ip/link_ip6tnl.c
+++ b/ip/link_ip6tnl.c
@@ -421,17 +421,11 @@ static void ip6tunnel_print_opt(struct link_util *lu,
FILE *f, struct rtattr *tb
"ip6_tnl_f_use_orig_flowlabel",
"flowlabel inherit ",
true);
- } else {
- if (is_json_context()) {
- SPRINT_BUF(b1);
+ } else if (tb[IFLA_IPTUN_FLOWINFO]) {
+ __u32 val = ntohl(flowinfo & IP6_FLOWINFO_FLOWLABEL);
- snprintf(b1, sizeof(b1), "0x%05x",
- ntohl(flowinfo & IP6_FLOWINFO_FLOWLABEL));
- print_string(PRINT_JSON, "flowlabel", NULL, b1);
- } else {
- printf("flowlabel 0x%05x ",
- ntohl(flowinfo & IP6_FLOWINFO_FLOWLABEL));
- }
+ snprintf(s2, sizeof(s2), "0x%05x", val);
+ print_string(PRINT_ANY, "flowlabel", "flowlabel %s ", s2);
}
if (flags & IP6_TNL_F_RCV_DSCP_COPY)
--
1.7.10.4
