Have tap listeners specify whether the "packet" routine requires

	a protocol tree;

	the column values.

This includes stats-tree listeners.

Have the routines to build the packet list, and to retap packets, honor
those requirements.  This means that cf_retap_packets() no longer needs
an argument to specify whether to construct the column values or not, so
get rid of that argument.

This also means that there's no need for a tap to have a fake filter
to ensure that the protocol tree will be built, so don't set up a fake
"frame" filter.

While we're at it, clean up some cases where "no filter" was represented
as a null string rather than a null pointer.

Have a routine to return an indication of the number of tap listeners
with filters; use that rather than the global num_tap_filters.

Clean up some indentation and some gboolean vs. gint items.


git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@28645 f5534014-38df-0310-8fa8-9805f1628bb7

1 files changed, 7 insertions, 9 deletions

diff --git a/gtk/h225_ras_srt.c b/gtk/h225_ras_srt.c
index 712ae83a0b..e28cc6d727 100644
--- a/gtk/h225_ras_srt.c
+++ b/gtk/h225_ras_srt.c
@@ -283,20 +283,18 @@ static void
 gtk_h225rassrt_init(const char *optarg, void *userdata _U_)
 {
 	h225rassrt_t *hs;
-	const char *filter=NULL;
 	GString *error_string;
 	GtkWidget *bbox;
 	GtkWidget *close_bt;
 
+	hs=g_malloc(sizeof(h225rassrt_t));
+
 	if(strncmp(optarg,"h225,srt,",9) == 0){
-		filter=optarg+9;
+		hs->filter=g_strdup(optarg+9);
 	} else {
-		filter="";
+		hs->filter=NULL;
 	}
 
-	hs=g_malloc(sizeof(h225rassrt_t));
-	hs->filter=g_strdup(filter);
-
 	h225rassrt_reset(hs);
 
 	hs->win=window_new(GTK_WINDOW_TOPLEVEL, "h225-ras-srt");
@@ -305,14 +303,14 @@ gtk_h225rassrt_init(const char *optarg, void *userdata _U_)
 	hs->vbox=gtk_vbox_new(FALSE, 3);
 	gtk_container_set_border_width(GTK_CONTAINER(hs->vbox), 12);
 
-	init_main_stat_window(hs->win, hs->vbox, "H.225 RAS Service Response Time", filter);
+	init_main_stat_window(hs->win, hs->vbox, "H.225 RAS Service Response Time", hs->filter);
 
         /* init a scrolled window*/
 	hs->scrolled_window = scrolled_window_new(NULL, NULL);
 
 	hs->table = create_stat_table(hs->scrolled_window, hs->vbox, 11, titles);
 
-	error_string=register_tap_listener("h225", hs, filter, h225rassrt_reset, h225rassrt_packet, h225rassrt_draw);
+	error_string=register_tap_listener("h225", hs, hs->filter, 0, h225rassrt_reset, h225rassrt_packet, h225rassrt_draw);
 	if(error_string){
 		simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, "%s", error_string->str);
 		g_string_free(error_string, TRUE);
@@ -334,7 +332,7 @@ gtk_h225rassrt_init(const char *optarg, void *userdata _U_)
 	gtk_widget_show_all(hs->win);
 	window_present(hs->win);
 
-	cf_retap_packets(&cfile, FALSE);
+	cf_retap_packets(&cfile);
 	gdk_window_raise(hs->win->window);
 }