diff options
author | Michael Mann <mmann78@netscape.net> | 2015-10-25 10:32:29 -0400 |
---|---|---|
committer | Michael Mann <mmann78@netscape.net> | 2015-10-27 11:41:35 +0000 |
commit | 616dbd78d6afc4f8825ce159de23b19752859605 (patch) | |
tree | 83ff123d37b33132a242c26aaf0f2504c2ab4e5b /epan/dissector_filters.h | |
parent | b90267bb7549c7be9900141f6737fd127a9a0515 (diff) |
Replace all "dissector filter" registrations with "dissector color filter" registration.
In the GTK, there was "colorize" (via context menu using color_dissector_filter.{c,h}) or "not colorize" (via main menu using dissector_filters.{c,h}). In Qt, you have the option to colorize (via context menu using color_dissector_filter.{c,h}) or not colorize (via main menu using color_dissector_filter.{c,h}).
Combine all into "colorize" and convert GTK to use color_dissector_filter.{c,h} in the "not colorize" main menu like Qt.
Change-Id: Ib3ca1c822f5f66ab5b812632d808f7905b328483
Reviewed-on: https://code.wireshark.org/review/11263
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan/dissector_filters.h')
-rw-r--r-- | epan/dissector_filters.h | 61 |
1 files changed, 0 insertions, 61 deletions
diff --git a/epan/dissector_filters.h b/epan/dissector_filters.h deleted file mode 100644 index 020fb107ed..0000000000 --- a/epan/dissector_filters.h +++ /dev/null @@ -1,61 +0,0 @@ -/* dissector_filters.h - * Routines for dissector generated display filters - * - * 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ - -#ifndef __DISSECTOR_FILTERS_H__ -#define __DISSECTOR_FILTERS_H__ - -#include "ws_symbol_export.h" - -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ - -/** @file - */ - -/** callback function definition: is a filter available for this packet? */ -typedef gboolean (*is_filter_valid_func)(packet_info *pinfo); - -/** callback function definition: return the available filter for this packet or NULL if no filter is available */ -typedef const gchar* (*build_filter_string_func)(packet_info *pinfo); - - -/** register a dissector filter */ -WS_DLL_PUBLIC void register_dissector_filter(const char *name, is_filter_valid_func is_filter_valid, build_filter_string_func build_filter_string); - - - -/*** THE FOLLOWING SHOULD NOT BE USED BY ANY DISSECTORS!!! ***/ - -typedef struct dissector_filter_s { - const char * name; - is_filter_valid_func is_filter_valid; - build_filter_string_func build_filter_string; -} dissector_filter_t; - -WS_DLL_PUBLIC GList *dissector_filter_list; - -#ifdef __cplusplus -} -#endif /* __cplusplus */ - -#endif /* dissector_filters.h */ |