From mboxrd@z Thu Jan 1 00:00:00 1970 From: Roman Mashak Subject: [PATCH iproute2-next 1/1] tc: enable json output for actions Date: Wed, 28 Mar 2018 16:59:44 -0400 Message-ID: <1522270784-17811-1-git-send-email-mrv@mojatatu.com> Cc: netdev@vger.kernel.org, stephen@networkplumber.org, kernel@mojatatu.com, jhs@mojatatu.com, xiyou.wangcong@gmail.com, jiri@resnulli.us, Roman Mashak To: dsahern@gmail.com Return-path: Received: from mail-io0-f196.google.com ([209.85.223.196]:46215 "EHLO mail-io0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752634AbeC1VAl (ORCPT ); Wed, 28 Mar 2018 17:00:41 -0400 Received: by mail-io0-f196.google.com with SMTP id q80so5126278ioi.13 for ; Wed, 28 Mar 2018 14:00:41 -0700 (PDT) Sender: netdev-owner@vger.kernel.org List-ID: Signed-off-by: Roman Mashak --- tc/m_action.c | 23 ++++++++++++++++++----- 1 file changed, 18 insertions(+), 5 deletions(-) diff --git a/tc/m_action.c b/tc/m_action.c index 6c3049c7db88..8891659ae15a 100644 --- a/tc/m_action.c +++ b/tc/m_action.c @@ -364,6 +364,7 @@ tc_print_action(FILE *f, const struct rtattr *arg, unsigned short tot_acts) if (tab_flush && NULL != tb[0] && NULL == tb[1]) return tc_print_action_flush(f, tb[0]); + open_json_object(NULL); open_json_array(PRINT_JSON, "actions"); for (i = 0; i <= tot_acts; i++) { if (tb[i]) { @@ -379,6 +380,7 @@ tc_print_action(FILE *f, const struct rtattr *arg, unsigned short tot_acts) } close_json_array(PRINT_JSON, NULL); + close_json_object(); return 0; } @@ -405,7 +407,10 @@ int print_action(const struct sockaddr_nl *who, if (tb[TCA_ROOT_COUNT]) tot_acts = RTA_DATA(tb[TCA_ROOT_COUNT]); - fprintf(fp, "total acts %d\n", tot_acts ? *tot_acts:0); + open_json_object(NULL); + print_uint(PRINT_ANY, "total acts", "total acts %u", + tot_acts ? *tot_acts : 0); + close_json_object(); if (tb[TCA_ACT_TAB] == NULL) { if (n->nlmsg_type != RTM_GETACTION) fprintf(stderr, "print_action: NULL kind\n"); @@ -531,10 +536,16 @@ static int tc_action_gd(int cmd, unsigned int flags, return 1; } - if (cmd == RTM_GETACTION && print_action(NULL, ans, stdout) < 0) { - fprintf(stderr, "Dump terminated\n"); - free(ans); - return 1; + if (cmd == RTM_GETACTION) { + new_json_obj(json); + ret = print_action(NULL, ans, stdout); + if (ret < 0) { + fprintf(stderr, "Dump terminated\n"); + free(ans); + delete_json_obj(); + return 1; + } + delete_json_obj(); } free(ans); @@ -675,7 +686,9 @@ static int tc_act_list_or_flush(int *argc_p, char ***argv_p, int event) perror("Cannot send dump request"); return 1; } + new_json_obj(json); ret = rtnl_dump_filter(&rth, print_action, stdout); + delete_json_obj(); } if (event == RTM_DELACTION) { -- 2.7.4