osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

Logray: Remove the "Follow Stream" dialog 

We don't reassemble log data into streams, so remove the "Follow" dialog
(for now, at least).
This commit is contained in:
Gerald Combs 2023-01-20 15:02:54 -08:00
parent b71d87ed27
commit cd9f7b64c7
6 changed files with 26 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ui/logray/CMakeLists.txt
View File

@ -36,7 +36,6 @@ set(WIRESHARK_WIDGET_HEADERS
../qt/widgets/field_filter_edit.h
../qt/widgets/filter_expression_toolbar.h
../qt/widgets/find_line_edit.h
../qt/widgets/follow_stream_text.h
../qt/widgets/interface_toolbar_lineedit.h
../qt/widgets/label_stack.h
../qt/widgets/overlay_scroll_bar.h
@ -169,7 +168,6 @@ set(WIRESHARK_QT_HEADERS
../qt/filter_dialog.h
../qt/filter_dialog.h
../qt/filter_expression_frame.h
../qt/follow_stream_dialog.h
../qt/font_color_preferences_frame.h
../qt/funnel_statistics.h
../qt/funnel_string_dialog.h
@ -265,7 +263,6 @@ set(WIRESHARK_WIDGET_SRCS
../qt/widgets/field_filter_edit.cpp
../qt/widgets/filter_expression_toolbar.cpp
../qt/widgets/find_line_edit.cpp
../qt/widgets/follow_stream_text.cpp
../qt/widgets/interface_toolbar_lineedit.cpp
../qt/widgets/label_stack.cpp
../qt/widgets/overlay_scroll_bar.cpp
@ -390,7 +387,6 @@ set(WIRESHARK_QT_SRC
../qt/filter_action.cpp
../qt/filter_dialog.cpp
../qt/filter_expression_frame.cpp
../qt/follow_stream_dialog.cpp
../qt/font_color_preferences_frame.cpp
../qt/funnel_string_dialog.cpp
../qt/funnel_text_dialog.cpp
@ -505,7 +501,6 @@ set(WIRESHARK_QT_UI
../qt/file_set_dialog.ui
../qt/filter_dialog.ui
../qt/filter_expression_frame.ui
../qt/follow_stream_dialog.ui
../qt/font_color_preferences_frame.ui
../qt/funnel_string_dialog.ui
../qt/funnel_text_dialog.ui

3
ui/logray/logray_main_window.h
View File

@ -431,9 +431,6 @@ private slots:
void applyConversationFilter();
void applyExportObject();
void openFollowStreamDialog(follow_type_t type, guint stream_num, guint sub_stream_num, bool use_stream_index = true);
void openFollowStreamDialogForType(follow_type_t type);
void statCommandExpertInfo(const char *, void *);
void on_actionHelpContents_triggered();

7
ui/logray/logray_main_window.ui
View File

@ -399,11 +399,6 @@
<string>Prepare as Filter</string>
</property>
</widget>
<widget class="QMenu" name="menuFollow">
<property name="title">
<string>Follow</string>
</property>
</widget>
<widget class="QMenu" name="menuConversationFilter">
<property name="title">
<string>Conversation Filter</string>
@ -422,8 +417,6 @@
<addaction name="actionAnalyzeDecodeAs"/>
<addaction name="actionAnalyzeReloadLuaPlugins"/>
<addaction name="separator"/>
<addaction name="menuFollow"/>
<addaction name="separator"/>
<addaction name="actionAnalyzeShowPacketBytes"/>
<addaction name="actionAnalyzeExpertInfo"/>
</widget>

19
ui/logray/logray_main_window_slots.cpp
View File

@ -2987,25 +2987,6 @@ void LograyMainWindow::applyExportObject()
export_dialog->show();
}
void LograyMainWindow::openFollowStreamDialog(follow_type_t type, guint stream_num, guint sub_stream_num, bool use_stream_index) {
FollowStreamDialog *fsd = new FollowStreamDialog(*this, capture_file_, type);
connect(fsd, SIGNAL(updateFilter(QString, bool)), this, SLOT(filterPackets(QString, bool)));
connect(fsd, SIGNAL(goToPacket(int)), packet_list_, SLOT(goToPacket(int)));
fsd->addCodecs(text_codec_map_);
fsd->show();
if (use_stream_index) {
// If a specific conversation was requested, then ignore any previous
// display filters and display all related packets.
fsd->follow("", true, stream_num, sub_stream_num);
} else {
fsd->follow(getFilter());
}
}
void LograyMainWindow::openFollowStreamDialogForType(follow_type_t type) {
openFollowStreamDialog(type, 0, 0, false);
}
// -z expert
void LograyMainWindow::statCommandExpertInfo(const char *, void *)
{

24
ui/qt/packet_list.cpp
View File

@ -690,17 +690,19 @@ void PacketList::contextMenuEvent(QContextMenuEvent *event)
}
main_menu_item = window()->findChild<QMenu *>("menuFollow");
submenu = new QMenu(main_menu_item->title(), ctx_menu);
ctx_menu->addMenu(submenu);
submenu->addAction(window()->findChild<QAction *>("actionAnalyzeFollowTCPStream"));
submenu->addAction(window()->findChild<QAction *>("actionAnalyzeFollowUDPStream"));
submenu->addAction(window()->findChild<QAction *>("actionAnalyzeFollowDCCPStream"));
submenu->addAction(window()->findChild<QAction *>("actionAnalyzeFollowTLSStream"));
submenu->addAction(window()->findChild<QAction *>("actionAnalyzeFollowHTTPStream"));
submenu->addAction(window()->findChild<QAction *>("actionAnalyzeFollowHTTP2Stream"));
submenu->addAction(window()->findChild<QAction *>("actionAnalyzeFollowQUICStream"));
submenu->addAction(window()->findChild<QAction *>("actionAnalyzeFollowWebsocketStream"));
submenu->addAction(window()->findChild<QAction *>("actionAnalyzeFollowSIPCall"));
if (main_menu_item) {
submenu = new QMenu(main_menu_item->title(), ctx_menu);
ctx_menu->addMenu(submenu);
submenu->addAction(window()->findChild<QAction *>("actionAnalyzeFollowTCPStream"));
submenu->addAction(window()->findChild<QAction *>("actionAnalyzeFollowUDPStream"));
submenu->addAction(window()->findChild<QAction *>("actionAnalyzeFollowDCCPStream"));
submenu->addAction(window()->findChild<QAction *>("actionAnalyzeFollowTLSStream"));
submenu->addAction(window()->findChild<QAction *>("actionAnalyzeFollowHTTPStream"));
submenu->addAction(window()->findChild<QAction *>("actionAnalyzeFollowHTTP2Stream"));
submenu->addAction(window()->findChild<QAction *>("actionAnalyzeFollowQUICStream"));
submenu->addAction(window()->findChild<QAction *>("actionAnalyzeFollowWebsocketStream"));
submenu->addAction(window()->findChild<QAction *>("actionAnalyzeFollowSIPCall"));
}
ctx_menu->addSeparator();

23
ui/qt/proto_tree.cpp
View File

@ -304,16 +304,19 @@ void ProtoTree::contextMenuEvent(QContextMenuEvent *event)
ctx_menu->addMenu(&colorize_menu_);
main_menu_item = window()->findChild<QMenu *>("menuFollow");
submenu = new QMenu(main_menu_item->title(), ctx_menu);
ctx_menu->addMenu(submenu);
submenu->addAction(window()->findChild<QAction *>("actionAnalyzeFollowTCPStream"));
submenu->addAction(window()->findChild<QAction *>("actionAnalyzeFollowUDPStream"));
submenu->addAction(window()->findChild<QAction *>("actionAnalyzeFollowDCCPStream"));
submenu->addAction(window()->findChild<QAction *>("actionAnalyzeFollowTLSStream"));
submenu->addAction(window()->findChild<QAction *>("actionAnalyzeFollowHTTPStream"));
submenu->addAction(window()->findChild<QAction *>("actionAnalyzeFollowHTTP2Stream"));
submenu->addAction(window()->findChild<QAction *>("actionAnalyzeFollowQUICStream"));
submenu->addAction(window()->findChild<QAction *>("actionAnalyzeFollowSIPCall"));
if (main_menu_item) {
submenu = new QMenu(main_menu_item->title(), ctx_menu);
ctx_menu->addMenu(submenu);
submenu->addAction(window()->findChild<QAction *>("actionAnalyzeFollowTCPStream"));
submenu->addAction(window()->findChild<QAction *>("actionAnalyzeFollowUDPStream"));
submenu->addAction(window()->findChild<QAction *>("actionAnalyzeFollowDCCPStream"));
submenu->addAction(window()->findChild<QAction *>("actionAnalyzeFollowTLSStream"));
submenu->addAction(window()->findChild<QAction *>("actionAnalyzeFollowHTTPStream"));
submenu->addAction(window()->findChild<QAction *>("actionAnalyzeFollowHTTP2Stream"));
submenu->addAction(window()->findChild<QAction *>("actionAnalyzeFollowQUICStream"));
submenu->addAction(window()->findChild<QAction *>("actionAnalyzeFollowSIPCall"));
}
ctx_menu->addSeparator();
}