diff --git a/ui/qt/capture_file.cpp b/ui/qt/capture_file.cpp index 7b6cb97051..62657a59f1 100644 --- a/ui/qt/capture_file.cpp +++ b/ui/qt/capture_file.cpp @@ -234,6 +234,13 @@ void CaptureFile::stopLoading() setCaptureStopFlag(true); } +QString CaptureFile::displayFilter() const +{ + if (isValid()) + return QString(cap_file_->dfilter); + return QString(); +} + capture_file *CaptureFile::globalCapFile() { return &cfile; diff --git a/ui/qt/capture_file.h b/ui/qt/capture_file.h index bac4c8d82f..d7d61cae0c 100644 --- a/ui/qt/capture_file.h +++ b/ui/qt/capture_file.h @@ -117,6 +117,10 @@ public: */ void reload(); + /** Return any set display filter + */ + QString displayFilter() const; + // XXX This shouldn't be needed. static capture_file *globalCapFile(); diff --git a/ui/qt/conversation_dialog.cpp b/ui/qt/conversation_dialog.cpp index ec6d5794e2..0ebb9d9335 100644 --- a/ui/qt/conversation_dialog.cpp +++ b/ui/qt/conversation_dialog.cpp @@ -95,6 +95,8 @@ ConversationDialog::ConversationDialog(QWidget &parent, CaptureFile &cf, int cli trafficTab()->setProtocolInfo(tr("Conversation"), cli_proto_id, &(recent.conversation_tabs), &createModel); trafficTab()->setDelegate(CONV_COLUMN_START, &createDelegate); trafficTab()->setDelegate(CONV_COLUMN_DURATION, &createDelegate); + trafficTab()->setFilter(cf.displayFilter()); + displayFilterCheckBox()->setChecked(true); connect(trafficTab(), &TrafficTab::filterAction, this, &ConversationDialog::filterAction); connect(trafficTab()->tabBar(), &QTabBar::currentChanged, this, &ConversationDialog::tabChanged); connect(trafficTab(), &TrafficTab::tabDataChanged, this, &ConversationDialog::tabChanged); diff --git a/ui/qt/endpoint_dialog.cpp b/ui/qt/endpoint_dialog.cpp index 5f07b6a83a..ee09949c22 100644 --- a/ui/qt/endpoint_dialog.cpp +++ b/ui/qt/endpoint_dialog.cpp @@ -67,6 +67,8 @@ EndpointDialog::EndpointDialog(QWidget &parent, CaptureFile &cf, int cli_proto_i TrafficTableDialog(parent, cf, filter, table_name_) { trafficTab()->setProtocolInfo(tr("Endpoints"), cli_proto_id, &(recent.endpoint_tabs), &createModel); + trafficTab()->setFilter(cf.displayFilter()); + displayFilterCheckBox()->setChecked(true); connect(trafficTab(), &TrafficTab::filterAction, this, &EndpointDialog::filterAction); connect(trafficTab(), &TrafficTab::tabDataChanged, this, &EndpointDialog::tabChanged); connect(trafficTab(), &TrafficTab::currentChanged, this, &EndpointDialog::tabChanged);