diff options
| author | AndersBroman <anders.broman@ericsson.com> | 2015-01-07 17:34:33 +0100 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2015-01-07 16:39:38 +0000 |
| commit | 667897c98aae109d741966a972db405090d780c9 (patch) | |
| tree | 96b39e4fb4b17dc1867e380ff0069257151d9a49 /epan/dissectors/packet-mip6.c | |
| parent | a479d9a262174c658bb1c58c718cc77456d6d6b5 (diff) | |
[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>
Diffstat (limited to 'epan/dissectors/packet-mip6.c')
| -rw-r--r-- | epan/dissectors/packet-mip6.c | 20 |
1 files changed, 3 insertions, 17 deletions
diff --git a/epan/dissectors/packet-mip6.c b/epan/dissectors/packet-mip6.c index 8d2c7e99dd..4310502ec0 100644 --- a/epan/dissectors/packet-mip6.c +++ b/epan/dissectors/packet-mip6.c @@ -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; |