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.

svn path=/trunk/; revision=28645

1 files changed, 4 insertions, 7 deletions

diff --git a/tap-sctpchunkstat.c b/tap-sctpchunkstat.c
index 630d4f4c91..695e8f9ca4 100644
--- a/tap-sctpchunkstat.c
+++ b/tap-sctpchunkstat.c
@@ -223,23 +223,20 @@ static void
 sctpstat_init(const char *optarg, void* userdata _U_)
 {
 	sctpstat_t *hs;
-	const char *filter=NULL;
 	GString *error_string;
 
+	hs = g_malloc(sizeof(sctpstat_t));
 	if(!strncmp(optarg,"sctp,stat,",11)){
-		filter=optarg+11;
+		hs->filter=g_strdup(optarg+11);
 	} else {
-		filter="";
+		hs->filter=NULL;
 	}
-
-	hs = g_malloc(sizeof(sctpstat_t));
-	hs->filter=g_strdup(filter);
 	hs->ep_list = NULL;
 	hs->number_of_packets = 0;
 
 	sctpstat_reset(hs);
 
-	error_string=register_tap_listener("sctp", hs, filter, NULL, sctpstat_packet, sctpstat_draw);
+	error_string=register_tap_listener("sctp", hs, hs->filter, 0, NULL, sctpstat_packet, sctpstat_draw);
 	if(error_string){
 		/* error, we failed to attach to the tap. clean up */
 		g_free(hs->filter);