diff options
| author | Michael Mann <mmann78@netscape.net> | 2017-10-28 09:58:28 -0400 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2017-10-28 14:33:11 +0000 |
| commit | 23afd9a18453c23cfbbc6a63f52b2e6e64e0056c (patch) | |
| tree | 89fd4995a9148c1a7fad6c112faeb28a238fbbb5 /epan/dissectors/packet-ntlmssp.c | |
| parent | 27c10ed72ea2451bfbb6c0eb50af4280e65a3fcf (diff) | |
Convert to using find_conversation_pinfo where appropriate
This makes it easier to identify the simpler/common conversations
Change-Id: I7094f23e49156ee27f5f72c8e130308470f3e462
Reviewed-on: https://code.wireshark.org/review/24145
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan/dissectors/packet-ntlmssp.c')
| -rw-r--r-- | epan/dissectors/packet-ntlmssp.c | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/epan/dissectors/packet-ntlmssp.c b/epan/dissectors/packet-ntlmssp.c index d0df92760a..2b32ebd50e 100644 --- a/epan/dissectors/packet-ntlmssp.c +++ b/epan/dissectors/packet-ntlmssp.c @@ -1874,9 +1874,7 @@ get_sign_key(packet_info *pinfo, int cryptpeer) conversation_t *conversation; ntlmssp_info *conv_ntlmssp_info; - conversation = find_conversation(pinfo->num, &pinfo->src, &pinfo->dst, - pinfo->ptype, pinfo->srcport, - pinfo->destport, 0); + conversation = find_conversation_pinfo(pinfo, 0); if (conversation == NULL) { /* We don't have a conversation. In this case, stop processing because we do not have enough info to decrypt the payload */ @@ -1914,9 +1912,7 @@ get_encrypted_state(packet_info *pinfo, int cryptpeer) conversation_t *conversation; ntlmssp_info *conv_ntlmssp_info; - conversation = find_conversation(pinfo->num, &pinfo->src, &pinfo->dst, - pinfo->ptype, pinfo->srcport, - pinfo->destport, 0); + conversation = find_conversation_pinfo(pinfo, 0); if (conversation == NULL) { /* We don't have a conversation. In this case, stop processing because we do not have enough info to decrypt the payload */ @@ -2041,9 +2037,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->num, &pinfo->src, &pinfo->dst, - pinfo->ptype, pinfo->srcport, - pinfo->destport, 0); + conversation = find_conversation_pinfo(pinfo, 0); if (conversation == NULL) { /* There is no conversation, thus no encryption state */ return NULL; @@ -2249,9 +2243,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->num, &pinfo->src, &pinfo->dst, - pinfo->ptype, pinfo->srcport, - pinfo->destport, 0); + conversation = find_conversation_pinfo(pinfo, 0); if (conversation == NULL) { /* There is no conversation, thus no encryption state */ return; |