From f58e26a369aba6aba89041b04e3b1e325b0e6566 Mon Sep 17 00:00:00 2001 From: Bill Fenner Date: Thu, 17 Sep 2020 19:01:01 -0700 Subject: Update LSP ping: timestamps are NTP int+fraction During development of LSP ping, the embedded timestamps were changed from struct timeval to NTP time, so update the printer to match the RFC. (Cherry-picked from GH #874.) --- print-lspping.c | 22 ++++++++++------------ tests/TESTLIST | 3 +++ tests/lsp-ping-timestamp.out | 8 ++++++++ tests/lsp-ping-timestamp.pcap | Bin 0 -> 116 bytes tests/lspping-fec-ldp-v.out | 20 ++++++++++---------- tests/lspping-fec-ldp-vv.out | 20 ++++++++++---------- tests/lspping-fec-rsvp-v.out | 20 ++++++++++---------- tests/lspping-fec-rsvp-vv.out | 20 ++++++++++---------- tests/tok2str-oobr-2.out | 2 +- 9 files changed, 62 insertions(+), 53 deletions(-) create mode 100644 tests/lsp-ping-timestamp.out create mode 100644 tests/lsp-ping-timestamp.pcap diff --git a/print-lspping.c b/print-lspping.c index f295435d..e798eeb1 100644 --- a/print-lspping.c +++ b/print-lspping.c @@ -26,6 +26,7 @@ #include "netdissect.h" #include "extract.h" #include "addrtoname.h" +#include "ntp.h" #include "l2vpn.h" #include "oui.h" @@ -68,10 +69,8 @@ struct lspping_common_header { nd_uint8_t return_subcode; nd_uint32_t sender_handle; nd_uint32_t seq_number; - nd_uint32_t ts_sent_sec; - nd_uint32_t ts_sent_usec; - nd_uint32_t ts_rcvd_sec; - nd_uint32_t ts_rcvd_usec; + struct l_fixedpt ts_sent; + struct l_fixedpt ts_rcvd; }; #define LSPPING_VERSION 1 @@ -498,7 +497,7 @@ lspping_print(netdissect_options *ndo, u_int tlen,lspping_tlv_len,lspping_tlv_type,tlv_tlen; int tlv_hexdump,subtlv_hexdump; u_int lspping_subtlv_len,lspping_subtlv_type; - struct timeval timestamp; + uint32_t int_part, fraction; u_int address_type; union { @@ -589,16 +588,15 @@ lspping_print(netdissect_options *ndo, GET_BE_U_4(lspping_com_header->sender_handle), GET_BE_U_4(lspping_com_header->seq_number)); - timestamp.tv_sec=GET_BE_U_4(lspping_com_header->ts_sent_sec); - timestamp.tv_usec=GET_BE_U_4(lspping_com_header->ts_sent_usec); ND_PRINT("\n\t Sender Timestamp: "); - ts_print(ndo, ×tamp); + p_ntp_time(ndo, &lspping_com_header->ts_sent); + ND_PRINT(" "); - timestamp.tv_sec=GET_BE_U_4(lspping_com_header->ts_rcvd_sec); - timestamp.tv_usec=GET_BE_U_4(lspping_com_header->ts_rcvd_usec); + int_part=GET_BE_U_4(lspping_com_header->ts_rcvd.int_part); + fraction=GET_BE_U_4(lspping_com_header->ts_rcvd.fraction); ND_PRINT("Receiver Timestamp: "); - if ((timestamp.tv_sec != 0) && (timestamp.tv_usec != 0)) - ts_print(ndo, ×tamp); + if ((int_part != 0) && (fraction != 0)) + p_ntp_time(ndo, &lspping_com_header->ts_rcvd); else ND_PRINT("no timestamp"); diff --git a/tests/TESTLIST b/tests/TESTLIST index ecc326a0..18dba83c 100644 --- a/tests/TESTLIST +++ b/tests/TESTLIST @@ -820,3 +820,6 @@ edns-opts-vv edns-opts.pcap edns-opts-vv.out -vv # unsupported link types unsupported-link-type-160 unsupported-link-type-160.pcap unsupported-link-type-160.out unsupported-link-type-dbus unsupported-link-type-dbus.pcap unsupported-link-type-dbus.out + +# LSP Ping +lsp-ping-timestamp lsp-ping-timestamp.pcap lsp-ping-timestamp.out -vv diff --git a/tests/lsp-ping-timestamp.out b/tests/lsp-ping-timestamp.out new file mode 100644 index 00000000..d697fd3e --- /dev/null +++ b/tests/lsp-ping-timestamp.out @@ -0,0 +1,8 @@ + 1 01:24:11.327631 IP (tos 0x0, ttl 64, id 65103, offset 0, flags [DF], proto UDP (17), length 60) + 30.0.0.2.3503 > 1.1.1.1.39381: [bad udp cksum 0x203d -> 0x7fa4!] + LSP-PINGv1, msg-type: MPLS Echo Reply (2), length: 32 + reply-mode: Reply via an IPv4/IPv6 UDP packet (2) + Return Code: Replying router is an egress for the FEC at stack depth 0 (3) + Return Subcode: (0) + Sender Handle: 0x00000000, Sequence: 1 + Sender Timestamp: 3809381051.326312999 (2020-09-18T01:24:11Z) Receiver Timestamp: 3809381051.327528999 (2020-09-18T01:24:11Z) diff --git a/tests/lsp-ping-timestamp.pcap b/tests/lsp-ping-timestamp.pcap new file mode 100644 index 00000000..94394f07 Binary files /dev/null and b/tests/lsp-ping-timestamp.pcap differ diff --git a/tests/lspping-fec-ldp-v.out b/tests/lspping-fec-ldp-v.out index 23b2b730..6f2f6757 100644 --- a/tests/lspping-fec-ldp-v.out +++ b/tests/lspping-fec-ldp-v.out @@ -10,7 +10,7 @@ Return Code: No return code or return code contained in the Error Code TLV (0) Return Subcode: (0) Sender Handle: 0x00000000, Sequence: 1 - Sender Timestamp: 10:17:08.118389 Receiver Timestamp: no timestamp + Sender Timestamp: 1087208228.000027564 (1934-06-15T10:17:08Z) Receiver Timestamp: no timestamp Target FEC Stack TLV (1), length: 12 LDP IPv4 prefix subTLV (1), length: 5 12.1.1.1/32 @@ -21,7 +21,7 @@ Return Code: Replying router is an egress for the FEC at stack depth 0 (3) Return Subcode: (0) Sender Handle: 0x00000000, Sequence: 1 - Sender Timestamp: 10:17:08.118389 Receiver Timestamp: 10:17:08.119950 + Sender Timestamp: 1087208228.000027564 (1934-06-15T10:17:08Z) Receiver Timestamp: 1087208228.000027928 (1934-06-15T10:17:08Z) 4 10:17:08.878375 MPLS (label 100704, exp 6, [S], ttl 64) IP (tos 0xc0, ttl 64, id 40725, offset 0, flags [none], proto TCP (6), length 71) 12.4.4.4.2006 > 12.1.1.1.179: Flags [P.], cksum 0x6c0d (correct), seq 399708866:399708885, ack 708613212, win 16384, options [nop,nop,TS val 84784455 ecr 130411], length 19: BGP @@ -37,7 +37,7 @@ Return Code: No return code or return code contained in the Error Code TLV (0) Return Subcode: (0) Sender Handle: 0x00000000, Sequence: 2 - Sender Timestamp: 10:17:09.128337 Receiver Timestamp: no timestamp + Sender Timestamp: 1087208229.000029880 (1934-06-15T10:17:09Z) Receiver Timestamp: no timestamp Target FEC Stack TLV (1), length: 12 LDP IPv4 prefix subTLV (1), length: 5 12.1.1.1/32 @@ -48,7 +48,7 @@ Return Code: Replying router is an egress for the FEC at stack depth 0 (3) Return Subcode: (0) Sender Handle: 0x00000000, Sequence: 2 - Sender Timestamp: 10:17:09.128337 Receiver Timestamp: 10:17:09.129649 + Sender Timestamp: 1087208229.000029880 (1934-06-15T10:17:09Z) Receiver Timestamp: 1087208229.000030186 (1934-06-15T10:17:09Z) 8 10:17:10.128607 MPLS (label 100688, exp 7, [S], ttl 255) IP (tos 0x0, ttl 64, id 40729, offset 0, flags [none], proto UDP (17), length 76) 12.4.4.4.4786 > 127.0.0.1.3503: @@ -57,7 +57,7 @@ Return Code: No return code or return code contained in the Error Code TLV (0) Return Subcode: (0) Sender Handle: 0x00000000, Sequence: 3 - Sender Timestamp: 10:17:10.128540 Receiver Timestamp: no timestamp + Sender Timestamp: 1087208230.000029928 (1934-06-15T10:17:10Z) Receiver Timestamp: no timestamp Target FEC Stack TLV (1), length: 12 LDP IPv4 prefix subTLV (1), length: 5 12.1.1.1/32 @@ -68,7 +68,7 @@ Return Code: Replying router is an egress for the FEC at stack depth 0 (3) Return Subcode: (0) Sender Handle: 0x00000000, Sequence: 3 - Sender Timestamp: 10:17:10.128540 Receiver Timestamp: 10:17:10.129926 + Sender Timestamp: 1087208230.000029928 (1934-06-15T10:17:10Z) Receiver Timestamp: 1087208230.000030250 (1934-06-15T10:17:10Z) 10 10:17:11.128577 MPLS (label 100688, exp 7, [S], ttl 255) IP (tos 0x0, ttl 64, id 40731, offset 0, flags [none], proto UDP (17), length 76) 12.4.4.4.4786 > 127.0.0.1.3503: @@ -77,7 +77,7 @@ Return Code: No return code or return code contained in the Error Code TLV (0) Return Subcode: (0) Sender Handle: 0x00000000, Sequence: 4 - Sender Timestamp: 10:17:11.128499 Receiver Timestamp: no timestamp + Sender Timestamp: 1087208231.000029918 (1934-06-15T10:17:11Z) Receiver Timestamp: no timestamp Target FEC Stack TLV (1), length: 12 LDP IPv4 prefix subTLV (1), length: 5 12.1.1.1/32 @@ -88,7 +88,7 @@ Return Code: Replying router is an egress for the FEC at stack depth 0 (3) Return Subcode: (0) Sender Handle: 0x00000000, Sequence: 4 - Sender Timestamp: 10:17:11.128499 Receiver Timestamp: 10:17:11.129870 + Sender Timestamp: 1087208231.000029918 (1934-06-15T10:17:11Z) Receiver Timestamp: 1087208231.000030237 (1934-06-15T10:17:11Z) 12 10:17:12.128655 MPLS (label 100688, exp 7, [S], ttl 255) IP (tos 0x0, ttl 64, id 40733, offset 0, flags [none], proto UDP (17), length 76) 12.4.4.4.4786 > 127.0.0.1.3503: @@ -97,7 +97,7 @@ Return Code: No return code or return code contained in the Error Code TLV (0) Return Subcode: (0) Sender Handle: 0x00000000, Sequence: 5 - Sender Timestamp: 10:17:12.128581 Receiver Timestamp: no timestamp + Sender Timestamp: 1087208232.000029937 (1934-06-15T10:17:12Z) Receiver Timestamp: no timestamp Target FEC Stack TLV (1), length: 12 LDP IPv4 prefix subTLV (1), length: 5 12.1.1.1/32 @@ -108,4 +108,4 @@ Return Code: Replying router is an egress for the FEC at stack depth 0 (3) Return Subcode: (0) Sender Handle: 0x00000000, Sequence: 5 - Sender Timestamp: 10:17:12.128581 Receiver Timestamp: 10:17:12.130022 + Sender Timestamp: 1087208232.000029937 (1934-06-15T10:17:12Z) Receiver Timestamp: 1087208232.000030273 (1934-06-15T10:17:12Z) diff --git a/tests/lspping-fec-ldp-vv.out b/tests/lspping-fec-ldp-vv.out index e1404875..41d8d5eb 100644 --- a/tests/lspping-fec-ldp-vv.out +++ b/tests/lspping-fec-ldp-vv.out @@ -10,7 +10,7 @@ Return Code: No return code or return code contained in the Error Code TLV (0) Return Subcode: (0) Sender Handle: 0x00000000, Sequence: 1 - Sender Timestamp: 10:17:08.118389 Receiver Timestamp: no timestamp + Sender Timestamp: 1087208228.000027564 (1934-06-15T10:17:08Z) Receiver Timestamp: no timestamp Target FEC Stack TLV (1), length: 12 LDP IPv4 prefix subTLV (1), length: 5 12.1.1.1/32 @@ -23,7 +23,7 @@ Return Code: Replying router is an egress for the FEC at stack depth 0 (3) Return Subcode: (0) Sender Handle: 0x00000000, Sequence: 1 - Sender Timestamp: 10:17:08.118389 Receiver Timestamp: 10:17:08.119950 + Sender Timestamp: 1087208228.000027564 (1934-06-15T10:17:08Z) Receiver Timestamp: 1087208228.000027928 (1934-06-15T10:17:08Z) 4 10:17:08.878375 MPLS (label 100704, exp 6, [S], ttl 64) IP (tos 0xc0, ttl 64, id 40725, offset 0, flags [none], proto TCP (6), length 71) 12.4.4.4.2006 > 12.1.1.1.179: Flags [P.], cksum 0x6c0d (correct), seq 399708866:399708885, ack 708613212, win 16384, options [nop,nop,TS val 84784455 ecr 130411], length 19: BGP @@ -39,7 +39,7 @@ Return Code: No return code or return code contained in the Error Code TLV (0) Return Subcode: (0) Sender Handle: 0x00000000, Sequence: 2 - Sender Timestamp: 10:17:09.128337 Receiver Timestamp: no timestamp + Sender Timestamp: 1087208229.000029880 (1934-06-15T10:17:09Z) Receiver Timestamp: no timestamp Target FEC Stack TLV (1), length: 12 LDP IPv4 prefix subTLV (1), length: 5 12.1.1.1/32 @@ -52,7 +52,7 @@ Return Code: Replying router is an egress for the FEC at stack depth 0 (3) Return Subcode: (0) Sender Handle: 0x00000000, Sequence: 2 - Sender Timestamp: 10:17:09.128337 Receiver Timestamp: 10:17:09.129649 + Sender Timestamp: 1087208229.000029880 (1934-06-15T10:17:09Z) Receiver Timestamp: 1087208229.000030186 (1934-06-15T10:17:09Z) 8 10:17:10.128607 MPLS (label 100688, exp 7, [S], ttl 255) IP (tos 0x0, ttl 64, id 40729, offset 0, flags [none], proto UDP (17), length 76) 12.4.4.4.4786 > 127.0.0.1.3503: [udp sum ok] @@ -61,7 +61,7 @@ Return Code: No return code or return code contained in the Error Code TLV (0) Return Subcode: (0) Sender Handle: 0x00000000, Sequence: 3 - Sender Timestamp: 10:17:10.128540 Receiver Timestamp: no timestamp + Sender Timestamp: 1087208230.000029928 (1934-06-15T10:17:10Z) Receiver Timestamp: no timestamp Target FEC Stack TLV (1), length: 12 LDP IPv4 prefix subTLV (1), length: 5 12.1.1.1/32 @@ -74,7 +74,7 @@ Return Code: Replying router is an egress for the FEC at stack depth 0 (3) Return Subcode: (0) Sender Handle: 0x00000000, Sequence: 3 - Sender Timestamp: 10:17:10.128540 Receiver Timestamp: 10:17:10.129926 + Sender Timestamp: 1087208230.000029928 (1934-06-15T10:17:10Z) Receiver Timestamp: 1087208230.000030250 (1934-06-15T10:17:10Z) 10 10:17:11.128577 MPLS (label 100688, exp 7, [S], ttl 255) IP (tos 0x0, ttl 64, id 40731, offset 0, flags [none], proto UDP (17), length 76) 12.4.4.4.4786 > 127.0.0.1.3503: [udp sum ok] @@ -83,7 +83,7 @@ Return Code: No return code or return code contained in the Error Code TLV (0) Return Subcode: (0) Sender Handle: 0x00000000, Sequence: 4 - Sender Timestamp: 10:17:11.128499 Receiver Timestamp: no timestamp + Sender Timestamp: 1087208231.000029918 (1934-06-15T10:17:11Z) Receiver Timestamp: no timestamp Target FEC Stack TLV (1), length: 12 LDP IPv4 prefix subTLV (1), length: 5 12.1.1.1/32 @@ -96,7 +96,7 @@ Return Code: Replying router is an egress for the FEC at stack depth 0 (3) Return Subcode: (0) Sender Handle: 0x00000000, Sequence: 4 - Sender Timestamp: 10:17:11.128499 Receiver Timestamp: 10:17:11.129870 + Sender Timestamp: 1087208231.000029918 (1934-06-15T10:17:11Z) Receiver Timestamp: 1087208231.000030237 (1934-06-15T10:17:11Z) 12 10:17:12.128655 MPLS (label 100688, exp 7, [S], ttl 255) IP (tos 0x0, ttl 64, id 40733, offset 0, flags [none], proto UDP (17), length 76) 12.4.4.4.4786 > 127.0.0.1.3503: [udp sum ok] @@ -105,7 +105,7 @@ Return Code: No return code or return code contained in the Error Code TLV (0) Return Subcode: (0) Sender Handle: 0x00000000, Sequence: 5 - Sender Timestamp: 10:17:12.128581 Receiver Timestamp: no timestamp + Sender Timestamp: 1087208232.000029937 (1934-06-15T10:17:12Z) Receiver Timestamp: no timestamp Target FEC Stack TLV (1), length: 12 LDP IPv4 prefix subTLV (1), length: 5 12.1.1.1/32 @@ -118,4 +118,4 @@ Return Code: Replying router is an egress for the FEC at stack depth 0 (3) Return Subcode: (0) Sender Handle: 0x00000000, Sequence: 5 - Sender Timestamp: 10:17:12.128581 Receiver Timestamp: 10:17:12.130022 + Sender Timestamp: 1087208232.000029937 (1934-06-15T10:17:12Z) Receiver Timestamp: 1087208232.000030273 (1934-06-15T10:17:12Z) diff --git a/tests/lspping-fec-rsvp-v.out b/tests/lspping-fec-rsvp-v.out index dd1282b4..41127511 100644 --- a/tests/lspping-fec-rsvp-v.out +++ b/tests/lspping-fec-rsvp-v.out @@ -6,7 +6,7 @@ Return Code: No return code or return code contained in the Error Code TLV (0) Return Subcode: (0) Sender Handle: 0x00000000, Sequence: 1 - Sender Timestamp: 10:13:57.562773 Receiver Timestamp: no timestamp + Sender Timestamp: 1087208037.000131030 (1934-06-15T10:13:57Z) Receiver Timestamp: no timestamp Target FEC Stack TLV (1), length: 24 RSVP IPv4 Session Query subTLV (3), length: 20 tunnel end-point 12.1.1.1, tunnel sender 12.4.4.4, lsp-id 0x0010 @@ -18,7 +18,7 @@ Return Code: Replying router is an egress for the FEC at stack depth 0 (3) Return Subcode: (0) Sender Handle: 0x00000000, Sequence: 1 - Sender Timestamp: 10:13:57.562773 Receiver Timestamp: 10:13:57.564137 + Sender Timestamp: 1087208037.000131030 (1934-06-15T10:13:57Z) Receiver Timestamp: 1087208037.000131348 (1934-06-15T10:13:57Z) 3 10:13:58.572787 MPLS (label 100704, exp 7, [S], ttl 255) IP (tos 0x0, ttl 64, id 40271, offset 0, flags [none], proto UDP (17), length 88) 12.4.4.4.4529 > 127.0.0.1.3503: @@ -27,7 +27,7 @@ Return Code: No return code or return code contained in the Error Code TLV (0) Return Subcode: (0) Sender Handle: 0x00000000, Sequence: 2 - Sender Timestamp: 10:13:58.572716 Receiver Timestamp: no timestamp + Sender Timestamp: 1087208038.000133345 (1934-06-15T10:13:58Z) Receiver Timestamp: no timestamp Target FEC Stack TLV (1), length: 24 RSVP IPv4 Session Query subTLV (3), length: 20 tunnel end-point 12.1.1.1, tunnel sender 12.4.4.4, lsp-id 0x0010 @@ -39,7 +39,7 @@ Return Code: Replying router is an egress for the FEC at stack depth 0 (3) Return Subcode: (0) Sender Handle: 0x00000000, Sequence: 2 - Sender Timestamp: 10:13:58.572716 Receiver Timestamp: 10:13:58.586178 + Sender Timestamp: 1087208038.000133345 (1934-06-15T10:13:58Z) Receiver Timestamp: 1087208038.000136480 (1934-06-15T10:13:58Z) 5 10:13:59.572866 MPLS (label 100704, exp 7, [S], ttl 255) IP (tos 0x0, ttl 64, id 40273, offset 0, flags [none], proto UDP (17), length 88) 12.4.4.4.4529 > 127.0.0.1.3503: @@ -48,7 +48,7 @@ Return Code: No return code or return code contained in the Error Code TLV (0) Return Subcode: (0) Sender Handle: 0x00000000, Sequence: 3 - Sender Timestamp: 10:13:59.572792 Receiver Timestamp: no timestamp + Sender Timestamp: 1087208039.000133363 (1934-06-15T10:13:59Z) Receiver Timestamp: no timestamp Target FEC Stack TLV (1), length: 24 RSVP IPv4 Session Query subTLV (3), length: 20 tunnel end-point 12.1.1.1, tunnel sender 12.4.4.4, lsp-id 0x0010 @@ -60,7 +60,7 @@ Return Code: Replying router is an egress for the FEC at stack depth 0 (3) Return Subcode: (0) Sender Handle: 0x00000000, Sequence: 3 - Sender Timestamp: 10:13:59.572792 Receiver Timestamp: 10:13:59.574169 + Sender Timestamp: 1087208039.000133363 (1934-06-15T10:13:59Z) Receiver Timestamp: 1087208039.000133684 (1934-06-15T10:13:59Z) 7 10:14:00.572959 MPLS (label 100704, exp 7, [S], ttl 255) IP (tos 0x0, ttl 64, id 40275, offset 0, flags [none], proto UDP (17), length 88) 12.4.4.4.4529 > 127.0.0.1.3503: @@ -69,7 +69,7 @@ Return Code: No return code or return code contained in the Error Code TLV (0) Return Subcode: (0) Sender Handle: 0x00000000, Sequence: 4 - Sender Timestamp: 10:14:00.572881 Receiver Timestamp: no timestamp + Sender Timestamp: 1087208040.000133384 (1934-06-15T10:14:00Z) Receiver Timestamp: no timestamp Target FEC Stack TLV (1), length: 24 RSVP IPv4 Session Query subTLV (3), length: 20 tunnel end-point 12.1.1.1, tunnel sender 12.4.4.4, lsp-id 0x0010 @@ -81,7 +81,7 @@ Return Code: Replying router is an egress for the FEC at stack depth 0 (3) Return Subcode: (0) Sender Handle: 0x00000000, Sequence: 4 - Sender Timestamp: 10:14:00.572881 Receiver Timestamp: 10:14:00.574226 + Sender Timestamp: 1087208040.000133384 (1934-06-15T10:14:00Z) Receiver Timestamp: 1087208040.000133697 (1934-06-15T10:14:00Z) 9 10:14:01.573010 MPLS (label 100704, exp 7, [S], ttl 255) IP (tos 0x0, ttl 64, id 40278, offset 0, flags [none], proto UDP (17), length 88) 12.4.4.4.4529 > 127.0.0.1.3503: @@ -90,7 +90,7 @@ Return Code: No return code or return code contained in the Error Code TLV (0) Return Subcode: (0) Sender Handle: 0x00000000, Sequence: 5 - Sender Timestamp: 10:14:01.572957 Receiver Timestamp: no timestamp + Sender Timestamp: 1087208041.000133401 (1934-06-15T10:14:01Z) Receiver Timestamp: no timestamp Target FEC Stack TLV (1), length: 24 RSVP IPv4 Session Query subTLV (3), length: 20 tunnel end-point 12.1.1.1, tunnel sender 12.4.4.4, lsp-id 0x0010 @@ -102,4 +102,4 @@ Return Code: Replying router is an egress for the FEC at stack depth 0 (3) Return Subcode: (0) Sender Handle: 0x00000000, Sequence: 5 - Sender Timestamp: 10:14:01.572957 Receiver Timestamp: 10:14:01.574268 + Sender Timestamp: 1087208041.000133401 (1934-06-15T10:14:01Z) Receiver Timestamp: 1087208041.000133707 (1934-06-15T10:14:01Z) diff --git a/tests/lspping-fec-rsvp-vv.out b/tests/lspping-fec-rsvp-vv.out index a1d69821..ce7eac61 100644 --- a/tests/lspping-fec-rsvp-vv.out +++ b/tests/lspping-fec-rsvp-vv.out @@ -6,7 +6,7 @@ Return Code: No return code or return code contained in the Error Code TLV (0) Return Subcode: (0) Sender Handle: 0x00000000, Sequence: 1 - Sender Timestamp: 10:13:57.562773 Receiver Timestamp: no timestamp + Sender Timestamp: 1087208037.000131030 (1934-06-15T10:13:57Z) Receiver Timestamp: no timestamp Target FEC Stack TLV (1), length: 24 RSVP IPv4 Session Query subTLV (3), length: 20 tunnel end-point 12.1.1.1, tunnel sender 12.4.4.4, lsp-id 0x0010 @@ -22,7 +22,7 @@ Return Code: Replying router is an egress for the FEC at stack depth 0 (3) Return Subcode: (0) Sender Handle: 0x00000000, Sequence: 1 - Sender Timestamp: 10:13:57.562773 Receiver Timestamp: 10:13:57.564137 + Sender Timestamp: 1087208037.000131030 (1934-06-15T10:13:57Z) Receiver Timestamp: 1087208037.000131348 (1934-06-15T10:13:57Z) 3 10:13:58.572787 MPLS (label 100704, exp 7, [S], ttl 255) IP (tos 0x0, ttl 64, id 40271, offset 0, flags [none], proto UDP (17), length 88) 12.4.4.4.4529 > 127.0.0.1.3503: [udp sum ok] @@ -31,7 +31,7 @@ Return Code: No return code or return code contained in the Error Code TLV (0) Return Subcode: (0) Sender Handle: 0x00000000, Sequence: 2 - Sender Timestamp: 10:13:58.572716 Receiver Timestamp: no timestamp + Sender Timestamp: 1087208038.000133345 (1934-06-15T10:13:58Z) Receiver Timestamp: no timestamp Target FEC Stack TLV (1), length: 24 RSVP IPv4 Session Query subTLV (3), length: 20 tunnel end-point 12.1.1.1, tunnel sender 12.4.4.4, lsp-id 0x0010 @@ -47,7 +47,7 @@ Return Code: Replying router is an egress for the FEC at stack depth 0 (3) Return Subcode: (0) Sender Handle: 0x00000000, Sequence: 2 - Sender Timestamp: 10:13:58.572716 Receiver Timestamp: 10:13:58.586178 + Sender Timestamp: 1087208038.000133345 (1934-06-15T10:13:58Z) Receiver Timestamp: 1087208038.000136480 (1934-06-15T10:13:58Z) 5 10:13:59.572866 MPLS (label 100704, exp 7, [S], ttl 255) IP (tos 0x0, ttl 64, id 40273, offset 0, flags [none], proto UDP (17), length 88) 12.4.4.4.4529 > 127.0.0.1.3503: [udp sum ok] @@ -56,7 +56,7 @@ Return Code: No return code or return code contained in the Error Code TLV (0) Return Subcode: (0) Sender Handle: 0x00000000, Sequence: 3 - Sender Timestamp: 10:13:59.572792 Receiver Timestamp: no timestamp + Sender Timestamp: 1087208039.000133363 (1934-06-15T10:13:59Z) Receiver Timestamp: no timestamp Target FEC Stack TLV (1), length: 24 RSVP IPv4 Session Query subTLV (3), length: 20 tunnel end-point 12.1.1.1, tunnel sender 12.4.4.4, lsp-id 0x0010 @@ -72,7 +72,7 @@ Return Code: Replying router is an egress for the FEC at stack depth 0 (3) Return Subcode: (0) Sender Handle: 0x00000000, Sequence: 3 - Sender Timestamp: 10:13:59.572792 Receiver Timestamp: 10:13:59.574169 + Sender Timestamp: 1087208039.000133363 (1934-06-15T10:13:59Z) Receiver Timestamp: 1087208039.000133684 (1934-06-15T10:13:59Z) 7 10:14:00.572959 MPLS (label 100704, exp 7, [S], ttl 255) IP (tos 0x0, ttl 64, id 40275, offset 0, flags [none], proto UDP (17), length 88) 12.4.4.4.4529 > 127.0.0.1.3503: [udp sum ok] @@ -81,7 +81,7 @@ Return Code: No return code or return code contained in the Error Code TLV (0) Return Subcode: (0) Sender Handle: 0x00000000, Sequence: 4 - Sender Timestamp: 10:14:00.572881 Receiver Timestamp: no timestamp + Sender Timestamp: 1087208040.000133384 (1934-06-15T10:14:00Z) Receiver Timestamp: no timestamp Target FEC Stack TLV (1), length: 24 RSVP IPv4 Session Query subTLV (3), length: 20 tunnel end-point 12.1.1.1, tunnel sender 12.4.4.4, lsp-id 0x0010 @@ -97,7 +97,7 @@ Return Code: Replying router is an egress for the FEC at stack depth 0 (3) Return Subcode: (0) Sender Handle: 0x00000000, Sequence: 4 - Sender Timestamp: 10:14:00.572881 Receiver Timestamp: 10:14:00.574226 + Sender Timestamp: 1087208040.000133384 (1934-06-15T10:14:00Z) Receiver Timestamp: 1087208040.000133697 (1934-06-15T10:14:00Z) 9 10:14:01.573010 MPLS (label 100704, exp 7, [S], ttl 255) IP (tos 0x0, ttl 64, id 40278, offset 0, flags [none], proto UDP (17), length 88) 12.4.4.4.4529 > 127.0.0.1.3503: [udp sum ok] @@ -106,7 +106,7 @@ Return Code: No return code or return code contained in the Error Code TLV (0) Return Subcode: (0) Sender Handle: 0x00000000, Sequence: 5 - Sender Timestamp: 10:14:01.572957 Receiver Timestamp: no timestamp + Sender Timestamp: 1087208041.000133401 (1934-06-15T10:14:01Z) Receiver Timestamp: no timestamp Target FEC Stack TLV (1), length: 24 RSVP IPv4 Session Query subTLV (3), length: 20 tunnel end-point 12.1.1.1, tunnel sender 12.4.4.4, lsp-id 0x0010 @@ -122,4 +122,4 @@ Return Code: Replying router is an egress for the FEC at stack depth 0 (3) Return Subcode: (0) Sender Handle: 0x00000000, Sequence: 5 - Sender Timestamp: 10:14:01.572957 Receiver Timestamp: 10:14:01.574268 + Sender Timestamp: 1087208041.000133401 (1934-06-15T10:14:01Z) Receiver Timestamp: 1087208041.000133707 (1934-06-15T10:14:01Z) diff --git a/tests/tok2str-oobr-2.out b/tests/tok2str-oobr-2.out index 9c474b06..29c40a5c 100644 --- a/tests/tok2str-oobr-2.out +++ b/tests/tok2str-oobr-2.out @@ -6,7 +6,7 @@ Return Code: unknown (65) Return Subcode: (0) Sender Handle: 0x00000023, Sequence: 1 - Sender Timestamp: [Error converting time] Receiver Timestamp: no timestamp + Sender Timestamp: 3558141471.506155999 (2012-10-02T04:37:51Z) Receiver Timestamp: no timestamp Target FEC Stack TLV (1), length: 24 Unknown subTLV (17), length: 20 0x0000: 0000 0001 0000 0001 c0a8 0001 c0a8 0001 -- cgit v1.2.1