diff options
author | Pascal Quantin <pascal.quantin@gmail.com> | 2018-10-31 17:41:13 +0100 |
---|---|---|
committer | Anders Broman <a.broman58@gmail.com> | 2018-11-01 06:26:13 +0000 |
commit | bcaf997f8af1ac0c718140977d1b4f98a3321533 (patch) | |
tree | 974bbd121ce30e90076066cc22ec7e621ceeabfe /extcap.c | |
parent | 54b58c5320ff2b524c94eb763a110f9448dd9ad3 (diff) |
wsutil: introduce ws_pipe_close() helper and use it to terminate mmdbresolve
We were not calling TerminateProcess() to stop mmdbresolve.Exe process on
Windows.
Bug: 15248
Change-Id: Ic90cf438a8003a6fefb023b7056984681ce09b46
Reviewed-on: https://code.wireshark.org/review/30449
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'extcap.c')
-rw-r--r-- | extcap.c | 5 |
1 files changed, 1 insertions, 4 deletions
@@ -1199,10 +1199,7 @@ void extcap_if_cleanup(capture_options *capture_opts, gchar **errormsg) if (interface_opts->extcap_pid != WS_INVALID_PID) { -#ifdef _WIN32 - TerminateProcess(interface_opts->extcap_pid, 0); -#endif - g_spawn_close_pid(interface_opts->extcap_pid); + ws_pipe_close((ws_pipe_t *) interface_opts->extcap_pipedata); interface_opts->extcap_pid = WS_INVALID_PID; g_free(interface_opts->extcap_pipedata); |