diff options
| author | Francois-Xavier Le Bail <devel.fx.lebail@orange.fr> | 2022-02-06 14:12:20 +0100 |
|---|---|---|
| committer | Francois-Xavier Le Bail <devel.fx.lebail@orange.fr> | 2023-02-20 13:56:15 +0100 |
| commit | d2559a83d1463492035d6eab82fc568f16aa8a33 (patch) | |
| tree | 63890fd2908c0ff7f0d6cb2f1ea68dceebb8d9bd | |
| parent | a356c5743fd7a461f8225585a05119b10e399083 (diff) | |
| download | tcpdump-d2559a83d1463492035d6eab82fc568f16aa8a33.tar.gz | |
ICMPv6: Update the output to show a RPL DAO field name
(cherry picked from commit ca513b2d06ad2db95ab4041cecb4702edc27c0df)
| -rw-r--r-- | print-icmp6.c | 2 | ||||
| -rw-r--r-- | tests/rpl-14-daovvv.out | 2 | ||||
| -rw-r--r-- | tests/rpl-19-pickdag.out | 2 | ||||
| -rw-r--r-- | tests/rpl-19-pickdagvvv.out | 2 | ||||
| -rw-r--r-- | tests/rpl-dao-oobr.out | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/print-icmp6.c b/print-icmp6.c index 47690f5a..f134186c 100644 --- a/print-icmp6.c +++ b/print-icmp6.c @@ -885,7 +885,7 @@ rpl_dao_print(netdissect_options *ndo, length -= DAGID_LEN; } - ND_PRINT(" [dagid:%s,seq:%u,instance:%u%s%s,%02x]", + ND_PRINT(" [dagid:%s,seq:%u,instance:%u%s%s,flags:%02x]", dagid_str, GET_U_1(dao->rpl_daoseq), GET_U_1(dao->rpl_instanceid), diff --git a/tests/rpl-14-daovvv.out b/tests/rpl-14-daovvv.out index 3ab7bda0..4a9d7fac 100644 --- a/tests/rpl-14-daovvv.out +++ b/tests/rpl-14-daovvv.out @@ -1 +1 @@ - 1 16:04:20.568260 IP6 (hlim 64, next-header ICMPv6 (58) payload length: 24) fe80::216:3eff:fe11:3424 > ff02::1: [icmp6 sum ok] ICMP6, RPL, (CLR)Destination Advertisement Object [dagid:7061:6e64:6f72:6120:6973:2066:756e:a6c,seq:1,instance:1,Dagid,40] + 1 16:04:20.568260 IP6 (hlim 64, next-header ICMPv6 (58) payload length: 24) fe80::216:3eff:fe11:3424 > ff02::1: [icmp6 sum ok] ICMP6, RPL, (CLR)Destination Advertisement Object [dagid:7061:6e64:6f72:6120:6973:2066:756e:a6c,seq:1,instance:1,Dagid,flags:40] diff --git a/tests/rpl-19-pickdag.out b/tests/rpl-19-pickdag.out index f1d70149..5afbb8c4 100644 --- a/tests/rpl-19-pickdag.out +++ b/tests/rpl-19-pickdag.out @@ -1 +1 @@ - 1 03:38:11.851768 IP6 (hlim 64, next-header ICMPv6 (58) payload length: 56) fe80::216:3eff:fe11:3424 > fe80::216:3eff:fe11:3424: [icmp6 sum ok] ICMP6, RPL, (CLR)Destination Advertisement Object [dagid:5431::,seq:10,instance:42,Dagid,40] opt:rpltarget len:25 opt:pad1 opt:pad1 opt:pad1 opt:pad1 opt:pad1 opt:pad1 opt:pad1 + 1 03:38:11.851768 IP6 (hlim 64, next-header ICMPv6 (58) payload length: 56) fe80::216:3eff:fe11:3424 > fe80::216:3eff:fe11:3424: [icmp6 sum ok] ICMP6, RPL, (CLR)Destination Advertisement Object [dagid:5431::,seq:10,instance:42,Dagid,flags:40] opt:rpltarget len:25 opt:pad1 opt:pad1 opt:pad1 opt:pad1 opt:pad1 opt:pad1 opt:pad1 diff --git a/tests/rpl-19-pickdagvvv.out b/tests/rpl-19-pickdagvvv.out index e42a36ef..41a1ba32 100644 --- a/tests/rpl-19-pickdagvvv.out +++ b/tests/rpl-19-pickdagvvv.out @@ -1 +1 @@ - 1 03:38:11.851768 IP6 (hlim 64, next-header ICMPv6 (58) payload length: 56) fe80::216:3eff:fe11:3424 > fe80::216:3eff:fe11:3424: [icmp6 sum ok] ICMP6, RPL, (CLR)Destination Advertisement Object [dagid:5431::,seq:10,instance:42,Dagid,40] opt:rpltarget len:25 0x0000: 0080 2001 0db8 0001 0000 0216 3eff fe11 0x0010: 3424 0000 0000 00 opt:pad1 opt:pad1 opt:pad1 opt:pad1 opt:pad1 opt:pad1 opt:pad1 + 1 03:38:11.851768 IP6 (hlim 64, next-header ICMPv6 (58) payload length: 56) fe80::216:3eff:fe11:3424 > fe80::216:3eff:fe11:3424: [icmp6 sum ok] ICMP6, RPL, (CLR)Destination Advertisement Object [dagid:5431::,seq:10,instance:42,Dagid,flags:40] opt:rpltarget len:25 0x0000: 0080 2001 0db8 0001 0000 0216 3eff fe11 0x0010: 3424 0000 0000 00 opt:pad1 opt:pad1 opt:pad1 opt:pad1 opt:pad1 opt:pad1 opt:pad1 diff --git a/tests/rpl-dao-oobr.out b/tests/rpl-dao-oobr.out index c123a6db..232ee772 100644 --- a/tests/rpl-dao-oobr.out +++ b/tests/rpl-dao-oobr.out @@ -1 +1 @@ - 1 00:04:16.851768 IP6 (hlim 64, next-header ICMPv6 (58) payload length: 56) fe80::216:3eff:fe11:3424 > fe80::216:3eff:fe11:3424: ICMP6, RPL, (CLR)Destination Advertisement Object [dagid:<elided>,seq:0,instance:42,00] opt:subopt:13 len:2 opt:subopt:128 len:15 opt:subopt:13 len:15 [|icmp6] + 1 00:04:16.851768 IP6 (hlim 64, next-header ICMPv6 (58) payload length: 56) fe80::216:3eff:fe11:3424 > fe80::216:3eff:fe11:3424: ICMP6, RPL, (CLR)Destination Advertisement Object [dagid:<elided>,seq:0,instance:42,flags:00] opt:subopt:13 len:2 opt:subopt:128 len:15 opt:subopt:13 len:15 [|icmp6] |