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 /capture_opts.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 'capture_opts.h')
| -rw-r--r-- | capture_opts.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/capture_opts.h b/capture_opts.h index 8e1cb8de2a..22d03c8472 100644 --- a/capture_opts.h +++ b/capture_opts.h @@ -36,6 +36,10 @@ #include <caputils/capture_ifinfo.h> +#ifdef _WIN32 +#include <windows.h> +#endif + #ifdef __cplusplus extern "C" { #endif /* __cplusplus */ @@ -232,6 +236,9 @@ typedef struct interface_options_tag { GPid extcap_pid; /* pid of running process or INVALID_EXTCAP_PID */ gpointer extcap_userdata; guint extcap_child_watch; +#ifdef _WIN32 + HANDLE extcap_pipe_h; +#endif gchar *extcap_control_in; gchar *extcap_control_out; #endif |