diff options
| author | Francois-Xavier Le Bail <devel.fx.lebail@orange.fr> | 2018-07-09 15:39:44 +0200 |
|---|---|---|
| committer | Francois-Xavier Le Bail <devel.fx.lebail@orange.fr> | 2018-07-09 20:28:19 +0200 |
| commit | ef85f48a7ef73e8f00b94abe71df8521b821e6f7 (patch) | |
| tree | b9c6957e00482ed1a14aba5854069300e5df8df3 | |
| parent | 154b32ede55d03fb0e3c19ad45349bdb793b9e9f (diff) | |
| download | tcpdump-ef85f48a7ef73e8f00b94abe71df8521b821e6f7.tar.gz | |
ICMPv6: Fix printing 'Reachable Time' and 'Retrans Timer' as milliseconds
Update 'retrans time' to 'retrans timer'.
See: https://tools.ietf.org/html/rfc4861#section-4.2.
Update the output of some tests accordingly.
| -rw-r--r-- | print-icmp6.c | 2 | ||||
| -rw-r--r-- | tests/icmpv6.out | 2 | ||||
| -rw-r--r-- | tests/icmpv6_opt24-v.out | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/print-icmp6.c b/print-icmp6.c index 5fe0cc97..ce569995 100644 --- a/print-icmp6.c +++ b/print-icmp6.c @@ -1199,7 +1199,7 @@ icmp6_print(netdissect_options *ndo, p = (const struct nd_router_advert *)dp; ND_TCHECK_4(p->nd_ra_retransmit); ND_PRINT("\n\thop limit %u, Flags [%s]" - ", pref %s, router lifetime %us, reachable time %us, retrans time %us", + ", pref %s, router lifetime %us, reachable time %ums, retrans timer %ums", EXTRACT_U_1(p->nd_ra_curhoplimit), bittok2str(icmp6_opt_ra_flag_values,"none",EXTRACT_U_1(p->nd_ra_flags_reserved)), get_rtpref(EXTRACT_U_1(p->nd_ra_flags_reserved)), diff --git a/tests/icmpv6.out b/tests/icmpv6.out index bb7775e2..66bdcc10 100644 --- a/tests/icmpv6.out +++ b/tests/icmpv6.out @@ -1,5 +1,5 @@ IP6 (hlim 255, next-header ICMPv6 (58) payload length: 176) fe80::b299:28ff:fec8:d66c > ff02::1: [icmp6 sum ok] ICMP6, router advertisement, length 176 - hop limit 64, Flags [home agent], pref medium, router lifetime 15s, reachable time 0s, retrans time 0s + hop limit 64, Flags [home agent], pref medium, router lifetime 15s, reachable time 0ms, retrans timer 0ms prefix info option (3), length 32 (4): 2222:3333:4444:5555:6600::/72, Flags [onlink, auto], valid time 2592000s, pref. time 604800s 0x0000: 48c0 0027 8d00 0009 3a80 0000 0000 2222 0x0010: 3333 4444 5555 6600 0000 0000 0000 diff --git a/tests/icmpv6_opt24-v.out b/tests/icmpv6_opt24-v.out index 2b7cf09d..edcffb1a 100644 --- a/tests/icmpv6_opt24-v.out +++ b/tests/icmpv6_opt24-v.out @@ -1,5 +1,5 @@ IP6 (hlim 255, next-header ICMPv6 (58) payload length: 120) fe80::16cf:92ff:fe87:23d6 > ff02::1: [icmp6 sum ok] ICMP6, router advertisement, length 120 - hop limit 0, Flags [managed, other stateful], pref medium, router lifetime 0s, reachable time 0s, retrans time 0s + hop limit 0, Flags [managed, other stateful], pref medium, router lifetime 0s, reachable time 0ms, retrans timer 0ms source link-address option (1), length 8 (1): 14:cf:92:87:23:d6 mtu option (5), length 8 (1): 1500 prefix info option (3), length 32 (4): fd8d:4fb3:5b2e::/64, Flags [onlink, auto], valid time 7200s, pref. time 1800s @@ -7,7 +7,7 @@ IP6 (hlim 255, next-header ICMPv6 (58) payload length: 120) fe80::16cf:92ff:fe87 rdnss option (25), length 24 (3): lifetime 1800s, addr: fd8d:4fb3:5b2e::1 dnssl option (31), length 16 (2): lifetime 1800s, domain(s): lan. IP6 (hlim 255, next-header ICMPv6 (58) payload length: 120) fe80::16cf:92ff:fe87:23d6 > ff02::1: [icmp6 sum ok] ICMP6, router advertisement, length 120 - hop limit 0, Flags [managed, other stateful], pref medium, router lifetime 0s, reachable time 0s, retrans time 0s + hop limit 0, Flags [managed, other stateful], pref medium, router lifetime 0s, reachable time 0ms, retrans timer 0ms source link-address option (1), length 8 (1): 14:cf:92:87:23:d6 mtu option (5), length 8 (1): 1500 prefix info option (3), length 32 (4): fd8d:4fb3:5b2e::/64, Flags [onlink, auto], valid time 7200s, pref. time 1800s |