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

1 files changed, 7 insertions, 19 deletions

diff --git a/epan/dissectors/packet-ldap.c b/epan/dissectors/packet-ldap.c
index b8551a3b2c..91e5c29367 100644
--- a/epan/dissectors/packet-ldap.c
+++ b/epan/dissectors/packet-ldap.c
@@ -3708,19 +3708,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?
@@ -4562,9 +4550,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);
 	}
@@ -5538,7 +5526,7 @@ void proto_register_ldap(void) {
         NULL, HFILL }},
 
 /*--- End of included file: packet-ldap-hfarr.c ---*/
-#line 2086 "packet-ldap-template.c"
+#line 2074 "packet-ldap-template.c"
   };
 
   /* List of subtrees */
@@ -5612,7 +5600,7 @@ void proto_register_ldap(void) {
     &ett_ldap_T_warning,
 
 /*--- End of included file: packet-ldap-ettarr.c ---*/
-#line 2099 "packet-ldap-template.c"
+#line 2087 "packet-ldap-template.c"
   };
 
     module_t *ldap_module;
@@ -5743,7 +5731,7 @@ proto_reg_handoff_ldap(void)
 
 
 /*--- End of included file: packet-ldap-dis-tab.c ---*/
-#line 2213 "packet-ldap-template.c"
+#line 2201 "packet-ldap-template.c"
 
 
 }