ip route: get: print JSON output when -j is given

The ip -j option to print output as JSON is ignored when using 'route get':

    $ ip -j route get 127.0.0.1
    local 127.0.0.1 dev lo src 127.0.0.1 uid 1000
        cache <local>

Enable JSON output in iproute_get(), and don't let print_cache_flags() close
the JSON output, as it's not always the last called JSON function.

Tested on different route types:

    $ ip -j -p route get 127.0.0.1
    [ {
            "type": "local",
            "dst": "127.0.0.1",
            "dev": "lo",
            "prefsrc": "127.0.0.1",
            "flags": [ ],
            "uid": 1000,
            "cache": [ "local" ]
        } ]

    $ ip -d -j -p route get 192.0.2.1
    [ {
            "type": "unicast",
            "dst": "192.0.2.1",
            "gateway": "192.168.85.1",
            "dev": "wlp3s0",
            "table": "main",
            "prefsrc": "192.168.85.2",
            "flags": [ ],
            "uid": 1000,
            "cache": [ ]
        } ]

Fixes: 663c3cb23103 ("iproute: implement JSON and color output")
Acked-by: Phil Sutter <phil@nwl.cc>
Reviewed-and-tested-by: Andrea Claudi <aclaudi@redhat.com>
Signed-off-by: Matteo Croce <mcroce@redhat.com>
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>

diff --git a/ip/iproute.c b/ip/iproute.c
index e091927b6dfd95c93f23c3e5e55fb1c93e270abf..2b3dcc5dbd53fc2318853f40f35c87c81561e5ff 100644 (file)
--- a/ip/iproute.c
+++ b/ip/iproute.c
@@ -450,10 +450,8 @@ static void print_cache_flags(FILE *fp, __u32 flags)
        if (flags)
                print_hex(PRINT_ANY, "flags", "%x>", flags);
 
-       if (jw) {
+       if (jw)
                jsonw_end_array(jw);
-               jsonw_destroy(&jw);
-       }
 }
 
 static void print_rta_cacheinfo(FILE *fp, const struct rta_cacheinfo *ci)
@@ -2079,6 +2077,8 @@ static int iproute_get(int argc, char **argv)
        if (rtnl_talk(&rth, &req.n, &answer) < 0)
                return -2;
 
+       new_json_obj(json);
+
        if (connected && !from_ok) {
                struct rtmsg *r = NLMSG_DATA(answer);
                int len = answer->nlmsg_len;
@@ -2123,6 +2123,7 @@ static int iproute_get(int argc, char **argv)
                req.n.nlmsg_flags = NLM_F_REQUEST;
                req.n.nlmsg_type = RTM_GETROUTE;
 
+               delete_json_obj();
                free(answer);
                if (rtnl_talk(&rth, &req.n, &answer) < 0)
                        return -2;
@@ -2134,6 +2135,7 @@ static int iproute_get(int argc, char **argv)
                return -1;
        }
 
+       delete_json_obj();
        free(answer);
        return 0;
 }