From bc5a0374bfd162d08834f5f7503bebd33d8ec943 Mon Sep 17 00:00:00 2001 From: Guy Harris Date: Sat, 23 Jan 2016 19:40:51 -0800 Subject: Add the packet number to the packet_info structure, and use it. That removes most of the uses of the frame number field in the frame_data structure. Change-Id: Ie22e4533e87f8360d7c0a61ca6ffb796cc233f22 Reviewed-on: https://code.wireshark.org/review/13509 Reviewed-by: Guy Harris --- epan/dissectors/packet-ntlmssp.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'epan/dissectors/packet-ntlmssp.c') diff --git a/epan/dissectors/packet-ntlmssp.c b/epan/dissectors/packet-ntlmssp.c index 4c029bf5dd..1a9df88865 100644 --- a/epan/dissectors/packet-ntlmssp.c +++ b/epan/dissectors/packet-ntlmssp.c @@ -1818,7 +1818,7 @@ get_sign_key(packet_info *pinfo, int cryptpeer) conversation_t *conversation; ntlmssp_info *conv_ntlmssp_info; - conversation = find_conversation(pinfo->fd->num, &pinfo->src, &pinfo->dst, + conversation = find_conversation(pinfo->num, &pinfo->src, &pinfo->dst, pinfo->ptype, pinfo->srcport, pinfo->destport, 0); if (conversation == NULL) { @@ -1858,7 +1858,7 @@ get_encrypted_state(packet_info *pinfo, int cryptpeer) conversation_t *conversation; ntlmssp_info *conv_ntlmssp_info; - conversation = find_conversation(pinfo->fd->num, &pinfo->src, &pinfo->dst, + conversation = find_conversation(pinfo->num, &pinfo->src, &pinfo->dst, pinfo->ptype, pinfo->srcport, pinfo->destport, 0); if (conversation == NULL) { @@ -1994,7 +1994,7 @@ decrypt_data_payload(tvbuff_t *tvb, int offset, guint32 encrypted_block_length, ntlmssp_info *conv_ntlmssp_info; /* Pull the challenge info from the conversation */ - conversation = find_conversation(pinfo->fd->num, &pinfo->src, &pinfo->dst, + conversation = find_conversation(pinfo->num, &pinfo->src, &pinfo->dst, pinfo->ptype, pinfo->srcport, pinfo->destport, 0); if (conversation == NULL) { @@ -2202,7 +2202,7 @@ decrypt_verifier(tvbuff_t *tvb, int offset, guint32 encrypted_block_length, /* We don't have data for this packet */ return; } - conversation = find_conversation(pinfo->fd->num, &pinfo->src, &pinfo->dst, + conversation = find_conversation(pinfo->num, &pinfo->src, &pinfo->dst, pinfo->ptype, pinfo->srcport, pinfo->destport, 0); if (conversation == NULL) { @@ -2507,7 +2507,7 @@ dissect_ntlmssp_encrypted_payload(tvbuff_t *data_tvb, if (!packet_ntlmssp_info->payload_decrypted) { /* Pull the challenge info from the conversation */ - conversation = find_conversation(pinfo->fd->num, &pinfo->src, &pinfo->dst, + conversation = find_conversation(pinfo->num, &pinfo->src, &pinfo->dst, pinfo->ptype, pinfo->srcport, pinfo->destport, 0); if (conversation == NULL) { -- cgit v1.2.3