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-camelsrt.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-camelsrt.c')
-rw-r--r-- | tap-camelsrt.c | 35 |
1 files changed, 9 insertions, 26 deletions
diff --git a/tap-camelsrt.c b/tap-camelsrt.c index 94e88a77b2..ec575f4a15 100644 --- a/tap-camelsrt.c +++ b/tap-camelsrt.c @@ -211,40 +211,23 @@ static void camelsrt_draw(void *phs) static void camelsrt_init(const char *optarg, void* userdata _U_) { struct camelsrt_t *p_camelsrt; - const char *filter=NULL; - const char *emptyfilter=""; - GString *error_string; - if(!strncmp(optarg,"camel,srt,",9)){ - filter=optarg+9; - } else { - filter=NULL; - } - p_camelsrt = g_malloc(sizeof(struct camelsrt_t)); - if(filter){ - p_camelsrt->filter=g_strdup(filter); + if(!strncmp(optarg,"camel,srt,",9)){ + p_camelsrt->filter=g_strdup(optarg+9); } else { p_camelsrt->filter=NULL; } camelsrt_reset(p_camelsrt); - if (filter) { - error_string=register_tap_listener("CAMEL", - p_camelsrt, - filter, - NULL, - camelsrt_packet, - camelsrt_draw); - } else { - error_string=register_tap_listener("CAMEL", - p_camelsrt, - emptyfilter, - NULL, - camelsrt_packet, - camelsrt_draw); - } + error_string=register_tap_listener("CAMEL", + p_camelsrt, + p_camelsrt->filter, + 0, + NULL, + camelsrt_packet, + camelsrt_draw); if(error_string){ /* error, we failed to attach to the tap. clean up */ |