diff options
author | Gerald Combs <gerald@wireshark.org> | 2018-03-01 15:31:45 -0800 |
---|---|---|
committer | Anders Broman <a.broman58@gmail.com> | 2018-03-02 05:22:20 +0000 |
commit | 1a0987904fa571dc5abce03726e4ca3e17793574 (patch) | |
tree | 59b7bfe30517005b046bddb9fcae2315f48570fa /capture_opts.h | |
parent | bf4c2fd82b30d8b088fcb1235263dce9173d4cd7 (diff) |
Generalize our process spawning code.
Move the contents of extcap_spawn to ws_pipe. Rename various extcap_*
prefixes to ws_pipe_*. Open stdin when we spawn processes.
Change-Id: I9286295443ee955bb6328b0ed6f945ee0bb2a798
Reviewed-on: https://code.wireshark.org/review/26216
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'capture_opts.h')
-rw-r--r-- | capture_opts.h | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/capture_opts.h b/capture_opts.h index 715a3bee90..7c344e31a7 100644 --- a/capture_opts.h +++ b/capture_opts.h @@ -198,12 +198,6 @@ typedef struct link_row_tag { gint dlt; } link_row; -#ifdef _WIN32 -#define INVALID_EXTCAP_PID INVALID_HANDLE_VALUE -#else -#define INVALID_EXTCAP_PID (GPid)-1 -#endif - typedef struct interface_options_tag { gchar *name; /* the name of the interface provided to winpcap/libpcap to specify the interface */ gchar *descr; @@ -218,7 +212,7 @@ typedef struct interface_options_tag { gchar *extcap_fifo; GHashTable *extcap_args; GPid extcap_pid; /* pid of running process or INVALID_EXTCAP_PID */ - gpointer extcap_userdata; + gpointer extcap_pipedata; guint extcap_child_watch; #ifdef _WIN32 HANDLE extcap_pipe_h; |