diff options
| author | Alexis La Goutte <alexis.lagoutte@gmail.com> | 2015-12-06 19:57:50 +0100 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2015-12-07 01:19:12 +0000 |
| commit | 0d2fce11894f9e91959341ad9ee38bf9da296547 (patch) | |
| tree | 9ec1e3f2ffe5a1848a848976afe199da7a88a36b /epan/dissectors/packet-mip6.c | |
| parent | f520f82750d189476fe4c2bf95c58d12640e5068 (diff) | |
MIP6: Don't no need to have a another subtree (with wrong lenght for LLA
Bug: 10627
Change-Id: Ia6940ef7624a92d453cada6693bcd7f4e145a5b6
Reviewed-on: https://code.wireshark.org/review/12453
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan/dissectors/packet-mip6.c')
| -rw-r--r-- | epan/dissectors/packet-mip6.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/epan/dissectors/packet-mip6.c b/epan/dissectors/packet-mip6.c index 9331b9ced8..70f68fe48d 100644 --- a/epan/dissectors/packet-mip6.c +++ b/epan/dissectors/packet-mip6.c @@ -2092,20 +2092,17 @@ dissect_fmip6_opt_lla(const mip6_opt *optp _U_, tvbuff_t *tvb, int offset, guint optlen, packet_info *pinfo _U_, proto_tree *opt_tree, proto_item *hdr_item _U_ ) { - proto_tree *field_tree; int len; - field_tree = proto_tree_add_subtree(opt_tree, tvb, offset, optlen, *optp->subtree_index, NULL, optp->name); - - proto_tree_add_item(field_tree, hf_mip6_opt_len, tvb, offset+1, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(opt_tree, hf_mip6_opt_len, tvb, offset+1, 1, ENC_BIG_ENDIAN); - proto_tree_add_item(field_tree, hf_fmip6_lla_optcode, tvb, + proto_tree_add_item(opt_tree, hf_fmip6_lla_optcode, tvb, offset + FMIP6_LLA_OPTCODE_OFF, FMIP6_LLA_OPTCODE_LEN, ENC_BIG_ENDIAN); len = optlen - FMIP6_LLA_LLA_OFF; if (len > 0) { - proto_tree_add_item(field_tree, hf_fmip6_lla, tvb, offset + FMIP6_LLA_LLA_OFF, len, ENC_NA); + proto_tree_add_item(opt_tree, hf_fmip6_lla, tvb, offset + FMIP6_LLA_LLA_OFF, len, ENC_NA); } } |