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-e100.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-e100.c')
-rw-r--r-- | epan/dissectors/packet-e100.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/epan/dissectors/packet-e100.c b/epan/dissectors/packet-e100.c index ebc53d0fc9..a83ebb217e 100644 --- a/epan/dissectors/packet-e100.c +++ b/epan/dissectors/packet-e100.c @@ -74,9 +74,9 @@ dissect_e100(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_ * (2) e100 header is 1 * (3) e100 capture size matches tvb packet size */ - if (tvb_captured_length(tvb) >= e100_encap_len && + if (tvb_length(tvb) >= e100_encap_len && tvb_get_guint8(tvb, e100_header_ver.offset) == 1 && - tvb_get_ntohl(tvb, e100_bytes_cap.offset) == tvb_captured_length(tvb)-e100_encap_len) + tvb_get_ntohl(tvb, e100_bytes_cap.offset) == tvb_length(tvb)-e100_encap_len) { guint32 bytes_captured=0; col_set_str(pinfo->cinfo, COL_PROTOCOL, "e100"); @@ -117,7 +117,7 @@ dissect_e100(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_ next_tvb = tvb_new_subset(tvb, e100_encap_len, -1, bytes_captured); call_dissector(eth_handle, next_tvb, pinfo, tree); - ret_val = tvb_captured_length(tvb); + ret_val = tvb_length(tvb); } /* heuristic testing */ return ret_val; |