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

diff --git a/gtk/tcp_graph.c b/gtk/tcp_graph.c
index e664cbf632..c93cf04cbb 100644
--- a/gtk/tcp_graph.c
+++ b/gtk/tcp_graph.c
@@ -1756,14 +1756,14 @@ static void graph_segment_list_get (struct graph *g)
 	ts.current=&current;
 	ts.g=g;
 	ts.last=NULL;
-	error_string=register_tap_listener("tcp", &ts, "tcp", NULL, tapall_tcpip_packet, NULL);
+	error_string=register_tap_listener("tcp", &ts, "tcp", 0, NULL, tapall_tcpip_packet, NULL);
 	if(error_string){
 		fprintf(stderr, "wireshark: Couldn't register tcp_graph tap: %s\n",
 		    error_string->str);
 		g_string_free(error_string, TRUE);
 		exit(1);
 	}
-	cf_retap_packets(&cfile, FALSE);
+	cf_retap_packets(&cfile);
 	remove_tap_listener(&ts);
 }
 
@@ -1817,7 +1817,7 @@ static struct tcpheader *select_tcpip_session (capture_file *cf, struct segment
 	}
 
 
-	error_string=register_tap_listener("tcp", &th, NULL, NULL, tap_tcpip_packet, NULL);
+	error_string=register_tap_listener("tcp", &th, NULL, 0, NULL, tap_tcpip_packet, NULL);
 	if(error_string){
 		fprintf(stderr, "wireshark: Couldn't register tcp_graph tap: %s\n",
 		    error_string->str);