diff options
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/qt/follow_stream_dialog.cpp | 4 | ||||
| -rw-r--r-- | ui/qt/packet_list.cpp | 1 | ||||
| -rw-r--r-- | ui/qt/wireshark_main_window.cpp | 3 | ||||
| -rw-r--r-- | ui/qt/wireshark_main_window.ui | 9 | ||||
| -rw-r--r-- | ui/qt/wireshark_main_window_slots.cpp | 4 |
5 files changed, 20 insertions, 1 deletions
diff --git a/ui/qt/follow_stream_dialog.cpp b/ui/qt/follow_stream_dialog.cpp index b4ce678e5e..417761b79d 100644 --- a/ui/qt/follow_stream_dialog.cpp +++ b/ui/qt/follow_stream_dialog.cpp @@ -116,6 +116,9 @@ FollowStreamDialog::FollowStreamDialog(QWidget &parent, CaptureFile &cf, follow_ case FOLLOW_SIP: follower_ = get_follow_by_name("SIP"); break; + case FOLLOW_WEBSOCKET: + follower_ = get_follow_by_name("WebSocket"); + break; default : ws_assert_not_reached(); } @@ -587,6 +590,7 @@ FollowStreamDialog::readStream() case FOLLOW_QUIC: case FOLLOW_TLS : case FOLLOW_SIP : + case FOLLOW_WEBSOCKET : ret = readFollowStream(); break; diff --git a/ui/qt/packet_list.cpp b/ui/qt/packet_list.cpp index 227fc139c3..831121ac7d 100644 --- a/ui/qt/packet_list.cpp +++ b/ui/qt/packet_list.cpp @@ -699,6 +699,7 @@ void PacketList::contextMenuEvent(QContextMenuEvent *event) 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(); diff --git a/ui/qt/wireshark_main_window.cpp b/ui/qt/wireshark_main_window.cpp index 7c47292014..ce1401e099 100644 --- a/ui/qt/wireshark_main_window.cpp +++ b/ui/qt/wireshark_main_window.cpp @@ -655,6 +655,9 @@ main_ui_->goToLineEdit->setValidator(goToLineQiv); connect(main_ui_->actionAnalyzeFollowQUICStream, &QAction::triggered, this, [this]() { this->openFollowStreamDialogForType(FOLLOW_QUIC); }, Qt::QueuedConnection); + connect(main_ui_->actionAnalyzeFollowWebsocketStream, &QAction::triggered, this, + [this]() { this->openFollowStreamDialogForType(FOLLOW_WEBSOCKET); }, + Qt::QueuedConnection); connect(main_ui_->actionAnalyzeFollowSIPCall, &QAction::triggered, this, [this]() { this->openFollowStreamDialogForType(FOLLOW_SIP); }, Qt::QueuedConnection); diff --git a/ui/qt/wireshark_main_window.ui b/ui/qt/wireshark_main_window.ui index 963f795f61..cf33b3ba3b 100644 --- a/ui/qt/wireshark_main_window.ui +++ b/ui/qt/wireshark_main_window.ui @@ -424,6 +424,7 @@ <addaction name="actionAnalyzeFollowHTTPStream"/> <addaction name="actionAnalyzeFollowHTTP2Stream"/> <addaction name="actionAnalyzeFollowQUICStream"/> + <addaction name="actionAnalyzeFollowWebsocketStream"/> <addaction name="actionAnalyzeFollowSIPCall"/> </widget> <widget class="QMenu" name="menuConversationFilter"> @@ -1785,6 +1786,14 @@ <string>QUIC Stream</string> </property> </action> + <action name="actionAnalyzeFollowWebsocketStream"> + <property name="enabled"> + <bool>false</bool> + </property> + <property name="text"> + <string>Websocket Stream</string> + </property> + </action> <action name="actionAnalyzeFollowSIPCall"> <property name="enabled"> <bool>false</bool> diff --git a/ui/qt/wireshark_main_window_slots.cpp b/ui/qt/wireshark_main_window_slots.cpp index 3e0fdc07ea..e6051a359b 100644 --- a/ui/qt/wireshark_main_window_slots.cpp +++ b/ui/qt/wireshark_main_window_slots.cpp @@ -1168,7 +1168,7 @@ void WiresharkMainWindow::setEditCommentsMenu() void WiresharkMainWindow::setMenusForSelectedPacket() { gboolean is_ip = FALSE, is_tcp = FALSE, is_udp = FALSE, is_dccp = FALSE, is_sctp = FALSE, is_tls = FALSE, is_rtp = FALSE, is_lte_rlc = FALSE, - is_http = FALSE, is_http2 = FALSE, is_quic = FALSE, is_sip = FALSE, is_exported_pdu = FALSE; + is_http = FALSE, is_http2 = FALSE, is_quic = FALSE, is_sip = FALSE, is_websocket = FALSE, is_exported_pdu = FALSE; /* Making the menu context-sensitive allows for easier selection of the desired item and has the added benefit, with large captures, of @@ -1243,6 +1243,7 @@ void WiresharkMainWindow::setMenusForSelectedPacket() /* TODO: to follow a QUIC stream we need a *decrypted* QUIC connection, i.e. checking for "quic" in the protocol stack is not enough */ is_quic = proto_is_frame_protocol(capture_file_.capFile()->edt->pi.layers, "quic"); is_sip = proto_is_frame_protocol(capture_file_.capFile()->edt->pi.layers, "sip"); + is_websocket = proto_is_frame_protocol(capture_file_.capFile()->edt->pi.layers, "websocket"); is_exported_pdu = proto_is_frame_protocol(capture_file_.capFile()->edt->pi.layers, "exported_pdu"); /* For Exported PDU there is a tag inserting IP addresses into the SRC and DST columns */ if (is_exported_pdu && @@ -1297,6 +1298,7 @@ void WiresharkMainWindow::setMenusForSelectedPacket() main_ui_->actionAnalyzeFollowHTTPStream->setEnabled(is_http); main_ui_->actionAnalyzeFollowHTTP2Stream->setEnabled(is_http2); main_ui_->actionAnalyzeFollowQUICStream->setEnabled(is_quic); + main_ui_->actionAnalyzeFollowWebsocketStream->setEnabled(is_websocket); main_ui_->actionAnalyzeFollowSIPCall->setEnabled(is_sip); foreach(QAction *cc_action, cc_actions) { |