diff options
| author | Guy Harris <guy@alum.mit.edu> | 2018-07-31 15:52:46 -0700 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2018-07-31 22:53:27 +0000 |
| commit | ba202ef36225b59eb797c5a48b8d4a4665b479c7 (patch) | |
| tree | 050e449f76d3cf248e64b9260a7c2438db028768 /epan/conversation.h | |
| parent | 137bbb2d146a89b42c8173c2b7e9a867df14ecae (diff) | |
Have find_or_create_conversation() use pinfo->conv_endpoint if present.
Add conversation_new_pinfo(), which uses the endpoint if present, and
have find_or_create_conversation() use it rather than
conversation_new().
Remove find_or_create_conversation_by_id() - it's no longer needed.
Bug: 15018
Change-Id: Ib13e539751af0f071aede4ee0ed751d0cb72ba3f
Reviewed-on: https://code.wireshark.org/review/28908
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'epan/conversation.h')
| -rw-r--r-- | epan/conversation.h | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/epan/conversation.h b/epan/conversation.h index cd8d41612c..d1d01c7ffb 100644 --- a/epan/conversation.h +++ b/epan/conversation.h @@ -134,6 +134,9 @@ 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 @@ -188,12 +191,6 @@ 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); |