diff options
| author | Michael Mann <mmann78@netscape.net> | 2014-06-01 14:38:24 -0400 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2014-06-03 12:39:16 +0000 |
| commit | 3d03216edaf99b5770e2dfc5e818346125074b58 (patch) | |
| tree | c5b6de268e8ea7cde1ae144765af36818c128e3b /epan/dissectors/packet-bzr.c | |
| parent | de9efa1cb91afddb70d1b56a2574fb0def628bd3 (diff) | |
packet-bencode: proto_tree_add_text -> somthing filterable
Also, cleanup dissector being called only with tree and a few tvb_new_subset calls.
Change-Id: I1dab1b42ef1a27fc85b05d126f51f1582d7e5c58
Reviewed-on: https://code.wireshark.org/review/1932
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan/dissectors/packet-bzr.c')
| -rw-r--r-- | epan/dissectors/packet-bzr.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/epan/dissectors/packet-bzr.c b/epan/dissectors/packet-bzr.c index 53ca9c3ea8..80a802fce3 100644 --- a/epan/dissectors/packet-bzr.c +++ b/epan/dissectors/packet-bzr.c @@ -128,6 +128,7 @@ dissect_prefixed_bencode(tvbuff_t *tvb, gint offset, packet_info *pinfo, guint32 plen; proto_tree *prefixed_bencode_tree; proto_item *ti; + tvbuff_t *subtvb; plen = tvb_get_ntohl(tvb, offset); @@ -135,15 +136,11 @@ dissect_prefixed_bencode(tvbuff_t *tvb, gint offset, packet_info *pinfo, plen, ENC_NA); prefixed_bencode_tree = proto_item_add_subtree(ti, ett_prefixed_bencode); - if (prefixed_bencode_tree) - { - tvbuff_t *subtvb; - proto_tree_add_item(prefixed_bencode_tree, hf_bzr_prefixed_bencode_len, + proto_tree_add_item(prefixed_bencode_tree, hf_bzr_prefixed_bencode_len, tvb, offset, 4, ENC_BIG_ENDIAN); - subtvb = tvb_new_subset(tvb, offset+4, plen, plen); - call_dissector(bencode_handle, subtvb, pinfo, prefixed_bencode_tree); - } + subtvb = tvb_new_subset_length(tvb, offset+4, plen); + call_dissector(bencode_handle, subtvb, pinfo, prefixed_bencode_tree); return 4 + plen; } |