diff options
| author | Gerald Combs <gerald@wireshark.org> | 2023-01-26 14:26:04 -0800 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2023-04-12 02:11:41 +0000 |
| commit | 3110d44a4cc2b917682641bc5cfc7195cc436340 (patch) | |
| tree | fb77161be30adf0fe06e2307947ab19b292d8c1c /ui | |
| parent | 4cc337383c15a795d4245cfe8aaa6be087b7c2ef (diff) | |
epan: Add user data to conversation filters
Add user data to conversation filters. Use it to provide necessary data
in the Falco Bridge dissector.
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/qt/conversation_colorize_action.cpp | 6 | ||||
| -rw-r--r-- | ui/qt/conversation_hash_tables_dialog.cpp | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/ui/qt/conversation_colorize_action.cpp b/ui/qt/conversation_colorize_action.cpp index 4977f22b4b..9518e1ee68 100644 --- a/ui/qt/conversation_colorize_action.cpp +++ b/ui/qt/conversation_colorize_action.cpp @@ -33,9 +33,9 @@ void ConversationAction::setPacketInfo(struct _packet_info *pinfo) { bool enable = false; if (conv_filter_ && pinfo) { - enable = conv_filter_->is_filter_valid(pinfo); + enable = conv_filter_->is_filter_valid(pinfo, conv_filter_->user_data); if (enable) { - filter_ba_ = gchar_free_to_qbytearray(conv_filter_->build_filter_string(pinfo)); + filter_ba_ = gchar_free_to_qbytearray(conv_filter_->build_filter_string(pinfo, conv_filter_->user_data)); } } setEnabled(enable); @@ -56,7 +56,7 @@ bool ConversationAction::isFilterValid(struct _packet_info *pinfo) { bool valid = false; if (conv_filter_ && pinfo) { - valid = conv_filter_->is_filter_valid(pinfo); + valid = conv_filter_->is_filter_valid(pinfo, conv_filter_->user_data); } return valid; } diff --git a/ui/qt/conversation_hash_tables_dialog.cpp b/ui/qt/conversation_hash_tables_dialog.cpp index 99b3bbc862..cc699dae91 100644 --- a/ui/qt/conversation_hash_tables_dialog.cpp +++ b/ui/qt/conversation_hash_tables_dialog.cpp @@ -57,7 +57,7 @@ fill_named_table(gpointer key, gpointer value _U_, gpointer user_data) title = QString("UInt64 %1").arg(uint64_count++); break; case CE_INT: - title = QString("UInt %1").arg(int_count++); + title = QString("Int %1").arg(int_count++); break; case CE_CONVERSATION_TYPE: html_table->append(QString("<th>Endpoint</th>")); |