summaryrefslogtreecommitdiff
path: root/ui/qt/capture_file.cpp
diff options
context:
space:
mode:
authorGerald Combs <gerald@wireshark.org>2015-09-10 17:31:19 -0700
committerGerald Combs <gerald@wireshark.org>2015-09-11 15:27:38 +0000
commit12176f45d9df961e28eb3bcbd0d9b2139a49e082 (patch)
tree3214df253f419561fb332fbb54b6f51bf0b272f8 /ui/qt/capture_file.cpp
parentb55ae49ba1947ae5cbf8ad12ff3b8855a5fd7813 (diff)
downloadwireshark-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/capture_file.cpp')
-rw-r--r--ui/qt/capture_file.cpp7
1 files changed, 7 insertions, 0 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);