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, 7 insertions, 2 deletions

diff --git a/epan/stats_tree.c b/epan/stats_tree.c
index 7fbf32362b..554c50eb2a 100644
--- a/epan/stats_tree.c
+++ b/epan/stats_tree.c
@@ -260,6 +260,7 @@ stats_tree_reinit(void *p)
 /* register a new stats_tree */
 extern void
 stats_tree_register_with_group(const char *tapname, const char *abbr, const char *name,
+		    guint flags,
 		    stat_tree_packet_cb packet, stat_tree_init_cb init,
 		    stat_tree_cleanup_cb cleanup, register_stat_group_t stat_group)
 {
@@ -272,11 +273,13 @@ stats_tree_register_with_group(const char *tapname, const char *abbr, const char
 	cfg->tapname = g_strdup(tapname);
 	cfg->abbr = g_strdup(abbr);
 	cfg->name = name ? g_strdup(name) : g_strdup(abbr);
-    cfg->stat_group = stat_group;
+	cfg->stat_group = stat_group;
 	
 	cfg->packet = packet;
 	cfg->init = init;
 	cfg->cleanup = cleanup;
+
+	cfg->flags = flags;
 	
 	/* these have to be filled in by implementations */
 	cfg->setup_node_pr = NULL;
@@ -297,10 +300,12 @@ stats_tree_register_with_group(const char *tapname, const char *abbr, const char
 /* register a new stats_tree with default group REGISTER_STAT_GROUP_UNSORTED */
 extern void
 stats_tree_register(const char *tapname, const char *abbr, const char *name,
+		    guint flags,
 		    stat_tree_packet_cb packet, stat_tree_init_cb init,
 		    stat_tree_cleanup_cb cleanup)
 {
-    stats_tree_register_with_group(tapname, abbr, name,
+	stats_tree_register_with_group(tapname, abbr, name,
+		    flags,
 		    packet, init,
 		    cleanup, REGISTER_STAT_GROUP_UNSORTED);
 }