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 /epan/dissectors/packet-eth.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 'epan/dissectors/packet-eth.c')
| -rw-r--r-- | epan/dissectors/packet-eth.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/epan/dissectors/packet-eth.c b/epan/dissectors/packet-eth.c index c7a9c76e5e..fad80ef0ed 100644 --- a/epan/dissectors/packet-eth.c +++ b/epan/dissectors/packet-eth.c @@ -29,7 +29,7 @@ #include <epan/addr_resolv.h> #include <epan/expert.h> #include <epan/conversation_table.h> -#include <epan/color_dissector_filters.h> +#include <epan/dissector_filters.h> #include <wsutil/pint.h> #include "packet-eth.h" #include "packet-ieee8023.h" @@ -162,13 +162,13 @@ eth_hostlist_packet(void *pit, packet_info *pinfo, epan_dissect_t *edt _U_, cons } static gboolean -eth_color_filter_valid(packet_info *pinfo) +eth_filter_valid(packet_info *pinfo) { return (pinfo->dl_src.type == AT_ETHER); } static gchar* -eth_build_color_filter(packet_info *pinfo) +eth_build_filter(packet_info *pinfo) { return g_strdup_printf("eth.addr eq %s and eth.addr eq %s", address_to_str(pinfo->pool, &pinfo->dl_src), @@ -1013,7 +1013,7 @@ proto_register_eth(void) eth_tap = register_tap("eth"); register_conversation_table(proto_eth, TRUE, eth_conversation_packet, eth_hostlist_packet); - register_color_conversation_filter("eth", "Ethernet", eth_color_filter_valid, eth_build_color_filter); + register_conversation_filter("eth", "Ethernet", eth_filter_valid, eth_build_filter); } void |