diff mbox series

[iproute2-next,master] bridge: fdb get: add missing json init (new_json_obj)

Message ID 20200710005302.8548-1-julien@cumulusnetworks.com
State Accepted
Delegated to: stephen hemminger
Headers show
Series [iproute2-next,master] bridge: fdb get: add missing json init (new_json_obj) | expand

Commit Message

Julien Fortin July 10, 2020, 12:53 a.m. UTC
From: Julien Fortin <julien@cumulusnetworks.com>

'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>
---
 bridge/fdb.c | 6 ++++++
 1 file changed, 6 insertions(+)
diff mbox series

Patch

diff --git a/bridge/fdb.c b/bridge/fdb.c
index 198c51d1..aaee4d7c 100644
--- a/bridge/fdb.c
+++ b/bridge/fdb.c
@@ -638,10 +638,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;
 }