diff options
| author | Guy Harris <gharris@sonic.net> | 2021-03-21 03:06:17 -0700 |
|---|---|---|
| committer | Guy Harris <gharris@sonic.net> | 2021-03-21 03:27:44 -0700 |
| commit | b61fd6d76a2ce97f2bae40d8a8eacebc91e617ea (patch) | |
| tree | d229e30e3f969bb916d1dd50f1d98a60b33252d0 /tools | |
| parent | ce611792c37f5c80692bc927e07d3d4f36cd5b65 (diff) | |
dfilter, ftypes: get rid of FT_PCRE.
It's not a valid field type, it's only a hack to support regular
expression matching in packet-matching expressions.
Instead, in the packet-matching code, have a separate syntax tree type
for Perl-compatible regular expressions, and a separate instruction to
load one into a register, and have the "matching" operator for field
types take a GRegex * as the second argument.
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/convert_proto_tree_add_text.pl | 2 | ||||
| -rwxr-xr-x | tools/fix-encoding-args.pl | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/tools/convert_proto_tree_add_text.pl b/tools/convert_proto_tree_add_text.pl index 055c547398..c54964d6d4 100755 --- a/tools/convert_proto_tree_add_text.pl +++ b/tools/convert_proto_tree_add_text.pl @@ -76,7 +76,7 @@ my %FIELD_TYPE = ('FT_NONE' => "FT_NONE", 'FT_PROTOCOL' => "FT_PROTOCOL", 'FT_BO 'FT_STRING' => "FT_STRING", 'FT_STRINGZ' => "FT_STRINGZ", 'FT_UINT_STRING' => "FT_UINT_STRING", 'FT_ETHER' => "FT_ETHER", 'FT_BYTES' => "FT_BYTES", 'FT_UINT_BYTES' => "FT_UINT_BYTES", 'FT_IPv4' => "FT_IPv4", 'FT_IPv6' => "FT_IPv6", 'FT_IPXNET' => "FT_IPXNET", 'FT_AX25' => "FT_AX25", 'FT_VINES' => "FT_VINES", - 'FT_FRAMENUM' => "FT_FRAMENUM", 'FT_PCRE' => "FT_PCRE", 'FT_GUID' => "FT_GUID", 'FT_OID' => "FT_OID", 'FT_REL_OID' => "FT_REL_OID", 'FT_EUI64' => "FT_EUI64"); + 'FT_FRAMENUM' => "FT_FRAMENUM", 'FT_GUID' => "FT_GUID", 'FT_OID' => "FT_OID", 'FT_REL_OID' => "FT_REL_OID", 'FT_EUI64' => "FT_EUI64"); my %EXPERT_SEVERITY = ('PI_COMMENT' => "PI_COMMENT", 'PI_CHAT' => "PI_CHAT", diff --git a/tools/fix-encoding-args.pl b/tools/fix-encoding-args.pl index e9f5186660..fc98c75bd5 100755 --- a/tools/fix-encoding-args.pl +++ b/tools/fix-encoding-args.pl @@ -167,7 +167,6 @@ my @types_ALL = FT_IPv6 FT_IPXNET FT_FRAMENUM - FT_PCRE FT_GUID FT_OID FT_REL_OID |