Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-02 22:58:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge branch 'set_to_regex-docs' of https://github.com/jlagermann/zeek

Browse source 
- Adjusted the formatting during merge

* 'set_to_regex-docs' of https://github.com/jlagermann/zeek:
  added examples to set_to_regex comments Signed-ff-by: James Lagermann <james.lagermann@corelight.com>
This commit is contained in:
Jon Siwek 2020-05-08 11:47:38 -07:00
commit b5531ecbd3
4 changed files with 18 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

8
CHANGES
View file

@ -1,4 +1,12 @@
3.2.0-dev.478 | 2020-05-08 11:47:38 -0700
* Added examples to set_to_regex comments (James Lagermann, Corelight)
* Unbreak build on Fedora 32 (gcc 10.0.1) (Johanna Amann, Corelight)
It requires cstdint in a few more headers.
3.2.0-dev.475 | 2020-05-07 17:15:23 -0700 3.2.0-dev.475 | 2020-05-07 17:15:23 -0700
* GH-958: Fix crash when trying to redef non-existing enum (Johanna Amann, Corelight) * GH-958: Fix crash when trying to redef non-existing enum (Johanna Amann, Corelight)

2
VERSION
View file

@ -1 +1 @@
3.2.0-dev.475 3.2.0-dev.478

2
doc

@ -1 +1 @@
Subproject commit 850c5bea8787c315cddc9079a29a17d89db055ec Subproject commit 73cce33f7ab3a08ee8c92bf7815a092eae7ad031

9
scripts/base/utils/patterns.zeek
View file

@ -4,7 +4,14 @@ module GLOBAL;
## Given a pattern as a string with two tildes (~~) contained in it, it will ## Given a pattern as a string with two tildes (~~) contained in it, it will
## return a pattern with string set's elements OR'd together where the ## return a pattern with string set's elements OR'd together where the
## double-tilde was given. ## double-tilde was given. Examples:
##
## .. sourcecode:: zeek
##
## global r1 = set_to_regex(set("a", "b", "c"), "~~");
## # r1 = /^?(a|b|c)$?/
## global r2 = set_to_regex(set("a.com", "b.com", "c.com"), "\\.(~~)");
## # r2 = /^?(\.(a\.com|b\.com|c\.com))$?/
## ##
## ss: a set of strings to OR together. ## ss: a set of strings to OR together.
## ##