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.c | |
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.c')
-rw-r--r-- | epan/dissector_filters.c | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/epan/dissector_filters.c b/epan/dissector_filters.c index 13a02c6c44..76335d113b 100644 --- a/epan/dissector_filters.c +++ b/epan/dissector_filters.c @@ -73,6 +73,24 @@ void conversation_filters_cleanup(void) g_list_free(conv_filter_list); } +gchar *conversation_filter_from_packet(struct _packet_info *pinfo) +{ + const char *layers[] = { "tcp", "udp", "ip", "ipv6", "eth" }; + conversation_filter_t *conv_filter; + gchar *filter; + size_t i; + + for (i = 0; i < G_N_ELEMENTS(layers); i++) { + conv_filter = find_conversation_filter(layers[i]); + if (conv_filter && conv_filter->is_filter_valid(pinfo)) { + if ((filter = conv_filter->build_filter_string(pinfo)) != NULL) + return filter; + } + } + + return NULL; +} + /* * Editor modelines - http://www.wireshark.org/tools/modelines.html * |