diff options
| author | Stig Bjørlykke <stig@bjorlykke.org> | 2019-11-07 11:35:47 +0000 |
|---|---|---|
| committer | Roland Knall <rknall@gmail.com> | 2019-11-07 12:53:47 +0000 |
| commit | abfa0d6218108a14898778b7142c55a27d42b298 (patch) | |
| tree | 75cbd81fa736b30f4e02969f3d2c4ac7953fba45 /capchild | |
| parent | f75f128462512a6c4efa9345af631d680808c1a6 (diff) | |
Qt: Keep extcap control channels when capturing to multiple files
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 <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Roland Knall <rknall@gmail.com>
Diffstat (limited to 'capchild')
| -rw-r--r-- | capchild/capture_session.h | 2 | ||||
| -rw-r--r-- | capchild/capture_sync.c | 2 |
2 files changed, 2 insertions, 2 deletions
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 */ |