From patchwork Mon Mar 18 17:19:30 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matteo Croce X-Patchwork-Id: 1057973 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=fail (p=none dis=none) header.from=redhat.com Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 44NNGl5s5gz9s4Y for ; Tue, 19 Mar 2019 04:19:59 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727861AbfCRRT6 (ORCPT ); Mon, 18 Mar 2019 13:19:58 -0400 Received: from mail-wr1-f68.google.com ([209.85.221.68]:40882 "EHLO mail-wr1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727708AbfCRRT6 (ORCPT ); Mon, 18 Mar 2019 13:19:58 -0400 Received: by mail-wr1-f68.google.com with SMTP id t5so17980562wri.7 for ; Mon, 18 Mar 2019 10:19:57 -0700 (PDT) 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=PrT8k+p99znJPLz1c/VpWdM6/JQk2eUn9YnSv49Nk20=; b=OJaCcdF0DyfEI9ofcgBdI4D8wGaX102nrDyOt0VDXRLqe2KY7vQoyyMRCT5rJEnKH+ /Rw6tg/mJK2PDqU09Wd/OGXiDStCVGjKy0WkilZ1K6EvYCyaNGsFVt979hEHx6fRGsCw 7RtaOGwMlp+McdKEmsTlfc9ypfDpCJHo7whWHc+osOIMdVGhTMNvsfMTeQJ3N/w2Jvi+ XLD3iT+1VKNY5HbIWgkhA+2WjKWIVexYDhXTxH/xDUhUVfmQewQ/HtMZ2GGyd8DTVuJK 0aXbIp67wdFObxXcRbdx59JNwAQnQbvAtJSLdiWLlaGxKt39hLhHhv+5n/vbWev3+/wy 0DDw== X-Gm-Message-State: APjAAAUQbQWuSIrRboBrWmOuQ+P+Hi/VXGmu9phKjsbPR+zYrgvUFFdi IVVXu6sbjQ2BL8m5dn5N1rCy9Otd1As= X-Google-Smtp-Source: APXvYqwhnpUzJtl58pBf8afNCkSKeUerx/SA1VOvYzF1P1pKUYkaImvfkcgI/ETfq+x0mGgc8z0NaA== X-Received: by 2002:a05:6000:1291:: with SMTP id f17mr8175242wrx.201.1552929596267; Mon, 18 Mar 2019 10:19:56 -0700 (PDT) Received: from raver.teknoraver.net (net-188-216-58-50.cust.vodafonedsl.it. [188.216.58.50]) by smtp.gmail.com with ESMTPSA id a20sm10346002wmb.17.2019.03.18.10.19.55 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 18 Mar 2019 10:19:55 -0700 (PDT) From: Matteo Croce To: netdev@vger.kernel.org Cc: Phil Sutter , Andrea Claudi , Stephen Hemminger , David Ahern Subject: [PATCH iproute2 2/2] ip route: get: print JSON output when -j is given Date: Mon, 18 Mar 2019 18:19:30 +0100 Message-Id: <20190318171930.22705-3-mcroce@redhat.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190318171930.22705-1-mcroce@redhat.com> References: <20190318171930.22705-1-mcroce@redhat.com> MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org 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 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 Reviewed-and-tested-by: Andrea Claudi Signed-off-by: Matteo Croce --- ip/iproute.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/ip/iproute.c b/ip/iproute.c index e091927b..2b3dcc5d 100644 --- 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; }