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-erf.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-erf.c')
-rw-r--r-- | epan/dissectors/packet-erf.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/epan/dissectors/packet-erf.c b/epan/dissectors/packet-erf.c index ebe95f4279..1d38ee92c1 100644 --- a/epan/dissectors/packet-erf.c +++ b/epan/dissectors/packet-erf.c @@ -1323,7 +1323,7 @@ dissect_erf(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) pinfo->pseudo_header->atm.type = TRAF_UNKNOWN; pinfo->pseudo_header->atm.subtype = TRAF_ST_UNKNOWN; /* Try to guess the type according to the first bytes */ - atm_pdu_caplen = tvb_captured_length(new_tvb); + atm_pdu_caplen = tvb_length(new_tvb); atm_pdu = tvb_get_ptr(new_tvb, 0, atm_pdu_caplen); erf_atm_guess_traffic_type(atm_pdu, atm_pdu_caplen, pinfo->pseudo_header); break; @@ -1371,7 +1371,7 @@ dissect_erf(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) pinfo->pseudo_header->atm.type = TRAF_UNKNOWN; pinfo->pseudo_header->atm.subtype = TRAF_ST_UNKNOWN; /* Try to guess the type according to the first bytes */ - atm_pdu_caplen = tvb_captured_length(new_tvb); + atm_pdu_caplen = tvb_length(new_tvb); atm_pdu = tvb_get_ptr(new_tvb, 0, atm_pdu_caplen); erf_atm_guess_traffic_type(atm_pdu, atm_pdu_caplen, pinfo->pseudo_header); break; |