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  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:   Tue, 19 May 2020 14:29:25 -0700
From:   Stephen Hemminger <stephen@...workplumber.org>
To:     Roman Mashak <mrv@...atatu.com>
Cc:     dsahern@...il.com, netdev@...r.kernel.org, kernel@...atatu.com,
        jhs@...atatu.com, xiyou.wangcong@...il.com, jiri@...nulli.us,
        Jiri Pirko <jiri@...lanox.com>
Subject: Re: [PATCH iproute2 1/1] tc: action: fix time values output in JSON
 format

On Mon, 18 May 2020 13:29:18 -0400
Roman Mashak <mrv@...atatu.com> wrote:

> Report tcf_t values in seconds, not jiffies, in JSON format as it is now
> for stdout.
> 
> Fixes: 2704bd625583 ("tc: jsonify actions core")
> Cc: Jiri Pirko <jiri@...lanox.com>
> Signed-off-by: Roman Mashak <mrv@...atatu.com>
> ---
>  tc/tc_util.c | 9 ++++++---
>  1 file changed, 6 insertions(+), 3 deletions(-)
> 
> diff --git a/tc/tc_util.c b/tc/tc_util.c
> index 12f865cc71bf..118e19da35bb 100644
> --- a/tc/tc_util.c
> +++ b/tc/tc_util.c
> @@ -751,17 +751,20 @@ void print_tm(FILE *f, const struct tcf_t *tm)
>  	int hz = get_user_hz();
>  
>  	if (tm->install != 0) {
> -		print_uint(PRINT_JSON, "installed", NULL, tm->install);
> +		print_uint(PRINT_JSON, "installed", NULL,
> +			   (unsigned int)(tm->install/hz));
>  		print_uint(PRINT_FP, NULL, " installed %u sec",
>  			   (unsigned int)(tm->install/hz));
>  	}

Please use PRINT_ANY, drop the useless casts and fix the style.

diff --git a/tc/tc_util.c b/tc/tc_util.c
index 12f865cc71bf..fd5fcb242b64 100644
--- a/tc/tc_util.c
+++ b/tc/tc_util.c
@@ -750,21 +750,17 @@ void print_tm(FILE *f, const struct tcf_t *tm)
 {
        int hz = get_user_hz();
 
-       if (tm->install != 0) {
-               print_uint(PRINT_JSON, "installed", NULL, tm->install);
-               print_uint(PRINT_FP, NULL, " installed %u sec",
-                          (unsigned int)(tm->install/hz));
-       }
-       if (tm->lastuse != 0) {
-               print_uint(PRINT_JSON, "last_used", NULL, tm->lastuse);
-               print_uint(PRINT_FP, NULL, " used %u sec",
-                          (unsigned int)(tm->lastuse/hz));
-       }
-       if (tm->expires != 0) {
-               print_uint(PRINT_JSON, "expires", NULL, tm->expires);
-               print_uint(PRINT_FP, NULL, " expires %u sec",
-                          (unsigned int)(tm->expires/hz));
-       }
+       if (tm->install != 0)
+               print_uint(PRINT_ANY, "installed", " installed %u sec",
+                          tm->install / hz);
+
+       if (tm->lastuse != 0)
+               print_uint(PRINT_ANY, "last_used", " used %u sec",
+                          tm->lastuse / hz);
+
+       if (tm->expires != 0)
+               print_uint(PRINT_ANY, "expires", " expires %u sec",
+                          tm->expires / hz);
 }

Powered by blists - more mailing lists