diff options
author | Evan Huus <eapache@gmail.com> | 2015-06-22 17:19:23 -0700 |
---|---|---|
committer | Evan Huus <eapache@gmail.com> | 2015-06-23 00:19:41 +0000 |
commit | 958cef5d68f4e18fc648a0bbb30408eb206fb0ef (patch) | |
tree | f49f047e15a9bc811499efee611c99118ecd1e36 /epan/dissectors/packet-e100.c | |
parent | 67ab8a059c489022aebe0e27d1f937c7b6abad06 (diff) |
Remove more deprecated tvb_length
Change-Id: Iac23a6c804ad3720d37186559477909b2ff33eb2
Reviewed-on: https://code.wireshark.org/review/9042
Reviewed-by: Evan Huus <eapache@gmail.com>
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 469f27c59f..109e940893 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_length(tvb) >= e100_encap_len && + if (tvb_captured_length(tvb) >= e100_encap_len && tvb_get_guint8(tvb, e100_header_ver.offset) == 1 && - tvb_get_ntohl(tvb, e100_bytes_cap.offset) == tvb_length(tvb)-e100_encap_len) + tvb_get_ntohl(tvb, e100_bytes_cap.offset) == tvb_reported_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_length(tvb); + ret_val = tvb_captured_length(tvb); } /* heuristic testing */ return ret_val; |