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-msdp.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-msdp.c')
| -rw-r--r-- | epan/dissectors/packet-msdp.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/epan/dissectors/packet-msdp.c b/epan/dissectors/packet-msdp.c index 66473b65da..13726929e5 100644 --- a/epan/dissectors/packet-msdp.c +++ b/epan/dissectors/packet-msdp.c @@ -260,18 +260,17 @@ static void dissect_msdp_sa(tvbuff_t *tvb, packet_info *pinfo, * This is probably visually better. */ while (entries-- > 0) { - proto_item *ei; proto_tree *entry_tree; if (length < 12) { *offset += length; return; } - ei = proto_tree_add_text(tree, tvb, *offset, 12, "(S,G) block: %s/%u -> %s", + entry_tree = proto_tree_add_subtree_format(tree, tvb, *offset, 12, ett_msdp_sa_entry, NULL, + "(S,G) block: %s/%u -> %s", tvb_ip_to_str(tvb, *offset + 8), tvb_get_guint8(tvb, *offset + 3), tvb_ip_to_str(tvb, *offset + 4)); - entry_tree = proto_item_add_subtree(ei, ett_msdp_sa_entry); proto_tree_add_item(entry_tree, hf_msdp_sa_reserved, tvb, *offset, 3, ENC_BIG_ENDIAN); *offset += 3; @@ -291,15 +290,13 @@ static void dissect_msdp_sa(tvbuff_t *tvb, packet_info *pinfo, * Check if an encapsulated multicast IPv4 packet follows */ if (length > 0) { - proto_item *ei; proto_tree *enc_tree; gint available_length, reported_length; tvbuff_t *next_tvb; - ei = proto_tree_add_text(tree, tvb, *offset, length, - "Encapsulated IPv4 packet: %u bytes", + enc_tree = proto_tree_add_subtree_format(tree, tvb, *offset, length, + ett_msdp_sa_enc_data, NULL, "Encapsulated IPv4 packet: %u bytes", length); - enc_tree = proto_item_add_subtree(ei, ett_msdp_sa_enc_data); available_length = tvb_length_remaining(tvb, *offset); reported_length = tvb_reported_length_remaining(tvb, *offset); |