From mboxrd@z Thu Jan 1 00:00:00 1970 From: Roman Mashak Subject: [PATCH iproute2-next 1/1] tc: jsonify connmark action Date: Tue, 3 Apr 2018 09:09:55 -0400 Message-ID: <1522760995-12441-1-git-send-email-mrv@mojatatu.com> Cc: stephen@networkplumber.org, netdev@vger.kernel.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-f194.google.com ([209.85.223.194]:46258 "EHLO mail-io0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932204AbeDCNKV (ORCPT ); Tue, 3 Apr 2018 09:10:21 -0400 Received: by mail-io0-f194.google.com with SMTP id q80so21913221ioi.13 for ; Tue, 03 Apr 2018 06:10:21 -0700 (PDT) Sender: netdev-owner@vger.kernel.org List-ID: Signed-off-by: Roman Mashak --- tc/m_connmark.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/tc/m_connmark.c b/tc/m_connmark.c index bcce41391398..45e2d05f1a91 100644 --- a/tc/m_connmark.c +++ b/tc/m_connmark.c @@ -114,16 +114,20 @@ static int print_connmark(struct action_util *au, FILE *f, struct rtattr *arg) parse_rtattr_nested(tb, TCA_CONNMARK_MAX, arg); if (tb[TCA_CONNMARK_PARMS] == NULL) { - fprintf(f, "[NULL connmark parameters]"); + print_string(PRINT_FP, NULL, "%s", "[NULL connmark parameters]"); return -1; } ci = RTA_DATA(tb[TCA_CONNMARK_PARMS]); - fprintf(f, " connmark zone %d", ci->zone); - print_action_control(f, " ", ci->action, "\n"); - fprintf(f, "\t index %u ref %d bind %d", ci->index, - ci->refcnt, ci->bindcnt); + print_string(PRINT_ANY, "kind", "%s ", "connmark"); + print_uint(PRINT_ANY, "zone", "zone %u", ci->zone); + print_action_control(f, " ", ci->action, ""); + + print_string(PRINT_FP, NULL, "%s", _SL_); + print_uint(PRINT_ANY, "index", "\t index %u", ci->index); + print_int(PRINT_ANY, "ref", " ref %d", ci->refcnt); + print_int(PRINT_ANY, "bind", " bind %d", ci->bindcnt); if (show_stats) { if (tb[TCA_CONNMARK_TM]) { @@ -132,7 +136,7 @@ static int print_connmark(struct action_util *au, FILE *f, struct rtattr *arg) print_tm(f, tm); } } - fprintf(f, "\n"); + print_string(PRINT_FP, NULL, "%s", _SL_); return 0; } -- 2.7.4