diff options
| author | Gerald Combs <gerald@wireshark.org> | 2015-09-10 17:31:19 -0700 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2015-09-11 15:27:38 +0000 |
| commit | 12176f45d9df961e28eb3bcbd0d9b2139a49e082 (patch) | |
| tree | 3214df253f419561fb332fbb54b6f51bf0b272f8 /ui/qt | |
| parent | b55ae49ba1947ae5cbf8ad12ff3b8855a5fd7813 (diff) | |
| download | wireshark-12176f45d9df961e28eb3bcbd0d9b2139a49e082.tar.gz | |
Export captured packets correctly.
Make sure we set and unset the "process_filtered" field of our range in
PacketRangeGroupBox. Otherwise we only export displayed packets. Make
sure we set "remove_ignored" as well.
Ignore the cf_cb_file_export_specified_packets_* callbacks in
CaptureFile so that we don't print spurious warnings.
Bug: 11473
Bug: 11428
Change-Id: Ica551addd3af2de79f7cd47a2cc361043d2982e5
Reviewed-on: https://code.wireshark.org/review/10477
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Diffstat (limited to 'ui/qt')
| -rw-r--r-- | ui/qt/capture_file.cpp | 7 | ||||
| -rw-r--r-- | ui/qt/packet_range_group_box.cpp | 16 | ||||
| -rw-r--r-- | ui/qt/packet_range_group_box.h | 1 |
3 files changed, 22 insertions, 2 deletions
diff --git a/ui/qt/capture_file.cpp b/ui/qt/capture_file.cpp index 4ce0fc03ea..92b9677fcf 100644 --- a/ui/qt/capture_file.cpp +++ b/ui/qt/capture_file.cpp @@ -229,6 +229,13 @@ void CaptureFile::captureFileEvent(int event, gpointer data) emit captureFileSaveStopped(); break; + case cf_cb_file_export_specified_packets_started: + case cf_cb_file_export_specified_packets_finished: + case cf_cb_file_export_specified_packets_failed: + case cf_cb_file_export_specified_packets_stopped: + // Ignored for now + break; + default: g_log(NULL, G_LOG_LEVEL_DEBUG, "FIX: main_cf_callback %d %p", event, data); g_warning("CaptureFile::captureFileCallback: event %u unknown", event); diff --git a/ui/qt/packet_range_group_box.cpp b/ui/qt/packet_range_group_box.cpp index a7ceefbea6..9e746d3524 100644 --- a/ui/qt/packet_range_group_box.cpp +++ b/ui/qt/packet_range_group_box.cpp @@ -322,10 +322,22 @@ void PacketRangeGroupBox::on_rangeButton_toggled(bool checked) void PacketRangeGroupBox::on_capturedButton_toggled(bool checked) { - if (checked) updateCounts(); + if (checked) { + if (range_) range_->process_filtered = FALSE; + updateCounts(); + } } void PacketRangeGroupBox::on_displayedButton_toggled(bool checked) { - if (checked) updateCounts(); + if (checked) { + if (range_) range_->process_filtered = TRUE; + updateCounts(); + } +} + +void PacketRangeGroupBox::on_ignoredCheckBox_toggled(bool checked) +{ + if (range_) range_->remove_ignored = checked ? TRUE : FALSE; + updateCounts(); } diff --git a/ui/qt/packet_range_group_box.h b/ui/qt/packet_range_group_box.h index 3a1740cbfa..f131416a1f 100644 --- a/ui/qt/packet_range_group_box.h +++ b/ui/qt/packet_range_group_box.h @@ -72,6 +72,7 @@ private slots: void on_capturedButton_toggled(bool checked); void on_displayedButton_toggled(bool checked); + void on_ignoredCheckBox_toggled(bool checked); }; #endif // PACKET_RANGE_GROUP_BOX_H |