]> The Tcpdump Group git mirrors - tcpdump/commitdiff
projects / tcpdump / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 7399fb8)
NTP: Fix UTC/GMT timestamps printing according to RFC3339
authorFrancois-Xavier Le Bail <[email protected]>
Tue, 14 Aug 2018 12:12:56 +0000 (14:12 +0200)
committerFrancois-Xavier Le Bail <[email protected]>
Tue, 14 Aug 2018 12:12:56 +0000 (14:12 +0200)
Add the "Z" suffix for UTC.

According to the RFC3339:
      Z           A suffix which, when applied to a time, denotes a UTC
                  offset of 00:00; often spoken "Zulu" from the ICAO
                  phonetic alphabet representation of the letter "Z".

Update the output of some tests accordingly.

print-ntp.c patch | blob | history
tests/ntp-time--v.out patch | blob | history
tests/ntp-time--vv.out patch | blob | history
tests/ntp-time--vvv.out patch | blob | history
tests/ntp-v.out patch | blob | history

diff --git a/print-ntp.c b/print-ntp.c
index de6ec6d951d2cfe59cc8cf01936a6db693e607e0..f695c8d09205339616064bc10d3e1cba1b930bf3 100644 (file)
--- a/print-ntp.c
+++ b/print-ntp.c
@@ -566,7 +566,7 @@ p_ntp_time(netdissect_options *ndo,
                    ND_PRINT(" (unrepresentable)");
                } else {
                    /* use ISO 8601 (RFC3339) format */
-                   strftime(time_buf, sizeof (time_buf), "%Y-%m-%dT%H:%M:%S", tm);
+                   strftime(time_buf, sizeof (time_buf), "%Y-%m-%dT%H:%M:%SZ", tm);
                    ND_PRINT(" (%s)", time_buf);
                }
            }
diff --git a/tests/ntp-time--v.out b/tests/ntp-time--v.out
index f56abc4c41b091ab43683f8dfeeea77b2c83f3dd..373144c58480309b7d4abac436e43ede4db38aac 100644 (file)
--- a/tests/ntp-time--v.out
+++ b/tests/ntp-time--v.out
@@ -5,16 +5,16 @@
          Reference Timestamp:  0.000000000
          Originator Timestamp: 0.000000000
          Receive Timestamp:    0.000000000
-         Transmit Timestamp:   3712483316.928478999 (2017-08-23T13:21:56)
+         Transmit Timestamp:   3712483316.928478999 (2017-08-23T13:21:56Z)
            Originator - Receive Timestamp:  0.000000000
-           Originator - Transmit Timestamp: 3712483316.928478999 (2017-08-23T13:21:56)
+           Originator - Transmit Timestamp: 3712483316.928478999 (2017-08-23T13:21:56Z)
     2  13:21:56.928851 IP (tos 0xb8, ttl 62, id 8834, offset 0, flags [DF], proto UDP (17), length 76)
     132.199.4.1.123 > 132.199.152.129.49445: NTPv4, Server, length 48
        Leap indicator:  (0), Stratum 2 (secondary reference), poll 8 (256s), precision -24
        Root Delay: 0.000320, Root dispersion: 0.036407, Reference-ID: 0x84c707c9
-         Reference Timestamp:  3712482106.337741360 (2017-08-23T13:01:46)
-         Originator Timestamp: 3712483316.928478999 (2017-08-23T13:21:56)
-         Receive Timestamp:    3712483316.929920629 (2017-08-23T13:21:56)
-         Transmit Timestamp:   3712483316.929948437 (2017-08-23T13:21:56)
+         Reference Timestamp:  3712482106.337741360 (2017-08-23T13:01:46Z)
+         Originator Timestamp: 3712483316.928478999 (2017-08-23T13:21:56Z)
+         Receive Timestamp:    3712483316.929920629 (2017-08-23T13:21:56Z)
+         Transmit Timestamp:   3712483316.929948437 (2017-08-23T13:21:56Z)
            Originator - Receive Timestamp:  +0.001441629
            Originator - Transmit Timestamp: +0.001469437
diff --git a/tests/ntp-time--vv.out b/tests/ntp-time--vv.out
index a94a475dafcfef7ffb33d73b978def0f46394784..f7bc88fcca5e8a9d798b7fcfbfd0e2b464f615b9 100644 (file)
--- a/tests/ntp-time--vv.out
+++ b/tests/ntp-time--vv.out
@@ -5,16 +5,16 @@
          Reference Timestamp:  0.000000000
          Originator Timestamp: 0.000000000
          Receive Timestamp:    0.000000000
-         Transmit Timestamp:   3712483316.928478999 (2017-08-23T13:21:56)
+         Transmit Timestamp:   3712483316.928478999 (2017-08-23T13:21:56Z)
            Originator - Receive Timestamp:  0.000000000
-           Originator - Transmit Timestamp: 3712483316.928478999 (2017-08-23T13:21:56)
+           Originator - Transmit Timestamp: 3712483316.928478999 (2017-08-23T13:21:56Z)
     2  13:21:56.928851 IP (tos 0xb8, ttl 62, id 8834, offset 0, flags [DF], proto UDP (17), length 76)
     132.199.4.1.123 > 132.199.152.129.49445: [udp sum ok] NTPv4, Server, length 48
        Leap indicator:  (0), Stratum 2 (secondary reference), poll 8 (256s), precision -24
        Root Delay: 0.000320, Root dispersion: 0.036407, Reference-ID: 0x84c707c9
-         Reference Timestamp:  3712482106.337741360 (2017-08-23T13:01:46)
-         Originator Timestamp: 3712483316.928478999 (2017-08-23T13:21:56)
-         Receive Timestamp:    3712483316.929920629 (2017-08-23T13:21:56)
-         Transmit Timestamp:   3712483316.929948437 (2017-08-23T13:21:56)
+         Reference Timestamp:  3712482106.337741360 (2017-08-23T13:01:46Z)
+         Originator Timestamp: 3712483316.928478999 (2017-08-23T13:21:56Z)
+         Receive Timestamp:    3712483316.929920629 (2017-08-23T13:21:56Z)
+         Transmit Timestamp:   3712483316.929948437 (2017-08-23T13:21:56Z)
            Originator - Receive Timestamp:  +0.001441629
            Originator - Transmit Timestamp: +0.001469437
diff --git a/tests/ntp-time--vvv.out b/tests/ntp-time--vvv.out
index a94a475dafcfef7ffb33d73b978def0f46394784..f7bc88fcca5e8a9d798b7fcfbfd0e2b464f615b9 100644 (file)
--- a/tests/ntp-time--vvv.out
+++ b/tests/ntp-time--vvv.out
@@ -5,16 +5,16 @@
          Reference Timestamp:  0.000000000
          Originator Timestamp: 0.000000000
          Receive Timestamp:    0.000000000
-         Transmit Timestamp:   3712483316.928478999 (2017-08-23T13:21:56)
+         Transmit Timestamp:   3712483316.928478999 (2017-08-23T13:21:56Z)
            Originator - Receive Timestamp:  0.000000000
-           Originator - Transmit Timestamp: 3712483316.928478999 (2017-08-23T13:21:56)
+           Originator - Transmit Timestamp: 3712483316.928478999 (2017-08-23T13:21:56Z)
     2  13:21:56.928851 IP (tos 0xb8, ttl 62, id 8834, offset 0, flags [DF], proto UDP (17), length 76)
     132.199.4.1.123 > 132.199.152.129.49445: [udp sum ok] NTPv4, Server, length 48
        Leap indicator:  (0), Stratum 2 (secondary reference), poll 8 (256s), precision -24
        Root Delay: 0.000320, Root dispersion: 0.036407, Reference-ID: 0x84c707c9
-         Reference Timestamp:  3712482106.337741360 (2017-08-23T13:01:46)
-         Originator Timestamp: 3712483316.928478999 (2017-08-23T13:21:56)
-         Receive Timestamp:    3712483316.929920629 (2017-08-23T13:21:56)
-         Transmit Timestamp:   3712483316.929948437 (2017-08-23T13:21:56)
+         Reference Timestamp:  3712482106.337741360 (2017-08-23T13:01:46Z)
+         Originator Timestamp: 3712483316.928478999 (2017-08-23T13:21:56Z)
+         Receive Timestamp:    3712483316.929920629 (2017-08-23T13:21:56Z)
+         Transmit Timestamp:   3712483316.929948437 (2017-08-23T13:21:56Z)
            Originator - Receive Timestamp:  +0.001441629
            Originator - Transmit Timestamp: +0.001469437
diff --git a/tests/ntp-v.out b/tests/ntp-v.out
index 466421aff2e4a51cfc0af1661a71587478c5610f..26a1bcbb3af575816b769c3c474135724b5d2404 100644 (file)
--- a/tests/ntp-v.out
+++ b/tests/ntp-v.out
@@ -5,9 +5,9 @@
          Reference Timestamp:  0.000000000
          Originator Timestamp: 0.000000000
          Receive Timestamp:    0.000000000
-         Transmit Timestamp:   2763234513.007738396 (1987-07-25T21:08:33)
+         Transmit Timestamp:   2763234513.007738396 (1987-07-25T21:08:33Z)
            Originator - Receive Timestamp:  0.000000000
-           Originator - Transmit Timestamp: 2763234513.007738396 (1987-07-25T21:08:33)
+           Originator - Transmit Timestamp: 2763234513.007738396 (1987-07-25T21:08:33Z)
        Key id: 8
        Authentication: 57ea530f6d74350cc5286bfec1ab8ca747c73584
     2  14:12:10.231082 IP (tos 0xb8, ttl 64, id 24722, offset 0, flags [DF], proto UDP (17), length 80)
@@ -15,9 +15,9 @@
        Leap indicator: clock unsynchronized (192), Stratum 0 (unspecified), poll 3 (8s), precision -23
        Root Delay: 0.000000, Root dispersion: 0.001373, Reference-ID: (unspec)
          Reference Timestamp:  0.000000000
-         Originator Timestamp: 2763234513.007738396 (1987-07-25T21:08:33)
-         Receive Timestamp:    3706870329.516015118 (2017-06-19T14:12:09)
-         Transmit Timestamp:   3706870329.516074047 (2017-06-19T14:12:09)
+         Originator Timestamp: 2763234513.007738396 (1987-07-25T21:08:33Z)
+         Receive Timestamp:    3706870329.516015118 (2017-06-19T14:12:09Z)
+         Transmit Timestamp:   3706870329.516074047 (2017-06-19T14:12:09Z)
            Originator - Receive Timestamp:  +943635816.508276721
            Originator - Transmit Timestamp: +943635816.508335651
        Key id: 0
@@ -26,9 +26,9 @@
        Leap indicator:  (0), Stratum 0 (unspecified), poll 0 (1s), precision 32
        Root Delay: 0.000000, Root dispersion: 0.000000, Reference-ID: (unspec)
          Reference Timestamp:  0.000000000
-         Originator Timestamp: 3706870757.473833108 (2017-06-19T14:19:17)
-         Receive Timestamp:    1802554105.693999877 (1957-02-13T21:28:25)
-         Transmit Timestamp:   2929527464.107565978 (1992-10-31T13:37:44)
+         Originator Timestamp: 3706870757.473833108 (2017-06-19T14:19:17Z)
+         Receive Timestamp:    1802554105.693999877 (1957-02-13T21:28:25Z)
+         Transmit Timestamp:   2929527464.107565978 (1992-10-31T13:37:44Z)
            Originator - Receive Timestamp:  -1904316651.779833231
            Originator - Transmit Timestamp: -777343293.366267130
        Key id: 8
@@ -37,10 +37,10 @@
     192.168.100.1.123 > 192.168.100.2.42818: NTPv4, Server, length 72
        Leap indicator:  (0), Stratum 2 (secondary reference), poll 0 (1s), precision -23
        Root Delay: 0.155502, Root dispersion: 0.001571, Reference-ID: 0x0a051b0a
-         Reference Timestamp:  3706870757.720418353 (2017-06-19T14:19:17)
-         Originator Timestamp: 2929527464.107565978 (1992-10-31T13:37:44)
-         Receive Timestamp:    3706870758.494427815 (2017-06-19T14:19:18)
-         Transmit Timestamp:   3706870758.494546877 (2017-06-19T14:19:18)
+         Reference Timestamp:  3706870757.720418353 (2017-06-19T14:19:17Z)
+         Originator Timestamp: 2929527464.107565978 (1992-10-31T13:37:44Z)
+         Receive Timestamp:    3706870758.494427815 (2017-06-19T14:19:18Z)
+         Transmit Timestamp:   3706870758.494546877 (2017-06-19T14:19:18Z)
            Originator - Receive Timestamp:  +777343294.386861836
            Originator - Transmit Timestamp: +777343294.386980899
        Key id: 8
@@ -52,17 +52,17 @@
          Reference Timestamp:  0.000000000
          Originator Timestamp: 0.000000000
          Receive Timestamp:    0.000000000
-         Transmit Timestamp:   3706870974.488488492 (2017-06-19T14:22:54)
+         Transmit Timestamp:   3706870974.488488492 (2017-06-19T14:22:54Z)
            Originator - Receive Timestamp:  0.000000000
-           Originator - Transmit Timestamp: 3706870974.488488492 (2017-06-19T14:22:54)
+           Originator - Transmit Timestamp: 3706870974.488488492 (2017-06-19T14:22:54Z)
     6  14:22:54.488761 IP (tos 0x0, ttl 64, id 456, offset 0, flags [DF], proto UDP (17), length 76)
     192.168.100.1.123 > 192.168.100.2.53144: NTPv4, Server, length 48
        Leap indicator:  (0), Stratum 2 (secondary reference), poll 3 (8s), precision -23
        Root Delay: 0.155456, Root dispersion: 0.001007, Reference-ID: 0x0a051b0a
-         Reference Timestamp:  3706870972.021018556 (2017-06-19T14:22:52)
-         Originator Timestamp: 3706870974.488488492 (2017-06-19T14:22:54)
-         Receive Timestamp:    3706870974.488540573 (2017-06-19T14:22:54)
-         Transmit Timestamp:   3706870974.488665335 (2017-06-19T14:22:54)
+         Reference Timestamp:  3706870972.021018556 (2017-06-19T14:22:52Z)
+         Originator Timestamp: 3706870974.488488492 (2017-06-19T14:22:54Z)
+         Receive Timestamp:    3706870974.488540573 (2017-06-19T14:22:54Z)
+         Transmit Timestamp:   3706870974.488665335 (2017-06-19T14:22:54Z)
            Originator - Receive Timestamp:  +0.000052081
            Originator - Transmit Timestamp: +0.000176842
     7  14:47:12.800853 IP (tos 0xc0, ttl 64, id 4575, offset 0, flags [DF], proto UDP (17), length 96)
@@ -72,19 +72,19 @@
          Reference Timestamp:  0.000000000
          Originator Timestamp: 0.000000000
          Receive Timestamp:    0.000000000
-         Transmit Timestamp:   3706872432.800841171 (2017-06-19T14:47:12)
+         Transmit Timestamp:   3706872432.800841171 (2017-06-19T14:47:12Z)
            Originator - Receive Timestamp:  0.000000000
-           Originator - Transmit Timestamp: 3706872432.800841171 (2017-06-19T14:47:12)
+           Originator - Transmit Timestamp: 3706872432.800841171 (2017-06-19T14:47:12Z)
        Key id: 8
        Authentication: d5378a09c04da845732097104348843a
     8  14:47:12.800979 IP (tos 0xb8, ttl 64, id 6653, offset 0, flags [DF], proto UDP (17), length 96)
     192.168.100.1.123 > 192.168.100.2.123: NTPv4, Server, length 68
        Leap indicator:  (0), Stratum 2 (secondary reference), poll 6 (64s), precision -23
        Root Delay: 0.116577, Root dispersion: 0.001739, Reference-ID: 0x0a0ba0ee
-         Reference Timestamp:  3706872421.265296222 (2017-06-19T14:47:01)
-         Originator Timestamp: 3706872432.800841171 (2017-06-19T14:47:12)
-         Receive Timestamp:    3706872432.799168336 (2017-06-19T14:47:12)
-         Transmit Timestamp:   3706872432.799217265 (2017-06-19T14:47:12)
+         Reference Timestamp:  3706872421.265296222 (2017-06-19T14:47:01Z)
+         Originator Timestamp: 3706872432.800841171 (2017-06-19T14:47:12Z)
+         Receive Timestamp:    3706872432.799168336 (2017-06-19T14:47:12Z)
+         Transmit Timestamp:   3706872432.799217265 (2017-06-19T14:47:12Z)
            Originator - Receive Timestamp:  -0.001672834
            Originator - Transmit Timestamp: -0.001623905
        Key id: 8
[mirror] the TCPdump network dissector