Revert "Have find_or_create_conversation() use pinfo->conv_endpoint if present."

This reverts commit ba202ef36225b59eb797c5a48b8d4a4665b479c7.

Creating endpoints, and corresponding conversations, for protocols atop which TCP or UDP runs can potentially cause attempts to look up the conversation to find the conversation for that protocol rather than for TCP/UDP, which can confuse protocols running atop TCP or UDP.

Change-Id: I3ca522e54e67cc4f996d0ee841c6bb40ee6a9976
Reviewed-on: https://code.wireshark.org/review/28912
Reviewed-by: Guy Harris <guy@alum.mit.edu>

1 files changed, 6 insertions, 3 deletions

diff --git a/epan/conversation.h b/epan/conversation.h
index d1d01c7ffb..cd8d41612c 100644
--- a/epan/conversation.h
+++ b/epan/conversation.h
@@ -134,9 +134,6 @@ WS_DLL_PUBLIC conversation_t *conversation_new(const guint32 setup_frame, const
 
 WS_DLL_PUBLIC conversation_t *conversation_new_by_id(const guint32 setup_frame, const endpoint_type etype, const guint32 id, const guint options);
 
-WS_DLL_PUBLIC
-conversation_t *conversation_new_pinfo(packet_info *pinfo);
-
 /**
  * Given two address/port pairs for a packet, search for a conversation
  * containing packets between those address/port pairs.  Returns NULL if
@@ -191,6 +188,12 @@ WS_DLL_PUBLIC conversation_t *find_conversation_pinfo(packet_info *pinfo, const
  */
 WS_DLL_PUBLIC conversation_t *find_or_create_conversation(packet_info *pinfo);
 
+/**  A helper function that calls find_conversation_by_id() and, if a
+ *  conversation is not found, calls conversation_new_by_id().
+ *  The frame number is taken from pinfo.
+ */
+WS_DLL_PUBLIC conversation_t *find_or_create_conversation_by_id(packet_info *pinfo, const endpoint_type etype, const guint32 id);
+
 WS_DLL_PUBLIC void conversation_add_proto_data(conversation_t *conv, const int proto,
     void *proto_data);
 WS_DLL_PUBLIC void *conversation_get_proto_data(const conversation_t *conv, const int proto);