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-ntlmssp.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-ntlmssp.c')
| -rw-r--r-- | epan/dissectors/packet-ntlmssp.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/epan/dissectors/packet-ntlmssp.c b/epan/dissectors/packet-ntlmssp.c index ab1449eb26..1e7d154e31 100644 --- a/epan/dissectors/packet-ntlmssp.c +++ b/epan/dissectors/packet-ntlmssp.c @@ -1961,7 +1961,7 @@ dissect_ntlmssp_payload(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, voi guint32 ntlm_seq_size = 4; void *pd_save; - length = tvb_captured_length (tvb); + length = tvb_length (tvb); /* signature + seq + real payload */ encrypted_block_length = length - ntlm_magic_size; @@ -2411,7 +2411,7 @@ dissect_ntlmssp_payload_only(tvbuff_t *tvb, packet_info *pinfo, _U_ proto_tree * /* the magic ntlm is the identifier of a NTLMSSP packet that's 00 00 00 01 */ - encrypted_block_length = tvb_captured_length (tvb); + encrypted_block_length = tvb_length (tvb); /* signature + seq + real payload */ /* Setup a new tree for the NTLMSSP payload */ @@ -2470,7 +2470,7 @@ dissect_ntlmssp_verf(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void * guint32 encrypted_block_length; void *pd_save; - verifier_length = tvb_captured_length (tvb); + verifier_length = tvb_length (tvb); encrypted_block_length = verifier_length - 4; if (encrypted_block_length < 12) { @@ -2559,7 +2559,7 @@ dissect_ntlmssp_encrypted_payload(tvbuff_t *data_tvb, ntlmssp_info *conv_ntlmssp_info = NULL; ntlmssp_packet_info *packet_ntlmssp_info; - encrypted_block_length = tvb_captured_length_remaining (data_tvb, offset); + encrypted_block_length = tvb_length_remaining (data_tvb, offset); fprintf(stderr, "Called dissect_ntlmssp_encrypted_payload\n"); /* Check to see if we already have state for this packet */ @@ -2689,7 +2689,7 @@ wrap_dissect_ntlmssp(tvbuff_t *tvb, int offset, packet_info *pinfo, dissect_ntlmssp(auth_tvb, pinfo, tree); - return tvb_captured_length_remaining(tvb, offset); + return tvb_length_remaining(tvb, offset); } static int |