From 9b731e2b320ca936499bf7840a7b2ac5c2b64e05 Mon Sep 17 00:00:00 2001 From: Guy Harris Date: Fri, 20 Jul 2018 17:07:19 -0700 Subject: Add a tap "finish" callback, called when a listener is removed. Change-Id: Ic6c23dbd39d1adf8f730f1c866e409f731947475 Reviewed-on: https://code.wireshark.org/review/28786 Reviewed-by: Guy Harris --- ui/qt/bluetooth_device_dialog.cpp | 1 + ui/qt/bluetooth_hci_summary_dialog.cpp | 2 ++ ui/qt/gsm_map_summary_dialog.cpp | 1 + ui/qt/io_graph_dialog.cpp | 3 ++- ui/qt/lbm_lbtrm_transport_dialog.cpp | 3 ++- ui/qt/lbm_lbtru_transport_dialog.cpp | 3 ++- ui/qt/lbm_stream_dialog.cpp | 3 ++- ui/qt/mtp3_summary_dialog.cpp | 1 + ui/qt/rtp_player_dialog.cpp | 2 +- ui/qt/sequence_dialog.cpp | 2 +- ui/qt/wireless_timeline.cpp | 2 +- ui/qt/wireshark_dialog.cpp | 2 +- 12 files changed, 17 insertions(+), 8 deletions(-) (limited to 'ui/qt') diff --git a/ui/qt/bluetooth_device_dialog.cpp b/ui/qt/bluetooth_device_dialog.cpp index 5c7b3b002c..ff13eb646d 100644 --- a/ui/qt/bluetooth_device_dialog.cpp +++ b/ui/qt/bluetooth_device_dialog.cpp @@ -86,6 +86,7 @@ bluetooth_devices_tap(void *data) 0, bluetooth_device_tap_reset, bluetooth_device_tap_packet, + NULL, NULL ); diff --git a/ui/qt/bluetooth_hci_summary_dialog.cpp b/ui/qt/bluetooth_hci_summary_dialog.cpp index 1e594c07b8..19b82f0542 100644 --- a/ui/qt/bluetooth_hci_summary_dialog.cpp +++ b/ui/qt/bluetooth_hci_summary_dialog.cpp @@ -73,6 +73,7 @@ bluetooth_hci_summary_tap_init(void *data) 0, bluetooth_hci_summary_tap_reset, bluetooth_hci_summary_tap_packet, + NULL, NULL ); @@ -889,6 +890,7 @@ void BluetoothHciSummaryDialog::displayFilterLineEditAccepted() 0, bluetooth_hci_summary_tap_reset, bluetooth_hci_summary_tap_packet, + NULL, NULL ); diff --git a/ui/qt/gsm_map_summary_dialog.cpp b/ui/qt/gsm_map_summary_dialog.cpp index 8d4b9b3d04..e53630e7c7 100644 --- a/ui/qt/gsm_map_summary_dialog.cpp +++ b/ui/qt/gsm_map_summary_dialog.cpp @@ -367,6 +367,7 @@ register_tap_listener_qt_gsm_map_summary(void) register_tap_listener("gsm_map", &gsm_map_stat, NULL, 0, gsm_map_summary_reset, gsm_map_summary_packet, + NULL, NULL); if (err_p != NULL) diff --git a/ui/qt/io_graph_dialog.cpp b/ui/qt/io_graph_dialog.cpp index 7965f11c7a..132e3574ff 100644 --- a/ui/qt/io_graph_dialog.cpp +++ b/ui/qt/io_graph_dialog.cpp @@ -1506,7 +1506,8 @@ IOGraph::IOGraph(QCustomPlot *parent) : TL_REQUIRES_PROTO_TREE, tapReset, tapPacket, - tapDraw); + tapDraw, + NULL); if (error_string) { // QMessageBox::critical(this, tr("%1 failed to register tap listener").arg(name_), // error_string->str); diff --git a/ui/qt/lbm_lbtrm_transport_dialog.cpp b/ui/qt/lbm_lbtrm_transport_dialog.cpp index dadbb1665b..f6305cea7d 100644 --- a/ui/qt/lbm_lbtrm_transport_dialog.cpp +++ b/ui/qt/lbm_lbtrm_transport_dialog.cpp @@ -1293,7 +1293,8 @@ void LBMLBTRMTransportDialog::fillTree(void) TL_REQUIRES_COLUMNS, resetTap, tapPacket, - drawTreeItems); + drawTreeItems, + NULL); if (error_string) { QMessageBox::critical(this, tr("LBT-RM Statistics failed to attach to tap"), diff --git a/ui/qt/lbm_lbtru_transport_dialog.cpp b/ui/qt/lbm_lbtru_transport_dialog.cpp index 6b293c6b7b..3d3eefd5cf 100644 --- a/ui/qt/lbm_lbtru_transport_dialog.cpp +++ b/ui/qt/lbm_lbtru_transport_dialog.cpp @@ -1712,7 +1712,8 @@ void LBMLBTRUTransportDialog::fillTree(void) TL_REQUIRES_COLUMNS, resetTap, tapPacket, - drawTreeItems); + drawTreeItems, + NULL); if (error_string) { QMessageBox::critical(this, tr("LBT-RU Statistics failed to attach to tap"), diff --git a/ui/qt/lbm_stream_dialog.cpp b/ui/qt/lbm_stream_dialog.cpp index 67eec58b9d..24856e299f 100644 --- a/ui/qt/lbm_stream_dialog.cpp +++ b/ui/qt/lbm_stream_dialog.cpp @@ -372,7 +372,8 @@ void LBMStreamDialog::fillTree(void) TL_REQUIRES_COLUMNS, resetTap, tapPacket, - drawTreeItems); + drawTreeItems, + NULL); if (error_string) { QMessageBox::critical(this, tr("LBM Stream failed to attach to tap"), diff --git a/ui/qt/mtp3_summary_dialog.cpp b/ui/qt/mtp3_summary_dialog.cpp index 3832356948..81af57ef2d 100644 --- a/ui/qt/mtp3_summary_dialog.cpp +++ b/ui/qt/mtp3_summary_dialog.cpp @@ -366,6 +366,7 @@ register_tap_listener_qt_mtp3_summary(void) register_tap_listener("mtp3", &mtp3_stat, NULL, 0, mtp3_summary_reset, mtp3_summary_packet, + NULL, NULL); if (err_p != NULL) diff --git a/ui/qt/rtp_player_dialog.cpp b/ui/qt/rtp_player_dialog.cpp index 091b4267ea..93148319df 100644 --- a/ui/qt/rtp_player_dialog.cpp +++ b/ui/qt/rtp_player_dialog.cpp @@ -208,7 +208,7 @@ void RtpPlayerDialog::retapPackets() { GString *error_string; - error_string = register_tap_listener("rtp", this, NULL, 0, NULL, tapPacket, NULL); + error_string = register_tap_listener("rtp", this, NULL, 0, NULL, tapPacket, NULL, NULL); if (error_string) { report_failure("RTP Player - tap registration failed: %s", error_string->str); g_string_free(error_string, TRUE); diff --git a/ui/qt/sequence_dialog.cpp b/ui/qt/sequence_dialog.cpp index 73991608c7..b97b72ba68 100644 --- a/ui/qt/sequence_dialog.cpp +++ b/ui/qt/sequence_dialog.cpp @@ -429,7 +429,7 @@ void SequenceDialog::fillDiagram() filter = cap_file_.capFile()->dfilter; error_string = register_tap_listener(sequence_analysis_get_tap_listener_name(analysis), info_->sainfo(), filter, sequence_analysis_get_tap_flags(analysis), - NULL, sequence_analysis_get_packet_func(analysis), NULL); + NULL, sequence_analysis_get_packet_func(analysis), NULL, NULL); if (error_string) { report_failure("Sequence dialog - tap registration failed: %s", error_string->str); g_string_free(error_string, TRUE); diff --git a/ui/qt/wireless_timeline.cpp b/ui/qt/wireless_timeline.cpp index be8677a5a4..56b1deda23 100644 --- a/ui/qt/wireless_timeline.cpp +++ b/ui/qt/wireless_timeline.cpp @@ -286,7 +286,7 @@ void WirelessTimeline::captureFileReadFinished() void WirelessTimeline::appInitialized() { GString *error_string; - error_string = register_tap_listener("wlan_radio_timeline", this, NULL, TL_REQUIRES_NOTHING, tap_timeline_reset, tap_timeline_packet, NULL/*tap_draw_cb tap_draw*/); + error_string = register_tap_listener("wlan_radio_timeline", this, NULL, TL_REQUIRES_NOTHING, tap_timeline_reset, tap_timeline_packet, NULL/*tap_draw_cb tap_draw*/, NULL); if (error_string) { report_failure("Wireless Timeline - tap registration failed: %s", error_string->str); g_string_free(error_string, TRUE); diff --git a/ui/qt/wireshark_dialog.cpp b/ui/qt/wireshark_dialog.cpp index 4a219c42f2..2c7498a56e 100644 --- a/ui/qt/wireshark_dialog.cpp +++ b/ui/qt/wireshark_dialog.cpp @@ -103,7 +103,7 @@ void WiresharkDialog::updateWidgets() bool WiresharkDialog::registerTapListener(const char *tap_name, void *tap_data, const char *filter, guint flags, void(*tap_reset)(void *), gboolean(*tap_packet)(void *, struct _packet_info *, struct epan_dissect *, const void *), void(*tap_draw)(void *)) { GString *error_string = register_tap_listener(tap_name, tap_data, filter, flags, - tap_reset, tap_packet, tap_draw); + tap_reset, tap_packet, tap_draw, NULL); if (error_string) { QMessageBox::warning(this, tr("Failed to attach to tap \"%1\"").arg(tap_name), error_string->str); -- cgit v1.2.3