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-rx.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-rx.c')
-rw-r--r-- | epan/dissectors/packet-rx.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/epan/dissectors/packet-rx.c b/epan/dissectors/packet-rx.c index 74ddd5968b..23ea1f7c1d 100644 --- a/epan/dissectors/packet-rx.c +++ b/epan/dissectors/packet-rx.c @@ -380,7 +380,7 @@ dissect_rx_acks(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, int * any sort of documentation other than "read the source of any of the * (compatible?) implementations. */ - if (tvb_length_remaining(tvb, offset)>3) { + if (tvb_captured_length_remaining(tvb, offset)>3) { offset += 3; /* guess. some implementations adds 3 bytes */ if (tvb_reported_length_remaining(tvb, offset) >= 4){ @@ -452,7 +452,7 @@ dissect_rx(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, void *dat guint16 serviceid; /* Ensure we have enough data */ - if (tvb_length(tvb) < 28) + if (tvb_captured_length(tvb) < 28) return 0; /* Make sure it's a known type */ @@ -572,7 +572,7 @@ dissect_rx(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, void *dat break; } - return(tvb_length(tvb)); + return(tvb_captured_length(tvb)); } void |