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-icmp.c | |
| parent | 971ffd683ea23362bd8009567ff7860371e6e2cc (diff) | |
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-icmp.c')
| -rw-r--r-- | epan/dissectors/packet-icmp.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/epan/dissectors/packet-icmp.c b/epan/dissectors/packet-icmp.c index 1f7b8bbc62..2e35380b43 100644 --- a/epan/dissectors/packet-icmp.c +++ b/epan/dissectors/packet-icmp.c @@ -1352,7 +1352,7 @@ dissect_icmp(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree, void* data) col_append_fstr(pinfo->cinfo, COL_INFO, " (%s)", code_str); } - length = tvb_length(tvb); + length = tvb_captured_length(tvb); reported_length = tvb_reported_length(tvb); ti = proto_tree_add_item(tree, proto_icmp, tvb, 0, length, ENC_NA); @@ -1603,8 +1603,8 @@ dissect_icmp(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree, void* data) /* Make sure we have enough bytes in the payload before trying to * see if the data looks like a timestamp; otherwise we'll get * malformed packets as we try to access data that isn't there. */ - if (tvb_length_remaining(tvb, 8) < 8) { - if (tvb_length_remaining(tvb, 8) > 0) { + if (tvb_captured_length_remaining(tvb, 8) < 8) { + if (tvb_captured_length_remaining(tvb, 8) > 0) { call_dissector(data_handle, tvb_new_subset_remaining (tvb, 8), pinfo, icmp_tree); @@ -1720,7 +1720,7 @@ dissect_icmp(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree, void* data) tap_queue_packet(icmp_tap, pinfo, trans); } - return tvb_length(tvb); + return tvb_captured_length(tvb); } void proto_register_icmp(void) |