diff options
| author | Michael Mann <mmann78@netscape.net> | 2014-06-19 17:18:16 +0000 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2014-06-19 18:25:59 +0000 |
| commit | 14824e6adf07a1c3cfb6537ce8723d873ecd0d0f (patch) | |
| tree | bdf1b52ecffe7825d719f34fb4be63c8a60bd1b4 /epan/dissectors/packet-rx.c | |
| parent | 3557ac4ec688b86ec7819005a3a181600e056251 (diff) | |
Revert "Fixup: tvb_* -> tvb_captured"
https://www.wireshark.org/lists/wireshark-dev/201406/msg00131.html
This reverts commit 246fe2ca4c67d8c98caa84e2f57694f6322e2f96.
Change-Id: Ib24bae0198c13a84bd7f731bf4af921212109a8f
Reviewed-on: https://code.wireshark.org/review/2430
Reviewed-by: Michael Mann <mmann78@netscape.net>
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 23ea1f7c1d..74ddd5968b 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_captured_length_remaining(tvb, offset)>3) { + if (tvb_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_captured_length(tvb) < 28) + if (tvb_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_captured_length(tvb)); + return(tvb_length(tvb)); } void |