diff options
| author | Håkon Øye Amundsen <haakon.amundsen@nordicsemi.no> | 2017-08-25 11:28:34 +0200 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2017-08-28 08:13:04 +0000 |
| commit | 78d30d687b17cff81395013a5bf55f21232fac95 (patch) | |
| tree | 719532fa2ff96f0b560617744ae0499f472b46a2 /ui/qt/main_window.cpp | |
| parent | af90b3190673f547a64e1c86748819acb3c322e4 (diff) | |
| download | wireshark-78d30d687b17cff81395013a5bf55f21232fac95.tar.gz wireshark-78d30d687b17cff81395013a5bf55f21232fac95.tar.bz2 wireshark-78d30d687b17cff81395013a5bf55f21232fac95.zip | |
extcap: Interface Toolbar support on Windows
Add support for extcap control pipes on Windows.
Improved read loop in InterfaceToolbarReader.
Delay opening control pipes until extcap has opened the fifo pipe.
Make extcap_example.py work on Windows.
Bug: 13833
Change-Id: I4b47d25452637759b8a3be53be48eee5365bc0e4
Reviewed-on: https://code.wireshark.org/review/23211
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
(cherry picked from commit 018f6bff18785a1c3971a1ccfe3b1b5243d4d154)
Reviewed-on: https://code.wireshark.org/review/23250
Diffstat (limited to 'ui/qt/main_window.cpp')
| -rw-r--r-- | ui/qt/main_window.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/ui/qt/main_window.cpp b/ui/qt/main_window.cpp index 6aa5243b33..2f64d3eb5d 100644 --- a/ui/qt/main_window.cpp +++ b/ui/qt/main_window.cpp @@ -700,14 +700,12 @@ MainWindow::MainWindow(QWidget *parent) : #endif plugin_if_register_gui_cb(PLUGIN_IF_REMOVE_TOOLBAR, plugin_if_mainwindow_update_toolbars); -#if QT_VERSION >= QT_VERSION_CHECK(5, 2, 0) && !defined(_WIN32) +#if QT_VERSION >= QT_VERSION_CHECK(5, 2, 0) // Register Interface Toolbar callbacks // // Qt version must be 5.2 or higher because the use of // QThread::requestInterruption() in interface_toolbar.cpp and // QThread::isInterruptionRequested() in interface_toolbar_reader.cpp - // - // The toolbar in/out control pipes are not supported on WIN32 yet. iface_toolbar_register_cb(mainwindow_add_toolbar, mainwindow_remove_toolbar); #endif |