diff options
author | Peter Wu <peter@lekensteyn.nl> | 2017-06-20 14:08:39 -0400 |
---|---|---|
committer | Peter Wu <peter@lekensteyn.nl> | 2017-06-20 20:34:23 +0000 |
commit | 4deb97f31f52ca9c88efbbf46cf3e580c85474f3 (patch) | |
tree | 50694ea33ffc945f0ce47edbead84b1003ed4a6c /epan/dissector_filters.h | |
parent | e6883c15ac00942e3232213f087147e355f7494b (diff) |
Fix filter for "Next Packet in Conversation"
The "Previous/Next Packet in Conversation" actions accidentally
overwrites more specific filters (like TCP port matching) by less
specific ones (like IP addresses). This resulted in strange behavior
where packets from different TCP streams were selected.
Change-Id: Ifa93064e1db3777fa3c12e2220bbb0b36b9478fe
Reported-by: Christian Landström
Reviewed-on: https://code.wireshark.org/review/22274
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Diffstat (limited to 'epan/dissector_filters.h')
-rw-r--r-- | epan/dissector_filters.h | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/epan/dissector_filters.h b/epan/dissector_filters.h index 44bca5d79b..7924e0177b 100644 --- a/epan/dissector_filters.h +++ b/epan/dissector_filters.h @@ -49,6 +49,15 @@ WS_DLL_PUBLIC struct conversation_filter_s* find_conversation_filter(const char /* Cleanup internal structures */ extern void conversation_filters_cleanup(void); +/** + * Tries to build a suitable display filter for the conversation in the current + * packet. More specific matches are tried first (like TCP ports) followed by + * less specific ones (IP addresses). NULL is returned when no filter is found. + * + * The returned filter should be freed with g_free. + */ +WS_DLL_PUBLIC gchar *conversation_filter_from_packet(struct _packet_info *pinfo); + /*** THE FOLLOWING SHOULD NOT BE USED BY ANY DISSECTORS!!! ***/ typedef struct conversation_filter_s { |