From cf91fdf16b2d961024ea062503ce5fb91af28186 Mon Sep 17 00:00:00 2001 From: Guy Harris Date: Fri, 5 Jun 2009 22:42:47 +0000 Subject: 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 --- tap-protohierstat.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) (limited to 'tap-protohierstat.c') diff --git a/tap-protohierstat.c b/tap-protohierstat.c index 29ef508218..b413f5035e 100644 --- a/tap-protohierstat.c +++ b/tap-protohierstat.c @@ -180,17 +180,11 @@ protohierstat_init(const char *optarg, void* userdata _U_) const char *filter=NULL; GString *error_string; - if(!strcmp("io,phs",optarg)){ - filter="frame"; + if(strcmp("io,phs",optarg)==0){ + /* No arguments */ } else if(sscanf(optarg,"io,phs,%n",&pos)==0){ if(pos){ filter=optarg+pos; - } else { - /* We must use a filter to guarantee that edt->tree - will be populated. "frame" matches everything so - that one is used instead of no filter. - */ - filter="frame"; } } else { fprintf(stderr, "tshark: invalid \"-z io,phs[,]\" argument\n"); @@ -205,7 +199,7 @@ protohierstat_init(const char *optarg, void* userdata _U_) rs->filter=NULL; } - error_string=register_tap_listener("frame", rs, filter, NULL, protohierstat_packet, protohierstat_draw); + error_string=register_tap_listener("frame", rs, filter, TL_REQUIRES_PROTO_TREE, NULL, protohierstat_packet, protohierstat_draw); if(error_string){ /* error, we failed to attach to the tap. clean up */ g_free(rs->filter); -- cgit v1.2.3