URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=66721cad21ec8075f14a3ed26f1b8fe61b5c8a5a
Submitter: Anders Broman (a.broman58@xxxxxxxxx)
Changed: branch: master-2.2
Repository: wireshark
Commits:
66721ca by Roland Knall (roland.knall@xxxxxxxxxxxxxxxxx):
extcap: Restore functionality for options
Allow stored options to be restored to their default values. This
adds a global cleanup method for extcap and globally defined
preference values, which fixes the parameter problem with windows
Change-Id: I48e0cf846ef81f4732d652c6a2ad0020db5df08e
Reviewed-on: https://code.wireshark.org/review/13741
Petri-Dish: Roland Knall <rknall@xxxxxxxxx>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@xxxxxxxxxxxxx>
Reviewed-by: Roland Knall <rknall@xxxxxxxxx>
(cherry picked from commit 485bc456c57a16dbe50b76c476e48223038bb0e8)
Reviewed-on: https://code.wireshark.org/review/16759
Reviewed-by: Anders Broman <a.broman58@xxxxxxxxx>
Actions performed:
from 527650d Report the pathname of the color filter file in "Could not compile" messages.
adds 66721ca extcap: Restore functionality for options
Summary of changes:
capchild/capture_sync.c | 2 +-
extcap.c | 145 ++++++++++++++++++++++++++-------------
extcap.h | 19 +++--
extcap_parser.c | 2 +-
extcap_parser.h | 1 +
rawshark.c | 16 +++++
tfshark.c | 19 +++++
tshark.c | 19 +++++
ui/gtk/main.c | 4 ++
ui/qt/extcap_argument.cpp | 52 +++++++++++---
ui/qt/extcap_argument.h | 11 ++-
ui/qt/extcap_argument_file.cpp | 5 +-
ui/qt/extcap_options_dialog.cpp | 114 ++++++++++++++++++++++++------
ui/qt/extcap_options_dialog.h | 4 ++
ui/qt/extcap_options_dialog.ui | 2 +-
wireshark-qt.cpp | 4 ++
16 files changed, 329 insertions(+), 90 deletions(-)