From: Michael Richardson <mcr@sandelman.ca>
Date: Sun, 5 Jan 2014 04:31:47 +0000 (-0500)
Subject: added test case for a DAO-ACK with no options
X-Git-Tag: tcpdump-4.6.0~300
X-Git-Url: https://git.tcpdump.org/tcpdump/commitdiff_plain/defc20085e3edd1dbccbc8bc81bf21b08bea36f5

added test case for a DAO-ACK with no options
---

diff --git a/print-icmp6.c b/print-icmp6.c
index c4f99878..6047ab65 100644
--- a/print-icmp6.c
+++ b/print-icmp6.c
@@ -673,6 +673,8 @@ rpl_dio_printopt(netdissect_options *ndo,
                  u_int length)
 {
         length -= sizeof(struct rpl_dio_genoption);
+        if(length == 0) return;
+
         ND_TCHECK(opt->rpl_dio_len);
 
         while((opt->rpl_dio_type == RPL_OPT_PAD0 &&
diff --git a/tests/26-senddaoack.pcap b/tests/26-senddaoack.pcap
new file mode 100644
index 00000000..fd397a43
Binary files /dev/null and b/tests/26-senddaoack.pcap differ
diff --git a/tests/26-senddaovv.out b/tests/26-senddaovv.out
new file mode 100644
index 00000000..258fa2ab
--- /dev/null
+++ b/tests/26-senddaovv.out
@@ -0,0 +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 Ack [dagid:thisismydicedag2,seq:11,instance:43,status:0] [|truncated]
diff --git a/tests/TESTLIST b/tests/TESTLIST
index 670ea8b7..d5d4ef23 100644
--- a/tests/TESTLIST
+++ b/tests/TESTLIST
@@ -58,6 +58,7 @@ ikev2pI2	ikev2pI2.pcap		ikev2pI2.out	-t -E "file ikev2pI2-secrets.txt" -v -v -v
 dio01           dio.pcap                dio.out         -t -v
 dio02           19-pickdag.pcap         19-pickdag.out  -t -v -v
 dio03           19-pickdag.pcap         19-pickdagvvv.out  -t -v -v -v
+daoack01        26-senddaoack.pcap      26-senddaovv.out -t -v -v -v
 
 # IPNET encapsulated site
 e1000g		e1000g.pcap		e1000g.out	-t