Skip to content

Commit e06a303

Browse files
committed
NTP: Update a field name with the RFC 5905 name
s/Originate Timestamp/Origin Timestamp/ s/Originator Timestamp/Origin Timestamp/ Originate Timestamp: Obsoleted. Originator Timestamp: Never used.
1 parent e4e3caa commit e06a303

File tree

5 files changed

+16
-16
lines changed

5 files changed

+16
-16
lines changed

print-ntp.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@
6666
* | |
6767
* +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
6868
* | |
69-
* | Originate Timestamp (64) |
69+
* | Origin Timestamp (64) |
7070
* | |
7171
* +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
7272
* | |
@@ -309,7 +309,7 @@ ntp_time_print(netdissect_options *ndo,
309309
ND_PRINT("\n\t Reference Timestamp: ");
310310
p_ntp_time(ndo, &(bp->ref_timestamp));
311311

312-
ND_PRINT("\n\t Originator Timestamp: ");
312+
ND_PRINT("\n\t Origin Timestamp: ");
313313
p_ntp_time(ndo, &(bp->org_timestamp));
314314

315315
ND_PRINT("\n\t Receive Timestamp: ");

tests/ntp-time--v.out

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
Leap indicator: clock unsynchronized (192), Stratum 0 (unspecified), poll 8 (256s), precision 0
44
Root Delay: 0.000000, Root dispersion: 0.000000, Reference-ID: (unspec)
55
Reference Timestamp: 0.000000000
6-
Originator Timestamp: 0.000000000
6+
Origin Timestamp: 0.000000000
77
Receive Timestamp: 0.000000000
88
Transmit Timestamp: 3712483316.928478999 (2017-08-23T13:21:56Z)
99
Originator - Receive Timestamp: 0.000000000
@@ -13,7 +13,7 @@
1313
Leap indicator: (0), Stratum 2 (secondary reference), poll 8 (256s), precision -24
1414
Root Delay: 0.000320, Root dispersion: 0.036407, Reference-ID: 0x84c707c9
1515
Reference Timestamp: 3712482106.337741360 (2017-08-23T13:01:46Z)
16-
Originator Timestamp: 3712483316.928478999 (2017-08-23T13:21:56Z)
16+
Origin Timestamp: 3712483316.928478999 (2017-08-23T13:21:56Z)
1717
Receive Timestamp: 3712483316.929920629 (2017-08-23T13:21:56Z)
1818
Transmit Timestamp: 3712483316.929948437 (2017-08-23T13:21:56Z)
1919
Originator - Receive Timestamp: +0.001441629

tests/ntp-time-ef--v.out

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
Leap indicator: (0), Stratum 0 (unspecified), poll 6 (64s), precision 32
44
Root Delay: 0.000000, Root dispersion: 0.000000, Reference-ID: (unspec)
55
Reference Timestamp: 0.000000000
6-
Originator Timestamp: 0.000000000
6+
Origin Timestamp: 0.000000000
77
Receive Timestamp: 0.000000000
88
Transmit Timestamp: 3656702015.307509582 (2015-11-16T22:33:35Z)
99
Originator - Receive Timestamp: 0.000000000
@@ -18,7 +18,7 @@
1818
Leap indicator: (0), Stratum 3 (secondary reference), poll 6 (64s), precision -25
1919
Root Delay: 0.017074, Root dispersion: 0.000732, Reference-ID: 0x0a1f0880
2020
Reference Timestamp: 3869212959.224956389 (2022-08-11T13:22:39Z)
21-
Originator Timestamp: 3656702015.307509582 (2015-11-16T22:33:35Z)
21+
Origin Timestamp: 3656702015.307509582 (2015-11-16T22:33:35Z)
2222
Receive Timestamp: 3869213010.188058000 (2022-08-11T13:23:30Z)
2323
Transmit Timestamp: 3869213010.188123546 (2022-08-11T13:23:30Z)
2424
Originator - Receive Timestamp: +212510994.880548417

tests/ntp-time-ef--vvv.out

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
Leap indicator: (0), Stratum 0 (unspecified), poll 6 (64s), precision 32
44
Root Delay: 0.000000, Root dispersion: 0.000000, Reference-ID: (unspec)
55
Reference Timestamp: 0.000000000
6-
Originator Timestamp: 0.000000000
6+
Origin Timestamp: 0.000000000
77
Receive Timestamp: 0.000000000
88
Transmit Timestamp: 3656702015.307509582 (2015-11-16T22:33:35Z)
99
Originator - Receive Timestamp: 0.000000000
@@ -37,7 +37,7 @@
3737
Leap indicator: (0), Stratum 3 (secondary reference), poll 6 (64s), precision -25
3838
Root Delay: 0.017074, Root dispersion: 0.000732, Reference-ID: 0x0a1f0880
3939
Reference Timestamp: 3869212959.224956389 (2022-08-11T13:22:39Z)
40-
Originator Timestamp: 3656702015.307509582 (2015-11-16T22:33:35Z)
40+
Origin Timestamp: 3656702015.307509582 (2015-11-16T22:33:35Z)
4141
Receive Timestamp: 3869213010.188058000 (2022-08-11T13:23:30Z)
4242
Transmit Timestamp: 3869213010.188123546 (2022-08-11T13:23:30Z)
4343
Originator - Receive Timestamp: +212510994.880548417

tests/ntp-v.out

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
Leap indicator: (0), Stratum 0 (unspecified), poll 0 (1s), precision 32
44
Root Delay: 0.000000, Root dispersion: 0.000000, Reference-ID: (unspec)
55
Reference Timestamp: 0.000000000
6-
Originator Timestamp: 0.000000000
6+
Origin Timestamp: 0.000000000
77
Receive Timestamp: 0.000000000
88
Transmit Timestamp: 2763234513.007738396 (1987-07-25T21:08:33Z)
99
Originator - Receive Timestamp: 0.000000000
@@ -15,7 +15,7 @@
1515
Leap indicator: clock unsynchronized (192), Stratum 0 (unspecified), poll 3 (8s), precision -23
1616
Root Delay: 0.000000, Root dispersion: 0.001373, Reference-ID: STEP
1717
Reference Timestamp: 0.000000000
18-
Originator Timestamp: 2763234513.007738396 (1987-07-25T21:08:33Z)
18+
Origin Timestamp: 2763234513.007738396 (1987-07-25T21:08:33Z)
1919
Receive Timestamp: 3706870329.516015118 (2017-06-19T14:12:09Z)
2020
Transmit Timestamp: 3706870329.516074047 (2017-06-19T14:12:09Z)
2121
Originator - Receive Timestamp: +943635816.508276721
@@ -26,7 +26,7 @@
2626
Leap indicator: (0), Stratum 0 (unspecified), poll 0 (1s), precision 32
2727
Root Delay: 0.000000, Root dispersion: 0.000000, Reference-ID: (unspec)
2828
Reference Timestamp: 0.000000000
29-
Originator Timestamp: 3706870757.473833108 (2017-06-19T14:19:17Z)
29+
Origin Timestamp: 3706870757.473833108 (2017-06-19T14:19:17Z)
3030
Receive Timestamp: 1802554105.693999877 (2093-03-22T03:56:41Z)
3131
Transmit Timestamp: 2929527464.107565978 (1992-10-31T13:37:44Z)
3232
Originator - Receive Timestamp: -1904316651.779833231
@@ -38,7 +38,7 @@
3838
Leap indicator: (0), Stratum 2 (secondary reference), poll 0 (1s), precision -23
3939
Root Delay: 0.155502, Root dispersion: 0.001571, Reference-ID: 0x0a051b0a
4040
Reference Timestamp: 3706870757.720418353 (2017-06-19T14:19:17Z)
41-
Originator Timestamp: 2929527464.107565978 (1992-10-31T13:37:44Z)
41+
Origin Timestamp: 2929527464.107565978 (1992-10-31T13:37:44Z)
4242
Receive Timestamp: 3706870758.494427815 (2017-06-19T14:19:18Z)
4343
Transmit Timestamp: 3706870758.494546877 (2017-06-19T14:19:18Z)
4444
Originator - Receive Timestamp: +777343294.386861836
@@ -50,7 +50,7 @@
5050
Leap indicator: clock unsynchronized (192), Stratum 0 (unspecified), poll 3 (8s), precision -6
5151
Root Delay: 1.000000, Root dispersion: 1.000000, Reference-ID: (unspec)
5252
Reference Timestamp: 0.000000000
53-
Originator Timestamp: 0.000000000
53+
Origin Timestamp: 0.000000000
5454
Receive Timestamp: 0.000000000
5555
Transmit Timestamp: 3706870974.488488492 (2017-06-19T14:22:54Z)
5656
Originator - Receive Timestamp: 0.000000000
@@ -60,7 +60,7 @@
6060
Leap indicator: (0), Stratum 2 (secondary reference), poll 3 (8s), precision -23
6161
Root Delay: 0.155456, Root dispersion: 0.001007, Reference-ID: 0x0a051b0a
6262
Reference Timestamp: 3706870972.021018556 (2017-06-19T14:22:52Z)
63-
Originator Timestamp: 3706870974.488488492 (2017-06-19T14:22:54Z)
63+
Origin Timestamp: 3706870974.488488492 (2017-06-19T14:22:54Z)
6464
Receive Timestamp: 3706870974.488540573 (2017-06-19T14:22:54Z)
6565
Transmit Timestamp: 3706870974.488665335 (2017-06-19T14:22:54Z)
6666
Originator - Receive Timestamp: +0.000052081
@@ -70,7 +70,7 @@
7070
Leap indicator: clock unsynchronized (192), Stratum 0 (unspecified), poll 6 (64s), precision -25
7171
Root Delay: 0.000000, Root dispersion: 0.000000, Reference-ID: INIT
7272
Reference Timestamp: 0.000000000
73-
Originator Timestamp: 0.000000000
73+
Origin Timestamp: 0.000000000
7474
Receive Timestamp: 0.000000000
7575
Transmit Timestamp: 3706872432.800841171 (2017-06-19T14:47:12Z)
7676
Originator - Receive Timestamp: 0.000000000
@@ -82,7 +82,7 @@
8282
Leap indicator: (0), Stratum 2 (secondary reference), poll 6 (64s), precision -23
8383
Root Delay: 0.116577, Root dispersion: 0.001739, Reference-ID: 0x0a0ba0ee
8484
Reference Timestamp: 3706872421.265296222 (2017-06-19T14:47:01Z)
85-
Originator Timestamp: 3706872432.800841171 (2017-06-19T14:47:12Z)
85+
Origin Timestamp: 3706872432.800841171 (2017-06-19T14:47:12Z)
8686
Receive Timestamp: 3706872432.799168336 (2017-06-19T14:47:12Z)
8787
Transmit Timestamp: 3706872432.799217265 (2017-06-19T14:47:12Z)
8888
Originator - Receive Timestamp: -0.001672834

0 commit comments

Comments
 (0)