From 7e842fa5514c79046d7d1986b0b379c3d4f9ce2c Mon Sep 17 00:00:00 2001 From: Michael Mann Date: Sun, 11 Mar 2018 07:52:56 -0400 Subject: F5ETHTRAILER: Initial cleanup from submission The dissector had been a plugin since at least 1.3 (based on comments in the dissector). Not all of the most current APIs were used for functionality and there was some cruft left over. Also disable F5ETHTRAILER by default since it doesn't have a discriminating heuristic. Change-Id: I8c977167a906eafd6fbb663d2fe6c44f080f2209 Reviewed-on: https://code.wireshark.org/review/26428 Petri-Dish: Michael Mann Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann --- tools/checkfiltername.pl | 3 --- 1 file changed, 3 deletions(-) (limited to 'tools') diff --git a/tools/checkfiltername.pl b/tools/checkfiltername.pl index c67715c676..8ae4c272f7 100755 --- a/tools/checkfiltername.pl +++ b/tools/checkfiltername.pl @@ -392,9 +392,6 @@ sub is_from_other_protocol_whitelist { if (($proto_filename eq "packet-dvb-ipdc.c") && (index($_[0], "ipdc") >= 0)) {return 1;} if (($proto_filename eq "packet-enip.c") && (index($_[0], "cip") >= 0)) {return 1;} if (($proto_filename eq "packet-extreme.c") && (index($_[0], "llc") >= 0)) {return 1;} - if (($proto_filename eq "packet-f5ethtrailer.c") && (index($_[0], "ip") >= 0)) {return 1;} - if (($proto_filename eq "packet-f5ethtrailer.c") && (index($_[0], "udp") >= 0)) {return 1;} - if (($proto_filename eq "packet-f5ethtrailer.c") && (index($_[0], "tcp") >= 0)) {return 1;} if (($proto_filename eq "packet-fmp_notify.c") && (index($_[0], "fmp") >= 0)) {return 1;} if (($proto_filename eq "packet-foundry.c") && (index($_[0], "llc") >= 0)) {return 1;} if (($proto_filename eq "packet-glusterfs.c") && (index($_[0], "gluster") >= 0)) {return 1;} -- cgit v1.2.3