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 /debian | |
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 'debian')
-rw-r--r-- | debian/libwireshark0.symbols | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/debian/libwireshark0.symbols b/debian/libwireshark0.symbols index de8897f2ac..2c745b0aa0 100644 --- a/debian/libwireshark0.symbols +++ b/debian/libwireshark0.symbols @@ -164,6 +164,7 @@ libwireshark.so.0 libwireshark0 #MINVER# conversation_key_port2@Base 2.5.0 conversation_new@Base 1.9.1 conversation_new_by_id@Base 2.5.0 + conversation_new_pinfo@Base 2.6.3 conversation_pt_to_endpoint_type@Base 2.5.0 conversation_set_dissector@Base 1.9.1 conversation_set_dissector_from_frame_number@Base 2.0.0 @@ -632,7 +633,6 @@ libwireshark.so.0 libwireshark0 #MINVER# find_heur_dissector_by_unique_short_name@Base 1.99.8 find_heur_dissector_list@Base 1.99.2 find_or_create_conversation@Base 1.9.1 - find_or_create_conversation_by_id@Base 2.6.3 find_protocol_by_id@Base 1.9.1 find_sid_name@Base 1.9.1 find_stream_circ@Base 1.9.1 |