added test case for a DAO-ACK with no options

diff --git a/print-icmp6.c b/print-icmp6.c
index c4f99878d6bbc00578587effc7ba033cab83c313..6047ab659bc58ae93157919ce9aca2a1d42c3c4c 100644 (file)
--- 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);
                  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 &&
         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 (file)
index 0000000..fd397a4
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 (file)
index 0000000..258fa2a
--- /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 670ea8b701f6197784085a150c2223c3be0a0aa8..d5d4ef238bd0e4fc8418cdbad42f5449cf5459a5 100644 (file)
--- 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
 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
 
 # IPNET encapsulated site
 e1000g         e1000g.pcap             e1000g.out      -t