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

[MIP6] Update to handling of 

Mobility Header Link-Layer Address (MH-LLA) Option
to RFC 5268 e.g no special handling of length.
Bug:10043

Change-Id: Id32789fa5e34766c5734b0be13af015473ac257c
Reviewed-on: https://code.wireshark.org/review/6372
Reviewed-by: Anders Broman <a.broman58@gmail.com>
This commit is contained in:
AndersBroman 2015-01-07 17:34:33 +01:00 committed by Anders Broman
parent a479d9a262
commit 667897c98a
1 changed files with 3 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
epan/dissectors/packet-mip6.c
View File

@ -3763,26 +3763,12 @@ dissect_mipv6_options(tvbuff_t *tvb, int offset, guint length,
} else {
if (dissect != NULL) {
/* Option has a dissector. */
if (opt == MIP6_MHLLA)
(*dissect)(optp, tvb, offset,
len + 2 + FMIP6_LLA_OPTCODE_LEN, pinfo, opt_data_tree, ti);
else
(*dissect)(optp, tvb, offset, len + 2, pinfo, opt_data_tree, ti);
(*dissect)(optp, tvb, offset, len + 2, pinfo, opt_data_tree, ti);
}
}
/* RFC4068 Section 6.4.4
* Length The size of this option in octets not including the
* Type, Length, and Option-Code fields.
*/
if (opt == MIP6_MHLLA)
offset += len + 2 + FMIP6_LLA_OPTCODE_LEN;
else
offset += len + 2;
offset += len + 2;
}
if (opt == MIP6_MHLLA)
length -= (len + FMIP6_LLA_OPTCODE_LEN);
else
length -= len;
length -= len;
} else {
proto_tree_add_text(opt_tree, tvb, offset, 1, "%s", name);
offset += 1;