diff options
| author | Tomasz Moń <desowin@gmail.com> | 2022-08-13 05:58:50 +0200 |
|---|---|---|
| committer | Tomasz Moń <desowin@gmail.com> | 2022-08-13 20:23:51 +0200 |
| commit | d0a9de2af1882f0ff23a43baa051da35d7fed512 (patch) | |
| tree | df1d17c56309f24649ddb5b140829adee49110d4 /capture_opts.c | |
| parent | 8291dc23f3d2591f8b22e342ff061d65d50032b0 (diff) | |
capture: Stop extcaps before dumpcap
Send SIGTERM on UNIX systems to all extcap processes when user requests
capture stop. Wait up to 30 seconds for extcaps to finish. If extcaps do
not finish in time, send SIGKILL to remaining extcaps.
Do not call TerminateProcess() on Windows in the same place where UNIX
SIGTERM is sent. Instead schedule extcap termination timeout to happen
as soon as control returns back to the event loop.
There is no universally agreed replacement for SIGTERM on Windows, so
just keep things simple (forcefully terminate like always) until we
have agreed on something.
Diffstat (limited to 'capture_opts.c')
| -rw-r--r-- | capture_opts.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/capture_opts.c b/capture_opts.c index f20509b684..53c1800bb7 100644 --- a/capture_opts.c +++ b/capture_opts.c @@ -128,6 +128,8 @@ capture_opts_init(capture_options *capture_opts) capture_opts->output_to_pipe = FALSE; capture_opts->capture_child = FALSE; + capture_opts->stop_after_extcaps = FALSE; + capture_opts->wait_for_extcap_cbs = FALSE; capture_opts->print_file_names = FALSE; capture_opts->print_name_to = NULL; capture_opts->temp_dir = NULL; |