diff options
| author | Evan Huus <eapache@gmail.com> | 2015-06-23 17:22:18 -0700 |
|---|---|---|
| committer | Evan Huus <eapache@gmail.com> | 2015-06-24 00:22:50 +0000 |
| commit | f92fab41a5266cb380c443882ce5efd5a7ee3318 (patch) | |
| tree | 13e190875507342a2c5847b2629a6dab44d2d61d /epan/dissectors/packet-netanalyzer.c | |
| parent | ad784bc7ce29c2d8ad64bca73e4863a6353c578f (diff) | |
Remove a bunch more deprecated tvb_length calls
(getting really close!)
Change-Id: Ibf22a5f727c4dc0070b78144a4b0ab8e0c5e1bce
Reviewed-on: https://code.wireshark.org/review/9081
Reviewed-by: Evan Huus <eapache@gmail.com>
Diffstat (limited to 'epan/dissectors/packet-netanalyzer.c')
| -rw-r--r-- | epan/dissectors/packet-netanalyzer.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/epan/dissectors/packet-netanalyzer.c b/epan/dissectors/packet-netanalyzer.c index 367e4a6c0c..29941e47f2 100644 --- a/epan/dissectors/packet-netanalyzer.c +++ b/epan/dissectors/packet-netanalyzer.c @@ -240,7 +240,7 @@ dissect_netanalyzer_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (packet_status & MSK_ALIGN_ERR) { - proto_tree_add_expert(netanalyzer_header_tree, pinfo, &ei_netanalyzer_alignment_error, tvb, tvb_length(tvb)-1, 1); + proto_tree_add_expert(netanalyzer_header_tree, pinfo, &ei_netanalyzer_alignment_error, tvb, tvb_captured_length(tvb)-1, 1); } } } @@ -302,7 +302,7 @@ dissect_netanalyzer(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { tvbuff_t *next_tvb; - if (tvb_length(tvb) >= 4) + if (tvb_reported_length(tvb) >= 4) { /* generate tvb subset for Ethernet frame */ if (dissect_netanalyzer_common(tvb, pinfo, tree)) @@ -328,7 +328,7 @@ dissect_netanalyzer_transparent(tvbuff_t *tvb, packet_info *pinfo, proto_tree *t proto_tree *transparent_payload_tree = NULL; tvbuff_t *next_tvb; - if (tvb_length(tvb) >= 4) + if (tvb_reported_length(tvb) >= 4) { /* generate tvb subset for Ethernet frame */ if (dissect_netanalyzer_common(tvb, pinfo, tree)) @@ -337,7 +337,7 @@ dissect_netanalyzer_transparent(tvbuff_t *tvb, packet_info *pinfo, proto_tree *t * as normally the transparent mode is used for low level analysis * where dissecting the frame's content wouldn't make much sense * use data dissector instead */ - transparent_payload_tree = proto_tree_add_subtree(tree, tvb, 4, tvb_length(tvb)-4, + transparent_payload_tree = proto_tree_add_subtree(tree, tvb, 4, tvb_captured_length(tvb)-4, ett_netanalyzer_transparent, NULL, "Raw packet data"); next_tvb = tvb_new_subset_remaining(tvb, 4); call_dissector(data_dissector_handle, next_tvb, pinfo, transparent_payload_tree); |