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-megacostat.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-megacostat.c')
-rw-r--r-- | tap-megacostat.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/tap-megacostat.c b/tap-megacostat.c index d2999815c7..5e2b3c5d36 100644 --- a/tap-megacostat.c +++ b/tap-megacostat.c @@ -83,7 +83,6 @@ megacostat_init(const char *optarg, void* userdata _U_) { megacostat_t *ms; int i; - const char *filter=NULL; GString *error_string; pref_t *megaco_ctx_track,*h248_ctx_track; @@ -95,15 +94,13 @@ megacostat_init(const char *optarg, void* userdata _U_) exit(1); } + ms=g_malloc(sizeof(megacostat_t)); if(!strncmp(optarg,"megaco,rtd,",11)){ - filter=optarg+11; + ms->filter=g_strdup(optarg+11); } else { - filter=""; + ms->filter=NULL; } - ms=g_malloc(sizeof(megacostat_t)); - ms->filter=g_strdup(filter); - for(i=0;i<NUM_TIMESTATS;i++) { ms->rtd[i].num=0; ms->rtd[i].min_num=0; @@ -121,7 +118,7 @@ megacostat_init(const char *optarg, void* userdata _U_) ms->req_dup_num=0; ms->rsp_dup_num=0; - error_string=register_tap_listener("megaco", ms, filter, NULL, megacostat_packet, megacostat_draw); + error_string=register_tap_listener("megaco", ms, ms->filter, 0, NULL, megacostat_packet, megacostat_draw); if(error_string){ /* error, we failed to attach to the tap. clean up */ g_free(ms->filter); |