osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

From Roy Marples: 

ICMPv6 DNSSL option can contain padding, which does not represent a malformed option.

svn path=/trunk/; revision=40159
This commit is contained in:
Jaap Keuter 2011-12-12 08:18:18 +00:00
parent 10ca01fb1b
commit b6872d0a3b
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
epan/dissectors/packet-icmpv6.c
View File

@ -1976,7 +1976,11 @@ dissect_icmpv6_nd_opt(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree
opt_offset += 4;
while(opt_offset < (offset + opt_len) ) {
if(tvb_get_guint8(tvb, opt_offset) == 0){ /* if Zero there is padding, skip the loop */
if(tvb_get_guint8(tvb, opt_offset) == 0){
/* Padding... */
int padd_length = (offset + opt_len) - opt_offset;
proto_tree_add_item(icmp6opt_tree, hf_icmpv6_opt_padding, tvb, opt_offset, padd_length, FALSE);
opt_offset += padd_length;
break;
}
dnssl_len = get_dns_name(tvb, opt_offset, 0, opt_offset, &dnssl_name);