From 29715ccc8f78d9a2f791437f49d6718615795c15 Mon Sep 17 00:00:00 2001 From: Guy Harris Date: Tue, 19 Feb 2013 23:17:07 +0000 Subject: 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 --- epan/dissectors/packet-ixveriwave.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'epan/dissectors/packet-ixveriwave.c') diff --git a/epan/dissectors/packet-ixveriwave.c b/epan/dissectors/packet-ixveriwave.c index 5f6327fa66..39c0dd0665 100644 --- a/epan/dissectors/packet-ixveriwave.c +++ b/epan/dissectors/packet-ixveriwave.c @@ -694,7 +694,7 @@ ethernettap_dissect(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, proto_t } /* Grab the rest of the frame. */ - next_tvb = tvb_new_subset(tvb, length, -1, -1); + next_tvb = tvb_new_subset_remaining(tvb, length); /* dissect the ethernet header next */ call_dissector(ethernet_handle, next_tvb, pinfo, tree); @@ -945,7 +945,7 @@ wlantap_dissect(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, proto_tree pinfo->pseudo_header->ieee_802_11.fcs_len = 0; /* Grab the rest of the frame. */ - next_tvb = tvb_new_subset(tvb, length, -1, -1); + next_tvb = tvb_new_subset_remaining(tvb, length); #if 0 /* XXX: 'hdr_fcs_ti' is never set so the following code will never be executed ? */ /* If we had an in-header FCS, check it. */ -- cgit v1.2.3