diff options
| author | Michael Mann <mmann78@netscape.net> | 2014-07-01 18:31:05 -0400 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2014-07-04 16:59:14 +0000 |
| commit | c7a6e6fa130611941a5d05e7646d7c38d78b2d0a (patch) | |
| tree | 435964d38acd7196e6d6aa58be80e44634ebfa9c /epan/dissectors/packet-mip.c | |
| parent | 93517043e96c26a1d3dad49c2f57b345e3bbbba0 (diff) | |
convert to proto_tree_add_subtree[_format]
Change-Id: I621f2e2cad9403449cb78f45302388f0c874d3bc
Reviewed-on: https://code.wireshark.org/review/2852
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan/dissectors/packet-mip.c')
| -rw-r--r-- | epan/dissectors/packet-mip.c | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/epan/dissectors/packet-mip.c b/epan/dissectors/packet-mip.c index 8939a25f0c..98ba689845 100644 --- a/epan/dissectors/packet-mip.c +++ b/epan/dissectors/packet-mip.c @@ -498,12 +498,10 @@ dissect_mip_priv_ext_3gpp2(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tr static void dissect_mip_extensions( tvbuff_t *tvb, int offset, proto_tree *tree, packet_info *pinfo) { - proto_item *ti; proto_tree *exts_tree=NULL; proto_tree *ext_tree; proto_tree *tf; proto_tree *ext_flags_tree; - proto_tree *tp; proto_tree *pmipv4_tree; gint ext_len; guint8 ext_type; @@ -520,8 +518,7 @@ dissect_mip_extensions( tvbuff_t *tvb, int offset, proto_tree *tree, packet_info if (!tree) return; /* Add our tree, if we have extensions */ - ti = proto_tree_add_text(tree, tvb, offset, -1, "Extensions"); - exts_tree = proto_item_add_subtree(ti, ett_mip_exts); + exts_tree = proto_tree_add_subtree(tree, tvb, offset, -1, ett_mip_exts, NULL, "Extensions"); /* And, handle each extension */ while (tvb_reported_length_remaining(tvb, offset) > 0) { @@ -550,11 +547,10 @@ dissect_mip_extensions( tvbuff_t *tvb, int offset, proto_tree *tree, packet_info hdrLen = 2; } - ti = proto_tree_add_text(exts_tree, tvb, offset, ext_len + hdrLen, - "Extension: %s", + ext_tree = proto_tree_add_subtree_format(exts_tree, tvb, offset, ext_len + hdrLen, + ett_mip_ext, NULL, "Extension: %s", val_to_str(ext_type, mip_ext_types, "Unknown Extension %u")); - ext_tree = proto_item_add_subtree(ti, ett_mip_ext); proto_tree_add_uint(ext_tree, hf_mip_ext_type, tvb, offset, 1, ext_type); offset++; @@ -676,10 +672,9 @@ dissect_mip_extensions( tvbuff_t *tvb, int offset, proto_tree *tree, packet_info case PMIPv4_SKIP_EXT: /* draft-leung-mip4-proxy-mode */ /* sub-type */ ext_subtype = tvb_get_guint8(tvb, offset); - tp = proto_tree_add_text(ext_tree, tvb, offset, ext_len, - "PMIPv4 Sub-Type: %s", + pmipv4_tree = proto_tree_add_subtree_format(ext_tree, tvb, offset, ext_len, + ett_mip_pmipv4_ext, NULL, "PMIPv4 Sub-Type: %s", val_to_str(ext_subtype, mip_pmipv4skipext_stypes, "Unknown Sub-Type %u")); - pmipv4_tree = proto_item_add_subtree(tp, ett_mip_pmipv4_ext); proto_tree_add_uint(pmipv4_tree, hf_mip_pmipv4skipext_stype, tvb, offset, 1, ext_subtype); if (ext_subtype == PMIPv4_SKIPEXT_STYPE_INTERFACE_ID) { |