diff options
| author | Jeff Morriss <jeff.morriss@ulticom.com> | 2011-05-12 03:18:34 +0000 |
|---|---|---|
| committer | Jeff Morriss <jeff.morriss@ulticom.com> | 2011-05-12 03:18:34 +0000 |
| commit | 009156289f5af6d6abe25c0b24f0b439bc996f47 (patch) | |
| tree | c103eac46fa0a63a2535c91386947715c15589e6 /epan/tap.h | |
| parent | 995d748f0561867b02682d2468fb7ae935866de3 (diff) | |
Fix the test.sh failures based on Guy's suggestion in https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5445#c15 :
Add a new tap flag to indicate that a tap listener is just a "dissector helper",
that is, a tap which is used by a dissector to help it do its dissection but
does not, itself, require dissection.
Use this new flag in the dissectors which register taps.
Remove the (now-unused) have_tap_listeners() function.
svn path=/trunk/; revision=37069
Diffstat (limited to 'epan/tap.h')
| -rw-r--r-- | epan/tap.h | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/epan/tap.h b/epan/tap.h index 4624a5fe92..48a5c834af 100644 --- a/epan/tap.h +++ b/epan/tap.h @@ -6,17 +6,17 @@ * Wireshark - Network traffic analyzer * By Gerald Combs <gerald@wireshark.org> * Copyright 1998 Gerald Combs - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -37,6 +37,9 @@ typedef void (*tap_draw_cb)(void *tapdata); #define TL_REQUIRES_NOTHING 0x00000000 /**< nothing */ #define TL_REQUIRES_PROTO_TREE 0x00000001 /**< full protocol tree */ #define TL_REQUIRES_COLUMNS 0x00000002 /**< columns */ +/* Flags to indicate what the tap listener does */ +#define TL_IS_DISSECTOR_HELPER 0x00000004 /** tap helps a dissector do work + ** but does not, itself, require dissection */ extern void tap_init(void); extern int register_tap(const char *name); @@ -52,7 +55,7 @@ extern GString *register_tap_listener(const char *tapname, void *tapdata, tap_packet_cb tap_packet, tap_draw_cb tap_draw); extern GString *set_tap_dfilter(void *tapdata, const char *fstring); extern void remove_tap_listener(void *tapdata); -extern gboolean have_tap_listeners(void); +extern gboolean tap_listeners_require_dissection(void); extern gboolean have_tap_listener(int tap_id); extern gboolean have_filtering_tap_listeners(void); extern guint union_of_tap_listener_flags(void); |