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 /plugins/docsis | |
| 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 'plugins/docsis')
| -rw-r--r-- | plugins/docsis/packet-docsis.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/plugins/docsis/packet-docsis.c b/plugins/docsis/packet-docsis.c index e8bfd9d067..01f44c384b 100644 --- a/plugins/docsis/packet-docsis.c +++ b/plugins/docsis/packet-docsis.c @@ -778,7 +778,7 @@ dissect_docsis (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree, void* da call_dissector (eth_withoutfcs_handle, next_tvb, pinfo, docsis_tree); } else { /* Otherwise treat as Data */ - tvbuff_t *payload_tvb = tvb_new_subset(tvb, hdrlen, (len_sid - 4), -1); + tvbuff_t *payload_tvb = tvb_new_subset_length_caplen(tvb, hdrlen, (len_sid - 4), -1); call_data_dissector(payload_tvb, pinfo, docsis_tree); } } else { @@ -832,7 +832,7 @@ dissect_docsis (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree, void* da * docsis frames are dissected. */ while (concatlen > 0) { - next_tvb = tvb_new_subset (tvb, concatpos, -1, concatlen); + next_tvb = tvb_new_subset_length_caplen (tvb, concatpos, -1, concatlen); call_dissector (docsis_handle, next_tvb, pinfo, docsis_tree); } concatlen = 0; |