diff options
| author | Guy Harris <guy@alum.mit.edu> | 2015-10-28 20:30:55 -0700 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2015-10-29 03:32:30 +0000 |
| commit | a8a4098e12b1b60548ce1a1887b2a18a54ef790f (patch) | |
| tree | 1c1c7b32c714bb63c60f8b3073eb78317bfe364a /plugins/profinet/packet-dcom-cba-acco.c | |
| parent | 0257a30de62d1cc19e437b937026a14db3665a6f (diff) | |
"Color dissector filters" are just filters.
Rename the color_dissector_filters.[ch] files to just
dissector_filters.[ch], and rename the routines not to include the
string "color_", as those filters can be used as color filters *or*
display filters.
Remove "color_" from other places where we're not doing colorization.
In the GTK+ code, combine the two loops that add menu items for filters
in the dissector-provided filters list into one.
Change-Id: I08ecccc6b1b1be675e4129a0589f36c9f240407c
Reviewed-on: https://code.wireshark.org/review/11379
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'plugins/profinet/packet-dcom-cba-acco.c')
| -rw-r--r-- | plugins/profinet/packet-dcom-cba-acco.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/plugins/profinet/packet-dcom-cba-acco.c b/plugins/profinet/packet-dcom-cba-acco.c index 94de1f9ae2..4e28c25a52 100644 --- a/plugins/profinet/packet-dcom-cba-acco.c +++ b/plugins/profinet/packet-dcom-cba-acco.c @@ -27,7 +27,7 @@ #include <epan/packet.h> #include <epan/expert.h> #include <epan/addr_resolv.h> -#include <epan/color_dissector_filters.h> +#include <epan/dissector_filters.h> #include <epan/dissectors/packet-dcerpc.h> #include <epan/dissectors/packet-dcom.h> #include "packet-dcom-cba-acco.h" @@ -336,7 +336,7 @@ GList *cba_pdevs; const true_false_string acco_flags_set_truth = { "Set", "Not set" }; static gboolean -cba_color_filter_valid(packet_info *pinfo) +cba_filter_valid(packet_info *pinfo) { void* profinet_type = p_get_proto_data(pinfo->pool, pinfo, proto_ICBAAccoMgt, 0); @@ -344,7 +344,7 @@ cba_color_filter_valid(packet_info *pinfo) } static gchar* -cba_build_color_filter(packet_info *pinfo) +cba_build_filter(packet_info *pinfo) { gboolean is_tcp = proto_is_frame_protocol(pinfo->layers, "tcp"); void* profinet_type = p_get_proto_data(pinfo->pool, pinfo, proto_ICBAAccoMgt, 0); @@ -5113,7 +5113,7 @@ proto_register_dcom_cba_acco (void) proto_ICBAAccoSync = proto_register_protocol ("ICBAAccoSync", "ICBAAccoSync", "cba_acco_sync"); proto_register_subtree_array (ett5, array_length (ett5)); - register_color_conversation_filter("cba", "PN-CBA", cba_color_filter_valid, cba_build_color_filter); + register_conversation_filter("cba", "PN-CBA", cba_filter_valid, cba_build_filter); } |