diff options
| author | Guy Harris <guy@alum.mit.edu> | 2009-06-05 22:42:47 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2009-06-05 22:42:47 +0000 |
| commit | cf91fdf16b2d961024ea062503ce5fb91af28186 (patch) | |
| tree | 2654abe47f378933a5d325856a7b3f877338dd19 /tap-protocolinfo.c | |
| parent | f84499059642f102c7272e72f74d7a986f51b520 (diff) | |
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
Diffstat (limited to 'tap-protocolinfo.c')
| -rw-r--r-- | tap-protocolinfo.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tap-protocolinfo.c b/tap-protocolinfo.c index 632949692e..588f8fb775 100644 --- a/tap-protocolinfo.c +++ b/tap-protocolinfo.c @@ -123,7 +123,7 @@ protocolinfo_init(const char *optarg, void* userdata _U_) rs->filter=NULL; } - error_string=register_tap_listener("frame", rs, rs->filter, NULL, protocolinfo_packet, NULL); + error_string=register_tap_listener("frame", rs, rs->filter, TL_REQUIRES_PROTO_TREE, NULL, protocolinfo_packet, NULL); if(error_string){ /* error, we failed to attach to the tap. complain and clean up */ fprintf(stderr, "tshark: Couldn't register proto,colinfo tap: %s\n", |