diff options
| author | Michael Mann <mmann78@netscape.net> | 2015-12-16 23:15:03 -0500 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2015-12-19 14:22:56 +0000 |
| commit | 444dfda793784cecda0757cbe50e27a5ba855ba0 (patch) | |
| tree | ec34e5780c2dbe29bc2f170c2fc406ee20aa0430 /capchild/capture_session.h | |
| parent | 7baac67149a68b66087c5d688dbeda2869485765 (diff) | |
Allow "capture info data" to not be a singleton.
It was buried as a static variable in capture_info.c, and functions were refactored to allow a pointer to the info_data_t structure to be passed in. TShark and GTK will have their own single (global) copy of the structure, while it opens up Qt to have multiple instances.
Change-Id: Ic2d7a2ad574de43f457cb18b194d6bc3fffb6120
Reviewed-on: https://code.wireshark.org/review/12691
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'capchild/capture_session.h')
| -rw-r--r-- | capchild/capture_session.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/capchild/capture_session.h b/capchild/capture_session.h index d55ef1f768..e10eeb5f7b 100644 --- a/capchild/capture_session.h +++ b/capchild/capture_session.h @@ -45,7 +45,7 @@ typedef enum { } capture_state; struct _capture_file; - +struct _info_data; /* * State of a capture session. */ @@ -64,6 +64,7 @@ typedef struct _capture_session { guint32 count; /**< Total number of frames captured */ capture_options *capture_opts; /**< options for this capture */ struct _capture_file *cf; /**< handle to cfile */ + struct _info_data *cap_data_info; /**< stats for this capture */ } capture_session; extern void |