diff options
author | morriss <morriss@f5534014-38df-0310-8fa8-9805f1628bb7> | 2010-05-13 18:55:31 +0000 |
---|---|---|
committer | morriss <morriss@f5534014-38df-0310-8fa8-9805f1628bb7> | 2010-05-13 18:55:31 +0000 |
commit | 1b46f02843bccec9767c29b37a306be0895db4a0 (patch) | |
tree | 1610055010fb39d6ed9a2462e01d72b1c279cccc /asn1/ldap | |
parent | 3dbfe3bb913477a70091b2440b199dccfe74c197 (diff) |
Use find_or_create_conversation() in some ASN.1 dissectors
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32791 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'asn1/ldap')
-rw-r--r-- | asn1/ldap/packet-ldap-template.c | 20 |
1 files changed, 4 insertions, 16 deletions
diff --git a/asn1/ldap/packet-ldap-template.c b/asn1/ldap/packet-ldap-template.c index 6b6099525f..93aa3c3c08 100644 --- a/asn1/ldap/packet-ldap-template.c +++ b/asn1/ldap/packet-ldap-template.c @@ -829,19 +829,7 @@ dissect_ldap_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gboolean i ldm_tree = NULL; - /* - * Do we have a conversation for this connection? - */ - conversation = find_conversation(pinfo->fd->num, &pinfo->src, &pinfo->dst, - pinfo->ptype, pinfo->srcport, - pinfo->destport, 0); - if (conversation == NULL) { - /* We don't yet have a conversation, so create one. */ - conversation = conversation_new(pinfo->fd->num, &pinfo->src, &pinfo->dst, - pinfo->ptype, pinfo->srcport, - pinfo->destport, 0); - - } + conversation = find_or_create_conversation(pinfo); /* * Do we already have a type and mechanism? @@ -1683,9 +1671,9 @@ dissect_ldap_tcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) * Do we have a conversation for this connection? */ conversation = find_conversation(pinfo->fd->num, - &pinfo->src, &pinfo->dst, - pinfo->ptype, pinfo->srcport, - pinfo->destport, 0); + &pinfo->src, &pinfo->dst, + pinfo->ptype, pinfo->srcport, + pinfo->destport, 0); if(conversation){ ldap_info = conversation_get_proto_data(conversation, proto_ldap); } |