diff options
author | Michael Mann <mmann78@netscape.net> | 2015-06-23 08:53:17 -0400 |
---|---|---|
committer | Michael Mann <mmann78@netscape.net> | 2015-07-03 23:08:28 +0000 |
commit | a8ff1e2778b22ca55db752264eaf864d720ca8dc (patch) | |
tree | 1b7182449a95437aa6a0419519c92fcc08ca3aa0 /ui/gtk/tap_param_dlg.c | |
parent | 09ea473cee9ef37335f2ef8247da94bc71d12bba (diff) | |
download | wireshark-a8ff1e2778b22ca55db752264eaf864d720ca8dc.tar.gz |
Create very basic "generic" stat tap API to create a "GUI" independent table.
A few sample tap/dissectors (ANSI/A, ANSI MAP) are also included to test the API. The "GUI output" is a bit raw and could use some "prettying up", but all the basic hooks are there.
Telephony "stat grouping" needs to be better alphabetized to properly populate menu (on GTK, probably Qt)
Change-Id: I98514171f69c4ab3a304dccb26c71d629703c9ab
Reviewed-on: https://code.wireshark.org/review/9110
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'ui/gtk/tap_param_dlg.c')
-rw-r--r-- | ui/gtk/tap_param_dlg.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/ui/gtk/tap_param_dlg.c b/ui/gtk/tap_param_dlg.c index f5f57e03e5..cdb6a3bf08 100644 --- a/ui/gtk/tap_param_dlg.c +++ b/ui/gtk/tap_param_dlg.c @@ -183,7 +183,7 @@ tap_param_dlg_start_button_clicked(GtkWidget *item _U_, gpointer dialog_data) break; } } - (dlg_data->cont.tap_init_cb)(params->str,NULL); + (dlg_data->cont.tap_init_cb)(params->str, dlg_data->cont.user_data); g_string_free(params, TRUE); } @@ -222,6 +222,7 @@ tap_param_dlg_cb(GtkAction *action _U_, gpointer data) end_dlg_list->cont.tap_init_cb = dlg_data->tap_init_cb; end_dlg_list->cont.nparams = dlg_data->nparams; end_dlg_list->cont.params = dlg_data->params; + end_dlg_list->cont.user_data = dlg_data->user_data; end_dlg_list->args.title = g_strdup_printf("%s Filter", dlg_data->win_title); end_dlg_list->args.wants_apply_button = TRUE; end_dlg_list->args.activate_on_ok = FALSE; @@ -248,6 +249,13 @@ tap_param_dlg_cb(GtkAction *action _U_, gpointer data) return; } + /* If we don't have any parameters, just launch the stat dialog */ + if (current_dlg->cont.nparams == 0) + { + tap_param_dlg_start_button_clicked(NULL, current_dlg); + return; + } + display_name = cf_get_display_name(&cfile); title = g_strdup_printf("Wireshark: %s: %s", current_dlg->cont.win_title , display_name); g_free(display_name); |