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 05:48:01 +0000 |
| commit | 018f6bff18785a1c3971a1ccfe3b1b5243d4d154 (patch) | |
| tree | aa4d61e478e39f628000dd6cf7bbbccc2e745a7d /extcap.h | |
| parent | 7aeff4fb904e67ce8f81053f595b8a8b0340cb52 (diff) | |
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>
Diffstat (limited to 'extcap.h')
| -rw-r--r-- | extcap.h | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -40,8 +40,8 @@ /* Prefix for the pipe interfaces */ #define EXTCAP_PIPE_PREFIX "wireshark_extcap" -#define EXTCAP_CONTROL_IN_PREFIX "wireshark_control_in" -#define EXTCAP_CONTROL_OUT_PREFIX "wireshark_control_out" +#define EXTCAP_CONTROL_IN_PREFIX "wireshark_control_ext_to_ws" +#define EXTCAP_CONTROL_OUT_PREFIX "wireshark_control_ws_to_ext" #define EXTCAP_ARGUMENT_CONFIG "--extcap-config" #define EXTCAP_ARGUMENT_LIST_INTERFACES "--extcap-interfaces" @@ -143,11 +143,11 @@ gboolean extcap_init_interfaces(capture_options * capture_opts); gboolean -extcap_create_pipe(const gchar *ifname, gchar **fifo, const gchar *pipe_prefix); +extcap_create_pipe(const gchar *ifname, gchar **fifo, const gchar *pipe_prefix, gboolean byte_mode); /* Clean up all if related stuff */ void -extcap_if_cleanup(capture_options * capture_opts _U_, gchar ** errormsg); +extcap_if_cleanup(capture_options * capture_opts, gchar ** errormsg); struct preference * extcap_pref_for_argument(const gchar *ifname, struct _extcap_arg * arg); |