Always create a subtree for Mobility options, even if it doesn't have a specific dissection function.

Bug: 10618
Change-Id: Ic4d52485a6bd96f906b4a0d61b75a31bfad4e8f8
Reviewed-on: https://code.wireshark.org/review/5276
Reviewed-by: Michael Mann <mmann78@netscape.net>
This commit is contained in:
Michael Mann 2014-11-13 22:38:54 -05:00
parent c2e090f2cf
commit 4a7dd62012
1 changed files with 4 additions and 0 deletions

View File

@ -1176,6 +1176,7 @@ static gint ett_mip6_opt_em = -1;
static gint ett_mip6_opt_vsm = -1;
static gint ett_mip6_opt_ssm = -1;
static gint ett_mip6_opt_badff = -1;
static gint ett_mip6_opt_unknown = -1;
static gint ett_pmip6_opt_hnp = -1;
static gint ett_pmip6_opt_hi = -1;
static gint ett_pmip6_opt_att = -1;
@ -3666,6 +3667,8 @@ dissect_mipv6_options(tvbuff_t *tvb, int offset, guint length,
val_to_str_ext_const(opt, &mip6_mobility_options_ext, "<unknown>"));
if (optp && *optp->subtree_index) {
opt_data_tree = proto_item_add_subtree(ti, *optp->subtree_index);
} else {
opt_data_tree = proto_item_add_subtree(ti, ett_mip6_opt_unknown);
}
proto_tree_add_item(opt_data_tree, hf_mip6_mobility_opt, tvb, offset, 1, ENC_BIG_ENDIAN);
if (optp == NULL) {
@ -4831,6 +4834,7 @@ proto_register_mip6(void)
&ett_mip6_opt_vsm,
&ett_mip6_opt_ssm,
&ett_mip6_opt_badff,
&ett_mip6_opt_unknown,
&ett_pmip6_opt_hnp,
&ett_pmip6_opt_hi,
&ett_pmip6_opt_att,