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 /plugins/mate | |
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 'plugins/mate')
-rw-r--r-- | plugins/mate/packet-mate.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/plugins/mate/packet-mate.c b/plugins/mate/packet-mate.c index d4132cace1..d533a235f1 100644 --- a/plugins/mate/packet-mate.c +++ b/plugins/mate/packet-mate.c @@ -341,10 +341,11 @@ proto_reg_handoff_mate(void) register_init_routine(initialize_mate_runtime); tap_error = register_tap_listener("frame", &mate_tap_data, - (char*) mc->tap_filter, - (tap_reset_cb) NULL, - mate_packet, - (tap_draw_cb) NULL); + (char*) mc->tap_filter, + 0, + (tap_reset_cb) NULL, + mate_packet, + (tap_draw_cb) NULL); if ( tap_error ) { g_warning("mate: couldn't (re)register tap: %s",tap_error->str); |