From: Julien Fortin <julien@cumulusnetworks.com>
Date: Fri, 10 Jul 2020 00:53:02 +0000 (+0200)
Subject: bridge: fdb get: add missing json init (new_json_obj)
X-Git-Tag: v5.8.0~12
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8fc09aff8dfc65e1ebb7c1b4a6809cf6a4146ae7;p=thirdparty%2Fiproute2.git

bridge: fdb get: add missing json init (new_json_obj)

'bridge fdb get' has json support but the json object is never initialized

before patch:

$ bridge -j fdb get 56:23:28:4f:4f:e5 dev vx0
56:23:28:4f:4f:e5 dev vx0 master br0 permanent
$

after patch:

$ bridge -j fdb get 56:23:28:4f:4f:e5 dev vx0 | \
python -c \
'import sys,json;print(json.dumps(json.loads(sys.stdin.read()),indent=4))'
[
    {
        "master": "br0",
        "mac": "56:23:28:4f:4f:e5",
        "flags": [],
        "ifname": "vx0",
        "state": "permanent"
    }
]
$

Signed-off-by: Julien Fortin <julien@cumulusnetworks.com>
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
---

diff --git a/bridge/fdb.c b/bridge/fdb.c
index 710dfc99e..a12b5474e 100644
--- a/bridge/fdb.c
+++ b/bridge/fdb.c
@@ -619,10 +619,16 @@ static int fdb_get(int argc, char **argv)
 	if (rtnl_talk(&rth, &req.n, &answer) < 0)
 		return -2;
 
+	/*
+	 * Initialize a json_writer and open an array object
+	 * if -json was specified.
+	 */
+	new_json_obj(json);
 	if (print_fdb(answer, stdout) < 0) {
 		fprintf(stderr, "An error :-)\n");
 		return -1;
 	}
+	delete_json_obj();
 
 	return 0;
 }