From abfa0d6218108a14898778b7142c55a27d42b298 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stig=20Bj=C3=B8rlykke?= Date: Thu, 7 Nov 2019 11:35:47 +0000 Subject: Qt: Keep extcap control channels when capturing to multiple files MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit When using the "Create a new file automatically" feature the capture in Wireshark will stop and start, but the extcap utility will continue run as normal. Ensure the control channels are kept when doing this. Rename the unused capture_session.session_started to session_will_restart to detect this. Bug: 16178 Change-Id: I6797c982760a1013fca2a24699befff1dc82f28c Reviewed-on: https://code.wireshark.org/review/35013 Petri-Dish: Stig Bjørlykke Tested-by: Petri Dish Buildbot Reviewed-by: Roland Knall --- capchild/capture_session.h | 2 +- capchild/capture_sync.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'capchild') diff --git a/capchild/capture_session.h b/capchild/capture_session.h index 93ddabb147..eb99a2d556 100644 --- a/capchild/capture_session.h +++ b/capchild/capture_session.h @@ -48,7 +48,7 @@ typedef struct _capture_session { uid_t owner; /**< owner of the cfile */ gid_t group; /**< group of the cfile */ #endif - gboolean session_started; + gboolean session_will_restart; /**< Set when session will restart */ guint32 count; /**< Total number of frames captured */ capture_options *capture_opts; /**< options for this capture */ capture_file *cf; /**< handle to cfile */ diff --git a/capchild/capture_sync.c b/capchild/capture_sync.c index d2ed2ee75a..ca59d9711e 100644 --- a/capchild/capture_sync.c +++ b/capchild/capture_sync.c @@ -128,7 +128,7 @@ capture_session_init(capture_session *cap_session, capture_file *cf) cap_session->group = getgid(); #endif cap_session->count = 0; - cap_session->session_started = FALSE; + cap_session->session_will_restart = FALSE; } /* Append an arg (realloc) to an argc/argv array */ -- cgit v1.2.3