From defc20085e3edd1dbccbc8bc81bf21b08bea36f5 Mon Sep 17 00:00:00 2001 From: Michael Richardson Date: Sat, 4 Jan 2014 23:31:47 -0500 Subject: [PATCH] added test case for a DAO-ACK with no options --- print-icmp6.c | 2 ++ tests/26-senddaoack.pcap | Bin 0 -> 118 bytes tests/26-senddaovv.out | 1 + tests/TESTLIST | 1 + 4 files changed, 4 insertions(+) create mode 100644 tests/26-senddaoack.pcap create mode 100644 tests/26-senddaovv.out 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 0000000000000000000000000000000000000000..fd397a4340dfabcec48a6e8d8d90c0eced2caa19 GIT binary patch literal 118 zcmca|c+)~A1{MYw`2U}Qff2}Qy>lYy9}5eEACL{gOeSF!v-U8ZUfG`N+;%qsD8e9N xuTi!+OJD^oI)Q&SStjR5Is9svLV literal 0 HcmV?d00001 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 -- 2.39.5