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-ppp.c | |
| parent | 2a3b2360e15d49defde55240a5c1e171c7cade89 (diff) | |
| download | wireshark-7cd6906056922e4b8f68f1216d94eaa0809896fe.tar.gz | |
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-ppp.c')
| -rw-r--r-- | epan/dissectors/packet-ppp.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/epan/dissectors/packet-ppp.c b/epan/dissectors/packet-ppp.c index 318415cbb8..b542c7a686 100644 --- a/epan/dissectors/packet-ppp.c +++ b/epan/dissectors/packet-ppp.c @@ -1910,7 +1910,7 @@ decode_fcs(tvbuff_t *tvb, packet_info *pinfo, proto_tree *fh_tree, int fcs_decod reported_len -= 2; if (len > reported_len) len = reported_len; - next_tvb = tvb_new_subset(tvb, proto_offset, len, reported_len); + next_tvb = tvb_new_subset_length_caplen(tvb, proto_offset, len, reported_len); } else { /* * We have the entire packet, and it includes a 2-byte FCS. @@ -1918,7 +1918,7 @@ decode_fcs(tvbuff_t *tvb, packet_info *pinfo, proto_tree *fh_tree, int fcs_decod */ len -= 2; reported_len -= 2; - next_tvb = tvb_new_subset(tvb, proto_offset, len, reported_len); + next_tvb = tvb_new_subset_length_caplen(tvb, proto_offset, len, reported_len); /* * Compute the FCS and put it into the tree. @@ -1952,7 +1952,7 @@ decode_fcs(tvbuff_t *tvb, packet_info *pinfo, proto_tree *fh_tree, int fcs_decod reported_len -= 4; if (len > reported_len) len = reported_len; - next_tvb = tvb_new_subset(tvb, proto_offset, len, reported_len); + next_tvb = tvb_new_subset_length_caplen(tvb, proto_offset, len, reported_len); } else { /* * We have the entire packet, and it includes a 4-byte FCS. @@ -1960,7 +1960,7 @@ decode_fcs(tvbuff_t *tvb, packet_info *pinfo, proto_tree *fh_tree, int fcs_decod */ len -= 4; reported_len -= 4; - next_tvb = tvb_new_subset(tvb, proto_offset, len, reported_len); + next_tvb = tvb_new_subset_length_caplen(tvb, proto_offset, len, reported_len); /* * Compute the FCS and put it into the tree. @@ -4574,7 +4574,7 @@ dissect_bcp_bpdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data reported_length -= pad_length; if (captured_length > reported_length) captured_length = reported_length; - next_tvb = tvb_new_subset(tvb, offset, captured_length, + next_tvb = tvb_new_subset_length_caplen(tvb, offset, captured_length, reported_length); switch (mac_type) { |