aboutsummaryrefslogtreecommitdiffstats
path: root/ui
diff options
context:
space:
mode:
authorGerald Combs <gerald@wireshark.org>2022-02-10 17:37:02 -0800
committerGerald Combs <gerald@wireshark.org>2022-04-04 09:39:27 -0700
commitdceffb8e565b9d66fc1adbc0c24223e1298cb1c6 (patch)
treeeca7e214637350645d080110f8a43f218e717d2a /ui
parentd8008cb89e20aa86200bf37099b26021f98c6931 (diff)
Qt: Remove telephony and wireless code from Logwolf.
Remove the Telephony menu and associated code and dependencies from LogWolf. Remove the remaining wireless code as well.
Diffstat (limited to 'ui')
-rw-r--r--ui/qt_logshark/CMakeLists.txt92
-rw-r--r--ui/qt_logshark/logshark_application.h4
-rw-r--r--ui/qt_logshark/logwolf_main_window.cpp212
-rw-r--r--ui/qt_logshark/logwolf_main_window.h56
-rw-r--r--ui/qt_logshark/logwolf_main_window.ui366
-rw-r--r--ui/qt_logshark/logwolf_main_window_slots.cpp383
6 files changed, 45 insertions, 1068 deletions
diff --git a/ui/qt_logshark/CMakeLists.txt b/ui/qt_logshark/CMakeLists.txt
index 6fe995b393..b77b55c7c0 100644
--- a/ui/qt_logshark/CMakeLists.txt
+++ b/ui/qt_logshark/CMakeLists.txt
@@ -43,12 +43,11 @@ set(WIRESHARK_WIDGET_HEADERS
../qt/widgets/pref_module_view.h
../qt/widgets/profile_tree_view.h
../qt/widgets/range_syntax_lineedit.h
- ../qt/widgets/rtp_audio_graph.h
../qt/widgets/splash_overlay.h
../qt/widgets/stock_icon_tool_button.h
../qt/widgets/syntax_line_edit.h
+ ../qt/widgets/wireless_timeline.h # Required by PacketListModel
../qt/widgets/tabnav_tree_view.h
- ../qt/widgets/wireless_timeline.h
../qt/widgets/wireshark_file_dialog.h
)
@@ -75,10 +74,6 @@ set(WIRESHARK_UTILS_HEADERS
../qt/utils/idata_printable.h
../qt/utils/proto_node.h
../qt/utils/qt_ui_utils.h
- ../qt/utils/rtp_audio_file.h
- ../qt/utils/rtp_audio_routing_filter.h
- ../qt/utils/rtp_audio_routing.h
- ../qt/utils/rtp_audio_silence_generator.h
../qt/utils/stock_icon.h
../qt/utils/tango_colors.h
../qt/utils/variant_pointer.h
@@ -126,7 +121,6 @@ set(WIRESHARK_MODEL_HEADERS
../qt/models/uat_delegate.h
../qt/models/uat_model.h
../qt/models/url_link_delegate.h
- ../qt/models/voip_calls_info_model.h
)
set (LOGSHARK_MODEL_HEADERS ${WIRESHARK_MODEL_HEADERS})
@@ -178,27 +172,18 @@ set(WIRESHARK_QT_HEADERS
../qt/funnel_string_dialog.h
../qt/funnel_text_dialog.h
../qt/geometry_state_dialog.h
- ../qt/gsm_map_summary_dialog.h
- ../qt/iax2_analysis_dialog.h
../qt/import_text_dialog.h
../qt/interface_frame.h
../qt/interface_toolbar_reader.h
../qt/interface_toolbar.h
../qt/io_graph_dialog.h
../qt/layout_preferences_frame.h
- ../qt/lbm_lbtrm_transport_dialog.h
- ../qt/lbm_lbtru_transport_dialog.h
- ../qt/lbm_stream_dialog.h
- ../qt/lte_mac_statistics_dialog.h
- ../qt/lte_rlc_graph_dialog.h
- ../qt/lte_rlc_statistics_dialog.h
../qt/main_application.h
../qt/main_status_bar.h
../qt/main_window_preferences_frame.h
../qt/main_window.h
../qt/manage_interfaces_dialog.h
../qt/module_preferences_scroll_area.h
- ../qt/mtp3_summary_dialog.h
../qt/multicast_statistics_dialog.h
../qt/packet_comment_dialog.h
../qt/packet_diagram.h
@@ -219,20 +204,11 @@ set(WIRESHARK_QT_HEADERS
../qt/response_time_delay_dialog.h
../qt/rpc_service_response_time_dialog.h
../qt/rsa_keys_frame.h
- ../qt/rtp_analysis_dialog.h
- ../qt/rtp_audio_stream.h
- ../qt/rtp_player_dialog.h
- ../qt/rtp_stream_dialog.h
../qt/scsi_service_response_time_dialog.h
- ../qt/sctp_all_assocs_dialog.h
- ../qt/sctp_assoc_analyse_dialog.h
- ../qt/sctp_chunk_statistics_dialog.h
- ../qt/sctp_graph_arwnd_dialog.h
- ../qt/sctp_graph_byte_dialog.h
- ../qt/sctp_graph_dialog.h
../qt/search_frame.h
- ../qt/sequence_diagram.h
- ../qt/sequence_dialog.h
+ # XXX Depends on RTP Stream Dialog
+ # ../qt/sequence_diagram.h
+ # ../qt/sequence_dialog.h
../qt/service_response_time_dialog.h
../qt/show_packet_bytes_dialog.h
../qt/simple_statistics_dialog.h
@@ -245,9 +221,7 @@ set(WIRESHARK_QT_HEADERS
../qt/traffic_table_dialog.h
../qt/uat_dialog.h
../qt/uat_frame.h
- ../qt/voip_calls_dialog.h
../qt/welcome_page.h
- ../qt/wireless_frame.h
../qt/wireshark_dialog.h
../qt/${WIRESHARK_CUSTOM_QT_HEADERS}
)
@@ -298,12 +272,11 @@ set(WIRESHARK_WIDGET_SRCS
../qt/widgets/pref_module_view.cpp
../qt/widgets/profile_tree_view.cpp
../qt/widgets/range_syntax_lineedit.cpp
- ../qt/widgets/rtp_audio_graph.cpp
../qt/widgets/splash_overlay.cpp
../qt/widgets/stock_icon_tool_button.cpp
../qt/widgets/syntax_line_edit.cpp
+ ../qt/widgets/wireless_timeline.cpp # Required by PacketListModel
../qt/widgets/tabnav_tree_view.cpp
- ../qt/widgets/wireless_timeline.cpp
../qt/widgets/wireshark_file_dialog.cpp
)
@@ -329,10 +302,6 @@ set(WIRESHARK_UTILS_SRCS
../qt/utils/frame_information.cpp
../qt/utils/proto_node.cpp
../qt/utils/qt_ui_utils.cpp
- ../qt/utils/rtp_audio_file.cpp
- ../qt/utils/rtp_audio_routing_filter.cpp
- ../qt/utils/rtp_audio_routing.cpp
- ../qt/utils/rtp_audio_silence_generator.cpp
../qt/utils/stock_icon.cpp
../qt/utils/wireshark_mime_data.cpp
../qt/utils/wireshark_zip_helper.cpp
@@ -377,7 +346,6 @@ set(WIRESHARK_MODEL_SRCS
../qt/models/uat_delegate.cpp
../qt/models/uat_model.cpp
../qt/models/url_link_delegate.cpp
- ../qt/models/voip_calls_info_model.cpp
)
set (LOGSHARK_MODEL_SRCS ${WIRESHARK_MODEL_SRCS})
@@ -424,7 +392,6 @@ set(WIRESHARK_QT_SRC
../qt/funnel_string_dialog.cpp
../qt/funnel_text_dialog.cpp
../qt/geometry_state_dialog.cpp
- ../qt/iax2_analysis_dialog.cpp
../qt/import_text_dialog.cpp
../qt/interface_frame.cpp
../qt/interface_toolbar_reader.cpp
@@ -433,9 +400,6 @@ set(WIRESHARK_QT_SRC
../qt/lbm_lbtrm_transport_dialog.cpp
../qt/lbm_lbtru_transport_dialog.cpp
../qt/lbm_stream_dialog.cpp
- ../qt/lte_mac_statistics_dialog.cpp
- ../qt/lte_rlc_graph_dialog.cpp
- ../qt/lte_rlc_statistics_dialog.cpp
../qt/main_application.cpp
../qt/main_status_bar.cpp
../qt/main_window_layout.cpp
@@ -462,20 +426,11 @@ set(WIRESHARK_QT_SRC
../qt/response_time_delay_dialog.cpp
../qt/rpc_service_response_time_dialog.cpp
../qt/rsa_keys_frame.cpp
- ../qt/rtp_analysis_dialog.cpp
- ../qt/rtp_audio_stream.cpp
- ../qt/rtp_player_dialog.cpp
- ../qt/rtp_stream_dialog.cpp
../qt/scsi_service_response_time_dialog.cpp
- ../qt/sctp_all_assocs_dialog.cpp
- ../qt/sctp_assoc_analyse_dialog.cpp
- ../qt/sctp_chunk_statistics_dialog.cpp
- ../qt/sctp_graph_arwnd_dialog.cpp
- ../qt/sctp_graph_byte_dialog.cpp
- ../qt/sctp_graph_dialog.cpp
../qt/search_frame.cpp
- ../qt/sequence_diagram.cpp
- ../qt/sequence_dialog.cpp
+ # XXX Depends on RTP Stream Dialog
+ # ../qt/sequence_diagram.cpp
+ # ../qt/sequence_dialog.cpp
../qt/service_response_time_dialog.cpp
../qt/show_packet_bytes_dialog.cpp
../qt/simple_dialog.cpp
@@ -488,9 +443,7 @@ set(WIRESHARK_QT_SRC
../qt/traffic_table_dialog.cpp
../qt/uat_dialog.cpp
../qt/uat_frame.cpp
- ../qt/voip_calls_dialog.cpp
../qt/welcome_page.cpp
- ../qt/wireless_frame.cpp
../qt/wireshark_dialog.cpp
../qt/${WIRESHARK_CUSTOM_QT_SRCS}
)
@@ -517,15 +470,8 @@ set (LOGSHARK_QT_SRC
set(WIRESHARK_QT_TAP_SRC
${CMAKE_CURRENT_SOURCE_DIR}/../qt/expert_info_dialog.cpp
${CMAKE_CURRENT_SOURCE_DIR}/../qt/funnel_statistics.cpp
- ${CMAKE_CURRENT_SOURCE_DIR}/../qt/gsm_map_summary_dialog.cpp
${CMAKE_CURRENT_SOURCE_DIR}/../qt/io_graph_dialog.cpp
- ${CMAKE_CURRENT_SOURCE_DIR}/../qt/lte_mac_statistics_dialog.cpp
- ${CMAKE_CURRENT_SOURCE_DIR}/../qt/lte_rlc_statistics_dialog.cpp
- ${CMAKE_CURRENT_SOURCE_DIR}/../qt/mtp3_summary_dialog.cpp
${CMAKE_CURRENT_SOURCE_DIR}/../qt/multicast_statistics_dialog.cpp
- ${CMAKE_CURRENT_SOURCE_DIR}/../qt/rtp_stream_dialog.cpp
- ${CMAKE_CURRENT_SOURCE_DIR}/../qt/sctp_all_assocs_dialog.cpp
- ${CMAKE_CURRENT_SOURCE_DIR}/../qt/sctp_assoc_analyse_dialog.cpp
${CMAKE_CURRENT_SOURCE_DIR}/../qt/stats_tree_dialog.cpp
${WIRESHARK_CUSTOM_TAP_SRC}
)
@@ -542,10 +488,6 @@ set (LOGSHARK_QT_FILES ${WIRESHARK_QT_FILES})
set(WIRESHARK_QT_UI
../qt/about_dialog.ui
../qt/address_editor_frame.ui
- ../qt/bluetooth_att_server_attributes_dialog.ui
- ../qt/bluetooth_device_dialog.ui
- ../qt/bluetooth_devices_dialog.ui
- ../qt/bluetooth_hci_summary_dialog.ui
../qt/capture_file_properties_dialog.ui
../qt/capture_info_dialog.ui
../qt/capture_options_dialog.ui
@@ -572,8 +514,6 @@ set(WIRESHARK_QT_UI
../qt/font_color_preferences_frame.ui
../qt/funnel_string_dialog.ui
../qt/funnel_text_dialog.ui
- ../qt/gsm_map_summary_dialog.ui
- ../qt/iax2_analysis_dialog.ui
../qt/import_text_dialog.ui
../qt/interface_frame.ui
../qt/interface_toolbar.ui
@@ -582,11 +522,9 @@ set(WIRESHARK_QT_UI
../qt/lbm_lbtrm_transport_dialog.ui
../qt/lbm_lbtru_transport_dialog.ui
../qt/lbm_stream_dialog.ui
- ../qt/lte_rlc_graph_dialog.ui
../qt/main_window_preferences_frame.ui
../qt/manage_interfaces_dialog.ui
../qt/module_preferences_scroll_area.ui
- ../qt/mtp3_summary_dialog.ui
../qt/packet_comment_dialog.ui
../qt/packet_dialog.ui
../qt/packet_format_group_box.ui
@@ -599,17 +537,9 @@ set(WIRESHARK_QT_UI
../qt/protocol_hierarchy_dialog.ui
../qt/resolved_addresses_dialog.ui
../qt/rsa_keys_frame.ui
- ../qt/rtp_analysis_dialog.ui
- ../qt/rtp_player_dialog.ui
- ../qt/rtp_stream_dialog.ui
- ../qt/sctp_all_assocs_dialog.ui
- ../qt/sctp_assoc_analyse_dialog.ui
- ../qt/sctp_chunk_statistics_dialog.ui
- ../qt/sctp_graph_arwnd_dialog.ui
- ../qt/sctp_graph_byte_dialog.ui
- ../qt/sctp_graph_dialog.ui
../qt/search_frame.ui
- ../qt/sequence_dialog.ui
+ # XXX Depends on RTP Stream Dialog
+ # ../qt/sequence_dialog.ui
../qt/show_packet_bytes_dialog.ui
../qt/supported_protocols_dialog.ui
../qt/tap_parameter_dialog.ui
@@ -618,10 +548,8 @@ set(WIRESHARK_QT_UI
../qt/traffic_table_dialog.ui
../qt/uat_dialog.ui
../qt/uat_frame.ui
- ../qt/voip_calls_dialog.ui
../qt/welcome_page.ui
../qt/widgets/splash_overlay.ui
- ../qt/wireless_frame.ui
)
if(HAVE_PCAP_REMOTE)
diff --git a/ui/qt_logshark/logshark_application.h b/ui/qt_logshark/logshark_application.h
index b28bb21f9d..fca3792a08 100644
--- a/ui/qt_logshark/logshark_application.h
+++ b/ui/qt_logshark/logshark_application.h
@@ -12,6 +12,10 @@
#include <main_application.h>
+// To do:
+// - Remove SequenceDiagram dependency on RTPStreamDialog
+// - Remove PacketListModel dependency on WirelessTimeline
+
class LogsharkApplication : public MainApplication
{
public:
diff --git a/ui/qt_logshark/logwolf_main_window.cpp b/ui/qt_logshark/logwolf_main_window.cpp
index d482b98f00..71fa06563d 100644
--- a/ui/qt_logshark/logwolf_main_window.cpp
+++ b/ui/qt_logshark/logwolf_main_window.cpp
@@ -66,8 +66,6 @@ DIAG_ON(frame-larger-than=)
#include "proto_tree.h"
#include "simple_dialog.h"
#include "tap_parameter_dialog.h"
-#include "wireless_frame.h"
-#include <ui/qt/widgets/wireless_timeline.h>
#include <ui/qt/widgets/additional_toolbar.h>
#include <ui/qt/widgets/display_filter_edit.h>
@@ -364,13 +362,6 @@ LogwolfMainWindow::LogwolfMainWindow(QWidget *parent) :
#ifdef HAVE_SOFTWARE_UPDATE
update_action_ = new QAction(tr("Check for Updates…"), main_ui_->menuHelp);
#endif
-#if defined(HAVE_LIBNL) && defined(HAVE_NL80211)
- wireless_frame_ = new WirelessFrame(this);
- main_ui_->wirelessToolBar->addWidget(wireless_frame_);
-#else
- removeToolBar(main_ui_->wirelessToolBar);
- main_ui_->menuView->removeAction(main_ui_->actionViewWirelessToolbar);
-#endif
setWindowIcon(mainApp->normalIcon());
setTitlebarForCaptureFile();
@@ -446,11 +437,6 @@ LogwolfMainWindow::LogwolfMainWindow(QWidget *parent) :
main_ui_->displayFilterToolBar->addWidget(filter_expression_toolbar_);
-#if defined(HAVE_LIBNL) && defined(HAVE_NL80211)
- connect(wireless_frame_, SIGNAL(showWirelessPreferences(QString)),
- this, SLOT(showPreferencesDialog(QString)));
-#endif
-
main_ui_->goToFrame->hide();
connect(main_ui_->goToFrame, SIGNAL(visibilityChanged(bool)),
main_ui_->actionGoGoToPacket, SLOT(setChecked(bool)));
@@ -511,7 +497,6 @@ main_ui_->goToLineEdit->setValidator(goToLineQiv);
empty_pane_.setVisible(false);
packet_list_ = new PacketList(&master_split_);
- main_ui_->wirelessTimelineWidget->setPacketList(packet_list_);
connect(packet_list_, SIGNAL(framesSelected(QList<int>)), this, SLOT(setMenusForSelectedPacket()));
connect(packet_list_, SIGNAL(framesSelected(QList<int>)), this, SIGNAL(framesSelected(QList<int>)));
@@ -758,9 +743,6 @@ QMenu *LogwolfMainWindow::createPopupMenu()
QMenu *menu = new QMenu();
menu->addAction(main_ui_->actionViewMainToolbar);
menu->addAction(main_ui_->actionViewFilterToolbar);
-#if defined(HAVE_LIBNL) && defined(HAVE_NL80211)
- menu->addAction(main_ui_->actionViewWirelessToolbar);
-#endif
if (!main_ui_->menuInterfaceToolbars->actions().isEmpty()) {
QMenu *submenu = menu->addMenu(main_ui_->menuInterfaceToolbars->title());
@@ -2152,9 +2134,6 @@ void LogwolfMainWindow::initShowHideMainWidgets()
show_hide_actions_->setExclusive(false);
shmw_actions[main_ui_->actionViewMainToolbar] = main_ui_->mainToolBar;
shmw_actions[main_ui_->actionViewFilterToolbar] = main_ui_->displayFilterToolBar;
-#if defined(HAVE_LIBNL) && defined(HAVE_NL80211)
- shmw_actions[main_ui_->actionViewWirelessToolbar] = main_ui_->wirelessToolBar;
-#endif
shmw_actions[main_ui_->actionViewStatusBar] = main_ui_->statusBar;
shmw_actions[main_ui_->actionViewPacketList] = packet_list_;
shmw_actions[main_ui_->actionViewPacketDetails] = proto_tree_;
@@ -2639,10 +2618,6 @@ void LogwolfMainWindow::setForCaptureInProgress(bool capture_in_progress, bool h
{
setMenusForCaptureInProgress(capture_in_progress);
-#if defined(HAVE_LIBNL) && defined(HAVE_NL80211)
- wireless_frame_->setCaptureInProgress(capture_in_progress);
-#endif
-
#ifdef HAVE_LIBPCAP
packet_list_->setCaptureInProgress(capture_in_progress);
packet_list_->setVerticalAutoScroll(capture_in_progress && main_ui_->actionGoAutoScroll->isChecked());
@@ -2671,12 +2646,6 @@ static QList<register_stat_group_t> menu_groups = QList<register_stat_group_t>()
<< REGISTER_STAT_GROUP_ENDPOINT_LIST
<< REGISTER_STAT_GROUP_RESPONSE_TIME
<< REGISTER_STAT_GROUP_RSERPOOL
- << REGISTER_STAT_GROUP_TELEPHONY
- << REGISTER_STAT_GROUP_TELEPHONY_ANSI
- << REGISTER_STAT_GROUP_TELEPHONY_GSM
- << REGISTER_STAT_GROUP_TELEPHONY_LTE
- << REGISTER_STAT_GROUP_TELEPHONY_MTP3
- << REGISTER_STAT_GROUP_TELEPHONY_SCTP
<< REGISTER_TOOLS_GROUP_UNSORTED;
void LogwolfMainWindow::addMenuActions(QList<QAction *> &actions, int menu_group)
@@ -2695,21 +2664,6 @@ void LogwolfMainWindow::addMenuActions(QList<QAction *> &actions, int menu_group
case REGISTER_STAT_GROUP_RSERPOOL:
main_ui_->menuRSerPool->addAction(action);
break;
- case REGISTER_STAT_GROUP_TELEPHONY:
- main_ui_->menuTelephony->addAction(action);
- break;
- case REGISTER_STAT_GROUP_TELEPHONY_ANSI:
- main_ui_->menuANSI->addAction(action);
- break;
- case REGISTER_STAT_GROUP_TELEPHONY_GSM:
- main_ui_->menuGSM->addAction(action);
- break;
- case REGISTER_STAT_GROUP_TELEPHONY_LTE:
- main_ui_->menuLTE->addAction(action);
- break;
- case REGISTER_STAT_GROUP_TELEPHONY_MTP3:
- main_ui_->menuMTP3->addAction(action);
- break;
case REGISTER_TOOLS_GROUP_UNSORTED:
{
// Allow the creation of submenus. Mimics the behavor of
@@ -2761,21 +2715,6 @@ void LogwolfMainWindow::removeMenuActions(QList<QAction *> &actions, int menu_gr
case REGISTER_STAT_GROUP_RSERPOOL:
main_ui_->menuRSerPool->removeAction(action);
break;
- case REGISTER_STAT_GROUP_TELEPHONY:
- main_ui_->menuTelephony->removeAction(action);
- break;
- case REGISTER_STAT_GROUP_TELEPHONY_ANSI:
- main_ui_->menuANSI->removeAction(action);
- break;
- case REGISTER_STAT_GROUP_TELEPHONY_GSM:
- main_ui_->menuGSM->removeAction(action);
- break;
- case REGISTER_STAT_GROUP_TELEPHONY_LTE:
- main_ui_->menuLTE->removeAction(action);
- break;
- case REGISTER_STAT_GROUP_TELEPHONY_MTP3:
- main_ui_->menuMTP3->removeAction(action);
- break;
case REGISTER_TOOLS_GROUP_UNSORTED:
{
// Allow removal of submenus.
@@ -2799,35 +2738,11 @@ void LogwolfMainWindow::removeMenuActions(QList<QAction *> &actions, int menu_gr
void LogwolfMainWindow::addDynamicMenus()
{
- // Manual additions
- mainApp->addDynamicMenuGroupItem(REGISTER_STAT_GROUP_TELEPHONY_GSM, main_ui_->actionTelephonyGsmMapSummary);
- mainApp->addDynamicMenuGroupItem(REGISTER_STAT_GROUP_TELEPHONY_LTE, main_ui_->actionTelephonyLteMacStatistics);
- mainApp->addDynamicMenuGroupItem(REGISTER_STAT_GROUP_TELEPHONY_LTE, main_ui_->actionTelephonyLteRlcStatistics);
- mainApp->addDynamicMenuGroupItem(REGISTER_STAT_GROUP_TELEPHONY_LTE, main_ui_->actionTelephonyLteRlcGraph);
- mainApp->addDynamicMenuGroupItem(REGISTER_STAT_GROUP_TELEPHONY_MTP3, main_ui_->actionTelephonyMtp3Summary);
- mainApp->addDynamicMenuGroupItem(REGISTER_STAT_GROUP_TELEPHONY, main_ui_->actionTelephonySipFlows);
-
// Fill in each menu
foreach(register_stat_group_t menu_group, menu_groups) {
QList<QAction *>actions = mainApp->dynamicMenuGroupItems(menu_group);
addMenuActions(actions, menu_group);
}
-
- // Empty menus don't show up: https://bugreports.qt.io/browse/QTBUG-33728
- // We've added a placeholder in order to make sure some menus are visible.
- // Hide them as needed.
- if (mainApp->dynamicMenuGroupItems(REGISTER_STAT_GROUP_TELEPHONY_ANSI).length() > 0) {
- main_ui_->actionTelephonyANSIPlaceholder->setVisible(false);
- }
- if (mainApp->dynamicMenuGroupItems(REGISTER_STAT_GROUP_TELEPHONY_GSM).length() > 0) {
- main_ui_->actionTelephonyGSMPlaceholder->setVisible(false);
- }
- if (mainApp->dynamicMenuGroupItems(REGISTER_STAT_GROUP_TELEPHONY_LTE).length() > 0) {
- main_ui_->actionTelephonyLTEPlaceholder->setVisible(false);
- }
- if (mainApp->dynamicMenuGroupItems(REGISTER_STAT_GROUP_TELEPHONY_MTP3).length() > 0) {
- main_ui_->actionTelephonyMTP3Placeholder->setVisible(false);
- }
}
void LogwolfMainWindow::reloadDynamicMenus()
@@ -3031,130 +2946,3 @@ frame_data * LogwolfMainWindow::frameDataForRow(int row) const
return Q_NULLPTR;
}
-
-// Finds rtp id for selected stream and adds it to stream_ids
-// If reverse is set, tries to find reverse stream too
-// Return error string if error happens
-//
-// Note: Caller must free each returned rtpstream_info_t
-QString LogwolfMainWindow::findRtpStreams(QVector<rtpstream_id_t *> *stream_ids, bool reverse)
-{
- rtpstream_tapinfo_t tapinfo;
- rtpstream_id_t *fwd_id, *rev_id;
- bool fwd_id_used, rev_id_used;
- const gchar filter_text[] = "rtp && rtp.version == 2 && rtp.ssrc && (ip || ipv6)";
- dfilter_t *sfcode;
- gchar *err_msg;
-
- /* Try to get the hfid for "rtp.ssrc". */
- int hfid_rtp_ssrc = proto_registrar_get_id_byname("rtp.ssrc");
- if (hfid_rtp_ssrc == -1) {
- return tr("There is no \"rtp.ssrc\" field in this version of Wireshark.");
- }
-
- /* Try to compile the filter. */
- if (!dfilter_compile(filter_text, &sfcode, &err_msg)) {
- QString err = QString(err_msg);
- g_free(err_msg);
- return err;
- }
-
- if (!capture_file_.capFile() || !capture_file_.capFile()->current_frame) close();
-
- if (!cf_read_current_record(capture_file_.capFile())) close();
-
- frame_data *fdata = capture_file_.capFile()->current_frame;
-
- epan_dissect_t edt;
-
- epan_dissect_init(&edt, capture_file_.capFile()->epan, true, false);
- epan_dissect_prime_with_dfilter(&edt, sfcode);
- epan_dissect_prime_with_hfid(&edt, hfid_rtp_ssrc);
- epan_dissect_run(&edt, capture_file_.capFile()->cd_t,
- &capture_file_.capFile()->rec,
- frame_tvbuff_new_buffer(
- &capture_file_.capFile()->provider, fdata,
- &capture_file_.capFile()->buf),
- fdata, NULL);
-
- /*
- * Packet must be an RTPv2 packet with an SSRC; we use the filter to
- * check.
- */
- if (!dfilter_apply_edt(sfcode, &edt)) {
- epan_dissect_cleanup(&edt);
- dfilter_free(sfcode);
- return tr("Please select an RTPv2 packet with an SSRC value");
- }
-
- dfilter_free(sfcode);
-
- /* We need the SSRC value of the current frame; try to get it. */
- GPtrArray *gp = proto_get_finfo_ptr_array(edt.tree, hfid_rtp_ssrc);
- if (gp == NULL || gp->len == 0) {
- /* XXX - should not happen, as the filter includes rtp.ssrc */
- epan_dissect_cleanup(&edt);
- return tr("SSRC value not found.");
- }
-
- /*
- * OK, we have the SSRC value, so we can proceed.
- * Allocate RTP stream ID structures.
- */
- fwd_id = g_new0(rtpstream_id_t, 1);
- fwd_id_used = false;
- rev_id = g_new0(rtpstream_id_t, 1);
- rev_id_used = false;
-
- /* Get the IP and port values for the forward direction. */
- rtpstream_id_copy_pinfo(&(edt.pi), fwd_id, false);
-
- /* assume the inverse ip/port combination for the reverse direction */
- rtpstream_id_copy_pinfo(&(edt.pi), rev_id, true);
-
- /* Save the SSRC value for the forward direction. */
- fwd_id->ssrc = fvalue_get_uinteger(&((field_info *)gp->pdata[0])->value);
-
- epan_dissect_cleanup(&edt);
-
- /* Register the tap listener */
- memset(&tapinfo, 0, sizeof(rtpstream_tapinfo_t));
- tapinfo.tap_data = this;
- tapinfo.mode = TAP_ANALYSE;
-
- /* Scan for RTP streams (redissect all packets) */
- rtpstream_scan(&tapinfo, capture_file_.capFile(), Q_NULLPTR);
-
- for (GList *strinfo_list = g_list_first(tapinfo.strinfo_list); strinfo_list; strinfo_list = gxx_list_next(strinfo_list)) {
- rtpstream_info_t * strinfo = gxx_list_data(rtpstream_info_t*, strinfo_list);
- if (rtpstream_id_equal(&(strinfo->id), fwd_id,RTPSTREAM_ID_EQUAL_NONE))
- {
- *stream_ids << fwd_id;
- fwd_id_used = true;
- }
-
- if (rtpstream_id_equal(&(strinfo->id), rev_id,RTPSTREAM_ID_EQUAL_NONE))
- {
- if (rev_id->ssrc == 0) {
- rev_id->ssrc = strinfo->id.ssrc;
- }
- if (reverse) {
- *stream_ids << rev_id;
- rev_id_used = true;
- }
- }
- }
-
- //
- // XXX - is it guaranteed that fwd_id and rev_id were both added to
- // *stream_ids? If so, this isn't necessary.
- //
- if (!fwd_id_used) {
- rtpstream_id_free(fwd_id);
- }
- if (!rev_id_used) {
- rtpstream_id_free(rev_id);
- }
- return NULL;
-}
-
diff --git a/ui/qt_logshark/logwolf_main_window.h b/ui/qt_logshark/logwolf_main_window.h
index df1e76e8e3..27b9176b95 100644
--- a/ui/qt_logshark/logwolf_main_window.h
+++ b/ui/qt_logshark/logwolf_main_window.h
@@ -73,9 +73,6 @@
#include <ui/qt/widgets/display_filter_combo.h>
#include "follow_stream_dialog.h"
#include "main_window.h"
-#include "rtp_stream_dialog.h"
-#include "voip_calls_dialog.h"
-#include "rtp_analysis_dialog.h"
class AccordionFrame;
class ByteViewTab;
@@ -89,9 +86,6 @@ class PacketCommentDialog;
class PacketDiagram;
class PacketList;
class ProtoTree;
-#if defined(HAVE_LIBNL) && defined(HAVE_NL80211)
-class WirelessFrame;
-#endif
class FilterExpressionToolBar;
class WiresharkApplication;
@@ -175,9 +169,6 @@ private:
CaptureFile capture_file_;
QFont mono_font_;
QMap<QString, QTextCodec *> text_codec_map_;
-#if defined(HAVE_LIBNL) && defined(HAVE_NL80211)
- WirelessFrame *wireless_frame_;
-#endif
QWidget *previous_focus_;
FileSetDialog *file_set_dialog_;
QActionGroup *show_hide_actions_;
@@ -281,8 +272,6 @@ signals:
void fieldHighlight(FieldInformation *);
void captureActive(int);
- void selectRtpStream(rtpstream_id_t *id);
- void deselectRtpStream(rtpstream_id_t *id);
#ifdef HAVE_LIBPCAP
void showExtcapOptions(QString &device_name, bool startCaptureOnClose);
@@ -323,20 +312,8 @@ public slots:
void captureFileClosing();
void captureFileClosed();
- void launchRLCGraph(bool channelKnown, guint16 ueid, guint8 rlcMode,
- guint16 channelType, guint16 channelId, guint8 direction);
-
void on_actionViewFullScreen_triggered(bool checked);
- void rtpPlayerDialogReplaceRtpStreams(QVector<rtpstream_id_t *> stream_ids);
- void rtpPlayerDialogAddRtpStreams(QVector<rtpstream_id_t *> stream_ids);
- void rtpPlayerDialogRemoveRtpStreams(QVector<rtpstream_id_t *> stream_ids);
- void rtpAnalysisDialogReplaceRtpStreams(QVector<rtpstream_id_t *> stream_ids);
- void rtpAnalysisDialogAddRtpStreams(QVector<rtpstream_id_t *> stream_ids);
- void rtpAnalysisDialogRemoveRtpStreams(QVector<rtpstream_id_t *> stream_ids);
- void rtpStreamsDialogSelectRtpStreams(QVector<rtpstream_id_t *> stream_ids);
- void rtpStreamsDialogDeselectRtpStreams(QVector<rtpstream_id_t *> stream_ids);
-
private slots:
void captureEventHandler(CaptureEvent ev);
@@ -563,7 +540,6 @@ private slots:
void on_actionAnalyzeFollowHTTPStream_triggered();
void on_actionAnalyzeFollowHTTP2Stream_triggered();
void on_actionAnalyzeFollowQUICStream_triggered();
- void on_actionAnalyzeFollowSIPCall_triggered();
void statCommandExpertInfo(const char *, void *);
void on_actionAnalyzeExpertInfo_triggered();
@@ -608,10 +584,6 @@ private slots:
void on_actionStatisticsTcpStreamThroughput_triggered();
void on_actionStatisticsTcpStreamRoundTripTime_triggered();
void on_actionStatisticsTcpStreamWindowScaling_triggered();
- void openSCTPAllAssocsDialog();
- void on_actionSCTPShowAllAssociations_triggered();
- void on_actionSCTPAnalyseThisAssociation_triggered();
- void on_actionSCTPFilterThisAssociation_triggered();
void statCommandMulticastStatistics(const char *arg, void *);
void on_actionStatisticsUdpMulticastStreams_triggered();
@@ -656,32 +628,6 @@ private slots:
void on_actionStatisticsSOMEIPmessages_triggered();
void on_actionStatisticsSOMEIPSDentries_triggered();
- RtpStreamDialog *openTelephonyRtpStreamsDialog();
- RtpPlayerDialog *openTelephonyRtpPlayerDialog();
- VoipCallsDialog *openTelephonyVoipCallsDialogVoip();
- VoipCallsDialog *openTelephonyVoipCallsDialogSip();
- RtpAnalysisDialog *openTelephonyRtpAnalysisDialog();
- void on_actionTelephonyVoipCalls_triggered();
- void on_actionTelephonyGsmMapSummary_triggered();
- void statCommandLteMacStatistics(const char *arg, void *);
- void on_actionTelephonyLteRlcStatistics_triggered();
- void statCommandLteRlcStatistics(const char *arg, void *);
- void on_actionTelephonyLteMacStatistics_triggered();
- void on_actionTelephonyLteRlcGraph_triggered();
- void on_actionTelephonyIax2StreamAnalysis_triggered();
- void on_actionTelephonyISUPMessages_triggered();
- void on_actionTelephonyMtp3Summary_triggered();
- void on_actionTelephonyOsmuxPacketCounter_triggered();
- void on_actionTelephonyRtpStreams_triggered();
- void on_actionTelephonyRtpStreamAnalysis_triggered();
- void on_actionTelephonyRtpPlayer_triggered();
- void on_actionTelephonyRTSPPacketCounter_triggered();
- void on_actionTelephonySMPPOperations_triggered();
- void on_actionTelephonyUCPMessages_triggered();
- void on_actionTelephonyF1APMessages_triggered();
- void on_actionTelephonyNGAPMessages_triggered();
- void on_actionTelephonySipFlows_triggered();
-
void on_actionToolsFirewallAclRules_triggered();
void on_actionToolsCredentials_triggered();
@@ -695,8 +641,6 @@ private slots:
void extcap_options_finished(int result);
void showExtcapOptionsDialog(QString & device_name, bool startCaptureOnClose);
- QString findRtpStreams(QVector<rtpstream_id_t *> *stream_ids, bool reverse);
-
friend class MainApplication;
};
diff --git a/ui/qt_logshark/logwolf_main_window.ui b/ui/qt_logshark/logwolf_main_window.ui
index fadc2e711e..379f452743 100644
--- a/ui/qt_logshark/logwolf_main_window.ui
+++ b/ui/qt_logshark/logwolf_main_window.ui
@@ -123,9 +123,6 @@
<widget class="FilterExpressionFrame" name="filterExpressionFrame"/>
</item>
<item>
- <widget class="WirelessTimeline" name="wirelessTimelineWidget" native="true"/>
- </item>
- <item>
<widget class="QStackedWidget" name="mainStack">
<property name="enabled">
<bool>true</bool>
@@ -141,7 +138,7 @@
<x>0</x>
<y>0</y>
<width>960</width>
- <height>22</height>
+ <height>21</height>
</rect>
</property>
<widget class="QMenu" name="menuFile">
@@ -355,7 +352,6 @@
</widget>
<addaction name="actionViewMainToolbar"/>
<addaction name="actionViewFilterToolbar"/>
- <addaction name="actionViewWirelessToolbar"/>
<addaction name="menuInterfaceToolbars"/>
<addaction name="menuAdditionalToolbars"/>
<addaction name="actionViewStatusBar"/>
@@ -404,14 +400,6 @@
<string>Prepare as Filter</string>
</property>
</widget>
- <widget class="QMenu" name="menuSCTP">
- <property name="title">
- <string>SCTP</string>
- </property>
- <addaction name="actionSCTPAnalyseThisAssociation"/>
- <addaction name="actionSCTPShowAllAssociations"/>
- <addaction name="actionSCTPFilterThisAssociation"/>
- </widget>
<widget class="QMenu" name="menuFollow">
<property name="title">
<string>Follow</string>
@@ -423,7 +411,6 @@
<addaction name="actionAnalyzeFollowHTTPStream"/>
<addaction name="actionAnalyzeFollowHTTP2Stream"/>
<addaction name="actionAnalyzeFollowQUICStream"/>
- <addaction name="actionAnalyzeFollowSIPCall"/>
</widget>
<widget class="QMenu" name="menuConversationFilter">
<property name="title">
@@ -443,7 +430,6 @@
<addaction name="actionAnalyzeDecodeAs"/>
<addaction name="actionAnalyzeReloadLuaPlugins"/>
<addaction name="separator"/>
- <addaction name="menuSCTP"/>
<addaction name="menuFollow"/>
<addaction name="separator"/>
<addaction name="actionAnalyzeShowPacketBytes"/>
@@ -526,6 +512,18 @@
<string>Service &amp;Response Time</string>
</property>
</widget>
+ <widget class="QMenu" name="menuRSerPool">
+ <property name="title">
+ <string>Reliable Server Pooling (RSerPool)</string>
+ </property>
+ </widget>
+ <widget class="QMenu" name="menuSOMEIP">
+ <property name="title">
+ <string>SOME/IP</string>
+ </property>
+ <addaction name="actionStatisticsSOMEIPmessages"/>
+ <addaction name="actionStatisticsSOMEIPSDentries"/>
+ </widget>
<addaction name="actionStatisticsCaptureFileProperties"/>
<addaction name="actionStatisticsResolvedAddresses"/>
<addaction name="actionStatisticsProtocolHierarchy"/>
@@ -550,91 +548,8 @@
<addaction name="menuTcpStreamGraphs"/>
<addaction name="actionStatisticsUdpMulticastStreams"/>
<addaction name="menuRSerPool"/>
- <widget class="QMenu" name="menuRSerPool">
- <property name="title">
- <string>Reliable Server Pooling (RSerPool)</string>
- </property>
- </widget>
<addaction name="actionStatistics_REGISTER_STAT_GROUP_RSERPOOL"/>
<addaction name="menuSOMEIP"/>
- <widget class="QMenu" name="menuSOMEIP">
- <property name="title">
- <string>SOME/IP</string>
- </property>
- <addaction name="actionStatisticsSOMEIPmessages"/>
- <addaction name="actionStatisticsSOMEIPSDentries"/>
- </widget>
- </widget>
- <widget class="QMenu" name="menuTelephony">
- <property name="title">
- <string>Telephon&amp;y</string>
- </property>
- <widget class="QMenu" name="menuRTSP">
- <property name="title">
- <string>RTSP</string>
- </property>
- <addaction name="actionTelephonyRTSPPacketCounter"/>
- </widget>
- <widget class="QMenu" name="menuRTP">
- <property name="title">
- <string>&amp;RTP</string>
- </property>
- <addaction name="actionTelephonyRtpStreams"/>
- <addaction name="actionTelephonyRtpStreamAnalysis"/>
- <addaction name="actionTelephonyRtpPlayer"/>
- </widget>
- <widget class="QMenu" name="menuTelephonySCTP">
- <property name="title">
- <string>S&amp;CTP</string>
- </property>
- <addaction name="actionSCTPAnalyseThisAssociation"/>
- <addaction name="actionSCTPShowAllAssociations"/>
- </widget>
- <widget class="QMenu" name="menuANSI">
- <property name="title">
- <string>&amp;ANSI</string>
- </property>
- <addaction name="actionTelephonyANSIPlaceholder"/>
- </widget>
- <widget class="QMenu" name="menuGSM">
- <property name="title">
- <string>&amp;GSM</string>
- </property>
- <addaction name="actionTelephonyGSMPlaceholder"/>
- </widget>
- <widget class="QMenu" name="menuLTE">
- <property name="title">
- <string>&amp;LTE</string>
- </property>
- <addaction name="actionTelephonyLTEPlaceholder"/>
- </widget>
- <widget class="QMenu" name="menuMTP3">
- <property name="title">
- <string>&amp;MTP3</string>
- </property>
- <addaction name="actionTelephonyMTP3Placeholder"/>
- </widget>
- <widget class="QMenu" name="menuOsmux">
- <property name="title">
- <string>Osmux</string>
- </property>
- <addaction name="actionTelephonyOsmuxPacketCounter"/>
- </widget>
- <addaction name="actionTelephonyVoipCalls"/>
- <addaction name="menuANSI"/>
- <addaction name="menuGSM"/>
- <addaction name="actionTelephonyIax2StreamAnalysis"/>
- <addaction name="actionTelephonyISUPMessages"/>
- <addaction name="menuLTE"/>
- <addaction name="menuMTP3"/>
- <addaction name="menuOsmux"/>
- <addaction name="menuRTP"/>
- <addaction name="menuRTSP"/>
- <addaction name="menuTelephonySCTP"/>
- <addaction name="actionTelephonySMPPOperations"/>
- <addaction name="actionTelephonyUCPMessages"/>
- <addaction name="actionTelephonyF1APMessages"/>
- <addaction name="actionTelephonyNGAPMessages"/>
</widget>
<widget class="QMenu" name="menuEdit">
<property name="title">
@@ -656,6 +571,11 @@
<addaction name="separator"/>
<addaction name="actionEditCopyAsFilter"/>
</widget>
+ <widget class="QMenu" name="menuPacketComment">
+ <property name="title">
+ <string>Packet Comments</string>
+ </property>
+ </widget>
<addaction name="menuEditCopy"/>
<addaction name="actionEditFindPacket"/>
<addaction name="actionEditFindNext"/>
@@ -678,11 +598,6 @@
<addaction name="separator"/>
<addaction name="actionEditTimeShift"/>
<addaction name="separator"/>
- <widget class="QMenu" name="menuPacketComment">
- <property name="title">
- <string>Packet Comments</string>
- </property>
- </widget>
<addaction name="menuPacketComment"/>
<addaction name="actionDeleteAllPacketComments"/>
<addaction name="separator"/>
@@ -703,8 +618,6 @@
<addaction name="menuCapture"/>
<addaction name="menuAnalyze"/>
<addaction name="menuStatistics"/>
- <addaction name="menuTelephony"/>
- <addaction name="menuWireless"/>
<addaction name="menuTools"/>
<addaction name="menuHelp"/>
</widget>
@@ -783,20 +696,6 @@
</attribute>
<addaction name="actionNewDisplayFilterExpression"/>
</widget>
- <widget class="QToolBar" name="wirelessToolBar">
- <property name="windowTitle">
- <string>Wireless Toolbar</string>
- </property>
- <property name="movable">
- <bool>false</bool>
- </property>
- <attribute name="toolBarArea">
- <enum>TopToolBarArea</enum>
- </attribute>
- <attribute name="toolBarBreak">
- <bool>true</bool>
- </attribute>
- </widget>
<action name="actionFileOpen">
<property name="text">
<string>&amp;Open</string>
@@ -1767,14 +1666,6 @@
<string>QUIC Stream</string>
</property>
</action>
- <action name="actionAnalyzeFollowSIPCall">
- <property name="enabled">
- <bool>false</bool>
- </property>
- <property name="text">
- <string>SIP Call</string>
- </property>
- </action>
<action name="actionStatisticsTcpStreamTcptrace">
<property name="text">
<string>Time Sequence (tcptrace)</string>
@@ -1783,16 +1674,6 @@
<string>TCP time sequence graph (tcptrace)</string>
</property>
</action>
- <action name="actionSCTPAnalyseThisAssociation">
- <property name="text">
- <string>Analyse this Association</string>
- </property>
- </action>
- <action name="actionSCTPShowAllAssociations">
- <property name="text">
- <string>Show All Associations</string>
- </property>
- </action>
<action name="actionStatisticsFlowGraph">
<property name="text">
<string>Flow Graph</string>
@@ -1929,76 +1810,20 @@
<string>Sametime statistics</string>
</property>
</action>
- <action name="actionStatisticsSOMEIPmessages">
- <property name="text">
- <string>SOME/IP Messages</string>
- </property>
- <property name="toolTip">
- <string>SOME/IP Message statistics</string>
- </property>
- </action>
- <action name="actionStatisticsSOMEIPSDentries">
- <property name="text">
- <string>SOME/IP-SD Entries</string>
- </property>
- <property name="toolTip">
- <string>SOME/IP-SD Entries statistics</string>
- </property>
- </action>
- <action name="actionTelephonyISUPMessages">
- <property name="text">
- <string>&amp;ISUP Messages</string>
- </property>
- <property name="toolTip">
- <string>ISUP message statistics</string>
- </property>
- </action>
- <action name="actionTelephonyOsmuxPacketCounter">
- <property name="text">
- <string>Packet Counter</string>
- </property>
- <property name="toolTip">
- <string>Osmux packet counts</string>
- </property>
- </action>
- <action name="actionTelephonyRTSPPacketCounter">
+ <action name="actionStatisticsSOMEIPmessages">
<property name="text">
- <string>Packet Counter</string>
+ <string>SOME/IP Messages</string>
</property>
<property name="toolTip">
- <string>RTSP packet counts</string>
+ <string>SOME/IP Message statistics</string>
</property>
</action>
- <action name="actionTelephonySMPPOperations">
+ <action name="actionStatisticsSOMEIPSDentries">
<property name="text">
- <string>SM&amp;PP Operations</string>
- </property>
- <property name="toolTip">
- <string>SMPP operation statistics</string>
- </property>
- </action>
- <action name="actionTelephonyUCPMessages">
- <property name="text">
- <string>&amp;UCP Messages</string>
- </property>
- <property name="toolTip">
- <string>UCP message statistics</string>
- </property>
- </action>
- <action name="actionTelephonyF1APMessages">
- <property name="text">
- <string>F1AP</string>
- </property>
- <property name="toolTip">
- <string>F1AP Messages</string>
- </property>
- </action>
- <action name="actionTelephonyNGAPMessages">
- <property name="text">
- <string>NGAP</string>
+ <string>SOME/IP-SD Entries</string>
</property>
<property name="toolTip">
- <string>NGAP Messages</string>
+ <string>SOME/IP-SD Entries statistics</string>
</property>
</action>
<action name="actionAnalyzeDecodeAs">
@@ -2098,14 +1923,6 @@
<string>LBT-RU</string>
</property>
</action>
- <action name="actionSCTPFilterThisAssociation">
- <property name="text">
- <string>Filter this Association</string>
- </property>
- <property name="toolTip">
- <string>Filter this Association</string>
- </property>
- </action>
<action name="actionFileExportPDU">
<property name="text">
<string>Export PDUs to File…</string>
@@ -2466,17 +2283,6 @@
<string>Show names for known TCP, UDP, and SCTP services. Lookups can generate traffic on some systems.</string>
</property>
</action>
- <action name="actionViewWirelessToolbar">
- <property name="checkable">
- <bool>true</bool>
- </property>
- <property name="text">
- <string>Wire&amp;less Toolbar</string>
- </property>
- <property name="toolTip">
- <string>Show or hide the wireless toolbar</string>
- </property>
- </action>
<action name="actionViewStatusBar">
<property name="checkable">
<bool>true</bool>
@@ -2571,67 +2377,6 @@
<string>Show the currently supported protocols and display filter fields</string>
</property>
</action>
- <action name="actionTelephonyGsmMapSummary">
- <property name="text">
- <string>MAP Summary</string>
- </property>
- <property name="toolTip">
- <string>GSM MAP summary statistics</string>
- </property>
- </action>
- <action name="actionTelephonyLteMacStatistics">
- <property name="text">
- <string>MAC Statistics</string>
- </property>
- <property name="toolTip">
- <string>LTE MAC statistics</string>
- </property>
- </action>
- <action name="actionTelephonyLteRlcStatistics">
- <property name="text">
- <string>RLC Statistics</string>
- </property>
- <property name="toolTip">
- <string>LTE RLC statistics</string>
- </property>
- </action>
- <action name="actionTelephonyLteRlcGraph">
- <property name="text">
- <string>RLC &amp;Graph</string>
- </property>
- <property name="toolTip">
- <string>LTE RLC graph</string>
- </property>
- </action>
- <action name="actionTelephonyMtp3Summary">
- <property name="text">
- <string>MTP3 Summary</string>
- </property>
- <property name="toolTip">
- <string>MTP3 summary statistics</string>
- </property>
- </action>
- <action name="actionTelephonyVoipCalls">
- <property name="text">
- <string>&amp;VoIP Calls</string>
- </property>
- <property name="toolTip">
- <string>All VoIP Calls</string>
- </property>
- </action>
- <action name="actionTelephonySipFlows">
- <property name="text">
- <string>SIP &amp;Flows</string>
- </property>
- <property name="toolTip">
- <string>SIP Flows</string>
- </property>
- </action>
- <action name="actionTelephonyRtpStreams">
- <property name="text">
- <string>RTP Streams</string>
- </property>
- </action>
<action name="actionViewColoringRules">
<property name="text">
<string>&amp;Coloring Rules…</string>
@@ -2714,38 +2459,6 @@
<enum>QAction::NoRole</enum>
</property>
</action>
- <action name="actionTelephonyANSIPlaceholder">
- <property name="enabled">
- <bool>false</bool>
- </property>
- <property name="text">
- <string>No ANSI statistics registered</string>
- </property>
- </action>
- <action name="actionTelephonyGSMPlaceholder">
- <property name="enabled">
- <bool>false</bool>
- </property>
- <property name="text">
- <string>No GSM statistics registered</string>
- </property>
- </action>
- <action name="actionTelephonyLTEPlaceholder">
- <property name="enabled">
- <bool>false</bool>
- </property>
- <property name="text">
- <string>No LTE statistics registered</string>
- </property>
- </action>
- <action name="actionTelephonyMTP3Placeholder">
- <property name="enabled">
- <bool>false</bool>
- </property>
- <property name="text">
- <string>No MTP3 statistics registered</string>
- </property>
- </action>
<action name="actionStatisticsResolvedAddresses">
<property name="text">
<string>Resolved Addresses</string>
@@ -2880,30 +2593,6 @@
<string notr="true">Ctrl+Space</string>
</property>
</action>
- <action name="actionTelephonyRtpStreamAnalysis">
- <property name="text">
- <string>RTP Stream Analysis</string>
- </property>
- <property name="toolTip">
- <string>RTP Stream Analysis for selected stream. Press CTRL key for adding reverse stream too.</string>
- </property>
- </action>
- <action name="actionTelephonyRtpPlayer">
- <property name="text">
- <string>RTP Player</string>
- </property>
- <property name="toolTip">
- <string>Play selected stream. Press CTRL key for playing reverse stream too.</string>
- </property>
- </action>
- <action name="actionTelephonyIax2StreamAnalysis">
- <property name="text">
- <string>IA&amp;X2 Stream Analysis</string>
- </property>
- <property name="toolTip">
- <string>IAX2 Stream Analysis</string>
- </property>
- </action>
<action name="actionViewEditResolvedName">
<property name="text">
<string>Edit Resolved Name</string>
@@ -3038,15 +2727,10 @@
<header>filter_expression_frame.h</header>
<container>1</container>
</customwidget>
- <customwidget>
- <class>WirelessTimeline</class>
- <extends>QWidget</extends>
- <header>widgets/wireless_timeline.h</header>
- <container>1</container>
- </customwidget>
</customwidgets>
<resources>
<include location="../../image/stock_icons.qrc"/>
+ <include location="../../image/stock_icons.qrc"/>
</resources>
<connections>
<connection>
diff --git a/ui/qt_logshark/logwolf_main_window_slots.cpp b/ui/qt_logshark/logwolf_main_window_slots.cpp
index 6f4764c3a6..c217187c52 100644
--- a/ui/qt_logshark/logwolf_main_window_slots.cpp
+++ b/ui/qt_logshark/logwolf_main_window_slots.cpp
@@ -114,19 +114,13 @@ DIAG_ON(frame-larger-than=)
#include "filter_dialog.h"
#include "firewall_rules_dialog.h"
#include "funnel_statistics.h"
-#include "gsm_map_summary_dialog.h"
-#include "iax2_analysis_dialog.h"
#include "interface_toolbar.h"
#include "io_graph_dialog.h"
#include <ui/qt/widgets/additional_toolbar.h>
#include "lbm_stream_dialog.h"
#include "lbm_lbtrm_transport_dialog.h"
#include "lbm_lbtru_transport_dialog.h"
-#include "lte_mac_statistics_dialog.h"
-#include "lte_rlc_statistics_dialog.h"
-#include "lte_rlc_graph_dialog.h"
#include "main_application.h"
-#include "mtp3_summary_dialog.h"
#include "multicast_statistics_dialog.h"
#include "packet_comment_dialog.h"
#include "packet_diagram.h"
@@ -140,12 +134,7 @@ DIAG_ON(frame-larger-than=)
#include <ui/qt/utils/qt_ui_utils.h>
#include "resolved_addresses_dialog.h"
#include "rpc_service_response_time_dialog.h"
-#include "rtp_stream_dialog.h"
-#include "rtp_analysis_dialog.h"
-#include "sctp_all_assocs_dialog.h"
-#include "sctp_assoc_analyse_dialog.h"
-#include "sctp_graph_dialog.h"
-#include "sequence_dialog.h"
+//#include "sequence_dialog.h"
#include "show_packet_bytes_dialog.h"
#include "stats_tree_dialog.h"
#include <ui/qt/utils/stock_icon.h>
@@ -154,8 +143,6 @@ DIAG_ON(frame-larger-than=)
#include "tcp_stream_dialog.h"
#include "time_shift_dialog.h"
#include "uat_dialog.h"
-#include "voip_calls_dialog.h"
-#include <ui/qt/widgets/wireless_timeline.h>
#include <functional>
#include <QClipboard>
@@ -330,9 +317,6 @@ void LogwolfMainWindow::layoutToolbars()
main_ui_->mainToolBar->setVisible(recent.main_toolbar_show);
main_ui_->displayFilterToolBar->setVisible(recent.filter_toolbar_show);
-#if defined(HAVE_LIBNL) && defined(HAVE_NL80211)
- main_ui_->wirelessToolBar->setVisible(recent.wireless_toolbar_show);
-#endif
main_ui_->statusBar->setVisible(recent.statusbar_show);
foreach(QAction *action, main_ui_->menuInterfaceToolbars->actions()) {
@@ -377,7 +361,6 @@ void LogwolfMainWindow::updateRecentActions()
{
main_ui_->actionViewMainToolbar->setChecked(recent.main_toolbar_show);
main_ui_->actionViewFilterToolbar->setChecked(recent.filter_toolbar_show);
- main_ui_->actionViewWirelessToolbar->setChecked(recent.wireless_toolbar_show);
main_ui_->actionViewStatusBar->setChecked(recent.statusbar_show);
main_ui_->actionViewPacketList->setChecked(recent.packet_list_show && prefs_has_layout_pane_content(layout_pane_content_plist));
main_ui_->actionViewPacketDetails->setChecked(recent.tree_view_show && prefs_has_layout_pane_content(layout_pane_content_pdetails));
@@ -755,7 +738,6 @@ void LogwolfMainWindow::captureFileReadStarted(const QString &action) {
mainApp->pushStatus(WiresharkApplication::FileStatus, msg, msgtip);
showCapture();
main_ui_->actionAnalyzeReloadLuaPlugins->setEnabled(false);
- main_ui_->wirelessTimelineWidget->captureFileReadStarted(capture_file_.capFile());
}
void LogwolfMainWindow::captureFileReadFinished() {
@@ -770,9 +752,6 @@ void LogwolfMainWindow::captureFileReadFinished() {
/* Update the appropriate parts of the main window. */
updateForUnsavedChanges();
- /* enable wireless timeline if capture allows it */
- main_ui_->wirelessTimelineWidget->captureFileReadFinished();
-
/* Enable menu items that make sense if you have some captured packets. */
setForCapturedPackets(true);
@@ -1201,7 +1180,7 @@ void LogwolfMainWindow::setEditCommentsMenu()
void LogwolfMainWindow::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_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
@@ -1275,7 +1254,6 @@ void LogwolfMainWindow::setMenusForSelectedPacket()
is_http2 = proto_is_frame_protocol(capture_file_.capFile()->edt->pi.layers, "http2");
/* 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_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 &&
@@ -1330,7 +1308,6 @@ void LogwolfMainWindow::setMenusForSelectedPacket()
main_ui_->actionAnalyzeFollowHTTPStream->setEnabled(is_http);
main_ui_->actionAnalyzeFollowHTTP2Stream->setEnabled(is_http2);
main_ui_->actionAnalyzeFollowQUICStream->setEnabled(is_quic);
- main_ui_->actionAnalyzeFollowSIPCall->setEnabled(is_sip);
foreach(QAction *cc_action, cc_actions) {
cc_action->setEnabled(frame_selected);
@@ -1354,15 +1331,7 @@ void LogwolfMainWindow::setMenusForSelectedPacket()
main_ui_->actionStatisticsTcpStreamStevens->setEnabled(is_tcp);
main_ui_->actionStatisticsTcpStreamTcptrace->setEnabled(is_tcp);
main_ui_->actionStatisticsTcpStreamThroughput->setEnabled(is_tcp);
- main_ui_->actionStatisticsTcpStreamWindowScaling->setEnabled(is_tcp);
-
- main_ui_->actionSCTPAnalyseThisAssociation->setEnabled(is_sctp);
- main_ui_->actionSCTPShowAllAssociations->setEnabled(is_sctp);
- main_ui_->actionSCTPFilterThisAssociation->setEnabled(is_sctp);
- main_ui_->actionTelephonyRtpStreamAnalysis->setEnabled(is_rtp);
- main_ui_->actionTelephonyRtpPlayer->setEnabled(is_rtp);
- main_ui_->actionTelephonyLteRlcGraph->setEnabled(is_lte_rlc);
-}
+ main_ui_->actionStatisticsTcpStreamWindowScaling->setEnabled(is_tcp);}
void LogwolfMainWindow::setMenusForSelectedTreeRow(FieldInformation *finfo) {
@@ -2406,11 +2375,6 @@ void LogwolfMainWindow::showHideMainWidgets(QAction *action)
} else if (widget == main_ui_->displayFilterToolBar) {
recent.filter_toolbar_show = show;
main_ui_->actionViewFilterToolbar->setChecked(show);
-#if defined(HAVE_LIBNL) && defined(HAVE_NL80211)
- } else if (widget == main_ui_->wirelessToolBar) {
- recent.wireless_toolbar_show = show;
- main_ui_->actionViewWirelessToolbar->setChecked(show);
-#endif
} else if (widget == main_ui_->statusBar) {
recent.statusbar_show = show;
main_ui_->actionViewStatusBar->setChecked(show);
@@ -3019,71 +2983,6 @@ void LogwolfMainWindow::on_actionAnalyzeFollowQUICStream_triggered()
openFollowStreamDialogForType(FOLLOW_QUIC);
}
-void LogwolfMainWindow::on_actionAnalyzeFollowSIPCall_triggered()
-{
- openFollowStreamDialogForType(FOLLOW_SIP);
-}
-
-void LogwolfMainWindow::openSCTPAllAssocsDialog()
-{
- SCTPAllAssocsDialog *sctp_dialog = new SCTPAllAssocsDialog(this, capture_file_.capFile());
- connect(sctp_dialog, SIGNAL(filterPackets(QString, bool)),
- this, SLOT(filterPackets(QString, bool)));
- connect(this, SIGNAL(setCaptureFile(capture_file*)),
- sctp_dialog, SLOT(setCaptureFile(capture_file*)));
- sctp_dialog->fillTable();
-
- if (sctp_dialog->isMinimized() == true)
- {
- sctp_dialog->showNormal();
- }
- else
- {
- sctp_dialog->show();
- }
-
- sctp_dialog->raise();
- sctp_dialog->activateWindow();
-}
-
-void LogwolfMainWindow::on_actionSCTPShowAllAssociations_triggered()
-{
- openSCTPAllAssocsDialog();
-}
-
-void LogwolfMainWindow::on_actionSCTPAnalyseThisAssociation_triggered()
-{
- const sctp_assoc_info_t* assoc = SCTPAssocAnalyseDialog::findAssocForPacket(capture_file_.capFile());
- if (!assoc) {
- return;
- }
- SCTPAssocAnalyseDialog *sctp_analyse = new SCTPAssocAnalyseDialog(this, assoc, capture_file_.capFile());
- connect(sctp_analyse, SIGNAL(filterPackets(QString, bool)),
- this, SLOT(filterPackets(QString, bool)));
-
- if (sctp_analyse->isMinimized() == true)
- {
- sctp_analyse->showNormal();
- }
- else
- {
- sctp_analyse->show();
- }
-
- sctp_analyse->raise();
- sctp_analyse->activateWindow();
-}
-
-void LogwolfMainWindow::on_actionSCTPFilterThisAssociation_triggered()
-{
- const sctp_assoc_info_t* assoc = SCTPAssocAnalyseDialog::findAssocForPacket(capture_file_.capFile());
- if (assoc) {
- QString newFilter = QString("sctp.assoc_index==%1").arg(assoc->assoc_id);
- assoc = NULL;
- emit filterPackets(newFilter, false);
- }
-}
-
// -z expert
void LogwolfMainWindow::statCommandExpertInfo(const char *, void *)
{
@@ -3112,8 +3011,9 @@ void LogwolfMainWindow::on_actionAnalyzeExpertInfo_triggered()
void LogwolfMainWindow::on_actionStatisticsFlowGraph_triggered()
{
- SequenceDialog *sequence_dialog = new SequenceDialog(*this, capture_file_);
- sequence_dialog->show();
+ QMessageBox::warning(this, "Oops", "SequenceDialog depends on RTPStreamDialog");
+// SequenceDialog *sequence_dialog = new SequenceDialog(*this, capture_file_);
+// sequence_dialog->show();
}
void LogwolfMainWindow::openTcpStreamDialog(int graph_type)
@@ -3409,231 +3309,6 @@ void LogwolfMainWindow::on_actionStatisticsSOMEIPSDentries_triggered()
openStatisticsTreeDialog("someipsd_entries");
}
-// Telephony Menu
-
-RtpPlayerDialog *LogwolfMainWindow::openTelephonyRtpPlayerDialog()
-{
- RtpPlayerDialog *dialog;
-
-#ifdef HAVE_LIBPCAP
- dialog = RtpPlayerDialog::openRtpPlayerDialog(*this, capture_file_, packet_list_, captureSession()->state != CAPTURE_STOPPED);
-#else
- dialog = RtpPlayerDialog::openRtpPlayerDialog(*this, capture_file_, packet_list_, false);
-#endif
-
- dialog->show();
-
- return dialog;
-}
-
-VoipCallsDialog *LogwolfMainWindow::openTelephonyVoipCallsDialogVoip()
-{
- VoipCallsDialog *dialog;
-
- dialog = VoipCallsDialog::openVoipCallsDialogVoip(*this, capture_file_, packet_list_);
- dialog->show();
-
- return dialog;
-}
-
-VoipCallsDialog *LogwolfMainWindow::openTelephonyVoipCallsDialogSip()
-{
- VoipCallsDialog *dialog;
-
- dialog = VoipCallsDialog::openVoipCallsDialogSip(*this, capture_file_, packet_list_);
- dialog->show();
-
- return dialog;
-}
-
-RtpAnalysisDialog *LogwolfMainWindow::openTelephonyRtpAnalysisDialog()
-{
- RtpAnalysisDialog *dialog;
-
- dialog = RtpAnalysisDialog::openRtpAnalysisDialog(*this, capture_file_, packet_list_);
- dialog->show();
-
- return dialog;
-}
-
-void LogwolfMainWindow::on_actionTelephonyVoipCalls_triggered()
-{
- openTelephonyVoipCallsDialogVoip();
-}
-
-void LogwolfMainWindow::on_actionTelephonyGsmMapSummary_triggered()
-{
- GsmMapSummaryDialog *gms_dialog = new GsmMapSummaryDialog(*this, capture_file_);
- gms_dialog->show();
-}
-
-void LogwolfMainWindow::on_actionTelephonyIax2StreamAnalysis_triggered()
-{
- Iax2AnalysisDialog *iax2_analysis_dialog = new Iax2AnalysisDialog(*this, capture_file_);
- connect(iax2_analysis_dialog, SIGNAL(goToPacket(int)),
- packet_list_, SLOT(goToPacket(int)));
- iax2_analysis_dialog->show();
-}
-
-void LogwolfMainWindow::on_actionTelephonyISUPMessages_triggered()
-{
- openStatisticsTreeDialog("isup_msg");
-}
-
-// -z mac-lte,stat
-void LogwolfMainWindow::statCommandLteMacStatistics(const char *arg, void *)
-{
- LteMacStatisticsDialog *lte_mac_stats_dlg = new LteMacStatisticsDialog(*this, capture_file_, arg);
- connect(lte_mac_stats_dlg, SIGNAL(filterAction(QString, FilterAction::Action, FilterAction::ActionType)),
- this, SIGNAL(filterAction(QString, FilterAction::Action, FilterAction::ActionType)));
- lte_mac_stats_dlg->show();
-}
-
-void LogwolfMainWindow::on_actionTelephonyLteMacStatistics_triggered()
-{
- statCommandLteMacStatistics(NULL, NULL);
-}
-
-void LogwolfMainWindow::statCommandLteRlcStatistics(const char *arg, void *)
-{
- LteRlcStatisticsDialog *lte_rlc_stats_dlg = new LteRlcStatisticsDialog(*this, capture_file_, arg);
- connect(lte_rlc_stats_dlg, SIGNAL(filterAction(QString, FilterAction::Action, FilterAction::ActionType)),
- this, SIGNAL(filterAction(QString, FilterAction::Action, FilterAction::ActionType)));
- // N.B. It is necessary for the RLC Statistics window to launch the RLC graph in this way, to ensure
- // that the goToPacket() signal/slot connection gets set up...
- connect(lte_rlc_stats_dlg, SIGNAL(launchRLCGraph(bool, guint16, guint8, guint16, guint16, guint8)),
- this, SLOT(launchRLCGraph(bool, guint16, guint8, guint16, guint16, guint8)));
-
- lte_rlc_stats_dlg->show();
-}
-
-void LogwolfMainWindow::on_actionTelephonyLteRlcStatistics_triggered()
-{
- statCommandLteRlcStatistics(NULL, NULL);
-}
-
-void LogwolfMainWindow::launchRLCGraph(bool channelKnown,
- guint16 ueid, guint8 rlcMode,
- guint16 channelType, guint16 channelId, guint8 direction)
-{
- LteRlcGraphDialog *lrg_dialog = new LteRlcGraphDialog(*this, capture_file_, channelKnown);
- connect(lrg_dialog, SIGNAL(goToPacket(int)), packet_list_, SLOT(goToPacket(int)));
- // This is a bit messy, but wanted to hide these parameters from users of
- // on_actionTelephonyLteRlcGraph_triggered().
- if (channelKnown) {
- lrg_dialog->setChannelInfo(ueid, rlcMode, channelType, channelId, direction);
- }
- lrg_dialog->show();
-}
-
-void LogwolfMainWindow::on_actionTelephonyLteRlcGraph_triggered()
-{
- // We don't yet know the channel.
- launchRLCGraph(false, 0, 0, 0, 0, 0);
-}
-
-void LogwolfMainWindow::on_actionTelephonyMtp3Summary_triggered()
-{
- Mtp3SummaryDialog *mtp3s_dialog = new Mtp3SummaryDialog(*this, capture_file_);
- mtp3s_dialog->show();
-}
-
-void LogwolfMainWindow::on_actionTelephonyOsmuxPacketCounter_triggered()
-{
- openStatisticsTreeDialog("osmux");
-}
-
-RtpStreamDialog *LogwolfMainWindow::openTelephonyRtpStreamsDialog()
-{
- RtpStreamDialog *dialog;
-
- dialog = RtpStreamDialog::openRtpStreamDialog(*this, capture_file_, packet_list_);
- dialog->show();
-
- return dialog;
-}
-
-void LogwolfMainWindow::on_actionTelephonyRtpStreams_triggered()
-{
- openTelephonyRtpStreamsDialog();
-}
-
-void LogwolfMainWindow::on_actionTelephonyRtpStreamAnalysis_triggered()
-{
- QVector<rtpstream_id_t *> stream_ids;
- QString err;
-
- if (QGuiApplication::keyboardModifiers().testFlag(Qt::ControlModifier)) {
- err = findRtpStreams(&stream_ids, true);
- } else {
- err = findRtpStreams(&stream_ids, false);
- }
- if (!err.isNull()) {
- QMessageBox::warning(this, tr("RTP packet search failed"),
- err,
- QMessageBox::Ok);
- } else {
- openTelephonyRtpAnalysisDialog()->addRtpStreams(stream_ids);
- }
- foreach(rtpstream_id_t *id, stream_ids) {
- rtpstream_id_free(id);
- }
-}
-
-void LogwolfMainWindow::on_actionTelephonyRtpPlayer_triggered()
-{
- QVector<rtpstream_id_t *> stream_ids;
- QString err;
-
- if (QGuiApplication::keyboardModifiers().testFlag(Qt::ControlModifier)) {
- err = findRtpStreams(&stream_ids, true);
- } else {
- err = findRtpStreams(&stream_ids, false);
- }
- if (!err.isNull()) {
- QMessageBox::warning(this, tr("RTP packet search failed"),
- err,
- QMessageBox::Ok);
-#ifdef QT_MULTIMEDIA_LIB
- } else {
- openTelephonyRtpPlayerDialog()->addRtpStreams(stream_ids);
-#endif // QT_MULTIMEDIA_LIB
- }
- foreach(rtpstream_id_t *id, stream_ids) {
- rtpstream_id_free(id);
- }
-}
-
-void LogwolfMainWindow::on_actionTelephonyRTSPPacketCounter_triggered()
-{
- openStatisticsTreeDialog("rtsp");
-}
-
-void LogwolfMainWindow::on_actionTelephonySMPPOperations_triggered()
-{
- openStatisticsTreeDialog("smpp_commands");
-}
-
-void LogwolfMainWindow::on_actionTelephonyUCPMessages_triggered()
-{
- openStatisticsTreeDialog("ucp_messages");
-}
-
-void LogwolfMainWindow::on_actionTelephonyF1APMessages_triggered()
-{
- openStatisticsTreeDialog("f1ap");
-}
-
-void LogwolfMainWindow::on_actionTelephonyNGAPMessages_triggered()
-{
- openStatisticsTreeDialog("ngap");
-}
-
-void LogwolfMainWindow::on_actionTelephonySipFlows_triggered()
-{
- openTelephonyVoipCallsDialogSip();
-}
-
// Tools Menu
void LogwolfMainWindow::on_actionToolsFirewallAclRules_triggered()
@@ -4146,52 +3821,6 @@ void LogwolfMainWindow::activatePluginIFToolbar(bool)
}
}
-void LogwolfMainWindow::rtpPlayerDialogReplaceRtpStreams(QVector<rtpstream_id_t *> stream_ids _U_)
-{
-#ifdef QT_MULTIMEDIA_LIB
- openTelephonyRtpPlayerDialog()->replaceRtpStreams(stream_ids);
-#endif
-}
-
-void LogwolfMainWindow::rtpPlayerDialogAddRtpStreams(QVector<rtpstream_id_t *> stream_ids _U_)
-{
-#ifdef QT_MULTIMEDIA_LIB
- openTelephonyRtpPlayerDialog()->addRtpStreams(stream_ids);
-#endif
-}
-
-void LogwolfMainWindow::rtpPlayerDialogRemoveRtpStreams(QVector<rtpstream_id_t *> stream_ids _U_)
-{
-#ifdef QT_MULTIMEDIA_LIB
- openTelephonyRtpPlayerDialog()->removeRtpStreams(stream_ids);
-#endif
-}
-
-void LogwolfMainWindow::rtpAnalysisDialogReplaceRtpStreams(QVector<rtpstream_id_t *> stream_ids)
-{
- openTelephonyRtpAnalysisDialog()->replaceRtpStreams(stream_ids);
-}
-
-void LogwolfMainWindow::rtpAnalysisDialogAddRtpStreams(QVector<rtpstream_id_t *> stream_ids)
-{
- openTelephonyRtpAnalysisDialog()->addRtpStreams(stream_ids);
-}
-
-void LogwolfMainWindow::rtpAnalysisDialogRemoveRtpStreams(QVector<rtpstream_id_t *> stream_ids)
-{
- openTelephonyRtpAnalysisDialog()->removeRtpStreams(stream_ids);
-}
-
-void LogwolfMainWindow::rtpStreamsDialogSelectRtpStreams(QVector<rtpstream_id_t *> stream_ids)
-{
- openTelephonyRtpStreamsDialog()->selectRtpStream(stream_ids);
-}
-
-void LogwolfMainWindow::rtpStreamsDialogDeselectRtpStreams(QVector<rtpstream_id_t *> stream_ids)
-{
- openTelephonyRtpStreamsDialog()->deselectRtpStream(stream_ids);
-}
-
#ifdef _MSC_VER
#pragma warning(pop)
#endif