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-tcp.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-tcp.c')
-rw-r--r-- | epan/dissectors/packet-tcp.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/epan/dissectors/packet-tcp.c b/epan/dissectors/packet-tcp.c index 4caed8c5f2..657da75c78 100644 --- a/epan/dissectors/packet-tcp.c +++ b/epan/dissectors/packet-tcp.c @@ -33,7 +33,7 @@ #include <epan/prefs.h> #include <epan/show_exception.h> #include <epan/conversation_table.h> -#include <epan/color_dissector_filters.h> +#include <epan/dissector_filters.h> #include <epan/reassemble.h> #include <epan/decode_as.h> #include <epan/in_cksum.h> @@ -717,13 +717,13 @@ tcpip_hostlist_packet(void *pit, packet_info *pinfo, epan_dissect_t *edt _U_, co } static gboolean -tcp_color_filter_valid(packet_info *pinfo) +tcp_filter_valid(packet_info *pinfo) { return proto_is_frame_protocol(pinfo->layers, "tcp"); } static gchar* -tcp_build_color_filter(packet_info *pinfo) +tcp_build_filter(packet_info *pinfo) { if( pinfo->net_src.type == AT_IPv4 && pinfo->net_dst.type == AT_IPv4 ) { /* TCP over IPv4 */ @@ -6604,7 +6604,7 @@ proto_register_tcp(void) register_decode_as(&tcp_da); register_conversation_table(proto_tcp, FALSE, tcpip_conversation_packet, tcpip_hostlist_packet); - register_color_conversation_filter("tcp", "TCP", tcp_color_filter_valid, tcp_build_color_filter); + register_conversation_filter("tcp", "TCP", tcp_filter_valid, tcp_build_filter); /* considers MPTCP as a distinct protocol (even if it's a TCP option) */ |