From: Francois-Xavier Le Bail Date: Thu, 21 Mar 2024 13:43:49 +0000 (+0100) Subject: RX: Use the "%Y-%m-%d" date format X-Git-Tag: tcpdump-4.99.5~70 X-Git-Url: https://git.tcpdump.org/tcpdump/commitdiff_plain/f8a83655e42e74a8a0d3b450df3b8acbb4212975 RX: Use the "%Y-%m-%d" date format Replace "%Y/%m/%d" with "%Y-%m-%d" like in most date formats. (cherry picked from commit 8e464bd4d80e8b929ea05bdfc19b6e929a1196fd) --- diff --git a/print-rx.c b/print-rx.c index 0a1a8d12..5db91125 100644 --- a/print-rx.c +++ b/print-rx.c @@ -799,7 +799,7 @@ rx_cache_find(netdissect_options *ndo, const struct rx_header *rxh, bp += sizeof(int32_t); \ ND_PRINT(" %s", \ nd_format_time(str, sizeof(str), \ - "%Y/%m/%d %H:%M:%S", localtime(&_t))); \ + "%Y-%m-%d %H:%M:%S", localtime(&_t))); \ } #define STOREATTROUT() { uint32_t mask, _i; \ diff --git a/tests/rx-v.out b/tests/rx-v.out index 4d7e3f79..e1737583 100644 --- a/tests/rx-v.out +++ b/tests/rx-v.out @@ -5,7 +5,7 @@ 3 1999-11-11 21:46:16.889677 IP (tos 0x0, ttl 64, id 57926, offset 0, flags [none], proto UDP (17), length 93) 131.151.32.21.7001 > 131.151.1.59.7000: rx ack seq 0 ser 432 first 2 serial 347 reason delay (65) 4 1999-11-11 21:46:24.151512 IP (tos 0x0, ttl 64, id 57928, offset 0, flags [none], proto UDP (17), length 108) - 131.151.32.21.7001 > 131.151.1.59.7000: rx data seq 1 ser 433 fs call makedir fid 536871098/1/1 "tmpdir" StoreStatus date 1999/11/11 21:46:24 group 0 mode 755 (80) + 131.151.32.21.7001 > 131.151.1.59.7000: rx data seq 1 ser 433 fs call makedir fid 536871098/1/1 "tmpdir" StoreStatus date 1999-11-11 21:46:24 group 0 mode 755 (80) 5 1999-11-11 21:46:24.245048 IP (tos 0x0, ttl 254, id 59867, offset 0, flags [DF], proto UDP (17), length 80) 131.151.1.59.7000 > 131.151.32.91.7001: rx data seq 1 ser 2312 cb call callback fid 536871098/1/1 (52) 6 1999-11-11 21:46:24.255513 IP (tos 0x0, ttl 128, id 42324, offset 0, flags [none], proto UDP (17), length 56) diff --git a/tests/rx.out b/tests/rx.out index 6e5f48e9..4ca4b94d 100644 --- a/tests/rx.out +++ b/tests/rx.out @@ -1,7 +1,7 @@ 1 1999-11-11 21:46:16.463334 IP 131.151.32.21.7001 > 131.151.1.59.7000: rx data fs call fetch-status fid 536871098/846/1049757 (44) 2 1999-11-11 21:46:16.483206 IP 131.151.1.59.7000 > 131.151.32.21.7001: rx data fs reply fetch-status (148) 3 1999-11-11 21:46:16.889677 IP 131.151.32.21.7001 > 131.151.1.59.7000: rx ack first 2 serial 347 reason delay (65) - 4 1999-11-11 21:46:24.151512 IP 131.151.32.21.7001 > 131.151.1.59.7000: rx data fs call makedir fid 536871098/1/1 "tmpdir" StoreStatus date 1999/11/11 21:46:24 group 0 mode 755 (80) + 4 1999-11-11 21:46:24.151512 IP 131.151.32.21.7001 > 131.151.1.59.7000: rx data fs call makedir fid 536871098/1/1 "tmpdir" StoreStatus date 1999-11-11 21:46:24 group 0 mode 755 (80) 5 1999-11-11 21:46:24.245048 IP 131.151.1.59.7000 > 131.151.32.91.7001: rx data cb call callback fid 536871098/1/1 (52) 6 1999-11-11 21:46:24.255513 IP 131.151.32.91.7001 > 131.151.1.59.7000: rx data (28) 7 1999-11-11 21:46:24.255528 IP 131.151.32.91.7001 > 131.151.1.59.7000: rx data (28)