From 309785674b253526be5bb85d4d6b8a811a9ac088 Mon Sep 17 00:00:00 2001 From: Pablo Neira Ayuso Date: Fri, 3 Sep 2021 10:12:11 +0200 Subject: datatype: time_print() ignores -T Honor NFT_CTX_OUTPUT_NUMERIC_TIME. # nft list ruleset table ip x { set y { type ipv4_addr flags timeout elements = { 1.1.1.1 timeout 5m expires 1m49s40ms } } } # sudo nft -T list ruleset table ip x { set y { type ipv4_addr flags timeout elements = { 1.1.1.1 timeout 300s expires 108s } } } Closes: https://bugzilla.netfilter.org/show_bug.cgi?id=1561 Signed-off-by: Pablo Neira Ayuso --- src/datatype.c | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'src/datatype.c') diff --git a/src/datatype.c b/src/datatype.c index 7267d608..b849f708 100644 --- a/src/datatype.c +++ b/src/datatype.c @@ -911,6 +911,11 @@ void time_print(uint64_t ms, struct output_ctx *octx) { uint64_t days, hours, minutes, seconds; + if (nft_output_seconds(octx)) { + nft_print(octx, "%" PRIu64 "s", ms / 1000); + return; + } + days = ms / 86400000; ms %= 86400000; -- cgit v1.2.3