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-e100.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-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 a83ebb217e..ebc53d0fc9 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_captured_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; |