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

Merge branch 'rename' of https://github.com/bhaskarbhar/zeek

Browse source 
* 'rename' of https://github.com/bhaskarbhar/zeek:
  Update zeek.bif
  Update init-bare.zeek
  Added Baseline
  Renamed
This commit is contained in:
Arne Welzel 2025-06-25 19:27:01 +02:00
commit 771c37b6b2
8 changed files with 22 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

11
CHANGES
View file

@ -1,3 +1,14 @@
8.0.0-dev.535 | 2025-06-25 19:27:01 +0200
* Update zeek.bif (bhaskarbhar)
* Update init-bare.zeek (bhaskarbhar)
* Remove `list` from Zeek grammar (Evan Typanski, Corelight)
Using it would make Zeek segfault (at least in locals). It has been an
error for 15 years.
8.0.0-dev.530 | 2025-06-25 10:35:53 -0400 8.0.0-dev.530 | 2025-06-25 10:35:53 -0400
* Remove `list` from Zeek grammar (Evan Typanski, Corelight) * Remove `list` from Zeek grammar (Evan Typanski, Corelight)

2
VERSION
View file

@ -1 +1 @@
8.0.0-dev.530 8.0.0-dev.535

6
scripts/base/init-bare.zeek
View file

@ -375,15 +375,15 @@ type endpoint_stats: record {
## Record containing information about a tag. ## Record containing information about a tag.
## ##
## .. zeek:see:: get_tags_by_category ## .. zeek:see:: get_plugin_components
type tag_component: record { type PluginComponent: record {
name: string; name: string;
canonical_name: string; canonical_name: string;
tag: string; tag: string;
enabled: bool; enabled: bool;
}; };
type tag_component_vec : vector of tag_component; type plugin_component_vec : vector of PluginComponent;
## Arguments given to Zeek from the command line. In order to use this, Zeek ## Arguments given to Zeek from the command line. In order to use this, Zeek
## must use a ``--`` command line argument immediately followed by a script ## must use a ``--`` command line argument immediately followed by a script

2
src/script_opt/FuncInfo.cc
View file

@ -317,7 +317,7 @@ static std::unordered_map<std::string, unsigned int> func_attrs = {
{"global_ids", ATTR_IDEMPOTENT}, {"global_ids", ATTR_IDEMPOTENT},
{"global_options", ATTR_IDEMPOTENT}, {"global_options", ATTR_IDEMPOTENT},
{"gsub", ATTR_FOLDABLE}, {"gsub", ATTR_FOLDABLE},
{"get_tags_by_category", ATTR_NO_ZEEK_SIDE_EFFECTS}, {"get_plugin_components", ATTR_NO_ZEEK_SIDE_EFFECTS},
{"has_event_group", ATTR_NO_ZEEK_SIDE_EFFECTS}, {"has_event_group", ATTR_NO_ZEEK_SIDE_EFFECTS},
{"has_module_events", ATTR_NO_ZEEK_SIDE_EFFECTS}, {"has_module_events", ATTR_NO_ZEEK_SIDE_EFFECTS},
{"have_spicy", ATTR_IDEMPOTENT}, {"have_spicy", ATTR_IDEMPOTENT},

8
src/zeek.bif
View file

@ -5653,7 +5653,7 @@ function find_in_zeekpath%(p: string%): string
## ##
## Returns: A vector of records containing the tags of all plugin components ## Returns: A vector of records containing the tags of all plugin components
## that belong to the specified category. ## that belong to the specified category.
function get_tags_by_category%(category: string%): tag_component_vec function get_plugin_components%(category: string%): plugin_component_vec
%{ %{
std::string cat = category->CheckString(); std::string cat = category->CheckString();
auto type = CategoryStringToEnum(cat); auto type = CategoryStringToEnum(cat);
@ -5664,12 +5664,12 @@ function get_tags_by_category%(category: string%): tag_component_vec
return nullptr; return nullptr;
} }
static auto vec_type = zeek::id::find_type<zeek::VectorType>("tag_component_vec"); static auto vec_type = zeek::id::find_type<zeek::VectorType>("plugin_component_vec");
static auto rec_type = zeek::id::find_type<zeek::RecordType>("tag_component"); static auto rec_type = zeek::id::find_type<zeek::RecordType>("PluginComponent");
if ( ! vec_type || ! rec_type ) if ( ! vec_type || ! rec_type )
{ {
reporter->Error("Required types not found (tag_component or component_vec)"); reporter->Error("Required types not found (PluginComponent or plugin_component_vec)");
return nullptr; return nullptr;
} }

0
testing/btest/Baseline/bifs.get_tags_by_category/out → testing/btest/Baseline/bifs.get_plugin_components/out
View file

2
testing/btest/bifs/get_tags_by_category.zeek → testing/btest/bifs/get_plugin_components.zeek
View file

@ -4,7 +4,7 @@
event zeek_init() event zeek_init()
{ {
local result = get_tags_by_category("ANALYZER"); local result = get_plugin_components("ANALYZER");
for (i in result) for (i in result)
{ {

2
testing/btest/opt/ZAM-bif-tracking.zeek
View file

@ -345,7 +345,7 @@ global known_BiFs = set(
"get_reporter_stats", "get_reporter_stats",
"get_resp_seq", "get_resp_seq",
"get_script_comments", "get_script_comments",
"get_tags_by_category", "get_plugin_components",
"get_thread_stats", "get_thread_stats",
"get_timer_stats", "get_timer_stats",
"getenv", "getenv",