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 /ui/capture.c | |
parent | 7baac67149a68b66087c5d688dbeda2869485765 (diff) | |
download | wireshark-444dfda793784cecda0757cbe50e27a5ba855ba0.tar.gz |
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 'ui/capture.c')
-rw-r--r-- | ui/capture.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/ui/capture.c b/ui/capture.c index 0a95cf8be9..f3818a6ef8 100644 --- a/ui/capture.c +++ b/ui/capture.c @@ -126,7 +126,7 @@ capture_callback_remove(capture_callback_t func, gpointer user_data) * @return TRUE if the capture starts successfully, FALSE otherwise. */ gboolean -capture_start(capture_options *capture_opts, capture_session *cap_session, void(*update_cb)(void)) +capture_start(capture_options *capture_opts, capture_session *cap_session, info_data_t* cap_data, void(*update_cb)(void)) { gboolean ret; GString *source; @@ -138,7 +138,7 @@ capture_start(capture_options *capture_opts, capture_session *cap_session, void( cf_set_tempfile_source((capture_file *)cap_session->cf, source->str); g_string_free(source, TRUE); /* try to start the capture child process */ - ret = sync_pipe_start(capture_opts, cap_session, update_cb); + ret = sync_pipe_start(capture_opts, cap_session, cap_data, update_cb); if(!ret) { if(capture_opts->save_file != NULL) { g_free(capture_opts->save_file); @@ -156,7 +156,7 @@ capture_start(capture_options *capture_opts, capture_session *cap_session, void( capture_callback_invoke(capture_cb_capture_prepared, cap_session); if(capture_opts->show_info) - capture_info_open(cap_session); + capture_info_open(cap_session, cap_data); } return ret; @@ -346,7 +346,7 @@ capture_input_new_file(capture_session *cap_session, gchar *new_file) } if(capture_opts->show_info) { - if (!capture_info_new_file(new_file)) + if (!capture_info_new_file(new_file, cap_session->cap_data_info)) return FALSE; } @@ -403,7 +403,7 @@ capture_input_new_packets(capture_session *cap_session, int to_read) #endif if(capture_opts->show_info) - capture_info_new_packets(to_read); + capture_info_new_packets(to_read, cap_session->cap_data_info); } @@ -594,7 +594,7 @@ capture_input_closed(capture_session *cap_session, gchar *msg) } if(capture_opts->show_info) - capture_info_close(); + capture_info_close(cap_session->cap_data_info); cap_session->state = CAPTURE_STOPPED; @@ -631,7 +631,7 @@ capture_input_closed(capture_session *cap_session, gchar *msg) /* close the currently loaded capture file */ cf_close((capture_file *)cap_session->cf); - capture_start(capture_opts, cap_session,NULL); /*XXX is this NULL ok or we need an update_cb???*/ + capture_start(capture_opts, cap_session, cap_session->cap_data_info, NULL); /*XXX is this NULL ok or we need an update_cb???*/ } else { /* We're not doing a capture any more, so we don't have a save file. */ g_free(capture_opts->save_file); |