diff options
| author | Roland Knall <rknall@gmail.com> | 2016-06-28 21:34:46 +0200 |
|---|---|---|
| committer | Roland Knall <rknall@gmail.com> | 2016-07-05 11:54:43 +0000 |
| commit | f2786bc8ff5ea25fd1c36d3ebf83a29277ee662b (patch) | |
| tree | 0e0f3c89505d3257ab5510c55eff956543814e40 /capture_opts.c | |
| parent | fdd87a1e41db7039b0af5bb15f40b83db1ca3a96 (diff) | |
extcap: Remove g_spawn_helper support
Move g_spawn to separate file and implement functions to
use Windows based method of spawning, instead of the glib
based version
Change-Id: Ibae03d834ec86531eba37dc8768fbf17ddadf57f
Reviewed-on: https://code.wireshark.org/review/16049
Petri-Dish: Roland Knall <rknall@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
Reviewed-by: Roland Knall <rknall@gmail.com>
Diffstat (limited to 'capture_opts.c')
| -rw-r--r-- | capture_opts.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/capture_opts.c b/capture_opts.c index f383c82a94..2eb5b630d1 100644 --- a/capture_opts.c +++ b/capture_opts.c @@ -685,6 +685,7 @@ capture_opts_add_iface_opt(capture_options *capture_opts, const char *optarg_str interface_opts.extcap_fifo = g_strdup(capture_opts->default_options.extcap_fifo); interface_opts.extcap_args = NULL; interface_opts.extcap_pid = INVALID_EXTCAP_PID; + interface_opts.extcap_userdata = NULL; #endif #ifdef CAN_SET_CAPTURE_BUFFER_SIZE interface_opts.buffer_size = capture_opts->default_options.buffer_size; @@ -1111,6 +1112,7 @@ capture_opts_del_iface(capture_options *capture_opts, guint if_index) g_hash_table_unref(interface_opts.extcap_args); if (interface_opts.extcap_pid != INVALID_EXTCAP_PID) g_spawn_close_pid(interface_opts.extcap_pid); + g_free(interface_opts.extcap_userdata); #endif #ifdef HAVE_PCAP_REMOTE if (interface_opts.src_type == CAPTURE_IFREMOTE) { @@ -1160,6 +1162,7 @@ collect_ifaces(capture_options *capture_opts) interface_opts.extcap_pid = INVALID_EXTCAP_PID; if (interface_opts.extcap_args) g_hash_table_ref(interface_opts.extcap_args); + interface_opts.extcap_userdata = NULL; #endif #ifdef CAN_SET_CAPTURE_BUFFER_SIZE interface_opts.buffer_size = device.buffer; |