From 1a0987904fa571dc5abce03726e4ca3e17793574 Mon Sep 17 00:00:00 2001 From: Gerald Combs Date: Thu, 1 Mar 2018 15:31:45 -0800 Subject: 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 Petri-Dish: Gerald Combs Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman --- capture_opts.h | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) (limited to 'capture_opts.h') 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; -- cgit v1.2.3