diff options
| author | Guy Harris <guy@alum.mit.edu> | 2017-01-09 22:18:49 -0800 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2017-01-10 06:19:37 +0000 |
| commit | 7cd6906056922e4b8f68f1216d94eaa0809896fe (patch) | |
| tree | 5a8c793f188ddda7f36a50369d00ff0de8f563e5 /epan/dissectors/packet-eth.c | |
| parent | 2a3b2360e15d49defde55240a5c1e171c7cade89 (diff) | |
Rename tvb_new_subset() to tvb_new_subset_length_caplen().
This emphasizes that there is no such thing as *the* routine to
construct a subset tvbuff; you need to choose one of
tvb_new_subset_remaining() (if you want a new tvbuff that contains
everything past a certain point in an existing tvbuff),
tvb_new_subset_length() (if you want a subset that contains everything
past a certain point, for some number of bytes, in an existing tvbuff),
and tvb_new_subset_length_caplen() (for all other cases).
Many of the calls to tvb_new_subset_length_caplen() should really be
calling one of the other routines; that's the next step. (This also
makes it easier to find the calls that need fixing.)
Change-Id: Ieb3d676d8cda535451c119487d7cd3b559221f2b
Reviewed-on: https://code.wireshark.org/review/19597
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'epan/dissectors/packet-eth.c')
| -rw-r--r-- | epan/dissectors/packet-eth.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/epan/dissectors/packet-eth.c b/epan/dissectors/packet-eth.c index a0b8b1a15d..1159e2289a 100644 --- a/epan/dissectors/packet-eth.c +++ b/epan/dissectors/packet-eth.c @@ -721,7 +721,7 @@ add_ethernet_trailer(packet_info *pinfo, proto_tree *tree, proto_tree *fh_tree, /* Create a new tvb without the padding and/or the (assumed) fcs */ if (fcs_len==4) - real_trailer_tvb = tvb_new_subset(trailer_tvb, padding_length, + real_trailer_tvb = tvb_new_subset_length_caplen(trailer_tvb, padding_length, trailer_length, trailer_reported_length); else real_trailer_tvb = tvb_new_subset_remaining(trailer_tvb, padding_length); @@ -788,7 +788,7 @@ dissect_eth(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) total_trailer_length = eth_trailer_length + (eth_assume_fcs ? 4 : 0); /* Dissect the tvb up to, but not including the trailer */ - next_tvb = tvb_new_subset(tvb, 0, + next_tvb = tvb_new_subset_length_caplen(tvb, 0, tvb_captured_length(tvb) - total_trailer_length, tvb_reported_length(tvb) - total_trailer_length); fh_tree = dissect_eth_common(next_tvb, pinfo, tree, 0); |