[iproute2,net-next,3/5] bridge: add json support for bridge fdb show

Message ID	1464410236-65044-4-git-send-email-roopa@cumulusnetworks.com
State	Superseded, archived
Delegated to:	stephen hemminger
Headers	show Return-Path: <netdev-owner@vger.kernel.org> From: Roopa Prabhu <roopa@cumulusnetworks.com> To: stephen@networkplumber.org, netdev@vger.kernel.org Cc: anuradhak@cumulusnetworks.com, nikolay@cumulusnetworks.com, julien@cumulusnetworks.com Subject: [PATCH iproute2 net-next 3/5] bridge: add json support for bridge fdb show Date: Fri, 27 May 2016 21:37:14 -0700 Message-Id: <1464410236-65044-4-git-send-email-roopa@cumulusnetworks.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk

diff --git a/bridge/fdb.c b/bridge/fdb.c index be849f9..79e9cbb 100644 --- a/bridge/fdb.c +++ b/bridge/fdb.c @@ -21,6 +21,8 @@ #include <linux/neighbour.h> #include <string.h> #include <limits.h> +#include <json_writer.h> +#include <stdbool.h> #include "libnetlink.h" #include "br_common.h" @@ -29,6 +31,8 @@ static unsigned int filter_index, filter_vlan; +json_writer_t *jw_global; + static void usage(void) { fprintf(stderr, "Usage: bridge fdb { add | append | del | replace } ADDR dev DEV\n" @@ -59,6 +63,15 @@ static const char *state_n2a(unsigned int s) return buf; } +static void start_json_fdb_flags_array(bool *fdb_flags) +{ + if (*fdb_flags) + return; + jsonw_name(jw_global, "flags"); + jsonw_start_array(jw_global); + *fdb_flags = true; +} + int print_fdb(const struct sockaddr_nl *who, struct nlmsghdr *n, void *arg) { FILE *fp = arg; @@ -66,11 +79,12 @@ int print_fdb(const struct sockaddr_nl *who, struct nlmsghdr *n, void *arg) int len = n->nlmsg_len; struct rtattr *tb[NDA_MAX+1]; __u16 vid = 0; + bool fdb_flags = false; + const char *state_s; if (n->nlmsg_type != RTM_NEWNEIGH && n->nlmsg_type != RTM_DELNEIGH) { fprintf(stderr, "Not RTM_NEWNEIGH: %08x %08x %08x\n", n->nlmsg_len, n->nlmsg_type, n->nlmsg_flags); - return 0; } @@ -86,6 +100,11 @@ int print_fdb(const struct sockaddr_nl *who, struct nlmsghdr *n, void *arg) if (filter_index && filter_index != r->ndm_ifindex) return 0; + if (jw_global) { + jsonw_pretty(jw_global, 1); + jsonw_start_object(jw_global); + } + parse_rtattr(tb, NDA_MAX, NDA_RTA(r), n->nlmsg_len - NLMSG_LENGTH(sizeof(*r))); @@ -96,39 +115,73 @@ int print_fdb(const struct sockaddr_nl *who, struct nlmsghdr *n, void *arg) return 0; if (n->nlmsg_type == RTM_DELNEIGH) - fprintf(fp, "Deleted "); + if (jw_global) + jsonw_string_field(jw_global, "opCode", "deleted"); + else + fprintf(fp, "Deleted "); if (tb[NDA_LLADDR]) { SPRINT_BUF(b1); - fprintf(fp, "%s ", - ll_addr_n2a(RTA_DATA(tb[NDA_LLADDR]), - RTA_PAYLOAD(tb[NDA_LLADDR]), - ll_index_to_type(r->ndm_ifindex), - b1, sizeof(b1))); + ll_addr_n2a(RTA_DATA(tb[NDA_LLADDR]), + RTA_PAYLOAD(tb[NDA_LLADDR]), + ll_index_to_type(r->ndm_ifindex), + b1, sizeof(b1)); + if (jw_global) + jsonw_string_field(jw_global, "mac", b1); + else + fprintf(fp, "%s ", b1); } - if (!filter_index && r->ndm_ifindex) - fprintf(fp, "dev %s ", ll_index_to_name(r->ndm_ifindex)); + if (!filter_index && r->ndm_ifindex) { + if (jw_global) + jsonw_string_field(jw_global, "dev", + ll_index_to_name(r->ndm_ifindex)); + else + fprintf(fp, "dev %s ", + ll_index_to_name(r->ndm_ifindex)); + } if (tb[NDA_DST]) { int family = AF_INET; + const char *abuf_s; if (RTA_PAYLOAD(tb[NDA_DST]) == sizeof(struct in6_addr)) family = AF_INET6; - fprintf(fp, "dst %s ", - format_host(family, - RTA_PAYLOAD(tb[NDA_DST]), - RTA_DATA(tb[NDA_DST]))); + abuf_s = format_host(family, + RTA_PAYLOAD(tb[NDA_DST]), + RTA_DATA(tb[NDA_DST])); + if (jw_global) + jsonw_string_field(jw_global, "dst", abuf_s); + else + fprintf(fp, "dst %s ", abuf_s); } - if (vid) - fprintf(fp, "vlan %hu ", vid); + if (vid) { + if (jw_global) + jsonw_uint_field(jw_global, "vlan", vid); + else + fprintf(fp, "vlan %hu ", vid); + } + + if (tb[NDA_PORT]) { + if (jw_global) + jsonw_uint_field(jw_global, "port", + ntohs(rta_getattr_u16(tb[NDA_PORT]))); + else + fprintf(fp, "port %d ", + ntohs(rta_getattr_u16(tb[NDA_PORT]))); + } + + if (tb[NDA_VNI]) { + if (jw_global) + jsonw_uint_field(jw_global, "vni", + rta_getattr_u32(tb[NDA_VNI])); + else + fprintf(fp, "vni %d ", + rta_getattr_u32(tb[NDA_VNI])); + } - if (tb[NDA_PORT]) - fprintf(fp, "port %d ", ntohs(rta_getattr_u16(tb[NDA_PORT]))); - if (tb[NDA_VNI]) - fprintf(fp, "vni %d ", rta_getattr_u32(tb[NDA_VNI])); if (tb[NDA_IFINDEX]) { unsigned int ifindex = rta_getattr_u32(tb[NDA_IFINDEX]); @@ -136,37 +189,95 @@ int print_fdb(const struct sockaddr_nl *who, struct nlmsghdr *n, void *arg) char ifname[IF_NAMESIZE]; if (!tb[NDA_LINK_NETNSID] && - if_indextoname(ifindex, ifname)) - fprintf(fp, "via %s ", ifname); - else - fprintf(fp, "via ifindex %u ", ifindex); + if_indextoname(ifindex, ifname)) { + if (jw_global) + jsonw_string_field(jw_global, "viaIf", + ifname); + else + fprintf(fp, "via %s ", ifname); + } else { + if (jw_global) + jsonw_uint_field(jw_global, "viaIfIndex", + ifindex); + else + fprintf(fp, "via ifindex %u ", ifindex); + } } } - if (tb[NDA_LINK_NETNSID]) - fprintf(fp, "link-netnsid %d ", - rta_getattr_u32(tb[NDA_LINK_NETNSID])); + + if (tb[NDA_LINK_NETNSID]) { + if (jw_global) + jsonw_uint_field(jw_global, "linkNetNsId", + rta_getattr_u32(tb[NDA_LINK_NETNSID])); + else + fprintf(fp, "link-netnsid %d ", + rta_getattr_u32(tb[NDA_LINK_NETNSID])); + } if (show_stats && tb[NDA_CACHEINFO]) { struct nda_cacheinfo *ci = RTA_DATA(tb[NDA_CACHEINFO]); int hz = get_user_hz(); - fprintf(fp, "used %d/%d ", ci->ndm_used/hz, - ci->ndm_updated/hz); + if (jw_global) { + jsonw_uint_field(jw_global, "used", + ci->ndm_used/hz); + jsonw_uint_field(jw_global, "updated", + ci->ndm_updated/hz); + } else { + fprintf(fp, "used %d/%d ", ci->ndm_used/hz, + ci->ndm_updated/hz); + } + } + + if (jw_global) { + if (r->ndm_flags & NTF_SELF) { + start_json_fdb_flags_array(&fdb_flags); + jsonw_string(jw_global, "self"); + } + if (r->ndm_flags & NTF_ROUTER) { + start_json_fdb_flags_array(&fdb_flags); + jsonw_string(jw_global, "router"); + } + if (r->ndm_flags & NTF_EXT_LEARNED) { + start_json_fdb_flags_array(&fdb_flags); + jsonw_string(jw_global, "offload"); + } + if (r->ndm_flags & NTF_MASTER) + jsonw_string(jw_global, "master"); + if (fdb_flags) + jsonw_end_array(jw_global); + + if (tb[NDA_MASTER]) + jsonw_string_field(jw_global, + "master", + ll_index_to_name(rta_getattr_u32(tb[NDA_MASTER]))); + + } else { + if (r->ndm_flags & NTF_SELF) + fprintf(fp, "self "); + if (r->ndm_flags & NTF_ROUTER) + fprintf(fp, "router "); + if (r->ndm_flags & NTF_EXT_LEARNED) + fprintf(fp, "offload "); + if (tb[NDA_MASTER]) { + fprintf(fp, "master %s ", + ll_index_to_name(rta_getattr_u32(tb[NDA_MASTER]))); + } else if (r->ndm_flags & NTF_MASTER) { + fprintf(fp, "master "); + } + } + + state_s = state_n2a(r->ndm_state); + if (jw_global) { + if (state_s[0]) + jsonw_string_field(jw_global, "state", state_s); + + jsonw_end_object(jw_global); + } else { + fprintf(fp, "%s\n", state_s); + + fflush(fp); } - if (r->ndm_flags & NTF_SELF) - fprintf(fp, "self "); - if (tb[NDA_MASTER]) - fprintf(fp, "master %s ", - ll_index_to_name(rta_getattr_u32(tb[NDA_MASTER]))); - else if (r->ndm_flags & NTF_MASTER) - fprintf(fp, "master "); - if (r->ndm_flags & NTF_ROUTER) - fprintf(fp, "router "); - if (r->ndm_flags & NTF_EXT_LEARNED) - fprintf(fp, "offload "); - - fprintf(fp, "%s\n", state_n2a(r->ndm_state)); - fflush(fp); return 0; } @@ -233,10 +344,19 @@ static int fdb_show(int argc, char **argv) exit(1); } + if (json_output) { + jw_global = jsonw_new_array(stdout); + if (!jw_global) { + fprintf(stderr, "Error allocation json object\n"); + exit(1); + } + } if (rtnl_dump_filter(&rth, print_fdb, stdout) < 0) { fprintf(stderr, "Dump terminated\n"); exit(1); } + if (jw_global) + jsonw_destroy(&jw_global); return 0; }

[iproute2,net-next,3/5] bridge: add json support for bridge fdb show

Commit Message

Comments

Patch