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-ziop.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-ziop.c')
| -rw-r--r-- | epan/dissectors/packet-ziop.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/epan/dissectors/packet-ziop.c b/epan/dissectors/packet-ziop.c index fa31065c61..cbb6ac825a 100644 --- a/epan/dissectors/packet-ziop.c +++ b/epan/dissectors/packet-ziop.c @@ -139,7 +139,7 @@ dissect_ziop (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree, void* data giop_version_minor); } call_dissector(data_handle, tvb, pinfo, tree); - return tvb_captured_length(tvb); + return tvb_length(tvb); } col_add_fstr (pinfo->cinfo, COL_INFO, "ZIOP %u.%u %s", @@ -185,7 +185,7 @@ dissect_ziop (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree, void* data proto_tree_add_item(ziop_tree, hf_ziop_original_length, tvb, offset, 4, byte_order); } - return tvb_captured_length(tvb); + return tvb_length(tvb); } static guint @@ -218,14 +218,14 @@ dissect_ziop_tcp (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree, void* if (tvb_get_ntohl(tvb, 0) == GIOP_MAGIC_NUMBER) { dissect_giop(tvb, pinfo, tree); - return tvb_captured_length(tvb); + return tvb_length(tvb); } return 0; } tcp_dissect_pdus(tvb, pinfo, tree, ziop_desegment, ZIOP_HEADER_SIZE, get_ziop_pdu_len, dissect_ziop, data); - return tvb_captured_length(tvb); + return tvb_length(tvb); } @@ -237,7 +237,7 @@ dissect_ziop_heur (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree, void conversation_t *conversation; /* check magic number and version */ - tot_len = tvb_captured_length(tvb); + tot_len = tvb_length(tvb); if (tot_len < ZIOP_HEADER_SIZE) /* tot_len < 12 */ { |