osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

Qt: Add recent capture filter entries. 

Copy over and adapt missing logic from the GTK+ UI which adds recent
capture filter entries when we start a capture.

Change-Id: Ifcf8b719e53727b7c269d9890731d542d1759efc
Ping-Bug: 11950
Reviewed-on: https://code.wireshark.org/review/13086
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
This commit is contained in:
Gerald Combs 2016-01-06 16:09:24 -08:00
parent f410121cf2
commit 613b406023
1 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
ui/qt/main_window_slots.cpp
View File

@ -871,12 +871,28 @@ void MainWindow::startCapture() {
/* The capture succeeded, which means the capture filter syntax is
valid; add this capture filter to the recent capture filter list. */
QByteArray filter_ba;
for (i = 0; i < global_capture_opts.ifaces->len; i++) {
interface_opts = g_array_index(global_capture_opts.ifaces, interface_options, i);
if (interface_opts.cfilter) {
// cfilter_combo_add_recent(interface_opts.cfilter);
recent_add_cfilter(interface_opts.name, interface_opts.cfilter);
if (filter_ba.isEmpty()) {
filter_ba = interface_opts.cfilter;
} else {
/* Not the first selected interface; is its capture filter
the same as the one the other interfaces we've looked
at have? */
if (strcmp(interface_opts.cfilter, filter_ba.constData()) != 0) {
/* No, so not all selected interfaces have the same capture
filter. */
filter_ba.clear();
}
}
}
}
if (!filter_ba.isEmpty()) {
recent_add_cfilter(NULL, filter_ba.constData());
}
} else {
CaptureFile::globalCapFile()->window = NULL;
}