From 148b286b52aa8f38d8d7587b598522310067de7b Mon Sep 17 00:00:00 2001 Message-Id: <148b286b52aa8f38d8d7587b598522310067de7b.1628790091.git.aclaudi@redhat.com> In-Reply-To: <650694eb0120722499207078f965442ef7343bb1.1628790091.git.aclaudi@redhat.com> References: <650694eb0120722499207078f965442ef7343bb1.1628790091.git.aclaudi@redhat.com> From: Andrea Claudi Date: Wed, 11 Aug 2021 12:55:14 +0200 Subject: [PATCH] police: Fix normal output back to what it was Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1981393 Upstream Status: iproute2.git commit 71d36000 commit 71d36000dc9ce8397fc45b680e0c0340df5a28e5 Author: Roi Dayan Date: Mon Jul 12 15:26:53 2021 +0300 police: Fix normal output back to what it was With the json support fix the normal output was changed. set it back to what it was. Print overhead with print_size(). Print newline before ref. Fixes: 0d5cf51e0d6c ("police: Add support for json output") Signed-off-by: Roi Dayan Signed-off-by: Stephen Hemminger Signed-off-by: Andrea Claudi --- tc/m_police.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/tc/m_police.c b/tc/m_police.c index 2594c089..f38ab90a 100644 --- a/tc/m_police.c +++ b/tc/m_police.c @@ -278,7 +278,7 @@ static int print_police(struct action_util *a, FILE *f, struct rtattr *arg) __u64 rate64, prate64; __u64 pps64, ppsburst64; - print_string(PRINT_ANY, "kind", "%s", "police"); + print_string(PRINT_JSON, "kind", "%s", "police"); if (arg == NULL) return 0; @@ -301,7 +301,8 @@ static int print_police(struct action_util *a, FILE *f, struct rtattr *arg) RTA_PAYLOAD(tb[TCA_POLICE_RATE64]) >= sizeof(rate64)) rate64 = rta_getattr_u64(tb[TCA_POLICE_RATE64]); - print_uint(PRINT_ANY, "index", "\t index %u ", p->index); + print_hex(PRINT_FP, NULL, " police 0x%x ", p->index); + print_uint(PRINT_JSON, "index", NULL, p->index); tc_print_rate(PRINT_FP, NULL, "rate %s ", rate64); buffer = tc_calc_xmitsize(rate64, p->burst); print_size(PRINT_FP, NULL, "burst %s ", buffer); @@ -342,12 +343,13 @@ static int print_police(struct action_util *a, FILE *f, struct rtattr *arg) print_string(PRINT_FP, NULL, " ", NULL); } - print_uint(PRINT_ANY, "overhead", "overhead %u ", p->rate.overhead); + print_size(PRINT_ANY, "overhead", "overhead %s ", p->rate.overhead); linklayer = (p->rate.linklayer & TC_LINKLAYER_MASK); if (linklayer > TC_LINKLAYER_ETHERNET || show_details) print_string(PRINT_ANY, "linklayer", "linklayer %s ", sprint_linklayer(linklayer, b2)); - print_int(PRINT_ANY, "ref", "ref %d ", p->refcnt); + print_nl(); + print_int(PRINT_ANY, "ref", "\tref %d ", p->refcnt); print_int(PRINT_ANY, "bind", "bind %d ", p->bindcnt); if (show_stats) { if (tb[TCA_POLICE_TM]) { -- 2.31.1