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-iousers.c | |
parent | f84499059642f102c7272e72f74d7a986f51b520 (diff) | |
download | wireshark-cf91fdf16b2d961024ea062503ce5fb91af28186.tar.gz wireshark-cf91fdf16b2d961024ea062503ce5fb91af28186.tar.bz2 wireshark-cf91fdf16b2d961024ea062503ce5fb91af28186.zip |
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-iousers.c')
-rw-r--r-- | tap-iousers.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tap-iousers.c b/tap-iousers.c index 21d5af761a..13361c872a 100644 --- a/tap-iousers.c +++ b/tap-iousers.c @@ -580,7 +580,7 @@ iousers_draw(void *arg) printf("================================================================================\n"); } -void +static void iousers_init(const char *optarg, void* userdata _U_) { const char *filter=NULL; @@ -695,7 +695,7 @@ iousers_init(const char *optarg, void* userdata _U_) iu->filter=NULL; } - error_string=register_tap_listener(tap_type, iu, filter, NULL, packet_func, iousers_draw); + error_string=register_tap_listener(tap_type, iu, filter, 0, NULL, packet_func, iousers_draw); if(error_string){ if(iu->items){ g_free(iu->items); |