| Message ID | 7090709d3ddace589952a128fb62f6603e2da9e8.1564653511.git.aclaudi@redhat.com |
|---|---|
| State | Changes Requested |
| Delegated to: | David Ahern |
| Headers | show |
| Series | [iproute2-next] ip tunnel: add json output | expand |
On Thu, 1 Aug 2019 12:12:58 +0200 Andrea Claudi <aclaudi@redhat.com> wrote: > Add json support on iptunnel and ip6tunnel. > The plain text output format should remain the same. > > Signed-off-by: Andrea Claudi <aclaudi@redhat.com> > --- > ip/ip6tunnel.c | 82 +++++++++++++++++++++++++++++++-------------- > ip/iptunnel.c | 90 +++++++++++++++++++++++++++++++++----------------- > ip/tunnel.c | 42 +++++++++++++++++------ > 3 files changed, 148 insertions(+), 66 deletions(-) > > diff --git a/ip/ip6tunnel.c b/ip/ip6tunnel.c > index d7684a673fdc4..f2b9710c1320f 100644 > --- a/ip/ip6tunnel.c > +++ b/ip/ip6tunnel.c > @@ -71,57 +71,90 @@ static void usage(void) > static void print_tunnel(const void *t) > { > const struct ip6_tnl_parm2 *p = t; > - char s1[1024]; > - char s2[1024]; > + SPRINT_BUF(b1); > > /* Do not use format_host() for local addr, > * symbolic name will not be useful. > */ > - printf("%s: %s/ipv6 remote %s local %s", > - p->name, > - tnl_strproto(p->proto), > - format_host_r(AF_INET6, 16, &p->raddr, s1, sizeof(s1)), > - rt_addr_n2a_r(AF_INET6, 16, &p->laddr, s2, sizeof(s2))); > + open_json_object(NULL); > + print_string(PRINT_ANY, "ifname", "%s: ", p->name); Print this using color for interface name? > + snprintf(b1, sizeof(b1), "%s/ipv6", tnl_strproto(p->proto)); > + print_string(PRINT_ANY, "mode", "%s ", b1); > + print_string(PRINT_ANY, > + "remote", > + "remote %s ", > + format_host_r(AF_INET6, 16, &p->raddr, b1, sizeof(b1))); > + print_string(PRINT_ANY, > + "local", > + "local %s", > + rt_addr_n2a_r(AF_INET6, 16, &p->laddr, b1, sizeof(b1))); > + > if (p->link) { > const char *n = ll_index_to_name(p->link); > > if (n) > - printf(" dev %s", n); > + print_string(PRINT_ANY, "link", " dev %s", n); > } > > if (p->flags & IP6_TNL_F_IGN_ENCAP_LIMIT) > - printf(" encaplimit none"); > + print_bool(PRINT_ANY, > + "ip6_tnl_f_ign_encap_limit", > + " encaplimit none", > + true); For flags like this, print_null is more typical JSON than a boolean value. Null is better for presence flag. Bool is better if both true and false are printed.
On Thu, Aug 1, 2019 at 5:16 PM Stephen Hemminger <stephen@networkplumber.org> wrote: > > On Thu, 1 Aug 2019 12:12:58 +0200 > Andrea Claudi <aclaudi@redhat.com> wrote: > > > Add json support on iptunnel and ip6tunnel. > > The plain text output format should remain the same. > > > > Signed-off-by: Andrea Claudi <aclaudi@redhat.com> > > --- > > ip/ip6tunnel.c | 82 +++++++++++++++++++++++++++++++-------------- > > ip/iptunnel.c | 90 +++++++++++++++++++++++++++++++++----------------- > > ip/tunnel.c | 42 +++++++++++++++++------ > > 3 files changed, 148 insertions(+), 66 deletions(-) > > > > diff --git a/ip/ip6tunnel.c b/ip/ip6tunnel.c > > index d7684a673fdc4..f2b9710c1320f 100644 > > --- a/ip/ip6tunnel.c > > +++ b/ip/ip6tunnel.c > > @@ -71,57 +71,90 @@ static void usage(void) > > static void print_tunnel(const void *t) > > { > > const struct ip6_tnl_parm2 *p = t; > > - char s1[1024]; > > - char s2[1024]; > > + SPRINT_BUF(b1); > > > > /* Do not use format_host() for local addr, > > * symbolic name will not be useful. > > */ > > - printf("%s: %s/ipv6 remote %s local %s", > > - p->name, > > - tnl_strproto(p->proto), > > - format_host_r(AF_INET6, 16, &p->raddr, s1, sizeof(s1)), > > - rt_addr_n2a_r(AF_INET6, 16, &p->laddr, s2, sizeof(s2))); > > + open_json_object(NULL); > > + print_string(PRINT_ANY, "ifname", "%s: ", p->name); > > Print this using color for interface name? Thanks for the suggestion, I can do the same also for remote and local addresses? > > > > + snprintf(b1, sizeof(b1), "%s/ipv6", tnl_strproto(p->proto)); > > + print_string(PRINT_ANY, "mode", "%s ", b1); > > + print_string(PRINT_ANY, > > + "remote", > > + "remote %s ", > > + format_host_r(AF_INET6, 16, &p->raddr, b1, sizeof(b1))); > > + print_string(PRINT_ANY, > > + "local", > > + "local %s", > > + rt_addr_n2a_r(AF_INET6, 16, &p->laddr, b1, sizeof(b1))); > > + > > if (p->link) { > > const char *n = ll_index_to_name(p->link); > > > > if (n) > > - printf(" dev %s", n); > > + print_string(PRINT_ANY, "link", " dev %s", n); > > } > > > > if (p->flags & IP6_TNL_F_IGN_ENCAP_LIMIT) > > - printf(" encaplimit none"); > > + print_bool(PRINT_ANY, > > + "ip6_tnl_f_ign_encap_limit", > > + " encaplimit none", > > + true); > > For flags like this, print_null is more typical JSON than a boolean > value. Null is better for presence flag. Bool is better if both true and > false are printed. Using print_null json JSON output becomes: { "ifname": "gre2", "mode": "gre/ipv6", "remote": "fd::1", "local": "::", "ip6_tnl_f_ign_encap_limit": null, "hoplimit": 64, "tclass": "0x00", "flowlabel": "0x00000", "flowinfo": "0x00000000", "flags": [] } Which seems a bit confusing to me (what does the "null" value means?). Using print_null we also introduce an inconsistency with the JSON output of ip/link_gre6.c and ip/link_ip6tnl.c. I would prefer to use print_bool and print out ip6_tnl_f_ign_encap_limit both when true and false, patching both files above to do the same. WDYT?
On Fri, 2 Aug 2019 13:14:15 +0200 Andrea Claudi <aclaudi@redhat.com> wrote: > On Thu, Aug 1, 2019 at 5:16 PM Stephen Hemminger > <stephen@networkplumber.org> wrote: > > > > On Thu, 1 Aug 2019 12:12:58 +0200 > > Andrea Claudi <aclaudi@redhat.com> wrote: > > > > > Add json support on iptunnel and ip6tunnel. > > > The plain text output format should remain the same. > > > > > > Signed-off-by: Andrea Claudi <aclaudi@redhat.com> > > > --- > > > ip/ip6tunnel.c | 82 +++++++++++++++++++++++++++++++-------------- > > > ip/iptunnel.c | 90 +++++++++++++++++++++++++++++++++----------------- > > > ip/tunnel.c | 42 +++++++++++++++++------ > > > 3 files changed, 148 insertions(+), 66 deletions(-) > > > > > > diff --git a/ip/ip6tunnel.c b/ip/ip6tunnel.c > > > index d7684a673fdc4..f2b9710c1320f 100644 > > > --- a/ip/ip6tunnel.c > > > +++ b/ip/ip6tunnel.c > > > @@ -71,57 +71,90 @@ static void usage(void) > > > static void print_tunnel(const void *t) > > > { > > > const struct ip6_tnl_parm2 *p = t; > > > - char s1[1024]; > > > - char s2[1024]; > > > + SPRINT_BUF(b1); > > > > > > /* Do not use format_host() for local addr, > > > * symbolic name will not be useful. > > > */ > > > - printf("%s: %s/ipv6 remote %s local %s", > > > - p->name, > > > - tnl_strproto(p->proto), > > > - format_host_r(AF_INET6, 16, &p->raddr, s1, sizeof(s1)), > > > - rt_addr_n2a_r(AF_INET6, 16, &p->laddr, s2, sizeof(s2))); > > > + open_json_object(NULL); > > > + print_string(PRINT_ANY, "ifname", "%s: ", p->name); > > > > Print this using color for interface name? > > Thanks for the suggestion, I can do the same also for remote and local > addresses? > > > > > > > > + snprintf(b1, sizeof(b1), "%s/ipv6", tnl_strproto(p->proto)); > > > + print_string(PRINT_ANY, "mode", "%s ", b1); > > > + print_string(PRINT_ANY, > > > + "remote", > > > + "remote %s ", > > > + format_host_r(AF_INET6, 16, &p->raddr, b1, sizeof(b1))); > > > + print_string(PRINT_ANY, > > > + "local", > > > + "local %s", > > > + rt_addr_n2a_r(AF_INET6, 16, &p->laddr, b1, sizeof(b1))); > > > + > > > if (p->link) { > > > const char *n = ll_index_to_name(p->link); > > > > > > if (n) > > > - printf(" dev %s", n); > > > + print_string(PRINT_ANY, "link", " dev %s", n); > > > } > > > > > > if (p->flags & IP6_TNL_F_IGN_ENCAP_LIMIT) > > > - printf(" encaplimit none"); > > > + print_bool(PRINT_ANY, > > > + "ip6_tnl_f_ign_encap_limit", > > > + " encaplimit none", > > > + true); > > > > For flags like this, print_null is more typical JSON than a boolean > > value. Null is better for presence flag. Bool is better if both true and > > false are printed. > > Using print_null json JSON output becomes: > > { > "ifname": "gre2", > "mode": "gre/ipv6", > "remote": "fd::1", > "local": "::", > "ip6_tnl_f_ign_encap_limit": null, > "hoplimit": 64, > "tclass": "0x00", > "flowlabel": "0x00000", > "flowinfo": "0x00000000", > "flags": [] > } > > Which seems a bit confusing to me (what does the "null" value means?). > Using print_null we also introduce an inconsistency with the JSON > output of ip/link_gre6.c and ip/link_ip6tnl.c. > I would prefer to use print_bool and print out > ip6_tnl_f_ign_encap_limit both when true and false, patching both > files above to do the same. WDYT? JSON has several ways to represent the same type of flag value. Since JSON always has key/value. Null is used to indicate something is present and in that case the value is unnecessary, which is what the null field was meant for.
On Fri, Aug 2, 2019 at 5:49 PM Stephen Hemminger <stephen@networkplumber.org> wrote: > > On Fri, 2 Aug 2019 13:14:15 +0200 > Andrea Claudi <aclaudi@redhat.com> wrote: > > > On Thu, Aug 1, 2019 at 5:16 PM Stephen Hemminger > > <stephen@networkplumber.org> wrote: > > > > > > On Thu, 1 Aug 2019 12:12:58 +0200 > > > Andrea Claudi <aclaudi@redhat.com> wrote: > > > > > > > Add json support on iptunnel and ip6tunnel. > > > > The plain text output format should remain the same. > > > > > > > > Signed-off-by: Andrea Claudi <aclaudi@redhat.com> > > > > --- > > > > ip/ip6tunnel.c | 82 +++++++++++++++++++++++++++++++-------------- > > > > ip/iptunnel.c | 90 +++++++++++++++++++++++++++++++++----------------- > > > > ip/tunnel.c | 42 +++++++++++++++++------ > > > > 3 files changed, 148 insertions(+), 66 deletions(-) > > > > > > > > diff --git a/ip/ip6tunnel.c b/ip/ip6tunnel.c > > > > index d7684a673fdc4..f2b9710c1320f 100644 > > > > --- a/ip/ip6tunnel.c > > > > +++ b/ip/ip6tunnel.c > > > > @@ -71,57 +71,90 @@ static void usage(void) > > > > static void print_tunnel(const void *t) > > > > { > > > > const struct ip6_tnl_parm2 *p = t; > > > > - char s1[1024]; > > > > - char s2[1024]; > > > > + SPRINT_BUF(b1); > > > > > > > > /* Do not use format_host() for local addr, > > > > * symbolic name will not be useful. > > > > */ > > > > - printf("%s: %s/ipv6 remote %s local %s", > > > > - p->name, > > > > - tnl_strproto(p->proto), > > > > - format_host_r(AF_INET6, 16, &p->raddr, s1, sizeof(s1)), > > > > - rt_addr_n2a_r(AF_INET6, 16, &p->laddr, s2, sizeof(s2))); > > > > + open_json_object(NULL); > > > > + print_string(PRINT_ANY, "ifname", "%s: ", p->name); > > > > > > Print this using color for interface name? > > > > Thanks for the suggestion, I can do the same also for remote and local > > addresses? > > > > > > > > > > > > + snprintf(b1, sizeof(b1), "%s/ipv6", tnl_strproto(p->proto)); > > > > + print_string(PRINT_ANY, "mode", "%s ", b1); > > > > + print_string(PRINT_ANY, > > > > + "remote", > > > > + "remote %s ", > > > > + format_host_r(AF_INET6, 16, &p->raddr, b1, sizeof(b1))); > > > > + print_string(PRINT_ANY, > > > > + "local", > > > > + "local %s", > > > > + rt_addr_n2a_r(AF_INET6, 16, &p->laddr, b1, sizeof(b1))); > > > > + > > > > if (p->link) { > > > > const char *n = ll_index_to_name(p->link); > > > > > > > > if (n) > > > > - printf(" dev %s", n); > > > > + print_string(PRINT_ANY, "link", " dev %s", n); > > > > } > > > > > > > > if (p->flags & IP6_TNL_F_IGN_ENCAP_LIMIT) > > > > - printf(" encaplimit none"); > > > > + print_bool(PRINT_ANY, > > > > + "ip6_tnl_f_ign_encap_limit", > > > > + " encaplimit none", > > > > + true); > > > > > > For flags like this, print_null is more typical JSON than a boolean > > > value. Null is better for presence flag. Bool is better if both true and > > > false are printed. > > > > Using print_null json JSON output becomes: > > > > { > > "ifname": "gre2", > > "mode": "gre/ipv6", > > "remote": "fd::1", > > "local": "::", > > "ip6_tnl_f_ign_encap_limit": null, > > "hoplimit": 64, > > "tclass": "0x00", > > "flowlabel": "0x00000", > > "flowinfo": "0x00000000", > > "flags": [] > > } > > > > Which seems a bit confusing to me (what does the "null" value means?). > > Using print_null we also introduce an inconsistency with the JSON > > output of ip/link_gre6.c and ip/link_ip6tnl.c. > > I would prefer to use print_bool and print out > > ip6_tnl_f_ign_encap_limit both when true and false, patching both > > files above to do the same. WDYT? > > JSON has several ways to represent the same type of flag value. > Since JSON always has key/value. Null is used to indicate something is present and > in that case the value is unnecessary, which is what the null field was meant for. > Thanks for the clarification, Stephen. I'll submit a v2 with print_null and I'll fix cases similar to the one you highlighted above in subsequent patches.
diff --git a/ip/ip6tunnel.c b/ip/ip6tunnel.c index d7684a673fdc4..f2b9710c1320f 100644 --- a/ip/ip6tunnel.c +++ b/ip/ip6tunnel.c @@ -71,57 +71,90 @@ static void usage(void) static void print_tunnel(const void *t) { const struct ip6_tnl_parm2 *p = t; - char s1[1024]; - char s2[1024]; + SPRINT_BUF(b1); /* Do not use format_host() for local addr, * symbolic name will not be useful. */ - printf("%s: %s/ipv6 remote %s local %s", - p->name, - tnl_strproto(p->proto), - format_host_r(AF_INET6, 16, &p->raddr, s1, sizeof(s1)), - rt_addr_n2a_r(AF_INET6, 16, &p->laddr, s2, sizeof(s2))); + open_json_object(NULL); + print_string(PRINT_ANY, "ifname", "%s: ", p->name); + snprintf(b1, sizeof(b1), "%s/ipv6", tnl_strproto(p->proto)); + print_string(PRINT_ANY, "mode", "%s ", b1); + print_string(PRINT_ANY, + "remote", + "remote %s ", + format_host_r(AF_INET6, 16, &p->raddr, b1, sizeof(b1))); + print_string(PRINT_ANY, + "local", + "local %s", + rt_addr_n2a_r(AF_INET6, 16, &p->laddr, b1, sizeof(b1))); + if (p->link) { const char *n = ll_index_to_name(p->link); if (n) - printf(" dev %s", n); + print_string(PRINT_ANY, "link", " dev %s", n); } if (p->flags & IP6_TNL_F_IGN_ENCAP_LIMIT) - printf(" encaplimit none"); + print_bool(PRINT_ANY, + "ip6_tnl_f_ign_encap_limit", + " encaplimit none", + true); else - printf(" encaplimit %u", p->encap_limit); + print_uint(PRINT_ANY, + "encap_limit", + " encaplimit %u", + p->encap_limit); if (p->hop_limit) - printf(" hoplimit %u", p->hop_limit); + print_uint(PRINT_ANY, "hoplimit", " hoplimit %u", p->hop_limit); else - printf(" hoplimit inherit"); - - if (p->flags & IP6_TNL_F_USE_ORIG_TCLASS) - printf(" tclass inherit"); - else { + print_string(PRINT_FP, "hoplimit", " hoplimit %s", "inherit"); + + if (p->flags & IP6_TNL_F_USE_ORIG_TCLASS) { + print_bool(PRINT_ANY, + "ip6_tnl_f_use_orig_tclass", + " tclass inherit", + true); + } else { __u32 val = ntohl(p->flowinfo & IP6_FLOWINFO_TCLASS); - printf(" tclass 0x%02x", (__u8)(val >> 20)); + snprintf(b1, sizeof(b1), "0x%02x", (__u8)(val >> 20)); + print_string(PRINT_ANY, "tclass", " tclass %s", b1); } - if (p->flags & IP6_TNL_F_USE_ORIG_FLOWLABEL) - printf(" flowlabel inherit"); - else - printf(" flowlabel 0x%05x", ntohl(p->flowinfo & IP6_FLOWINFO_FLOWLABEL)); + if (p->flags & IP6_TNL_F_USE_ORIG_FLOWLABEL) { + print_bool(PRINT_ANY, + "ip6_tnl_f_use_orig_flowlabel", + " flowlabel inherit", + true); + } else { + __u32 val = ntohl(p->flowinfo & IP6_FLOWINFO_FLOWLABEL); - printf(" (flowinfo 0x%08x)", ntohl(p->flowinfo)); + snprintf(b1, sizeof(b1), "0x%05x", val); + print_string(PRINT_ANY, "flowlabel", " flowlabel %s", b1); + } + + snprintf(b1, sizeof(b1), "0x%08x", ntohl(p->flowinfo)); + print_string(PRINT_ANY, "flowinfo", " (flowinfo %s)", b1); if (p->flags & IP6_TNL_F_RCV_DSCP_COPY) - printf(" dscp inherit"); + print_bool(PRINT_ANY, + "ip6_tnl_f_rcv_dscp_copy", + " dscp inherit", + true); if (p->flags & IP6_TNL_F_ALLOW_LOCAL_REMOTE) - printf(" allow-localremote"); + print_bool(PRINT_ANY, + "ip6_tnl_f_allow_local_remote", + " allow-localremote", + true); tnl_print_gre_flags(p->proto, p->i_flags, p->o_flags, p->i_key, p->o_key); + + close_json_object(); } static int parse_args(int argc, char **argv, int cmd, struct ip6_tnl_parm2 *p) @@ -357,7 +390,6 @@ static int do_show(int argc, char **argv) return -1; print_tunnel(&p); - fputc('\n', stdout); return 0; } diff --git a/ip/iptunnel.c b/ip/iptunnel.c index 66929e75c7448..84f708c727dc7 100644 --- a/ip/iptunnel.c +++ b/ip/iptunnel.c @@ -289,17 +289,23 @@ static void print_tunnel(const void *t) { const struct ip_tunnel_parm *p = t; struct ip_tunnel_6rd ip6rd = {}; - char s1[1024]; - char s2[1024]; + SPRINT_BUF(b1); /* Do not use format_host() for local addr, * symbolic name will not be useful. */ - printf("%s: %s/ip remote %s local %s", - p->name, - tnl_strproto(p->iph.protocol), - p->iph.daddr ? format_host_r(AF_INET, 4, &p->iph.daddr, s1, sizeof(s1)) : "any", - p->iph.saddr ? rt_addr_n2a_r(AF_INET, 4, &p->iph.saddr, s2, sizeof(s2)) : "any"); + open_json_object(NULL); + print_string(PRINT_ANY, "ifname", "%s: ", p->name); + snprintf(b1, sizeof(b1), "%s/ip", tnl_strproto(p->iph.protocol)); + print_string(PRINT_ANY, "mode", "%s ", b1); + print_string(PRINT_ANY, "remote", "remote %s ", + p->iph.daddr || is_json_context() + ? format_host_r(AF_INET, 4, &p->iph.daddr, b1, sizeof(b1)) + : "any"); + print_string(PRINT_ANY, "local", "local %s", + p->iph.saddr || is_json_context() + ? rt_addr_n2a_r(AF_INET, 4, &p->iph.saddr, b1, sizeof(b1)) + : "any"); if (p->iph.protocol == IPPROTO_IPV6 && (p->i_flags & SIT_ISATAP)) { struct ip_tunnel_prl prl[16] = {}; @@ -308,54 +314,78 @@ static void print_tunnel(const void *t) prl[0].datalen = sizeof(prl) - sizeof(prl[0]); prl[0].addr = htonl(INADDR_ANY); - if (!tnl_prl_ioctl(SIOCGETPRL, p->name, prl)) + if (!tnl_prl_ioctl(SIOCGETPRL, p->name, prl)) { for (i = 1; i < ARRAY_SIZE(prl); i++) { - if (prl[i].addr != htonl(INADDR_ANY)) { - printf(" %s %s ", - (prl[i].flags & PRL_DEFAULT) ? "pdr" : "pr", - format_host(AF_INET, 4, &prl[i].addr)); - } + if (prl[i].addr == htonl(INADDR_ANY)) + continue; + if (prl[i].flags & PRL_DEFAULT) + print_string(PRINT_ANY, + "pdr", + " pdr %s", + format_host(AF_INET, 4, &prl[i].addr)); + else + print_string(PRINT_ANY, + "pr", + " pr %s", + format_host(AF_INET, 4, &prl[i].addr)); } + } } if (p->link) { const char *n = ll_index_to_name(p->link); if (n) - printf(" dev %s", n); + print_string(PRINT_ANY, "dev", " dev %s", n); } if (p->iph.ttl) - printf(" ttl %u", p->iph.ttl); + print_uint(PRINT_ANY, "ttl", " ttl %u", p->iph.ttl); else - printf(" ttl inherit"); + print_string(PRINT_FP, "ttl", " ttl %s", "inherit"); if (p->iph.tos) { - SPRINT_BUF(b1); - printf(" tos"); - if (p->iph.tos & 1) - printf(" inherit"); - if (p->iph.tos & ~1) - printf("%c%s ", p->iph.tos & 1 ? '/' : ' ', - rtnl_dsfield_n2a(p->iph.tos & ~1, b1, sizeof(b1))); + SPRINT_BUF(b2); + + if (p->iph.tos != 1) { + if (!is_json_context() && p->iph.tos & 1) + snprintf(b2, sizeof(b2), "%s%s", + p->iph.tos & 1 ? "inherit/" : "", + rtnl_dsfield_n2a(p->iph.tos & ~1, b1, sizeof(b1))); + else + snprintf(b2, sizeof(b2), "%s", + rtnl_dsfield_n2a(p->iph.tos, b1, sizeof(b1))); + print_string(PRINT_ANY, "tos", " tos %s", b2); + } else { + print_string(PRINT_FP, NULL, " tos %s", "inherit"); + } } if (!(p->iph.frag_off & htons(IP_DF))) - printf(" nopmtudisc"); + print_bool(PRINT_ANY, "nopmtudisc", " nopmtudisc", true); if (p->iph.protocol == IPPROTO_IPV6 && !tnl_ioctl_get_6rd(p->name, &ip6rd) && ip6rd.prefixlen) { - printf(" 6rd-prefix %s/%u", - inet_ntop(AF_INET6, &ip6rd.prefix, s1, sizeof(s1)), - ip6rd.prefixlen); + print_string(PRINT_ANY, + "6rd-prefix", + " 6rd-prefix %s", + inet_ntop(AF_INET6, &ip6rd.prefix, b1, sizeof(b1))); + print_uint(PRINT_ANY, "6rd-prefixlen", "/%u", ip6rd.prefixlen); if (ip6rd.relay_prefix) { - printf(" 6rd-relay_prefix %s/%u", - format_host(AF_INET, 4, &ip6rd.relay_prefix), - ip6rd.relay_prefixlen); + print_string(PRINT_ANY, + "6rd-relay_prefix", + " 6rd-relay_prefix %s", + format_host(AF_INET, 4, &ip6rd.relay_prefix)); + print_uint(PRINT_ANY, + "6rd-relay_prefixlen", + "/%u", + ip6rd.relay_prefixlen); } } tnl_print_gre_flags(p->iph.protocol, p->i_flags, p->o_flags, p->i_key, p->o_key); + + close_json_object(); } diff --git a/ip/tunnel.c b/ip/tunnel.c index 41b0ef3165fdc..c2c0b9bc94356 100644 --- a/ip/tunnel.c +++ b/ip/tunnel.c @@ -314,24 +314,42 @@ void tnl_print_gre_flags(__u8 proto, { if ((i_flags & GRE_KEY) && (o_flags & GRE_KEY) && o_key == i_key) { - printf(" key %u", ntohl(i_key)); + print_uint(PRINT_ANY, "key", " key %u", ntohl(i_key)); } else { if (i_flags & GRE_KEY) - printf(" ikey %u", ntohl(i_key)); + print_uint(PRINT_ANY, "ikey", " ikey %u", ntohl(i_key)); if (o_flags & GRE_KEY) - printf(" okey %u", ntohl(o_key)); + print_uint(PRINT_ANY, "okey", " okey %u", ntohl(o_key)); } + open_json_array(PRINT_JSON, "flags"); if (proto == IPPROTO_GRE) { - if (i_flags & GRE_SEQ) - printf("%s Drop packets out of sequence.", _SL_); - if (i_flags & GRE_CSUM) - printf("%s Checksum in received packet is required.", _SL_); - if (o_flags & GRE_SEQ) - printf("%s Sequence packets on output.", _SL_); - if (o_flags & GRE_CSUM) - printf("%s Checksum output packets.", _SL_); + if (i_flags & GRE_SEQ) { + if (is_json_context()) + print_string(PRINT_JSON, NULL, "%s", "rx_drop_ooseq"); + else + printf("%s Drop packets out of sequence.", _SL_); + } + if (i_flags & GRE_CSUM) { + if (is_json_context()) + print_string(PRINT_JSON, NULL, "%s", "rx_csum"); + else + printf("%s Checksum in received packet is required.", _SL_); + } + if (o_flags & GRE_SEQ) { + if (is_json_context()) + print_string(PRINT_JSON, NULL, "%s", "tx_seq"); + else + printf("%s Sequence packets on output.", _SL_); + } + if (o_flags & GRE_CSUM) { + if (is_json_context()) + print_string(PRINT_JSON, NULL, "%s", "tx_csum"); + else + printf("%s Checksum output packets.", _SL_); + } } + close_json_array(PRINT_JSON, NULL); } static void tnl_print_stats(const struct rtnl_link_stats64 *s) @@ -417,6 +435,7 @@ static int print_nlmsg_tunnel(struct nlmsghdr *n, void *arg) int do_tunnels_list(struct tnl_print_nlmsg_info *info) { + new_json_obj(json); if (rtnl_linkdump_req(&rth, preferred_family) < 0) { perror("Cannot send dump request\n"); return -1; @@ -426,6 +445,7 @@ int do_tunnels_list(struct tnl_print_nlmsg_info *info) fprintf(stderr, "Dump terminated\n"); return -1; } + delete_json_obj(); return 0; }
Add json support on iptunnel and ip6tunnel. The plain text output format should remain the same. Signed-off-by: Andrea Claudi <aclaudi@redhat.com> --- ip/ip6tunnel.c | 82 +++++++++++++++++++++++++++++++-------------- ip/iptunnel.c | 90 +++++++++++++++++++++++++++++++++----------------- ip/tunnel.c | 42 +++++++++++++++++------ 3 files changed, 148 insertions(+), 66 deletions(-)