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-dtn.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-dtn.c')
| -rw-r--r-- | epan/dissectors/packet-dtn.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/epan/dissectors/packet-dtn.c b/epan/dissectors/packet-dtn.c index 98720a5624..a42839ba82 100644 --- a/epan/dissectors/packet-dtn.c +++ b/epan/dissectors/packet-dtn.c @@ -1771,7 +1771,7 @@ dissect_dtn_contact_header(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, } proto_tree_add_item(conv_tree, hf_contact_hdr_local_eid, tvb, sdnv_length + offset, eid_length, ENC_NA|ENC_ASCII); - return tvb_captured_length(tvb); + return tvb_length(tvb); } static guint @@ -1901,7 +1901,7 @@ dissect_tcpcl_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* dat if (bundle_size == 0) { /*Couldn't parse bundle, treat as raw data */ call_dissector(data_handle, new_tvb, pinfo, sub_tree); - return tvb_captured_length(tvb); + return tvb_length(tvb); } } else { @@ -1958,7 +1958,7 @@ dissect_tcpcl_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* dat break; } - return tvb_captured_length(tvb); + return tvb_length(tvb); } static int @@ -2015,7 +2015,7 @@ dissect_tcpcl(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) } tcp_dissect_pdus(tvb, pinfo, tree, TRUE, 8, get_dtn_contact_header_len, dissect_dtn_contact_header, data); - return tvb_captured_length(tvb); + return tvb_length(tvb); } /* Not for us */ @@ -2023,7 +2023,7 @@ dissect_tcpcl(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) }; tcp_dissect_pdus(tvb, pinfo, tree, TRUE, 1, get_tcpcl_pdu_len, dissect_tcpcl_pdu, data); - return tvb_captured_length(tvb); + return tvb_length(tvb); } static int |