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-mgcpstat.c b/tap-mgcpstat.c
index 1c6b850bbc..f4a71d181c 100644
--- a/tap-mgcpstat.c
+++ b/tap-mgcpstat.c
@@ -180,18 +180,15 @@ mgcpstat_init(const char *optarg, void* userdata _U_)
 {
 	mgcpstat_t *ms;
 	int i;
-	const char *filter=NULL;
 	GString *error_string;
 
+	ms=g_malloc(sizeof(mgcpstat_t));
 	if(!strncmp(optarg,"mgcp,rtd,",9)){
-		filter=optarg+9;
+		ms->filter=g_strdup(optarg+9);
 	} else {
-		filter="";
+		ms->filter=NULL;
 	}
 
-	ms=g_malloc(sizeof(mgcpstat_t));
-	ms->filter=g_strdup(filter);
-
 	for(i=0;i<NUM_TIMESTATS;i++) {
 		ms->rtd[i].num=0;
 		ms->rtd[i].min_num=0;
@@ -209,7 +206,7 @@ mgcpstat_init(const char *optarg, void* userdata _U_)
 	ms->req_dup_num=0;
 	ms->rsp_dup_num=0;
 
-	error_string=register_tap_listener("mgcp", ms, filter, NULL, mgcpstat_packet, mgcpstat_draw);
+	error_string=register_tap_listener("mgcp", ms, ms->filter, 0, NULL, mgcpstat_packet, mgcpstat_draw);
 	if(error_string){
 		/* error, we failed to attach to the tap. clean up */
 		g_free(ms->filter);