diff options
| author | Michael Mann <mmann78@netscape.net> | 2014-11-06 22:10:11 -0500 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2014-11-07 05:25:53 +0000 |
| commit | 09cdfe851ea4da83a7a92b80b06311dcc3666ad0 (patch) | |
| tree | d2504326f8bf16b617258844b8fae591b4f9eacf /tools | |
| parent | b5dead8e60a315739a66e52d947c6f0e852d21f1 (diff) | |
Fix all remaining filter name errors found with checkfiltername.pl
This should make it possible to add checkfiltername.pl to the pre-commit script.
Change-Id: Icdee7e4ea3381fa1467bb4b5caf0f60c255adec0
Reviewed-on: https://code.wireshark.org/review/5166
Reviewed-by: Michael Mann <mmann78@netscape.net>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/checkfiltername.pl | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/tools/checkfiltername.pl b/tools/checkfiltername.pl index 5c153ee401..6f8a0f2bd4 100755 --- a/tools/checkfiltername.pl +++ b/tools/checkfiltername.pl @@ -366,6 +366,7 @@ sub is_from_other_protocol_whitelist { # XXX - may be faster to hash this (note 1-many relationship)? if (($proto_filename eq "packet-bpdu.c") && (index($_[0], "mstp") >= 0)) {return 1;} + if (($proto_filename eq "packet-bssap.c") && (index($_[0], "bsap") >= 0)) {return 1;} if (($proto_filename eq "packet-cimetrics.c") && (index($_[0], "llc") >= 0)) {return 1;} if (($proto_filename eq "packet-cipsafety.c") && (index($_[0], "cip") >= 0)) {return 1;} if (($proto_filename eq "packet-cipsafety.c") && (index($_[0], "enip") >= 0)) {return 1;} @@ -384,6 +385,12 @@ sub is_from_other_protocol_whitelist { if (($proto_filename eq "packet-ieee80211-radio.c") && (index($_[0], "wlan") >= 0)) {return 1;} if (($proto_filename eq "packet-ieee80211-wlancap.c") && (index($_[0], "wlan") >= 0)) {return 1;} if (($proto_filename eq "packet-ieee802154.c") && (index($_[0], "wpan") >= 0)) {return 1;} + if (($proto_filename eq "packet-isup.c") && (index($_[0], "ansi_isup") >= 0)) {return 1;} + if (($proto_filename eq "packet-isup.c") && (index($_[0], "bat_ase") >= 0)) {return 1;} + if (($proto_filename eq "packet-isup.c") && (index($_[0], "nsap") >= 0)) {return 1;} + if (($proto_filename eq "packet-isup.c") && (index($_[0], "x213") >= 0)) {return 1;} + if (($proto_filename eq "packet-iwarp-ddp-rdmap.c") && (index($_[0], "iwarp_ddp") >= 0)) {return 1;} + if (($proto_filename eq "packet-iwarp-ddp-rdmap.c") && (index($_[0], "iwarp_rdma") >= 0)) {return 1;} if (($proto_filename eq "packet-k12.c") && (index($_[0], "aal2") >= 0)) {return 1;} if (($proto_filename eq "packet-k12.c") && (index($_[0], "atm") >= 0)) {return 1;} if (($proto_filename eq "packet-m3ua.c") && (index($_[0], "mtp3") >= 0)) {return 1;} @@ -400,6 +407,11 @@ sub is_from_other_protocol_whitelist { if (($proto_filename eq "packet-wsp.c") && (index($_[0], "wap") >= 0)) {return 1;} if (($proto_filename eq "packet-xot.c") && (index($_[0], "x25") >= 0)) {return 1;} + #Understand why, but I think it could be prefixed with "dissector" + #prefix (which isn't necessarily "protocol") + if (($proto_filename eq "packet-rtcp.c") && (index($_[0], "srtcp") >= 0)) {return 1;} + if (($proto_filename eq "packet-rtp.c") && (index($_[0], "srtp") >= 0)) {return 1;} + #XXX - HACK to get around nested "s in field name if (($proto_filename eq "packet-gsm_sim.c") && (index($_[0], "e\\") >= 0)) {return 1;} |