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-smb-pipe.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-smb-pipe.c')
| -rw-r--r-- | epan/dissectors/packet-smb-pipe.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/epan/dissectors/packet-smb-pipe.c b/epan/dissectors/packet-smb-pipe.c index 325924cec4..aabb34fc45 100644 --- a/epan/dissectors/packet-smb-pipe.c +++ b/epan/dissectors/packet-smb-pipe.c @@ -2525,7 +2525,7 @@ dissect_response_data(tvbuff_t *tvb, packet_info *pinfo, int convert, proto_tree_add_text(data_tree, tvb, offset, -1, "Data (no descriptor available)"); } - offset += tvb_captured_length_remaining(tvb, offset); + offset += tvb_length_remaining(tvb, offset); } else { /* * If we have an entry count, show all the entries, @@ -3254,7 +3254,7 @@ dissect_pipe_dcerpc(tvbuff_t *d_tvb, packet_info *pinfo, proto_tree *parent_tree pinfo->desegment_offset = 0; pinfo->desegment_len = 0; reported_len = tvb_reported_length(d_tvb); - if(smb_dcerpc_reassembly && tvb_captured_length(d_tvb) >= reported_len){ + if(smb_dcerpc_reassembly && tvb_length(d_tvb) >= reported_len){ pinfo->can_desegment=2; } @@ -3498,7 +3498,7 @@ dissect_pipe_smb(tvbuff_t *sp_tvb, tvbuff_t *s_tvb, tvbuff_t *pd_tvb, * anything.) */ if (sp_tvb != NULL) - sp_len = tvb_captured_length(sp_tvb); + sp_len = tvb_length(sp_tvb); else sp_len = 0; if (tree) { @@ -3511,7 +3511,7 @@ dissect_pipe_smb(tvbuff_t *sp_tvb, tvbuff_t *s_tvb, tvbuff_t *pd_tvb, /* * Do we have any setup words at all? */ - if (s_tvb != NULL && tvb_captured_length(s_tvb) != 0) { + if (s_tvb != NULL && tvb_length(s_tvb) != 0) { /* * Yes. The first of them is the function. */ |