diff options
| author | Stig Bjørlykke <stig@bjorlykke.org> | 2017-08-19 23:39:21 +0200 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2017-08-23 07:26:18 +0000 |
| commit | 45401950257ec58d01efefdbc53149739c7785e4 (patch) | |
| tree | 72a2be65add4aa8d63d604b368fe24100570b061 /extcap.h | |
| parent | 5574b78dae2f607d4ace66ab60d516d0c569357d (diff) | |
extcap: Create unique pipe names for each interface
On Windows the pipe names does not get random characters appended.
Add the interface name and pipe type to make it unique.
This partly fixes the issue with capturing from multiple extcap
interfaces on Windows.
Ping-Bug: 13653
Ping-Bug: 13833
Change-Id: I4290b37cf789bf77608993682a803aca29513d28
Reviewed-on: https://code.wireshark.org/review/23158
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 | 10 |
1 files changed, 3 insertions, 7 deletions
@@ -29,7 +29,6 @@ #include <glib.h> #ifdef _WIN32 -#include <windows.h> #include <wsutil/unicode-utils.h> #endif @@ -41,6 +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_ARGUMENT_CONFIG "--extcap-config" #define EXTCAP_ARGUMENT_LIST_INTERFACES "--extcap-interfaces" @@ -138,16 +139,11 @@ extcap_has_configuration(const char * ifname, gboolean is_required); gboolean extcap_has_toolbar(const char *ifname); -#ifdef WIN32 -HANDLE -extcap_get_win32_handle(); -#endif - gboolean extcap_init_interfaces(capture_options * capture_opts); gboolean -extcap_create_pipe(char ** fifo); +extcap_create_pipe(const gchar *ifname, gchar **fifo, const gchar *pipe_prefix); /* Clean up all if related stuff */ void |