From patchwork Fri Apr 12 15:30:55 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nikolay Aleksandrov X-Patchwork-Id: 1084800 X-Patchwork-Delegate: shemminger@vyatta.com Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=cumulusnetworks.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=cumulusnetworks.com header.i=@cumulusnetworks.com header.b="DttxmRZG"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 44ghhH66rBz9s4V for ; Sat, 13 Apr 2019 01:31:43 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727080AbfDLPbl (ORCPT ); Fri, 12 Apr 2019 11:31:41 -0400 Received: from mail-wr1-f67.google.com ([209.85.221.67]:44333 "EHLO mail-wr1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726780AbfDLPbl (ORCPT ); Fri, 12 Apr 2019 11:31:41 -0400 Received: by mail-wr1-f67.google.com with SMTP id y7so12467596wrn.11 for ; Fri, 12 Apr 2019 08:31:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cumulusnetworks.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=4myP+G1E4wFlneA+W3ca21+e+htsR59eMjl9g9Foie8=; b=DttxmRZGme2G+wnLbGc8usoFHdaP4serMKI4Qo2e/zeOTCVHbdHOqUYRy6KN1mhF5l FI9y4F01//oj2a3zHf3nW0PyE/gZ+Bmj0R680KwQzekZZV9UztKj4oSVhJ+HgZAwfY/L yIg5gYIUCPawCOswIwS/d7lHjviSaYkvn2d1Q= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=4myP+G1E4wFlneA+W3ca21+e+htsR59eMjl9g9Foie8=; b=X0lOydO5VGToDQMGH1sS2Okx1450TjCaka2TaeyvMYUd4A2duCzF5d/2F79sgB5ulO G26kSb0Oc+qW4rzhXu1cmDuMzc/G4ZSMM0f5N4oKHQSjI4gyNCIUDwFJLqOLfWKq5gfw EXC841OUW4MVohj6y8umQ1hABVD/ASXnFTnGIJSY0wMcDFfNrR9/EQZSg5sWIERJuHKi VEcAvaGh3VuWeeUGjgg5cRY6jzZzTb+qothDKJYe2aX4hL4yZEU//13yS9EXCSP7mNKC ZkJ5xeBYhuFV5yg24p3vpacynk/3VEf0OSvA7OlbMxsuQg+02N5NcZt0CAytjm++dfDT hdMw== X-Gm-Message-State: APjAAAXF/QO4xedTqSRAHmARjMG21ZF19Ykb/H8Qs00rXLeVGAAc4b91 RX3f8QRhOcZCGlhlWGkvkkJptgbPK4Dnug== X-Google-Smtp-Source: APXvYqy6eE/KIW/brmfT3b1VuGrFxuTIbjchgFUQ0O6L48+pF502avlrSUsINsvjYpzkK7V2o24V1A== X-Received: by 2002:adf:eb84:: with SMTP id t4mr9106425wrn.43.1555083094947; Fri, 12 Apr 2019 08:31:34 -0700 (PDT) Received: from localhost.localdomain (84-238-136-197.ip.btc-net.bg. [84.238.136.197]) by smtp.gmail.com with ESMTPSA id u17sm15644252wmu.36.2019.04.12.08.31.33 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 12 Apr 2019 08:31:34 -0700 (PDT) From: Nikolay Aleksandrov To: netdev@vger.kernel.org Cc: roopa@cumulusnetworks.com, dsa@cumulusnetworks.com, stephen@networkplumber.org, Nikolay Aleksandrov Subject: [PATCH iproute2] bridge: mdb: restore valid json output Date: Fri, 12 Apr 2019 18:30:55 +0300 Message-Id: <20190412153055.8111-1-nikolay@cumulusnetworks.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190405095259.6ca08f67@shemminger-XPS-13-9360> References: <20190405095259.6ca08f67@shemminger-XPS-13-9360> MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Since the commit below mdb's json output has been invalid and also with changed format. Restore it to a valid json like the previous format. Also takes care of a double "Deleted" print when monitoring for changes. Example bridge -p -d -j mdb show: [ { "mdb": [ { "index": 4, "dev": "virbr0", "port": "vnet2", "grp": "ff02::202", "state": "temp", "flags": [ ] },{ "index": 4, "dev": "virbr0", "port": "vnet2", "grp": "ff02::1:fffb:1939", "state": "temp", "flags": [ ] },{ "index": 6, "dev": "virbr1", "port": "vnet7", "grp": "ff02::202", "state": "temp", "flags": [ ] },{ "index": 6, "dev": "virbr1", "port": "vnet7", "grp": "ff02::1:ffd0:f61f", "state": "temp", "flags": [ ] } ], "router": { "virbr0": [ { "port": "vnet1" },{ "port": "vnet0" } ], "virbr1": [ { "port": "vnet5" } ] } } ] Fixes: c7c1a1ef51ae ("bridge: colorize output and use JSON print library") Signed-off-by: Nikolay Aleksandrov --- bridge/br_common.h | 2 +- bridge/mdb.c | 80 +++++++++++++++++++++++++++++++++++++++------- bridge/monitor.c | 2 +- 3 files changed, 70 insertions(+), 14 deletions(-) diff --git a/bridge/br_common.h b/bridge/br_common.h index 23d653df931d..b5798da300e8 100644 --- a/bridge/br_common.h +++ b/bridge/br_common.h @@ -8,8 +8,8 @@ void print_vlan_info(struct rtattr *tb, int ifindex); int print_linkinfo(struct nlmsghdr *n, void *arg); +int print_mdb_mon(struct nlmsghdr *n, void *arg); int print_fdb(struct nlmsghdr *n, void *arg); -int print_mdb(struct nlmsghdr *n, void *arg); int do_fdb(int argc, char **argv); int do_mdb(int argc, char **argv); diff --git a/bridge/mdb.c b/bridge/mdb.c index 855a6a4552c7..59aa17643517 100644 --- a/bridge/mdb.c +++ b/bridge/mdb.c @@ -132,9 +132,6 @@ static void print_mdb_entry(FILE *f, int ifindex, const struct br_mdb_entry *e, open_json_object(NULL); - if (n->nlmsg_type == RTM_DELMDB) - print_bool(PRINT_ANY, "deleted", "Deleted ", true); - print_int(PRINT_ANY, "index", "%u: ", ifindex); print_color_string(PRINT_ANY, COLOR_IFNAME, "dev", "%s ", dev); print_string(PRINT_ANY, "port", " %s ", @@ -189,10 +186,8 @@ static void print_mdb_entries(FILE *fp, struct nlmsghdr *n, int rem = RTA_PAYLOAD(mdb); struct rtattr *i; - open_json_array(PRINT_JSON, "mdb"); for (i = RTA_DATA(mdb); RTA_OK(i, rem); i = RTA_NEXT(i, rem)) br_print_mdb_entry(fp, ifindex, i, n); - close_json_array(PRINT_JSON, NULL); } static void print_router_entries(FILE *fp, struct nlmsghdr *n, @@ -200,7 +195,6 @@ static void print_router_entries(FILE *fp, struct nlmsghdr *n, { const char *brifname = ll_index_to_name(ifindex); - open_json_array(PRINT_JSON, "router"); if (n->nlmsg_type == RTM_GETMDB) { if (show_details) br_print_router_ports(fp, router, brifname); @@ -222,15 +216,12 @@ static void print_router_entries(FILE *fp, struct nlmsghdr *n, port_name, brifname); } } - close_json_array(PRINT_JSON, NULL); } -int print_mdb(struct nlmsghdr *n, void *arg) +static int __parse_mdb_nlmsg(struct nlmsghdr *n, struct rtattr **tb) { - FILE *fp = arg; struct br_port_msg *r = NLMSG_DATA(n); int len = n->nlmsg_len; - struct rtattr *tb[MDBA_MAX+1]; if (n->nlmsg_type != RTM_GETMDB && n->nlmsg_type != RTM_NEWMDB && @@ -253,6 +244,54 @@ int print_mdb(struct nlmsghdr *n, void *arg) parse_rtattr(tb, MDBA_MAX, MDBA_RTA(r), n->nlmsg_len - NLMSG_LENGTH(sizeof(*r))); + return 1; +} + +static int print_mdbs(struct nlmsghdr *n, void *arg) +{ + struct br_port_msg *r = NLMSG_DATA(n); + struct rtattr *tb[MDBA_MAX+1]; + FILE *fp = arg; + int ret; + + ret = __parse_mdb_nlmsg(n, tb); + if (ret != 1) + return ret; + + if (tb[MDBA_MDB]) + print_mdb_entries(fp, n, r->ifindex, tb[MDBA_MDB]); + + return 0; +} + +static int print_rtrs(struct nlmsghdr *n, void *arg) +{ + struct br_port_msg *r = NLMSG_DATA(n); + struct rtattr *tb[MDBA_MAX+1]; + FILE *fp = arg; + int ret; + + ret = __parse_mdb_nlmsg(n, tb); + if (ret != 1) + return ret; + + if (tb[MDBA_ROUTER]) + print_router_entries(fp, n, r->ifindex, tb[MDBA_ROUTER]); + + return 0; +} + +int print_mdb_mon(struct nlmsghdr *n, void *arg) +{ + struct br_port_msg *r = NLMSG_DATA(n); + struct rtattr *tb[MDBA_MAX+1]; + FILE *fp = arg; + int ret; + + ret = __parse_mdb_nlmsg(n, tb); + if (ret != 1) + return ret; + if (n->nlmsg_type == RTM_DELMDB) print_bool(PRINT_ANY, "deleted", "Deleted ", true); @@ -291,18 +330,35 @@ static int mdb_show(int argc, char **argv) } new_json_obj(json); + open_json_object(NULL); - /* get mdb entries*/ + /* get mdb entries */ if (rtnl_mdbdump_req(&rth, PF_BRIDGE) < 0) { perror("Cannot send dump request"); return -1; } - if (rtnl_dump_filter(&rth, print_mdb, stdout) < 0) { + open_json_array(PRINT_JSON, "mdb"); + if (rtnl_dump_filter(&rth, print_mdbs, stdout) < 0) { fprintf(stderr, "Dump terminated\n"); return -1; } + close_json_array(PRINT_JSON, NULL); + + /* get router ports */ + if (rtnl_mdbdump_req(&rth, PF_BRIDGE) < 0) { + perror("Cannot send dump request"); + return -1; + } + open_json_object("router"); + if (rtnl_dump_filter(&rth, print_rtrs, stdout) < 0) { + fprintf(stderr, "Dump terminated\n"); + return -1; + } + close_json_object(); + + close_json_object(); delete_json_obj(); fflush(stdout); diff --git a/bridge/monitor.c b/bridge/monitor.c index 708a1bd2ccb0..08439a60288a 100644 --- a/bridge/monitor.c +++ b/bridge/monitor.c @@ -61,7 +61,7 @@ static int accept_msg(struct rtnl_ctrl_data *ctrl, case RTM_DELMDB: if (prefix_banner) fprintf(fp, "[MDB]"); - return print_mdb(n, arg); + return print_mdb_mon(n, arg); case NLMSG_TSTAMP: print_nlmsg_timestamp(fp, n);