netdev - Re: [PATCH iproute2 1/1] police: Fix normal output back to what it was

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite for Android: free password hash cracker in your pocket

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Date:   Mon, 12 Jul 2021 21:07:21 +0800
From:   Hangbin Liu <liuhangbin@...il.com>
To:     Roi Dayan <roid@...dia.com>
Cc:     netdev@...r.kernel.org, David Ahern <dsahern@...il.com>,
        Paul Blakey <paulb@...dia.com>,
        Davide Caratti <dcaratti@...hat.com>,
        Jamal Hadi Salim <jhs@...atatu.com>,
        Roman Mashak <mrv@...atatu.com>,
        Baowen Zheng <baowen.zheng@...igine.com>,
        Stephen Hemminger <stephen@...workplumber.org>
Subject: Re: [PATCH iproute2 1/1] police: Fix normal output back to what it
 was

Hi Roi,

Thanks for the fix up.

Regards
Hangbin

On Mon, Jul 12, 2021 at 03:26:53PM +0300, Roi Dayan wrote:
> 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 <roid@...dia.com>
> ---
>  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 2594c08979e0..f38ab90a3039 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.26.2
>