diff options
| author | Dario Lombardo <lomato@gmail.com> | 2014-06-17 17:45:00 +0200 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2014-06-18 14:14:58 +0000 |
| commit | 246fe2ca4c67d8c98caa84e2f57694f6322e2f96 (patch) | |
| tree | 5f8651517a3423cce11c50e18371d8a73c3c7665 /epan/dissectors/packet-wccp.c | |
| parent | 971ffd683ea23362bd8009567ff7860371e6e2cc (diff) | |
| download | wireshark-246fe2ca4c67d8c98caa84e2f57694f6322e2f96.tar.gz | |
Fixup: tvb_* -> tvb_captured
Change-Id: I9209c1271967405c34c1b6fa43e1726a4d3a5a3f
Reviewed-on: https://code.wireshark.org/review/2377
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'epan/dissectors/packet-wccp.c')
| -rw-r--r-- | epan/dissectors/packet-wccp.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/epan/dissectors/packet-wccp.c b/epan/dissectors/packet-wccp.c index 07e8fed675..1d0feded2c 100644 --- a/epan/dissectors/packet-wccp.c +++ b/epan/dissectors/packet-wccp.c @@ -523,7 +523,7 @@ find_wccp_address_table(tvbuff_t *tvb, int offset, guint16 length, type = tvb_get_ntohs(tvb, offset); item_length = tvb_get_ntohs(tvb, offset+2); - if (item_length > tvb_length_remaining(tvb, offset)) + if (item_length > tvb_captured_length_remaining(tvb, offset)) return; if (type == WCCP2r1_ADDRESS_TABLE) @@ -764,7 +764,7 @@ dissect_wccp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_ break; } - return tvb_length(tvb); + return tvb_captured_length(tvb); } static guint @@ -921,12 +921,12 @@ dissect_wccp2_info(tvbuff_t *tvb, int offset, guint16 length, item_length = tvb_get_ntohs(tvb, offset+2); - if (item_length > tvb_length_remaining(tvb, offset)) { + if (item_length > tvb_captured_length_remaining(tvb, offset)) { tf = proto_tree_add_text(wccp_tree, tvb, offset, length, "Excessive WCCP Length values"); expert_add_info_format(pinfo, tf, &ei_wccp_length_bad, "The length of the item is %d but there are only %d bytes remaining in the packet, I counted %d remaining", - item_length, tvb_length_remaining(tvb, offset), length); + item_length, tvb_captured_length_remaining(tvb, offset), length); break; } switch (type) { |