Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-08 09:38:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

de-restrict pattern-oriented BiFs to no longer require only running at init

Browse source
This commit is contained in:
Vern Paxson 2018-07-05 10:13:20 -07:00
parent 9e2c70b90b
commit b9a5d9ccbe
2 changed files with 3 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

3
NEWS
View file

@ -249,6 +249,9 @@ New Functionality
'^' are binary "and", "or" and "xor" operators, and '~' is a unary '^' are binary "and", "or" and "xor" operators, and '~' is a unary
ones-complement operator. ones-complement operator.
- The string_to_pattern() built-in (and the now-deprecated merge_pattern()
built-in) is no longer restricted to only be called at initialization time.
Changed Functionality Changed Functionality
--------------------- ---------------------

12
src/bro.bif
View file

@ -2960,12 +2960,6 @@ function uuid_to_string%(uuid: string%): string
## :bro:id:`bro_init`. ## :bro:id:`bro_init`.
function merge_pattern%(p1: pattern, p2: pattern%): pattern function merge_pattern%(p1: pattern, p2: pattern%): pattern
%{ %{
if ( bro_start_network_time != 0.0 )
{
builtin_error("merge_pattern can only be called at init time");
return 0;
}
reporter->Warning("merge_pattern() builtin-function has been deprecated"); reporter->Warning("merge_pattern() builtin-function has been deprecated");
RE_Matcher* re = new RE_Matcher(); RE_Matcher* re = new RE_Matcher();
@ -3035,12 +3029,6 @@ function convert_for_pattern%(s: string%): string
## :bro:id:`bro_init`. ## :bro:id:`bro_init`.
function string_to_pattern%(s: string, convert: bool%): pattern function string_to_pattern%(s: string, convert: bool%): pattern
%{ %{
if ( bro_start_network_time != 0.0 )
{
builtin_error("string_to_pattern can only be called at init time");
return 0;
}
const char* ss = (const char*) (s->Bytes()); const char* ss = (const char*) (s->Bytes());
int sn = s->Len(); int sn = s->Len();
char* pat; char* pat;