From 018f6bff18785a1c3971a1ccfe3b1b5243d4d154 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?H=C3=A5kon=20=C3=98ye=20Amundsen?= Date: Fri, 25 Aug 2017 11:28:34 +0200 Subject: extcap: Interface Toolbar support on Windows MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman --- extcap.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'extcap.h') diff --git a/extcap.h b/extcap.h index 2e6739fa00..013ccdb4fd 100644 --- a/extcap.h +++ b/extcap.h @@ -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); -- cgit v1.2.3