netdev - Re: [PATCH iproute2-next] tc: jsonify output of q

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: Windows password security audit tool. GUI, reports in PDF.

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

Date:   Thu, 4 Oct 2018 17:10:58 -0700
From:   Stephen Hemminger <stephen@...workplumber.org>
To:     Jakub Kicinski <jakub.kicinski@...ronome.com>
Cc:     dsahern@...il.com, netdev@...r.kernel.org,
        oss-drivers@...ronome.com
Subject: Re: [PATCH iproute2-next] tc: jsonify output of q_fifo

On Thu,  4 Oct 2018 17:08:34 -0700
Jakub Kicinski <jakub.kicinski@...ronome.com> wrote:

> Print limits correctly in JSON context.
> 
> Signed-off-by: Jakub Kicinski <jakub.kicinski@...ronome.com>
> ---
>  tc/q_fifo.c | 9 ++++++---
>  1 file changed, 6 insertions(+), 3 deletions(-)
> 
> diff --git a/tc/q_fifo.c b/tc/q_fifo.c
> index cb86a404d4de..61493fbbc5bc 100644
> --- a/tc/q_fifo.c
> +++ b/tc/q_fifo.c
> @@ -69,9 +69,12 @@ static int fifo_print_opt(struct qdisc_util *qu, FILE *f, struct rtattr *opt)
>  	qopt = RTA_DATA(opt);
>  	if (strcmp(qu->id, "bfifo") == 0) {
>  		SPRINT_BUF(b1);
> -		fprintf(f, "limit %s", sprint_size(qopt->limit, b1));
> -	} else
> -		fprintf(f, "limit %up", qopt->limit);
> +		print_uint(PRINT_JSON, "limit", NULL, qopt->limit);
> +		print_string(PRINT_FP, NULL, "limit %s",
> +			     sprint_size(qopt->limit, b1));
> +	} else {
> +		print_uint(PRINT_ANY, "limit", "limit %up", qopt->limit);
> +	}
>  	return 0;
>  }
>  

This can go to current not net-next, since it is a bug fix really.