diff options
author | Guy Harris <guy@alum.mit.edu> | 2013-02-19 23:17:07 +0000 |
---|---|---|
committer | Guy Harris <guy@alum.mit.edu> | 2013-02-19 23:17:07 +0000 |
commit | 29715ccc8f78d9a2f791437f49d6718615795c15 (patch) | |
tree | 36c72f6cae5e8e8ed09086eef9249eac9a65ca04 /epan/dissectors/packet-netanalyzer.c | |
parent | 5a5d872639a9e20893f82079af06f4caec980277 (diff) |
How can I get a new tvbuff that starts at an offset within a given
tvbuff and runs to the end of the tvbuff? Let me count the ways....
Replace a bunch of different ways of doing that (some incorrect, in that
they're not properly handling tvbuffs where the captured and reported
lengths are different) with tvb_new_subset_remaining().
svn path=/trunk/; revision=47751
Diffstat (limited to 'epan/dissectors/packet-netanalyzer.c')
-rw-r--r-- | epan/dissectors/packet-netanalyzer.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/epan/dissectors/packet-netanalyzer.c b/epan/dissectors/packet-netanalyzer.c index 600fb9710c..544230a8aa 100644 --- a/epan/dissectors/packet-netanalyzer.c +++ b/epan/dissectors/packet-netanalyzer.c @@ -315,7 +315,7 @@ dissect_netanalyzer(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (dissect_netanalyzer_common(tvb, pinfo, tree)) { /* hand off to eth dissector with the new tvb subset */ - next_tvb = tvb_new_subset(tvb, 4, tvb_length(tvb)-4, tvb_reported_length(tvb)-4); + next_tvb = tvb_new_subset_remaining(tvb, 4); call_dissector(eth_dissector_handle, next_tvb, pinfo, tree); } } @@ -350,7 +350,7 @@ dissect_netanalyzer_transparent(tvbuff_t *tvb, packet_info *pinfo, proto_tree *t * use data dissector instead */ ti = proto_tree_add_text(tree, tvb, 4, tvb_length(tvb)-4, "Raw packet data"); transparent_payload_tree = proto_item_add_subtree(ti, ett_netanalyzer_transparent); - next_tvb = tvb_new_subset(tvb, 4, tvb_length(tvb)-4, tvb_reported_length(tvb)-4); + next_tvb = tvb_new_subset_remaining(tvb, 4); call_dissector(data_dissector_handle, next_tvb, pinfo, transparent_payload_tree); col_set_str(pinfo->cinfo, COL_PROTOCOL, "netANALYZER"); |