From: Michael Richardson <mcr@sandelman.ca>
Date: Sun, 5 Jan 2014 16:59:29 +0000 (-0500)
Subject: RPL: print DAO flags (acK, DagID)
X-Git-Tag: tcpdump-4.6.0~2
X-Git-Url: https://git.tcpdump.org/tcpdump/commitdiff_plain/817ec9f27e76dfe679d40ea4712bfb12ce6e4adf

RPL: print DAO flags (acK, DagID)
remove DAO messages from DIO test data
---

diff --git a/print-icmp6.c b/print-icmp6.c
index cb7e5279..553bb46e 100644
--- a/print-icmp6.c
+++ b/print-icmp6.c
@@ -759,10 +759,13 @@ rpl_dao_print(netdissect_options *ndo,
                 length -= DAGID_LEN;
         }
 
-        ND_PRINT((ndo, " [dagid:%s,seq:%u,instance:%u]",
+        ND_PRINT((ndo, " [dagid:%s,seq:%u,instance:%u%s%s,%02x]",
                   dagid_str,
                   dao->rpl_daoseq,
-                  dao->rpl_instanceid));
+                  dao->rpl_instanceid,
+                  RPL_DAO_K(dao->rpl_flags) ? ",acK":"",
+                  RPL_DAO_D(dao->rpl_flags) ? ",Dagid":"",
+                  dao->rpl_flags));
 
         if(ndo->ndo_vflag > 1) {
                 const struct rpl_dio_genoption *opt = (struct rpl_dio_genoption *)bp;
diff --git a/tests/TESTLIST b/tests/TESTLIST
index 7eb7627f..3cdc7caa 100644
--- a/tests/TESTLIST
+++ b/tests/TESTLIST
@@ -58,7 +58,6 @@ ikev2fourv4	ikev2four.pcap		ikev2fourv4.out	-t -v -v -v -v
 # ikev2pI2 test in crypto.sh
 
 # IETF ROLL RPL packets
-dio01           rpl-dio.pcap                rpl-dio.out         -t -v
 dio02           rpl-19-pickdag.pcap         rpl-19-pickdag.out  -t -v -v
 dio03           rpl-19-pickdag.pcap         rpl-19-pickdagvvv.out  -t -v -v -v
 dao01           rpl-14-dao.pcap             rpl-14-daovvv.out    -t -v -v -v
diff --git a/tests/rpl-14-daovvv.out b/tests/rpl-14-daovvv.out
index 8144aafb..bca04262 100644
--- a/tests/rpl-14-daovvv.out
+++ b/tests/rpl-14-daovvv.out
@@ -1 +1 @@
-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:pandora is fun0x0,seq:1,instance:1]
+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:pandora is fun0x0,seq:1,instance:1,Dagid,40]
diff --git a/tests/rpl-19-pickdag.out b/tests/rpl-19-pickdag.out
index fb29b887..e4aad231 100644
--- a/tests/rpl-19-pickdag.out
+++ b/tests/rpl-19-pickdag.out
@@ -1,2 +1 @@
-IP6 (hlim 64, next-header ICMPv6 (58) payload length: 48) fe80::216:3eff:fe11:3424 > ff02::1: [icmp6 sum ok] ICMP6, RPL, (CLR)DODAG Information Object [dagid:T10x0,seq:10,instance:42,rank:3,grounded,mop:storing,prf:0] opt:destprefix len:15  opt:pad0 opt:pad0 opt:pad0 opt:pad0 opt:pad0
-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:T10x0,seq:10,instance:42] opt:rpltarget len:25  opt:pad0 opt:pad0 opt:pad0 opt:pad0 opt:pad0 opt:pad0 opt:pad0
+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:T10x0,seq:10,instance:42,Dagid,40] opt:rpltarget len:25  opt:pad0 opt:pad0 opt:pad0 opt:pad0 opt:pad0 opt:pad0 opt:pad0
diff --git a/tests/rpl-19-pickdag.pcap b/tests/rpl-19-pickdag.pcap
index 97c0e0bc..3eca6c99 100644
Binary files a/tests/rpl-19-pickdag.pcap and b/tests/rpl-19-pickdag.pcap differ
diff --git a/tests/rpl-19-pickdagvvv.out b/tests/rpl-19-pickdagvvv.out
index 3616cc96..c7dc6b5e 100644
--- a/tests/rpl-19-pickdagvvv.out
+++ b/tests/rpl-19-pickdagvvv.out
@@ -1,2 +1 @@
-IP6 (hlim 64, next-header ICMPv6 (58) payload length: 48) fe80::216:3eff:fe11:3424 > ff02::1: [icmp6 sum ok] ICMP6, RPL, (CLR)DODAG Information Object [dagid:T10x0,seq:10,instance:42,rank:3,grounded,mop:storing,prf:0] opt:destprefix len:15  0x0000:  3000 0000 0000 2001 0db8 0001 00 opt:pad0 opt:pad0 opt:pad0 opt:pad0 opt:pad0
-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:T10x0,seq:10,instance:42] opt:rpltarget len:25  0x0000:  0080 2001 0db8 0001 0000 0216 3eff fe11 0x0010:  3424 0000 0000 00 opt:pad0 opt:pad0 opt:pad0 opt:pad0 opt:pad0 opt:pad0 opt:pad0
+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:T10x0,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:pad0 opt:pad0 opt:pad0 opt:pad0 opt:pad0 opt:pad0 opt:pad0
diff --git a/tests/rpl-dio.out b/tests/rpl-dio.out
deleted file mode 100644
index 02912af6..00000000
--- a/tests/rpl-dio.out
+++ /dev/null
@@ -1 +0,0 @@
-IP6 (hlim 255, next-header ICMPv6 (58) payload length: 24) fe80::1000:ff:fe64:6423 > ff02::1: [icmp6 sum ok] ICMP6, RPL, (CLR)Destination Advertisement Object [dagid:<elided>,seq:1,instance:0]
diff --git a/tests/rpl-dio.pcap b/tests/rpl-dio.pcap
deleted file mode 100644
index 81706352..00000000
Binary files a/tests/rpl-dio.pcap and /dev/null differ