diff --git a/doc b/doc deleted file mode 160000 index e9f6728f13..0000000000 --- a/doc +++ /dev/null @@ -1 +0,0 @@ -Subproject commit e9f6728f13165148ca8ffe0b373148ff78b10c6a diff --git a/testing/btest/Baseline/doc.broxygen.all_scripts/.stderr b/testing/btest/Baseline/doc.broxygen.all_scripts/.stderr deleted file mode 100644 index da6c357abf..0000000000 --- a/testing/btest/Baseline/doc.broxygen.all_scripts/.stderr +++ /dev/null @@ -1,11 +0,0 @@ -warning in /Users/jon/projects/bro/bro/scripts/policy/protocols/dhcp/deprecated_events.bro, line 245: deprecated (dhcp_discover) -warning in /Users/jon/projects/bro/bro/scripts/policy/protocols/dhcp/deprecated_events.bro, line 248: deprecated (dhcp_offer) -warning in /Users/jon/projects/bro/bro/scripts/policy/protocols/dhcp/deprecated_events.bro, line 251: deprecated (dhcp_request) -warning in /Users/jon/projects/bro/bro/scripts/policy/protocols/dhcp/deprecated_events.bro, line 254: deprecated (dhcp_decline) -warning in /Users/jon/projects/bro/bro/scripts/policy/protocols/dhcp/deprecated_events.bro, line 257: deprecated (dhcp_ack) -warning in /Users/jon/projects/bro/bro/scripts/policy/protocols/dhcp/deprecated_events.bro, line 260: deprecated (dhcp_nak) -warning in /Users/jon/projects/bro/bro/scripts/policy/protocols/dhcp/deprecated_events.bro, line 263: deprecated (dhcp_release) -warning in /Users/jon/projects/bro/bro/scripts/policy/protocols/dhcp/deprecated_events.bro, line 266: deprecated (dhcp_inform) -warning in /Users/jon/projects/bro/bro/scripts/policy/protocols/smb/__load__.bro, line 1: deprecated script loaded from /Users/jon/projects/bro/bro/scripts/broxygen/__load__.bro:10 "Use '@load base/protocols/smb' instead" -error in /Users/jon/projects/bro/bro/scripts/policy/frameworks/control/controller.bro, line 22: The '' control command is unknown. -, line 1: received termination signal diff --git a/testing/btest/Baseline/doc.broxygen.all_scripts/.stdout b/testing/btest/Baseline/doc.broxygen.all_scripts/.stdout deleted file mode 100644 index bfc3c033df..0000000000 --- a/testing/btest/Baseline/doc.broxygen.all_scripts/.stdout +++ /dev/null @@ -1 +0,0 @@ -WARNING: No Site::local_nets have been defined. It's usually a good idea to define your local networks. diff --git a/testing/btest/Baseline/doc.broxygen.command_line/output b/testing/btest/Baseline/doc.broxygen.command_line/output deleted file mode 100644 index f599e28b8a..0000000000 --- a/testing/btest/Baseline/doc.broxygen.command_line/output +++ /dev/null @@ -1 +0,0 @@ -10 diff --git a/testing/btest/Baseline/doc.broxygen.comment_retrieval_bifs/out b/testing/btest/Baseline/doc.broxygen.comment_retrieval_bifs/out deleted file mode 100644 index 2a01fa0a94..0000000000 --- a/testing/btest/Baseline/doc.broxygen.comment_retrieval_bifs/out +++ /dev/null @@ -1,70 +0,0 @@ -This is a test script. -With some summary comments. -myvar: - Hello world. This is an option. - With some more description here. - And here. - Maybe just one more. -print_lines: - This function prints a string line by line. - - lines: A string to print line by line, w/ lines delimited by newline chars. - And some more comments on the function implementation. -mytype: - This is an alias for count. -myrecord: - My record type. -myrecord$aaa: - The first field. - Does something... - Done w/ aaa. -myrecord$bbb: - The second field. - Done w/ bbb. - No really, done w/ bbb. -myrecord$ccc: - Third field. - Done w/ ccc. -myrecord$ddd: - Fourth field. - Done w/ ddd. -myrecord$eee: - First redef'd field. - With two lines of comments. - And two post-notation comments. - Done w/ eee. -myrecord$fff: - Second redef'd field. - Done w/ fff. -myrecord$ggg: - Third redef'd field. - Done w/ ggg. -myenum: - My enum type; -FIRST: - First enum value. - I know, the name isn't clever. - Done w/ first. -SECOND: - Second enum value. - Done w/ second. -THIRD: - Third enum value. - Done w/ third. - Done w/ third again. -FORTH: - SIC. - It's a programming language. - Using Reverse Polish Notation. - Done w/ forth. -FIFTH: - First redef'd enum val. - Done w/ fifth. -SIXTH: - Second redef'd enum val. - Done w/ sixth. -SEVENTH: - Third redef'd enum val. - Lucky number seven. - Still works with comma. - Done w/ seventh. diff --git a/testing/btest/Baseline/doc.broxygen.enums/autogen-reST-enums.rst b/testing/btest/Baseline/doc.broxygen.enums/autogen-reST-enums.rst deleted file mode 100644 index c98d2792df..0000000000 --- a/testing/btest/Baseline/doc.broxygen.enums/autogen-reST-enums.rst +++ /dev/null @@ -1,60 +0,0 @@ -.. bro:type:: TestEnum1 - - :Type: :bro:type:`enum` - - .. bro:enum:: ONE TestEnum1 - - like this - - .. bro:enum:: TWO TestEnum1 - - or like this - - .. bro:enum:: THREE TestEnum1 - - multiple - comments - and even - more comments - - .. bro:enum:: FOUR TestEnum1 - - adding another - value - - .. bro:enum:: FIVE TestEnum1 - - adding another - value - - There's tons of ways an enum can look... - -.. bro:type:: TestEnum2 - - :Type: :bro:type:`enum` - - .. bro:enum:: A TestEnum2 - - like this - - .. bro:enum:: B TestEnum2 - - or like this - - .. bro:enum:: C TestEnum2 - - multiple - comments - and even - more comments - - The final comma is optional - -.. bro:id:: TestEnumVal - - :Type: :bro:type:`TestEnum1` - :Attributes: :bro:attr:`&redef` - :Default: ``ONE`` - - this should reference the TestEnum1 type and not a generic "enum" type - diff --git a/testing/btest/Baseline/doc.broxygen.example/example.rst b/testing/btest/Baseline/doc.broxygen.example/example.rst deleted file mode 100644 index d729ab85ee..0000000000 --- a/testing/btest/Baseline/doc.broxygen.example/example.rst +++ /dev/null @@ -1,248 +0,0 @@ -:tocdepth: 3 - -broxygen/example.bro -==================== -.. bro:namespace:: BroxygenExample - -This is an example script that demonstrates Broxygen-style -documentation. It generally will make most sense when viewing -the script's raw source code and comparing to the HTML-rendered -version. - -Comments in the from ``##!`` are meant to summarize the script's -purpose. They are transferred directly in to the generated -`reStructuredText `_ -(reST) document associated with the script. - -.. tip:: You can embed directives and roles within ``##``-stylized comments. - -There's also a custom role to reference any identifier node in -the Bro Sphinx domain that's good for "see alsos", e.g. - -See also: :bro:see:`BroxygenExample::a_var`, -:bro:see:`BroxygenExample::ONE`, :bro:see:`SSH::Info` - -And a custom directive does the equivalent references: - -.. bro:see:: BroxygenExample::a_var BroxygenExample::ONE SSH::Info - -:Namespace: BroxygenExample -:Imports: :doc:`base/frameworks/notice `, :doc:`base/protocols/http `, :doc:`policy/frameworks/software/vulnerable.bro ` - -Summary -~~~~~~~ -Redefinable Options -################### -==================================================================================== ======================================================= -:bro:id:`BroxygenExample::an_option`: :bro:type:`set` :bro:attr:`&redef` Add documentation for "an_option" here. -:bro:id:`BroxygenExample::option_with_init`: :bro:type:`interval` :bro:attr:`&redef` Default initialization will be generated automatically. -==================================================================================== ======================================================= - -State Variables -############### -======================================================================== ======================================================================== -:bro:id:`BroxygenExample::a_var`: :bro:type:`bool` Put some documentation for "a_var" here. -:bro:id:`BroxygenExample::summary_test`: :bro:type:`string` The first sentence for a particular identifier's summary text ends here. -:bro:id:`BroxygenExample::var_without_explicit_type`: :bro:type:`string` Types are inferred, that information is self-documenting. -======================================================================== ======================================================================== - -Types -##### -================================================================================= =========================================================== -:bro:type:`BroxygenExample::ComplexRecord`: :bro:type:`record` :bro:attr:`&redef` General documentation for a type "ComplexRecord" goes here. -:bro:type:`BroxygenExample::Info`: :bro:type:`record` An example record to be used with a logging stream. -:bro:type:`BroxygenExample::SimpleEnum`: :bro:type:`enum` Documentation for the "SimpleEnum" type goes here. -:bro:type:`BroxygenExample::SimpleRecord`: :bro:type:`record` General documentation for a type "SimpleRecord" goes here. -================================================================================= =========================================================== - -Redefinitions -############# -============================================================= ==================================================================== -:bro:type:`BroxygenExample::SimpleEnum`: :bro:type:`enum` Document the "SimpleEnum" redef here with any special info regarding - the *redef* itself. -:bro:type:`BroxygenExample::SimpleRecord`: :bro:type:`record` Document the record extension *redef* itself here. -:bro:type:`Log::ID`: :bro:type:`enum` -:bro:type:`Notice::Type`: :bro:type:`enum` -============================================================= ==================================================================== - -Events -###### -====================================================== ========================== -:bro:id:`BroxygenExample::an_event`: :bro:type:`event` Summarize "an_event" here. -====================================================== ========================== - -Functions -######### -=========================================================== ======================================= -:bro:id:`BroxygenExample::a_function`: :bro:type:`function` Summarize purpose of "a_function" here. -=========================================================== ======================================= - - -Detailed Interface -~~~~~~~~~~~~~~~~~~ -Redefinable Options -################### -.. bro:id:: BroxygenExample::an_option - - :Type: :bro:type:`set` [:bro:type:`addr`, :bro:type:`addr`, :bro:type:`string`] - :Attributes: :bro:attr:`&redef` - :Default: ``{}`` - - Add documentation for "an_option" here. - The type/attribute information is all generated automatically. - -.. bro:id:: BroxygenExample::option_with_init - - :Type: :bro:type:`interval` - :Attributes: :bro:attr:`&redef` - :Default: ``10.0 msecs`` - - Default initialization will be generated automatically. - More docs can be added here. - -State Variables -############### -.. bro:id:: BroxygenExample::a_var - - :Type: :bro:type:`bool` - - Put some documentation for "a_var" here. Any global/non-const that - isn't a function/event/hook is classified as a "state variable" - in the generated docs. - -.. bro:id:: BroxygenExample::summary_test - - :Type: :bro:type:`string` - - The first sentence for a particular identifier's summary text ends here. - And this second sentence doesn't show in the short description provided - by the table of all identifiers declared by this script. - -.. bro:id:: BroxygenExample::var_without_explicit_type - - :Type: :bro:type:`string` - :Default: ``"this works"`` - - Types are inferred, that information is self-documenting. - -Types -##### -.. bro:type:: BroxygenExample::ComplexRecord - - :Type: :bro:type:`record` - - field1: :bro:type:`count` - Counts something. - - field2: :bro:type:`bool` - Toggles something. - - field3: :bro:type:`BroxygenExample::SimpleRecord` - Broxygen automatically tracks types - and cross-references are automatically - inserted in to generated docs. - - msg: :bro:type:`string` :bro:attr:`&default` = ``"blah"`` :bro:attr:`&optional` - Attributes are self-documenting. - :Attributes: :bro:attr:`&redef` - - General documentation for a type "ComplexRecord" goes here. - -.. bro:type:: BroxygenExample::Info - - :Type: :bro:type:`record` - - ts: :bro:type:`time` :bro:attr:`&log` - - uid: :bro:type:`string` :bro:attr:`&log` - - status: :bro:type:`count` :bro:attr:`&log` :bro:attr:`&optional` - - An example record to be used with a logging stream. - Nothing special about it. If another script redefs this type - to add fields, the generated documentation will show all original - fields plus the extensions and the scripts which contributed to it - (provided they are also @load'ed). - -.. bro:type:: BroxygenExample::SimpleEnum - - :Type: :bro:type:`enum` - - .. bro:enum:: BroxygenExample::ONE BroxygenExample::SimpleEnum - - Documentation for particular enum values is added like this. - And can also span multiple lines. - - .. bro:enum:: BroxygenExample::TWO BroxygenExample::SimpleEnum - - Or this style is valid to document the preceding enum value. - - .. bro:enum:: BroxygenExample::THREE BroxygenExample::SimpleEnum - - .. bro:enum:: BroxygenExample::FOUR BroxygenExample::SimpleEnum - - And some documentation for "FOUR". - - .. bro:enum:: BroxygenExample::FIVE BroxygenExample::SimpleEnum - - Also "FIVE". - - Documentation for the "SimpleEnum" type goes here. - It can span multiple lines. - -.. bro:type:: BroxygenExample::SimpleRecord - - :Type: :bro:type:`record` - - field1: :bro:type:`count` - Counts something. - - field2: :bro:type:`bool` - Toggles something. - - field_ext: :bro:type:`string` :bro:attr:`&optional` - Document the extending field like this. - Or here, like this. - - General documentation for a type "SimpleRecord" goes here. - The way fields can be documented is similar to what's already seen - for enums. - -Events -###### -.. bro:id:: BroxygenExample::an_event - - :Type: :bro:type:`event` (name: :bro:type:`string`) - - Summarize "an_event" here. - Give more details about "an_event" here. - - BroxygenExample::a_function should not be confused as a parameter - in the generated docs, but it also doesn't generate a cross-reference - link. Use the see role instead: :bro:see:`BroxygenExample::a_function`. - - - :name: Describe the argument here. - -Functions -######### -.. bro:id:: BroxygenExample::a_function - - :Type: :bro:type:`function` (tag: :bro:type:`string`, msg: :bro:type:`string`) : :bro:type:`string` - - Summarize purpose of "a_function" here. - Give more details about "a_function" here. - Separating the documentation of the params/return values with - empty comments is optional, but improves readability of script. - - - :tag: Function arguments can be described - like this. - - - :msg: Another param. - - - :returns: Describe the return type here. - - diff --git a/testing/btest/Baseline/doc.broxygen.func-params/autogen-reST-func-params.rst b/testing/btest/Baseline/doc.broxygen.func-params/autogen-reST-func-params.rst deleted file mode 100644 index 06f196b73c..0000000000 --- a/testing/btest/Baseline/doc.broxygen.func-params/autogen-reST-func-params.rst +++ /dev/null @@ -1,30 +0,0 @@ -.. bro:id:: test_func_params_func - - :Type: :bro:type:`function` (i: :bro:type:`int`, j: :bro:type:`int`) : :bro:type:`string` - - This is a global function declaration. - - - :i: First param. - - :j: Second param. - - - :returns: A string. - -.. bro:type:: test_func_params_rec - - :Type: :bro:type:`record` - - field_func: :bro:type:`function` (i: :bro:type:`int`, j: :bro:type:`int`) : :bro:type:`string` - This is a record field function. - - - :i: First param. - - :j: Second param. - - - :returns: A string. - - diff --git a/testing/btest/Baseline/doc.broxygen.identifier/test.rst b/testing/btest/Baseline/doc.broxygen.identifier/test.rst deleted file mode 100644 index 0c7c44581d..0000000000 --- a/testing/btest/Baseline/doc.broxygen.identifier/test.rst +++ /dev/null @@ -1,230 +0,0 @@ -.. bro:id:: BroxygenExample::Broxygen_One - - :Type: :bro:type:`Notice::Type` - - Any number of this type of comment - will document "Broxygen_One". - -.. bro:id:: BroxygenExample::Broxygen_Two - - :Type: :bro:type:`Notice::Type` - - Any number of this type of comment - will document "BROXYGEN_TWO". - -.. bro:id:: BroxygenExample::Broxygen_Three - - :Type: :bro:type:`Notice::Type` - - -.. bro:id:: BroxygenExample::Broxygen_Four - - :Type: :bro:type:`Notice::Type` - - Omitting comments is fine, and so is mixing ``##`` and ``##<``, but - it's probably best to use only one style consistently. - -.. bro:id:: BroxygenExample::LOG - - :Type: :bro:type:`Log::ID` - - -.. bro:type:: BroxygenExample::SimpleEnum - - :Type: :bro:type:`enum` - - .. bro:enum:: BroxygenExample::ONE BroxygenExample::SimpleEnum - - Documentation for particular enum values is added like this. - And can also span multiple lines. - - .. bro:enum:: BroxygenExample::TWO BroxygenExample::SimpleEnum - - Or this style is valid to document the preceding enum value. - - .. bro:enum:: BroxygenExample::THREE BroxygenExample::SimpleEnum - - .. bro:enum:: BroxygenExample::FOUR BroxygenExample::SimpleEnum - - And some documentation for "FOUR". - - .. bro:enum:: BroxygenExample::FIVE BroxygenExample::SimpleEnum - - Also "FIVE". - - Documentation for the "SimpleEnum" type goes here. - It can span multiple lines. - -.. bro:id:: BroxygenExample::ONE - - :Type: :bro:type:`BroxygenExample::SimpleEnum` - - Documentation for particular enum values is added like this. - And can also span multiple lines. - -.. bro:id:: BroxygenExample::TWO - - :Type: :bro:type:`BroxygenExample::SimpleEnum` - - Or this style is valid to document the preceding enum value. - -.. bro:id:: BroxygenExample::THREE - - :Type: :bro:type:`BroxygenExample::SimpleEnum` - - -.. bro:id:: BroxygenExample::FOUR - - :Type: :bro:type:`BroxygenExample::SimpleEnum` - - And some documentation for "FOUR". - -.. bro:id:: BroxygenExample::FIVE - - :Type: :bro:type:`BroxygenExample::SimpleEnum` - - Also "FIVE". - -.. bro:type:: BroxygenExample::SimpleRecord - - :Type: :bro:type:`record` - - field1: :bro:type:`count` - Counts something. - - field2: :bro:type:`bool` - Toggles something. - - field_ext: :bro:type:`string` :bro:attr:`&optional` - Document the extending field like this. - Or here, like this. - - General documentation for a type "SimpleRecord" goes here. - The way fields can be documented is similar to what's already seen - for enums. - -.. bro:type:: BroxygenExample::ComplexRecord - - :Type: :bro:type:`record` - - field1: :bro:type:`count` - Counts something. - - field2: :bro:type:`bool` - Toggles something. - - field3: :bro:type:`BroxygenExample::SimpleRecord` - Broxygen automatically tracks types - and cross-references are automatically - inserted in to generated docs. - - msg: :bro:type:`string` :bro:attr:`&default` = ``"blah"`` :bro:attr:`&optional` - Attributes are self-documenting. - :Attributes: :bro:attr:`&redef` - - General documentation for a type "ComplexRecord" goes here. - -.. bro:type:: BroxygenExample::Info - - :Type: :bro:type:`record` - - ts: :bro:type:`time` :bro:attr:`&log` - - uid: :bro:type:`string` :bro:attr:`&log` - - status: :bro:type:`count` :bro:attr:`&log` :bro:attr:`&optional` - - An example record to be used with a logging stream. - Nothing special about it. If another script redefs this type - to add fields, the generated documentation will show all original - fields plus the extensions and the scripts which contributed to it - (provided they are also @load'ed). - -.. bro:id:: BroxygenExample::an_option - - :Type: :bro:type:`set` [:bro:type:`addr`, :bro:type:`addr`, :bro:type:`string`] - :Attributes: :bro:attr:`&redef` - :Default: ``{}`` - - Add documentation for "an_option" here. - The type/attribute information is all generated automatically. - -.. bro:id:: BroxygenExample::option_with_init - - :Type: :bro:type:`interval` - :Attributes: :bro:attr:`&redef` - :Default: ``10.0 msecs`` - - Default initialization will be generated automatically. - More docs can be added here. - -.. bro:id:: BroxygenExample::a_var - - :Type: :bro:type:`bool` - - Put some documentation for "a_var" here. Any global/non-const that - isn't a function/event/hook is classified as a "state variable" - in the generated docs. - -.. bro:id:: BroxygenExample::var_without_explicit_type - - :Type: :bro:type:`string` - :Default: ``"this works"`` - - Types are inferred, that information is self-documenting. - -.. bro:id:: BroxygenExample::summary_test - - :Type: :bro:type:`string` - - The first sentence for a particular identifier's summary text ends here. - And this second sentence doesn't show in the short description provided - by the table of all identifiers declared by this script. - -.. bro:id:: BroxygenExample::a_function - - :Type: :bro:type:`function` (tag: :bro:type:`string`, msg: :bro:type:`string`) : :bro:type:`string` - - Summarize purpose of "a_function" here. - Give more details about "a_function" here. - Separating the documentation of the params/return values with - empty comments is optional, but improves readability of script. - - - :tag: Function arguments can be described - like this. - - - :msg: Another param. - - - :returns: Describe the return type here. - -.. bro:id:: BroxygenExample::an_event - - :Type: :bro:type:`event` (name: :bro:type:`string`) - - Summarize "an_event" here. - Give more details about "an_event" here. - - BroxygenExample::a_function should not be confused as a parameter - in the generated docs, but it also doesn't generate a cross-reference - link. Use the see role instead: :bro:see:`BroxygenExample::a_function`. - - - :name: Describe the argument here. - -.. bro:id:: BroxygenExample::function_without_proto - - :Type: :bro:type:`function` (tag: :bro:type:`string`) : :bro:type:`string` - - -.. bro:type:: BroxygenExample::PrivateRecord - - :Type: :bro:type:`record` - - field1: :bro:type:`bool` - - field2: :bro:type:`count` - - diff --git a/testing/btest/Baseline/doc.broxygen.package/test.rst b/testing/btest/Baseline/doc.broxygen.package/test.rst deleted file mode 100644 index b96de2148b..0000000000 --- a/testing/btest/Baseline/doc.broxygen.package/test.rst +++ /dev/null @@ -1,37 +0,0 @@ -:orphan: - -Package: broxygen -================= - -This package is loaded during the process which automatically generates -reference documentation for all Bro scripts (i.e. "Broxygen"). Its only -purpose is to provide an easy way to load all known Bro scripts plus any -extra scripts needed or used by the documentation process. - -:doc:`/scripts/broxygen/__load__.bro` - - -:doc:`/scripts/broxygen/example.bro` - - This is an example script that demonstrates Broxygen-style - documentation. It generally will make most sense when viewing - the script's raw source code and comparing to the HTML-rendered - version. - - Comments in the from ``##!`` are meant to summarize the script's - purpose. They are transferred directly in to the generated - `reStructuredText `_ - (reST) document associated with the script. - - .. tip:: You can embed directives and roles within ``##``-stylized comments. - - There's also a custom role to reference any identifier node in - the Bro Sphinx domain that's good for "see alsos", e.g. - - See also: :bro:see:`BroxygenExample::a_var`, - :bro:see:`BroxygenExample::ONE`, :bro:see:`SSH::Info` - - And a custom directive does the equivalent references: - - .. bro:see:: BroxygenExample::a_var BroxygenExample::ONE SSH::Info - diff --git a/testing/btest/Baseline/doc.broxygen.package_index/test.rst b/testing/btest/Baseline/doc.broxygen.package_index/test.rst deleted file mode 100644 index f551ab1cd3..0000000000 --- a/testing/btest/Baseline/doc.broxygen.package_index/test.rst +++ /dev/null @@ -1,7 +0,0 @@ -:doc:`broxygen ` - - This package is loaded during the process which automatically generates - reference documentation for all Bro scripts (i.e. "Broxygen"). Its only - purpose is to provide an easy way to load all known Bro scripts plus any - extra scripts needed or used by the documentation process. - diff --git a/testing/btest/Baseline/doc.broxygen.records/autogen-reST-records.rst b/testing/btest/Baseline/doc.broxygen.records/autogen-reST-records.rst deleted file mode 100644 index 60d80f6b07..0000000000 --- a/testing/btest/Baseline/doc.broxygen.records/autogen-reST-records.rst +++ /dev/null @@ -1,28 +0,0 @@ -.. bro:type:: TestRecord1 - - :Type: :bro:type:`record` - - field1: :bro:type:`bool` - - field2: :bro:type:`count` - - -.. bro:type:: TestRecord2 - - :Type: :bro:type:`record` - - A: :bro:type:`count` - document ``A`` - - B: :bro:type:`bool` - document ``B`` - - C: :bro:type:`TestRecord1` - and now ``C`` - is a declared type - - D: :bro:type:`set` [:bro:type:`count`, :bro:type:`bool`] - sets/tables should show the index types - - Here's the ways records and record fields can be documented. - diff --git a/testing/btest/Baseline/doc.broxygen.script_index/test.rst b/testing/btest/Baseline/doc.broxygen.script_index/test.rst deleted file mode 100644 index dda280facf..0000000000 --- a/testing/btest/Baseline/doc.broxygen.script_index/test.rst +++ /dev/null @@ -1,5 +0,0 @@ -.. toctree:: - :maxdepth: 1 - - broxygen/__load__.bro - broxygen/example.bro diff --git a/testing/btest/Baseline/doc.broxygen.script_summary/test.rst b/testing/btest/Baseline/doc.broxygen.script_summary/test.rst deleted file mode 100644 index 125a579c81..0000000000 --- a/testing/btest/Baseline/doc.broxygen.script_summary/test.rst +++ /dev/null @@ -1,23 +0,0 @@ -:doc:`/scripts/broxygen/example.bro` - This is an example script that demonstrates Broxygen-style - documentation. It generally will make most sense when viewing - the script's raw source code and comparing to the HTML-rendered - version. - - Comments in the from ``##!`` are meant to summarize the script's - purpose. They are transferred directly in to the generated - `reStructuredText `_ - (reST) document associated with the script. - - .. tip:: You can embed directives and roles within ``##``-stylized comments. - - There's also a custom role to reference any identifier node in - the Bro Sphinx domain that's good for "see alsos", e.g. - - See also: :bro:see:`BroxygenExample::a_var`, - :bro:see:`BroxygenExample::ONE`, :bro:see:`SSH::Info` - - And a custom directive does the equivalent references: - - .. bro:see:: BroxygenExample::a_var BroxygenExample::ONE SSH::Info - diff --git a/testing/btest/Baseline/doc.broxygen.type-aliases/autogen-reST-type-aliases.rst b/testing/btest/Baseline/doc.broxygen.type-aliases/autogen-reST-type-aliases.rst deleted file mode 100644 index 3a26b8adc6..0000000000 --- a/testing/btest/Baseline/doc.broxygen.type-aliases/autogen-reST-type-aliases.rst +++ /dev/null @@ -1,44 +0,0 @@ -.. bro:type:: BroxygenTest::TypeAlias - - :Type: :bro:type:`bool` - - This is just an alias for a builtin type ``bool``. - -.. bro:type:: BroxygenTest::NotTypeAlias - - :Type: :bro:type:`bool` - - This type should get its own comments, not associated w/ TypeAlias. - -.. bro:type:: BroxygenTest::OtherTypeAlias - - :Type: :bro:type:`bool` - - This cross references ``bool`` in the description of its type - instead of ``TypeAlias`` just because it seems more useful -- - one doesn't have to click through the full type alias chain to - find out what the actual type is... - -.. bro:id:: BroxygenTest::a - - :Type: :bro:type:`BroxygenTest::TypeAlias` - - But this should reference a type of ``TypeAlias``. - -.. bro:id:: BroxygenTest::b - - :Type: :bro:type:`BroxygenTest::OtherTypeAlias` - - And this should reference a type of ``OtherTypeAlias``. - -.. bro:type:: BroxygenTest::MyRecord - - :Type: :bro:type:`record` - - f1: :bro:type:`BroxygenTest::TypeAlias` - - f2: :bro:type:`BroxygenTest::OtherTypeAlias` - - f3: :bro:type:`bool` - - diff --git a/testing/btest/Baseline/doc.broxygen.vectors/autogen-reST-vectors.rst b/testing/btest/Baseline/doc.broxygen.vectors/autogen-reST-vectors.rst deleted file mode 100644 index 37eabb9419..0000000000 --- a/testing/btest/Baseline/doc.broxygen.vectors/autogen-reST-vectors.rst +++ /dev/null @@ -1,33 +0,0 @@ -.. bro:id:: test_vector0 - - :Type: :bro:type:`vector` of :bro:type:`string` - :Default: - - :: - - [] - - Yield type is documented/cross-referenced for primitize types. - -.. bro:id:: test_vector1 - - :Type: :bro:type:`vector` of :bro:type:`TestRecord` - :Default: - - :: - - [] - - Yield type is documented/cross-referenced for composite types. - -.. bro:id:: test_vector2 - - :Type: :bro:type:`vector` of :bro:type:`vector` of :bro:type:`TestRecord` - :Default: - - :: - - [] - - Just showing an even fancier yield type. - diff --git a/testing/btest/Baseline/doc.manual.connection_record_01/.stdout b/testing/btest/Baseline/doc.manual.connection_record_01/.stdout deleted file mode 100644 index 7f134460e3..0000000000 --- a/testing/btest/Baseline/doc.manual.connection_record_01/.stdout +++ /dev/null @@ -1,5 +0,0 @@ -[id=[orig_h=212.180.42.100, orig_p=25000/tcp, resp_h=131.243.64.3, resp_p=53/tcp], orig=[size=29, state=5, num_pkts=6, num_bytes_ip=273, flow_label=0], resp=[size=44, state=5, num_pkts=5, num_bytes_ip=248, flow_label=0], start_time=930613226.067666, duration=0.709643, service={ - -}, addl=, hot=0, history=ShADadFf, uid=UWkUyAuUGXf, tunnel=, conn=[ts=930613226.067666, uid=UWkUyAuUGXf, id=[orig_h=212.180.42.100, orig_p=25000/tcp, resp_h=131.243.64.3, resp_p=53/tcp], proto=tcp, service=, duration=0.709643, orig_bytes=29, resp_bytes=44, conn_state=SF, local_orig=, missed_bytes=0, history=ShADadFf, orig_pkts=6, orig_ip_bytes=273, resp_pkts=5, resp_ip_bytes=248, tunnel_parents={ - -}], extract_orig=F, extract_resp=F] diff --git a/testing/btest/Baseline/doc.manual.connection_record_02/.stdout b/testing/btest/Baseline/doc.manual.connection_record_02/.stdout deleted file mode 100644 index 824dd03097..0000000000 --- a/testing/btest/Baseline/doc.manual.connection_record_02/.stdout +++ /dev/null @@ -1,9 +0,0 @@ -[id=[orig_h=212.180.42.100, orig_p=25000/tcp, resp_h=131.243.64.3, resp_p=53/tcp], orig=[size=29, state=5, num_pkts=6, num_bytes_ip=273, flow_label=0], resp=[size=44, state=5, num_pkts=5, num_bytes_ip=248, flow_label=0], start_time=930613226.067666, duration=0.709643, service={ - -}, addl=, hot=0, history=ShADadFf, uid=UWkUyAuUGXf, tunnel=, conn=[ts=930613226.067666, uid=UWkUyAuUGXf, id=[orig_h=212.180.42.100, orig_p=25000/tcp, resp_h=131.243.64.3, resp_p=53/tcp], proto=tcp, service=, duration=0.709643, orig_bytes=29, resp_bytes=44, conn_state=SF, local_orig=, missed_bytes=0, history=ShADadFf, orig_pkts=6, orig_ip_bytes=273, resp_pkts=5, resp_ip_bytes=248, tunnel_parents={ - -}], extract_orig=F, extract_resp=F, dns=, dns_state=[pending={ - -}, finished_answers={ -34798 -}]] diff --git a/testing/btest/Baseline/doc.manual.data_struct_record_01/.stdout b/testing/btest/Baseline/doc.manual.data_struct_record_01/.stdout deleted file mode 100644 index 4e628b9ae7..0000000000 --- a/testing/btest/Baseline/doc.manual.data_struct_record_01/.stdout +++ /dev/null @@ -1,6 +0,0 @@ -Service: dns(RFC1035) - port: 53/tcp - port: 53/udp -Service: http(RFC2616) - port: 80/tcp - port: 8080/tcp diff --git a/testing/btest/Baseline/doc.manual.data_struct_record_02/.stdout b/testing/btest/Baseline/doc.manual.data_struct_record_02/.stdout deleted file mode 100644 index 0428764bea..0000000000 --- a/testing/btest/Baseline/doc.manual.data_struct_record_02/.stdout +++ /dev/null @@ -1,7 +0,0 @@ -System: morlock - Service: dns(RFC1035) - port: 53/tcp - port: 53/udp - Service: http(RFC2616) - port: 80/tcp - port: 8080/tcp diff --git a/testing/btest/Baseline/doc.manual.data_struct_set_declaration/.stdout b/testing/btest/Baseline/doc.manual.data_struct_set_declaration/.stdout deleted file mode 100644 index d1aa16c7d3..0000000000 --- a/testing/btest/Baseline/doc.manual.data_struct_set_declaration/.stdout +++ /dev/null @@ -1,8 +0,0 @@ -SSL Port: 993/tcp -SSL Port: 22/tcp -SSL Port: 587/tcp -SSL Port: 443/tcp -Non-SSL Port: 143/tcp -Non-SSL Port: 25/tcp -Non-SSL Port: 80/tcp -Non-SSL Port: 23/tcp diff --git a/testing/btest/Baseline/doc.manual.data_struct_table_complex/.stdout b/testing/btest/Baseline/doc.manual.data_struct_table_complex/.stdout deleted file mode 100644 index e22f36a244..0000000000 --- a/testing/btest/Baseline/doc.manual.data_struct_table_complex/.stdout +++ /dev/null @@ -1,4 +0,0 @@ -Kiru was released in 1968 by Toho studios, directed by Kihachi Okamoto and starring Tatsuya Nakadai -Goyokin was released in 1969 by Fuji studios, directed by Hideo Gosha and starring Tatsuya Nakadai -Harakiri was released in 1962 by Shochiku Eiga studios, directed by Masaki Kobayashi and starring Tatsuya Nakadai -Tasogare Seibei was released in 2002 by Eisei Gekijo studios, directed by Yoji Yamada and starring Hiroyuki Sanada diff --git a/testing/btest/Baseline/doc.manual.data_struct_table_declaration/.stdout b/testing/btest/Baseline/doc.manual.data_struct_table_declaration/.stdout deleted file mode 100644 index 19b1648904..0000000000 --- a/testing/btest/Baseline/doc.manual.data_struct_table_declaration/.stdout +++ /dev/null @@ -1,4 +0,0 @@ -Service Name: IMAPS - Common Port: 993/tcp -Service Name: HTTPS - Common Port: 443/tcp -Service Name: SSH - Common Port: 22/tcp -Service Name: SMTPS - Common Port: 587/tcp diff --git a/testing/btest/Baseline/doc.manual.data_struct_vector/.stdout b/testing/btest/Baseline/doc.manual.data_struct_vector/.stdout deleted file mode 100644 index 8348ce7198..0000000000 --- a/testing/btest/Baseline/doc.manual.data_struct_vector/.stdout +++ /dev/null @@ -1,2 +0,0 @@ -[1, 2, 3, 4] -[1, 2, 3, 4] diff --git a/testing/btest/Baseline/doc.manual.data_struct_vector_declaration/.stdout b/testing/btest/Baseline/doc.manual.data_struct_vector_declaration/.stdout deleted file mode 100644 index 48ce5d9c56..0000000000 --- a/testing/btest/Baseline/doc.manual.data_struct_vector_declaration/.stdout +++ /dev/null @@ -1,4 +0,0 @@ -contents of v1: [1, 2, 3, 4] -length of v1: 4 -contents of v1: [1, 2, 3, 4] -length of v2: 4 diff --git a/testing/btest/Baseline/doc.manual.data_struct_vector_iter/.stdout b/testing/btest/Baseline/doc.manual.data_struct_vector_iter/.stdout deleted file mode 100644 index 0326e6580e..0000000000 --- a/testing/btest/Baseline/doc.manual.data_struct_vector_iter/.stdout +++ /dev/null @@ -1,3 +0,0 @@ -1.2.0.0/18 -2.3.0.0/18 -3.4.0.0/18 diff --git a/testing/btest/Baseline/doc.manual.data_type_const/.stdout b/testing/btest/Baseline/doc.manual.data_type_const/.stdout deleted file mode 100644 index 0e49670a83..0000000000 --- a/testing/btest/Baseline/doc.manual.data_type_const/.stdout +++ /dev/null @@ -1,4 +0,0 @@ -{ -[6666/tcp] = IRC, -[80/tcp] = WWW -} diff --git a/testing/btest/Baseline/doc.manual.data_type_const_simple/.stdout b/testing/btest/Baseline/doc.manual.data_type_const_simple/.stdout deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/testing/btest/Baseline/doc.manual.data_type_declaration/.stdout b/testing/btest/Baseline/doc.manual.data_type_declaration/.stdout deleted file mode 100644 index a6f28b5e52..0000000000 --- a/testing/btest/Baseline/doc.manual.data_type_declaration/.stdout +++ /dev/null @@ -1 +0,0 @@ -A: 10, B: 10 diff --git a/testing/btest/Baseline/doc.manual.data_type_interval/.stdout b/testing/btest/Baseline/doc.manual.data_type_interval/.stdout deleted file mode 100644 index 1cd5999711..0000000000 --- a/testing/btest/Baseline/doc.manual.data_type_interval/.stdout +++ /dev/null @@ -1,15 +0,0 @@ -2011/06/18 19:03:08: New connection established from 141.142.220.118 to 208.80.152.118 -2011/06/18 19:03:08: New connection established from 141.142.220.118 to 208.80.152.3 - Time since last connection: 132.0 msecs 97.0 usecs -2011/06/18 19:03:08: New connection established from 141.142.220.118 to 208.80.152.3 - Time since last connection: 177.0 usecs -2011/06/18 19:03:08: New connection established from 141.142.220.118 to 208.80.152.3 - Time since last connection: 2.0 msecs 177.0 usecs -2011/06/18 19:03:08: New connection established from 141.142.220.118 to 208.80.152.3 - Time since last connection: 33.0 msecs 898.0 usecs -2011/06/18 19:03:08: New connection established from 141.142.220.118 to 208.80.152.3 - Time since last connection: 35.0 usecs -2011/06/18 19:03:08: New connection established from 141.142.220.118 to 208.80.152.3 - Time since last connection: 2.0 msecs 532.0 usecs -2011/06/18 19:03:08: New connection established from 141.142.220.118 to 208.80.152.2 - Time since last connection: 7.0 msecs 866.0 usecs diff --git a/testing/btest/Baseline/doc.manual.data_type_local/.stdout b/testing/btest/Baseline/doc.manual.data_type_local/.stdout deleted file mode 100644 index e150c0b19d..0000000000 --- a/testing/btest/Baseline/doc.manual.data_type_local/.stdout +++ /dev/null @@ -1 +0,0 @@ -i + 2 = 12 diff --git a/testing/btest/Baseline/doc.manual.data_type_pattern_01/.stdout b/testing/btest/Baseline/doc.manual.data_type_pattern_01/.stdout deleted file mode 100644 index 11358a776e..0000000000 --- a/testing/btest/Baseline/doc.manual.data_type_pattern_01/.stdout +++ /dev/null @@ -1,3 +0,0 @@ -The - brown fox jumped over the - dog. diff --git a/testing/btest/Baseline/doc.manual.data_type_pattern_02/.stdout b/testing/btest/Baseline/doc.manual.data_type_pattern_02/.stdout deleted file mode 100644 index 808dc3d572..0000000000 --- a/testing/btest/Baseline/doc.manual.data_type_pattern_02/.stdout +++ /dev/null @@ -1,2 +0,0 @@ -equality and /^?(equal)$?/ are not equal -equality and /^?(equality)$?/ are equal diff --git a/testing/btest/Baseline/doc.manual.data_type_subnets/.stdout b/testing/btest/Baseline/doc.manual.data_type_subnets/.stdout deleted file mode 100644 index facaaabe64..0000000000 --- a/testing/btest/Baseline/doc.manual.data_type_subnets/.stdout +++ /dev/null @@ -1,4 +0,0 @@ -172.16.4.56 belongs to subnet 172.16.0.0/20 -172.16.47.254 belongs to subnet 172.16.32.0/20 -172.16.22.45 belongs to subnet 172.16.16.0/20 -172.16.1.1 belongs to subnet 172.16.0.0/20 diff --git a/testing/btest/Baseline/doc.manual.data_type_time/.stdout b/testing/btest/Baseline/doc.manual.data_type_time/.stdout deleted file mode 100644 index 149cb40e2a..0000000000 --- a/testing/btest/Baseline/doc.manual.data_type_time/.stdout +++ /dev/null @@ -1,8 +0,0 @@ -2011/06/18 19:03:08: New connection established from 141.142.220.118 to 208.80.152.118^J -2011/06/18 19:03:08: New connection established from 141.142.220.118 to 208.80.152.3^J -2011/06/18 19:03:08: New connection established from 141.142.220.118 to 208.80.152.3^J -2011/06/18 19:03:08: New connection established from 141.142.220.118 to 208.80.152.3^J -2011/06/18 19:03:08: New connection established from 141.142.220.118 to 208.80.152.3^J -2011/06/18 19:03:08: New connection established from 141.142.220.118 to 208.80.152.3^J -2011/06/18 19:03:08: New connection established from 141.142.220.118 to 208.80.152.3^J -2011/06/18 19:03:08: New connection established from 141.142.220.118 to 208.80.152.2^J diff --git a/testing/btest/Baseline/doc.manual.framework_logging_factorial_01/.stdout b/testing/btest/Baseline/doc.manual.framework_logging_factorial_01/.stdout deleted file mode 100644 index db47b283d0..0000000000 --- a/testing/btest/Baseline/doc.manual.framework_logging_factorial_01/.stdout +++ /dev/null @@ -1,10 +0,0 @@ -1 -2 -6 -24 -120 -720 -5040 -40320 -362880 -3628800 diff --git a/testing/btest/Baseline/doc.manual.framework_logging_factorial_02/factor.log b/testing/btest/Baseline/doc.manual.framework_logging_factorial_02/factor.log deleted file mode 100644 index c643116265..0000000000 --- a/testing/btest/Baseline/doc.manual.framework_logging_factorial_02/factor.log +++ /dev/null @@ -1,19 +0,0 @@ -#separator \x09 -#set_separator , -#empty_field (empty) -#unset_field - -#path factor -#open 2013-03-19-03-25-33 -#fields num factorial_num -#types count count -1 1 -2 2 -3 6 -4 24 -5 120 -6 720 -7 5040 -8 40320 -9 362880 -10 3628800 -#close 2013-03-19-03-25-33 diff --git a/testing/btest/Baseline/doc.manual.framework_logging_factorial_03/factor-mod5.log b/testing/btest/Baseline/doc.manual.framework_logging_factorial_03/factor-mod5.log deleted file mode 100644 index 2a466484d6..0000000000 --- a/testing/btest/Baseline/doc.manual.framework_logging_factorial_03/factor-mod5.log +++ /dev/null @@ -1,15 +0,0 @@ -#separator \x09 -#set_separator , -#empty_field (empty) -#unset_field - -#path factor-mod5 -#open 2013-03-20-03-22-52 -#fields num factorial_num -#types count count -5 120 -6 720 -7 5040 -8 40320 -9 362880 -10 3628800 -#close 2013-03-20-03-22-52 diff --git a/testing/btest/Baseline/doc.manual.framework_logging_factorial_03/factor-non5.log b/testing/btest/Baseline/doc.manual.framework_logging_factorial_03/factor-non5.log deleted file mode 100644 index 4430dcc8a4..0000000000 --- a/testing/btest/Baseline/doc.manual.framework_logging_factorial_03/factor-non5.log +++ /dev/null @@ -1,13 +0,0 @@ -#separator \x09 -#set_separator , -#empty_field (empty) -#unset_field - -#path factor-non5 -#open 2013-03-20-03-22-52 -#fields num factorial_num -#types count count -1 1 -2 2 -3 6 -4 24 -#close 2013-03-20-03-22-52 diff --git a/testing/btest/Baseline/doc.manual.framework_logging_factorial_04/factor-mod5.log b/testing/btest/Baseline/doc.manual.framework_logging_factorial_04/factor-mod5.log deleted file mode 100644 index 6b50ca55e7..0000000000 --- a/testing/btest/Baseline/doc.manual.framework_logging_factorial_04/factor-mod5.log +++ /dev/null @@ -1,15 +0,0 @@ -#separator \x09 -#set_separator , -#empty_field (empty) -#unset_field - -#path factor-mod5 -#open 2013-03-25-02-00-12 -#fields num factorial_num -#types count count -5 120 -6 720 -7 5040 -8 40320 -9 362880 -10 3628800 -#close 2013-03-25-02-00-12 diff --git a/testing/btest/Baseline/doc.manual.framework_logging_factorial_04/factor-non5.log b/testing/btest/Baseline/doc.manual.framework_logging_factorial_04/factor-non5.log deleted file mode 100644 index d272ba48a9..0000000000 --- a/testing/btest/Baseline/doc.manual.framework_logging_factorial_04/factor-non5.log +++ /dev/null @@ -1,13 +0,0 @@ -#separator \x09 -#set_separator , -#empty_field (empty) -#unset_field - -#path factor-non5 -#open 2013-03-25-02-00-12 -#fields num factorial_num -#types count count -1 1 -2 2 -3 6 -4 24 -#close 2013-03-25-02-00-12 diff --git a/testing/btest/Baseline/doc.manual.framework_notice_hook_01/.stdout b/testing/btest/Baseline/doc.manual.framework_notice_hook_01/.stdout deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/testing/btest/Baseline/doc.manual.framework_notice_hook_suppression_01/.stdout b/testing/btest/Baseline/doc.manual.framework_notice_hook_suppression_01/.stdout deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/testing/btest/Baseline/doc.manual.framework_notice_shortcuts_01/.stdout b/testing/btest/Baseline/doc.manual.framework_notice_shortcuts_01/.stdout deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/testing/btest/Baseline/doc.manual.framework_notice_shortcuts_02/.stdout b/testing/btest/Baseline/doc.manual.framework_notice_shortcuts_02/.stdout deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/testing/btest/Baseline/doc.manual.using_bro_sandbox_01/.stdout b/testing/btest/Baseline/doc.manual.using_bro_sandbox_01/.stdout deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/testing/btest/Baseline/doc.manual.using_bro_sandbox_01/conn.log b/testing/btest/Baseline/doc.manual.using_bro_sandbox_01/conn.log deleted file mode 100644 index 6eb08725f5..0000000000 --- a/testing/btest/Baseline/doc.manual.using_bro_sandbox_01/conn.log +++ /dev/null @@ -1,43 +0,0 @@ -#separator \x09 -#set_separator , -#empty_field (empty) -#unset_field - -#path conn -#open 2013-05-05-20-51-24 -#fields ts uid id.orig_h id.orig_p id.resp_h id.resp_p proto service duration orig_bytes resp_bytes conn_state local_orig missed_bytes history orig_pkts orig_ip_bytes resp_pkts resp_ip_bytes tunnel_parents -#types time string addr port addr port enum string interval count count string bool count string count count count count table[string] -1300475167.096535 UWkUyAuUGXf 141.142.220.202 5353 224.0.0.251 5353 udp dns - - - S0 - 0 D 1 73 0 0 - -1300475167.097012 arKYeMETxOg fe80::217:f2ff:fed7:cf65 5353 ff02::fb 5353 udp - - - - S0 - 0 D 1 199 0 0 - -1300475167.099816 k6kgXLOoSKl 141.142.220.50 5353 224.0.0.251 5353 udp - - - - S0 - 0 D 1 179 0 0 - -1300475168.853899 TEfuqmmG4bh 141.142.220.118 43927 141.142.2.2 53 udp dns 0.000435 38 89 SF - 0 Dd 1 66 1 117 - -1300475168.854378 FrJExwHcSal 141.142.220.118 37676 141.142.2.2 53 udp dns 0.000420 52 99 SF - 0 Dd 1 80 1 127 - -1300475168.854837 5OKnoww6xl4 141.142.220.118 40526 141.142.2.2 53 udp dns 0.000392 38 183 SF - 0 Dd 1 66 1 211 - -1300475168.857956 fRFu0wcOle6 141.142.220.118 32902 141.142.2.2 53 udp dns 0.000317 38 89 SF - 0 Dd 1 66 1 117 - -1300475168.858306 qSsw6ESzHV4 141.142.220.118 59816 141.142.2.2 53 udp dns 0.000343 52 99 SF - 0 Dd 1 80 1 127 - -1300475168.858713 iE6yhOq3SF 141.142.220.118 59714 141.142.2.2 53 udp dns 0.000375 38 183 SF - 0 Dd 1 66 1 211 - -1300475168.891644 qCaWGmzFtM5 141.142.220.118 58206 141.142.2.2 53 udp dns 0.000339 38 89 SF - 0 Dd 1 66 1 117 - -1300475168.892037 70MGiRM1Qf4 141.142.220.118 38911 141.142.2.2 53 udp dns 0.000335 52 99 SF - 0 Dd 1 80 1 127 - -1300475168.892414 h5DsfNtYzi1 141.142.220.118 59746 141.142.2.2 53 udp dns 0.000421 38 183 SF - 0 Dd 1 66 1 211 - -1300475168.893988 c4Zw9TmAE05 141.142.220.118 45000 141.142.2.2 53 udp dns 0.000384 38 89 SF - 0 Dd 1 66 1 117 - -1300475168.894422 EAr0uf4mhq 141.142.220.118 48479 141.142.2.2 53 udp dns 0.000317 52 99 SF - 0 Dd 1 80 1 127 - -1300475168.894787 GvmoxJFXdTa 141.142.220.118 48128 141.142.2.2 53 udp dns 0.000423 38 183 SF - 0 Dd 1 66 1 211 - -1300475168.901749 slFea8xwSmb 141.142.220.118 56056 141.142.2.2 53 udp dns 0.000402 36 131 SF - 0 Dd 1 64 1 159 - -1300475168.902195 UfGkYA2HI2g 141.142.220.118 55092 141.142.2.2 53 udp dns 0.000374 36 198 SF - 0 Dd 1 64 1 226 - -1300475169.899438 BWaU4aSuwkc 141.142.220.44 5353 224.0.0.251 5353 udp dns - - - S0 - 0 D 1 85 0 0 - -1300475170.862384 10XodEwRycf 141.142.220.226 137 141.142.220.255 137 udp dns 2.613017 350 0 S0 - 0 D 7 546 0 0 - -1300475171.675372 zno26fFZkrh fe80::3074:17d5:2052:c324 65373 ff02::1:3 5355 udp dns 0.100096 66 0 S0 - 0 D 2 162 0 0 - -1300475171.677081 v5rgkJBig5l 141.142.220.226 55131 224.0.0.252 5355 udp dns 0.100021 66 0 S0 - 0 D 2 122 0 0 - -1300475173.116749 eWZCH7OONC1 fe80::3074:17d5:2052:c324 54213 ff02::1:3 5355 udp dns 0.099801 66 0 S0 - 0 D 2 162 0 0 - -1300475173.117362 0Pwk3ntf8O3 141.142.220.226 55671 224.0.0.252 5355 udp dns 0.099849 66 0 S0 - 0 D 2 122 0 0 - -1300475173.153679 0HKorjr8Zp7 141.142.220.238 56641 141.142.220.255 137 udp dns - - - S0 - 0 D 1 78 0 0 - -1300475168.859163 GSxOnSLghOa 141.142.220.118 49998 208.80.152.3 80 tcp http 0.215893 1130 734 S1 - 0 ShADad 6 1450 4 950 - -1300475168.652003 nQcgTWjvg4c 141.142.220.118 35634 208.80.152.2 80 tcp - 0.061329 463 350 OTH - 0 DdA 2 567 1 402 - -1300475168.895267 0Q4FH8sESw5 141.142.220.118 50001 208.80.152.3 80 tcp http 0.227284 1178 734 S1 - 0 ShADad 6 1498 4 950 - -1300475168.902635 i2rO3KD1Syg 141.142.220.118 35642 208.80.152.2 80 tcp http 0.120041 534 412 S1 - 0 ShADad 4 750 3 576 - -1300475168.892936 Tw8jXtpTGu6 141.142.220.118 50000 208.80.152.3 80 tcp http 0.229603 1148 734 S1 - 0 ShADad 6 1468 4 950 - -1300475168.855305 3PKsZ2Uye21 141.142.220.118 49996 208.80.152.3 80 tcp http 0.218501 1171 733 S1 - 0 ShADad 6 1491 4 949 - -1300475168.892913 P654jzLoe3a 141.142.220.118 49999 208.80.152.3 80 tcp http 0.220961 1137 733 S1 - 0 ShADad 6 1457 4 949 - -1300475169.780331 2cx26uAvUPl 141.142.220.235 6705 173.192.163.128 80 tcp - - - - OTH - 0 h 0 0 1 48 - -1300475168.724007 j4u32Pc5bif 141.142.220.118 48649 208.80.152.118 80 tcp http 0.119905 525 232 S1 - 0 ShADad 4 741 3 396 - -1300475168.855330 VW0XPVINV8a 141.142.220.118 49997 208.80.152.3 80 tcp http 0.219720 1125 734 S1 - 0 ShADad 6 1445 4 950 - -#close 2013-05-05-20-51-24 diff --git a/testing/btest/Baseline/doc.manual.using_bro_sandbox_01/http.log b/testing/btest/Baseline/doc.manual.using_bro_sandbox_01/http.log deleted file mode 100644 index 617c1f0e6e..0000000000 --- a/testing/btest/Baseline/doc.manual.using_bro_sandbox_01/http.log +++ /dev/null @@ -1,23 +0,0 @@ -#separator \x09 -#set_separator , -#empty_field (empty) -#unset_field - -#path http -#open 2013-05-05-21-12-40 -#fields ts uid id.orig_h id.orig_p id.resp_h id.resp_p trans_depth method host uri referrer user_agent request_body_len response_body_len status_code status_msg info_code info_msg filename tags username password proxied mime_type md5 extraction_file -#types time string addr port addr port count string string string string string count count count string count string string table[enum] string string table[string] string string file -1300475168.784020 j4u32Pc5bif 141.142.220.118 48649 208.80.152.118 80 1 GET bits.wikimedia.org /skins-1.5/monobook/main.css http://www.wikipedia.org/ Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.2.15) Gecko/20110303 Ubuntu/10.04 (lucid) Firefox/3.6.15 0 0 304 Not Modified - - - (empty) - - - - - - -1300475168.916018 VW0XPVINV8a 141.142.220.118 49997 208.80.152.3 80 1 GET upload.wikimedia.org /wikipedia/commons/6/63/Wikipedia-logo.png http://www.wikipedia.org/ Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.2.15) Gecko/20110303 Ubuntu/10.04 (lucid) Firefox/3.6.15 0 0 304 Not Modified - - - (empty) - - - - - - -1300475168.916183 3PKsZ2Uye21 141.142.220.118 49996 208.80.152.3 80 1 GET upload.wikimedia.org /wikipedia/commons/thumb/b/bb/Wikipedia_wordmark.svg/174px-Wikipedia_wordmark.svg.png http://www.wikipedia.org/ Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.2.15) Gecko/20110303 Ubuntu/10.04 (lucid) Firefox/3.6.15 0 0 304 Not Modified - - - (empty) - - - - - - -1300475168.918358 GSxOnSLghOa 141.142.220.118 49998 208.80.152.3 80 1 GET upload.wikimedia.org /wikipedia/commons/b/bd/Bookshelf-40x201_6.png http://www.wikipedia.org/ Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.2.15) Gecko/20110303 Ubuntu/10.04 (lucid) Firefox/3.6.15 0 0 304 Not Modified - - - (empty) - - - - - - -1300475168.952307 Tw8jXtpTGu6 141.142.220.118 50000 208.80.152.3 80 1 GET upload.wikimedia.org /wikipedia/commons/thumb/8/8a/Wikinews-logo.png/35px-Wikinews-logo.png http://www.wikipedia.org/ Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.2.15) Gecko/20110303 Ubuntu/10.04 (lucid) Firefox/3.6.15 0 0 304 Not Modified - - - (empty) - - - - - - -1300475168.952296 P654jzLoe3a 141.142.220.118 49999 208.80.152.3 80 1 GET upload.wikimedia.org /wikipedia/commons/4/4a/Wiktionary-logo-en-35px.png http://www.wikipedia.org/ Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.2.15) Gecko/20110303 Ubuntu/10.04 (lucid) Firefox/3.6.15 0 0 304 Not Modified - - - (empty) - - - - - - -1300475168.954820 0Q4FH8sESw5 141.142.220.118 50001 208.80.152.3 80 1 GET upload.wikimedia.org /wikipedia/commons/thumb/f/fa/Wikiquote-logo.svg/35px-Wikiquote-logo.svg.png http://www.wikipedia.org/ Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.2.15) Gecko/20110303 Ubuntu/10.04 (lucid) Firefox/3.6.15 0 0 304 Not Modified - - - (empty) - - - - - - -1300475168.962687 i2rO3KD1Syg 141.142.220.118 35642 208.80.152.2 80 1 GET meta.wikimedia.org /images/wikimedia-button.png http://www.wikipedia.org/ Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.2.15) Gecko/20110303 Ubuntu/10.04 (lucid) Firefox/3.6.15 0 0 304 Not Modified - - - (empty) - - - - - - -1300475168.975934 VW0XPVINV8a 141.142.220.118 49997 208.80.152.3 80 2 GET upload.wikimedia.org /wikipedia/commons/thumb/f/fa/Wikibooks-logo.svg/35px-Wikibooks-logo.svg.png http://www.wikipedia.org/ Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.2.15) Gecko/20110303 Ubuntu/10.04 (lucid) Firefox/3.6.15 0 0 304 Not Modified - - - (empty) - - - - - - -1300475168.976436 3PKsZ2Uye21 141.142.220.118 49996 208.80.152.3 80 2 GET upload.wikimedia.org /wikipedia/commons/thumb/d/df/Wikispecies-logo.svg/35px-Wikispecies-logo.svg.png http://www.wikipedia.org/ Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.2.15) Gecko/20110303 Ubuntu/10.04 (lucid) Firefox/3.6.15 0 0 304 Not Modified - - - (empty) - - - - - - -1300475168.979264 GSxOnSLghOa 141.142.220.118 49998 208.80.152.3 80 2 GET upload.wikimedia.org /wikipedia/commons/thumb/4/4c/Wikisource-logo.svg/35px-Wikisource-logo.svg.png http://www.wikipedia.org/ Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.2.15) Gecko/20110303 Ubuntu/10.04 (lucid) Firefox/3.6.15 0 0 304 Not Modified - - - (empty) - - - - - - -1300475169.014619 Tw8jXtpTGu6 141.142.220.118 50000 208.80.152.3 80 2 GET upload.wikimedia.org /wikipedia/commons/thumb/4/4a/Commons-logo.svg/35px-Commons-logo.svg.png http://www.wikipedia.org/ Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.2.15) Gecko/20110303 Ubuntu/10.04 (lucid) Firefox/3.6.15 0 0 304 Not Modified - - - (empty) - - - - - - -1300475169.014593 P654jzLoe3a 141.142.220.118 49999 208.80.152.3 80 2 GET upload.wikimedia.org /wikipedia/commons/thumb/9/91/Wikiversity-logo.svg/35px-Wikiversity-logo.svg.png http://www.wikipedia.org/ Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.2.15) Gecko/20110303 Ubuntu/10.04 (lucid) Firefox/3.6.15 0 0 304 Not Modified - - - (empty) - - - - - - -1300475169.014927 0Q4FH8sESw5 141.142.220.118 50001 208.80.152.3 80 2 GET upload.wikimedia.org /wikipedia/commons/thumb/7/75/Wikimedia_Community_Logo.svg/35px-Wikimedia_Community_Logo.svg.png http://www.wikipedia.org/ Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.2.15) Gecko/20110303 Ubuntu/10.04 (lucid) Firefox/3.6.15 0 0 304 Not Modified - - - (empty) - - - - - - -#close 2013-05-05-21-12-40 diff --git a/testing/btest/Baseline/doc.manual.using_bro_sandbox_02/conn.log b/testing/btest/Baseline/doc.manual.using_bro_sandbox_02/conn.log deleted file mode 100644 index cc68286986..0000000000 --- a/testing/btest/Baseline/doc.manual.using_bro_sandbox_02/conn.log +++ /dev/null @@ -1,15 +0,0 @@ -#separator \x09 -#set_separator , -#empty_field (empty) -#unset_field - -#path conn -#open 2013-05-07-14-38-27 -#fields ts uid id.orig_h id.orig_p id.resp_h id.resp_p proto service duration orig_bytes resp_bytes conn_state local_orig missed_bytes history orig_pkts orig_ip_bytes resp_pkts resp_ip_bytes tunnel_parents -#types time string addr port addr port enum string interval count count string bool count string count count count count table[string] -1320329757.771503 j4u32Pc5bif 10.0.2.15 49286 192.150.187.43 80 tcp http 15.161537 2899 1127 S2 - 0 ShADadF 20 3719 19 1891 - -1320329757.771262 nQcgTWjvg4c 10.0.2.15 49285 192.150.187.43 80 tcp http 15.161772 889 377 S2 - 0 ShADadF 8 1229 8 701 - -1320329757.761327 arKYeMETxOg 10.0.2.15 49283 192.150.187.43 80 tcp http 15.168898 459 189 S2 - 0 ShADadF 5 679 4 353 - -1320329757.458867 UWkUyAuUGXf 10.0.2.15 49282 192.150.187.43 80 tcp http 15.471378 1824 751 S2 - 0 ShADadF 12 2324 13 1275 - -1320329757.761638 k6kgXLOoSKl 10.0.2.15 49284 192.150.187.43 80 tcp http 15.168613 898 376 S2 - 0 ShADadF 8 1238 8 700 - -1320329757.771755 TEfuqmmG4bh 10.0.2.15 49287 192.150.187.43 80 tcp http 15.161267 900 376 S2 - 0 ShADadF 8 1240 8 700 - -#close 2013-05-07-14-38-27 diff --git a/testing/btest/Baseline/doc.manual.using_bro_sandbox_02/http.log b/testing/btest/Baseline/doc.manual.using_bro_sandbox_02/http.log deleted file mode 100644 index 031a9ce2ce..0000000000 --- a/testing/btest/Baseline/doc.manual.using_bro_sandbox_02/http.log +++ /dev/null @@ -1,26 +0,0 @@ -#separator \x09 -#set_separator , -#empty_field (empty) -#unset_field - -#path http -#open 2013-05-07-14-38-27 -#fields ts uid id.orig_h id.orig_p id.resp_h id.resp_p trans_depth method host uri referrer user_agent request_body_len response_body_len status_code status_msg info_code info_msg filename tags username password proxied mime_type md5 extraction_file -#types time string addr port addr port count string string string string string count count count string count string string table[enum] string string table[string] string string file -1320329757.460004 UWkUyAuUGXf 10.0.2.15 49282 192.150.187.43 80 1 GET bro-ids.org / - Mozilla/5.0 (X11; Linux i686) AppleWebKit/535.2 (KHTML, like Gecko) Chrome/15.0.874.106 Safari/535.2 0 0 304 Not Modified - - - (empty) - - - - - - -1320329757.772457 UWkUyAuUGXf 10.0.2.15 49282 192.150.187.43 80 2 GET bro-ids.org /css/pygments.css http://bro-ids.org/ Mozilla/5.0 (X11; Linux i686) AppleWebKit/535.2 (KHTML, like Gecko) Chrome/15.0.874.106 Safari/535.2 0 0 304 Not Modified - - - (empty) - - - - - - -1320329757.874406 UWkUyAuUGXf 10.0.2.15 49282 192.150.187.43 80 3 GET bro-ids.org /js/jquery.zrssfeed.js http://bro-ids.org/ Mozilla/5.0 (X11; Linux i686) AppleWebKit/535.2 (KHTML, like Gecko) Chrome/15.0.874.106 Safari/535.2 0 0 304 Not Modified - - - (empty) - - - - - - -1320329757.775110 k6kgXLOoSKl 10.0.2.15 49284 192.150.187.43 80 1 GET bro-ids.org /css/960.css http://bro-ids.org/ Mozilla/5.0 (X11; Linux i686) AppleWebKit/535.2 (KHTML, like Gecko) Chrome/15.0.874.106 Safari/535.2 0 0 304 Not Modified - - - (empty) - - - - - - -1320329757.776072 TEfuqmmG4bh 10.0.2.15 49287 192.150.187.43 80 1 GET bro-ids.org /js/jquery.cycle.all.min.js http://bro-ids.org/ Mozilla/5.0 (X11; Linux i686) AppleWebKit/535.2 (KHTML, like Gecko) Chrome/15.0.874.106 Safari/535.2 0 0 304 Not Modified - - - (empty) - - - - - - -1320329757.776421 nQcgTWjvg4c 10.0.2.15 49285 192.150.187.43 80 1 GET bro-ids.org /js/jquery.tweet.js http://bro-ids.org/ Mozilla/5.0 (X11; Linux i686) AppleWebKit/535.2 (KHTML, like Gecko) Chrome/15.0.874.106 Safari/535.2 0 0 304 Not Modified - - - (empty) - - - - - - -1320329757.776240 j4u32Pc5bif 10.0.2.15 49286 192.150.187.43 80 1 GET bro-ids.org /js/jquery.fancybox-1.3.4.pack.js http://bro-ids.org/ Mozilla/5.0 (X11; Linux i686) AppleWebKit/535.2 (KHTML, like Gecko) Chrome/15.0.874.106 Safari/535.2 0 0 304 Not Modified - - - (empty) - - - - - - -1320329757.775251 arKYeMETxOg 10.0.2.15 49283 192.150.187.43 80 1 GET bro-ids.org /css/bro-ids.css http://bro-ids.org/ Mozilla/5.0 (X11; Linux i686) AppleWebKit/535.2 (KHTML, like Gecko) Chrome/15.0.874.106 Safari/535.2 0 0 304 Not Modified - - - (empty) - - - - - - -1320329757.975651 UWkUyAuUGXf 10.0.2.15 49282 192.150.187.43 80 4 GET bro-ids.org /js/jquery.tableofcontents.js http://bro-ids.org/ Mozilla/5.0 (X11; Linux i686) AppleWebKit/535.2 (KHTML, like Gecko) Chrome/15.0.874.106 Safari/535.2 0 0 304 Not Modified - - - (empty) - - - - - - -1320329757.979943 k6kgXLOoSKl 10.0.2.15 49284 192.150.187.43 80 2 GET bro-ids.org /js/superfish.js http://bro-ids.org/ Mozilla/5.0 (X11; Linux i686) AppleWebKit/535.2 (KHTML, like Gecko) Chrome/15.0.874.106 Safari/535.2 0 0 304 Not Modified - - - (empty) - - - - - - -1320329757.985656 TEfuqmmG4bh 10.0.2.15 49287 192.150.187.43 80 2 GET bro-ids.org /js/hoverIntent.js http://bro-ids.org/ Mozilla/5.0 (X11; Linux i686) AppleWebKit/535.2 (KHTML, like Gecko) Chrome/15.0.874.106 Safari/535.2 0 0 304 Not Modified - - - (empty) - - - - - - -1320329757.989904 nQcgTWjvg4c 10.0.2.15 49285 192.150.187.43 80 2 GET bro-ids.org /js/general.js http://bro-ids.org/ Mozilla/5.0 (X11; Linux i686) AppleWebKit/535.2 (KHTML, like Gecko) Chrome/15.0.874.106 Safari/535.2 0 0 304 Not Modified - - - (empty) - - - - - - -1320329757.991315 j4u32Pc5bif 10.0.2.15 49286 192.150.187.43 80 2 GET bro-ids.org /js/jquery.collapse.js http://bro-ids.org/ Mozilla/5.0 (X11; Linux i686) AppleWebKit/535.2 (KHTML, like Gecko) Chrome/15.0.874.106 Safari/535.2 0 0 304 Not Modified - - - (empty) - - - - - - -1320329758.172397 j4u32Pc5bif 10.0.2.15 49286 192.150.187.43 80 3 GET bro-ids.org /css/print.css http://bro-ids.org/ Mozilla/5.0 (X11; Linux i686) AppleWebKit/535.2 (KHTML, like Gecko) Chrome/15.0.874.106 Safari/535.2 0 0 304 Not Modified - - - (empty) - - - - - - -1320329759.998388 j4u32Pc5bif 10.0.2.15 49286 192.150.187.43 80 4 GET bro-ids.org /documentation/index.html http://bro-ids.org/ Mozilla/5.0 (X11; Linux i686) AppleWebKit/535.2 (KHTML, like Gecko) Chrome/15.0.874.106 Safari/535.2 0 0 304 Not Modified - - - (empty) - - - - - - -1320329760.146412 j4u32Pc5bif 10.0.2.15 49286 192.150.187.43 80 5 GET bro-ids.org /js/breadcrumbs.js http://bro-ids.org/documentation/index.html Mozilla/5.0 (X11; Linux i686) AppleWebKit/535.2 (KHTML, like Gecko) Chrome/15.0.874.106 Safari/535.2 0 0 304 Not Modified - - - (empty) - - - - - - -1320329762.971726 j4u32Pc5bif 10.0.2.15 49286 192.150.187.43 80 6 GET bro-ids.org /documentation/reporting-problems.html http://bro-ids.org/documentation/index.html Mozilla/5.0 (X11; Linux i686) AppleWebKit/535.2 (KHTML, like Gecko) Chrome/15.0.874.106 Safari/535.2 0 0 304 Not Modified - - - (empty) - - - - - - -#close 2013-05-07-14-38-27 diff --git a/testing/btest/Baseline/language.zeek_init/out b/testing/btest/Baseline/language.zeek_init/out index 31b2428745..aa17ec8aa8 100644 --- a/testing/btest/Baseline/language.zeek_init/out +++ b/testing/btest/Baseline/language.zeek_init/out @@ -1,4 +1,8 @@ -zeek init at priority 10! -bro init at priority 5! -zeek init at priority 0! -bro init at priority -10! +zeek_init at priority 10! +bro_init at priority 5! +zeek_init at priority 0! +bro_init at priority -10! +zeek_done at priority 10! +bro_done at priority 5! +zeek_done at priority 0! +bro_done at priority -10! diff --git a/testing/btest/Baseline/plugins.hooks/output b/testing/btest/Baseline/plugins.hooks/output index 04908bed0b..1fb96d9d3c 100644 --- a/testing/btest/Baseline/plugins.hooks/output +++ b/testing/btest/Baseline/plugins.hooks/output @@ -562,7 +562,7 @@ 0.000000 MetaHookPost CallFunction(SumStats::register_observe_plugins, , ()) -> 0.000000 MetaHookPost CallFunction(Unified2::mappings_initialized, , ()) -> 0.000000 MetaHookPost CallFunction(Unified2::start_watching, , ()) -> -0.000000 MetaHookPost CallFunction(bro_init, , ()) -> +0.000000 MetaHookPost CallFunction(zeek_init, , ()) -> 0.000000 MetaHookPost CallFunction(current_time, , ()) -> 0.000000 MetaHookPost CallFunction(filter_change_tracking, , ()) -> 0.000000 MetaHookPost CallFunction(getenv, , (BRO_DEFAULT_LISTEN_ADDRESS)) -> @@ -899,7 +899,7 @@ 0.000000 MetaHookPost LogInit(Log::WRITER_ASCII, default, true, true, packet_filter(0.0,0.0,0.0), 5, {ts (time), node (string), filter (string), init (bool), success (bool)}) -> 0.000000 MetaHookPost LogWrite(Log::WRITER_ASCII, default, packet_filter(0.0,0.0,0.0), 5, {ts (time), node (string), filter (string), init (bool), success (bool)}, ) -> true 0.000000 MetaHookPost QueueEvent(NetControl::init()) -> false -0.000000 MetaHookPost QueueEvent(bro_init()) -> false +0.000000 MetaHookPost QueueEvent(zeek_init()) -> false 0.000000 MetaHookPost QueueEvent(filter_change_tracking()) -> false 0.000000 MetaHookPre CallFunction(Analyzer::__disable_analyzer, , (Analyzer::ANALYZER_BACKDOOR)) 0.000000 MetaHookPre CallFunction(Analyzer::__disable_analyzer, , (Analyzer::ANALYZER_INTERCONN)) @@ -1465,7 +1465,7 @@ 0.000000 MetaHookPre CallFunction(SumStats::register_observe_plugins, , ()) 0.000000 MetaHookPre CallFunction(Unified2::mappings_initialized, , ()) 0.000000 MetaHookPre CallFunction(Unified2::start_watching, , ()) -0.000000 MetaHookPre CallFunction(bro_init, , ()) +0.000000 MetaHookPre CallFunction(zeek_init, , ()) 0.000000 MetaHookPre CallFunction(current_time, , ()) 0.000000 MetaHookPre CallFunction(filter_change_tracking, , ()) 0.000000 MetaHookPre CallFunction(getenv, , (BRO_DEFAULT_LISTEN_ADDRESS)) @@ -1802,7 +1802,7 @@ 0.000000 MetaHookPre LogInit(Log::WRITER_ASCII, default, true, true, packet_filter(0.0,0.0,0.0), 5, {ts (time), node (string), filter (string), init (bool), success (bool)}) 0.000000 MetaHookPre LogWrite(Log::WRITER_ASCII, default, packet_filter(0.0,0.0,0.0), 5, {ts (time), node (string), filter (string), init (bool), success (bool)}, ) 0.000000 MetaHookPre QueueEvent(NetControl::init()) -0.000000 MetaHookPre QueueEvent(bro_init()) +0.000000 MetaHookPre QueueEvent(zeek_init()) 0.000000 MetaHookPre QueueEvent(filter_change_tracking()) 0.000000 | HookCallFunction Analyzer::__disable_analyzer(Analyzer::ANALYZER_BACKDOOR) 0.000000 | HookCallFunction Analyzer::__disable_analyzer(Analyzer::ANALYZER_INTERCONN) @@ -2367,7 +2367,7 @@ 0.000000 | HookCallFunction SumStats::register_observe_plugins() 0.000000 | HookCallFunction Unified2::mappings_initialized() 0.000000 | HookCallFunction Unified2::start_watching() -0.000000 | HookCallFunction bro_init() +0.000000 | HookCallFunction zeek_init() 0.000000 | HookCallFunction current_time() 0.000000 | HookCallFunction filter_change_tracking() 0.000000 | HookCallFunction getenv(BRO_DEFAULT_LISTEN_ADDRESS) @@ -2704,7 +2704,7 @@ 0.000000 | HookLogInit packet_filter 1/1 {ts (time), node (string), filter (string), init (bool), success (bool)} 0.000000 | HookLogWrite packet_filter [ts=1554405757.770254, node=bro, filter=ip or not ip, init=T, success=T] 0.000000 | HookQueueEvent NetControl::init() -0.000000 | HookQueueEvent bro_init() +0.000000 | HookQueueEvent zeek_init() 0.000000 | HookQueueEvent filter_change_tracking() 1362692526.869344 MetaHookPost BroObjDtor() -> 1362692526.869344 MetaHookPost CallFunction(ChecksumOffloading::check, , ()) -> @@ -3240,7 +3240,7 @@ 1362692527.080972 | HookLogInit conn 1/1 {ts (time), uid (string), id.orig_h (addr), id.orig_p (port), id.resp_h (addr), id.resp_p (port), proto (enum), service (string), duration (interval), orig_bytes (count), resp_bytes (count), conn_state (string), local_orig (bool), local_resp (bool), missed_bytes (count), history (string), orig_pkts (count), orig_ip_bytes (count), resp_pkts (count), resp_ip_bytes (count), tunnel_parents (set[string])} 1362692527.080972 | HookLogWrite conn [ts=1362692526.869344, uid=CHhAvVGS1DHFjwGM9, id.orig_h=141.142.228.5, id.orig_p=59856, id.resp_h=192.150.187.43, id.resp_p=80, proto=tcp, service=http, duration=0.211484, orig_bytes=136, resp_bytes=5007, conn_state=SF, local_orig=, local_resp=, missed_bytes=0, history=ShADadFf, orig_pkts=7, orig_ip_bytes=512, resp_pkts=7, resp_ip_bytes=5379, tunnel_parents=] 1362692527.080972 | HookQueueEvent ChecksumOffloading::check() -1362692527.080972 | HookQueueEvent bro_done() +1362692527.080972 | HookQueueEvent zeek_done() 1362692527.080972 | HookQueueEvent connection_state_remove([id=[orig_h=141.142.228.5, orig_p=59856<...>/plain], current_entity=, orig_mime_depth=1, resp_mime_depth=1], http_state=[pending={}, current_request=1, current_response=1, trans_depth=1], irc=, krb=, modbus=, mysql=, ntlm=, radius=, rdp=, rfb=, sip=, sip_state=, snmp=, smb_state=, smtp=, smtp_state=, socks=, ssh=, syslog=]) 1362692527.080972 | HookQueueEvent filter_change_tracking() 1362692527.080972 | HookQueueEvent get_file_handle(Analyzer::ANALYZER_HTTP, [id=[orig_h=141.142.228.5, orig_p=59856<...>/plain], current_entity=, orig_mime_depth=1, resp_mime_depth=1], http_state=[pending={}, current_request=1, current_response=1, trans_depth=1], irc=, krb=, modbus=, mysql=, ntlm=, radius=, rdp=, rfb=, sip=, sip_state=, snmp=, smb_state=, smtp=, smtp_state=, socks=, ssh=, syslog=], T) diff --git a/testing/btest/Baseline/scripts.policy.misc.dump-events/all-events-no-args.log b/testing/btest/Baseline/scripts.policy.misc.dump-events/all-events-no-args.log index b4be2cc92f..44e1435514 100644 --- a/testing/btest/Baseline/scripts.policy.misc.dump-events/all-events-no-args.log +++ b/testing/btest/Baseline/scripts.policy.misc.dump-events/all-events-no-args.log @@ -1,4 +1,4 @@ - 0.000000 bro_init + 0.000000 zeek_init 0.000000 NetControl::init 0.000000 filter_change_tracking 1254722767.492060 ChecksumOffloading::check @@ -226,5 +226,5 @@ 1437831800.217854 connection_state_remove 1437831800.217854 connection_pending 1437831800.217854 connection_state_remove -1437831800.217854 bro_done +1437831800.217854 zeek_done 1437831800.217854 ChecksumOffloading::check diff --git a/testing/btest/Baseline/scripts.policy.misc.dump-events/all-events.log b/testing/btest/Baseline/scripts.policy.misc.dump-events/all-events.log index 8f6550e2e2..9182b8f999 100644 --- a/testing/btest/Baseline/scripts.policy.misc.dump-events/all-events.log +++ b/testing/btest/Baseline/scripts.policy.misc.dump-events/all-events.log @@ -1,4 +1,4 @@ - 0.000000 bro_init + 0.000000 zeek_init 0.000000 NetControl::init 0.000000 filter_change_tracking 1254722767.492060 ChecksumOffloading::check @@ -1072,5 +1072,5 @@ 1437831800.217854 connection_state_remove [0] c: connection = [id=[orig_h=192.168.133.100, orig_p=49655/tcp, resp_h=17.167.150.73, resp_p=443/tcp], orig=[size=2249, state=4, num_pkts=15, num_bytes_ip=2873, flow_label=0, l2_addr=58:b0:35:86:54:8d], resp=[size=3653, state=4, num_pkts=13, num_bytes_ip=4185, flow_label=0, l2_addr=cc:b2:55:f4:62:92], start_time=1437831799.461152, duration=0.756702, service={\x0aSSL\x0a}, history=ShADda, uid=C3eiCBGOLw3VtHfOj, tunnel=, vlan=, inner_vlan=, dpd=, conn=, extract_orig=F, extract_resp=F, thresholds=, dce_rpc=, dce_rpc_state=, dce_rpc_backing=, dhcp=, dnp3=, dns=, dns_state=, ftp=, ftp_data_reuse=F, ssl=[ts=1437831799.611764, uid=C3eiCBGOLw3VtHfOj, id=[orig_h=192.168.133.100, orig_p=49655/tcp, resp_h=17.167.150.73, resp_p=443/tcp], version_num=771, version=TLSv12, cipher=TLS_RSA_WITH_RC4_128_MD5, curve=, server_name=p31-keyvalueservice.icloud.com, session_id=, resumed=F, client_ticket_empty_session_seen=F, client_key_exchange_seen=T, server_appdata=0, client_appdata=F, last_alert=, next_protocol=, analyzer_id=, established=T, logged=T, delay_tokens=, cert_chain=[[ts=1437831799.764576, fuid=F1vce92FT1oRjKI328, tx_hosts={\x0a\x0917.167.150.73\x0a}, rx_hosts={\x0a\x09192.168.133.100\x0a}, conn_uids={\x0aC3eiCBGOLw3VtHfOj\x0a}, source=SSL, depth=0, analyzers={\x0aMD5,\x0aSHA1,\x0aX509\x0a}, mime_type=application/x-x509-user-cert, filename=, duration=0 secs, local_orig=, is_orig=F, seen_bytes=1406, total_bytes=, missing_bytes=0, overflow_bytes=0, timedout=F, parent_fuid=, md5=1bf9696d9f337805383427e88781d001, sha1=f5ccb1a724133607548b00d8eb402efca3076d58, sha256=, x509=[ts=1437831799.764576, id=F1vce92FT1oRjKI328, certificate=[version=3, serial=053FCE9BA6805B00, subject=C=US,ST=California,O=Apple Inc.,OU=management:idms.group.506364,CN=*.icloud.com, issuer=C=US,O=Apple Inc.,OU=Certification Authority,CN=Apple IST CA 2 - G1, cn=*.icloud.com, not_valid_before=1424184331.0, not_valid_after=1489848331.0, key_alg=rsaEncryption, sig_alg=sha256WithRSAEncryption, key_type=rsa, key_length=2048, exponent=65537, curve=], handle=, extensions=[[name=Authority Information Access, short_name=authorityInfoAccess, oid=1.3.6.1.5.5.7.1.1, critical=F, value=OCSP - URI:http://ocsp.apple.com/ocsp04-appleistca2g101\x0a], [name=X509v3 Subject Key Identifier, short_name=subjectKeyIdentifier, oid=2.5.29.14, critical=F, value=8E:51:A1:0E:0A:9B:1C:04:F7:59:D3:69:2E:23:16:91:0E:AD:06:FB], [name=X509v3 Basic Constraints, short_name=basicConstraints, oid=2.5.29.19, critical=T, value=CA:FALSE], [name=X509v3 Authority Key Identifier, short_name=authorityKeyIdentifier, oid=2.5.29.35, critical=F, value=keyid:D8:7A:94:44:7C:90:70:90:16:9E:DD:17:9C:01:44:03:86:D6:2A:29\x0a], [name=X509v3 Certificate Policies, short_name=certificatePolicies, oid=2.5.29.32, critical=F, value=Policy: 1.2.840.113635.100.5.11.4\x0a User Notice:\x0a Explicit Text: Reliance on this certificate by any party assumes acceptance of any applicable terms and conditions of use and/or certification practice statements.\x0a CPS: http://www.apple.com/certificateauthority/rpa\x0a], [name=X509v3 CRL Distribution Points, short_name=crlDistributionPoints, oid=2.5.29.31, critical=F, value=\x0aFull Name:\x0a URI:http://crl.apple.com/appleistca2g1.crl\x0a], [name=X509v3 Key Usage, short_name=keyUsage, oid=2.5.29.15, critical=T, value=Digital Signature, Key Encipherment], [name=X509v3 Extended Key Usage, short_name=extendedKeyUsage, oid=2.5.29.37, critical=F, value=TLS Web Server Authentication, TLS Web Client Authentication], [name=X509v3 Subject Alternative Name, short_name=subjectAltName, oid=2.5.29.17, critical=F, value=DNS:*.icloud.com]], san=[dns=[*.icloud.com], uri=, email=, ip=, other_fields=F], basic_constraints=[ca=F, path_len=]], extracted=, extracted_cutoff=, extracted_size=], [ts=1437831799.764576, fuid=Fxp53s3wA5G3zdEJg8, tx_hosts={\x0a\x0917.167.150.73\x0a}, rx_hosts={\x0a\x09192.168.133.100\x0a}, conn_uids={\x0aC3eiCBGOLw3VtHfOj\x0a}, source=SSL, depth=0, analyzers={\x0aMD5,\x0aSHA1,\x0aX509\x0a}, mime_type=application/x-x509-ca-cert, filename=, duration=0 secs, local_orig=, is_orig=F, seen_bytes=1092, total_bytes=, missing_bytes=0, overflow_bytes=0, timedout=F, parent_fuid=, md5=48f0e38385112eeca5fc9ffd402eaecd, sha1=8e8321ca08b08e3726fe1d82996884eeb5f0d655, sha256=, x509=[ts=1437831799.764576, id=Fxp53s3wA5G3zdEJg8, certificate=[version=3, serial=023A74, subject=C=US,O=Apple Inc.,OU=Certification Authority,CN=Apple IST CA 2 - G1, issuer=CN=GeoTrust Global CA,O=GeoTrust Inc.,C=US, cn=Apple IST CA 2 - G1, not_valid_before=1402933322.0, not_valid_after=1653061322.0, key_alg=rsaEncryption, sig_alg=sha256WithRSAEncryption, key_type=rsa, key_length=2048, exponent=65537, curve=], handle=, extensions=[[name=X509v3 Authority Key Identifier, short_name=authorityKeyIdentifier, oid=2.5.29.35, critical=F, value=keyid:C0:7A:98:68:8D:89:FB:AB:05:64:0C:11:7D:AA:7D:65:B8:CA:CC:4E\x0a], [name=X509v3 Subject Key Identifier, short_name=subjectKeyIdentifier, oid=2.5.29.14, critical=F, value=D8:7A:94:44:7C:90:70:90:16:9E:DD:17:9C:01:44:03:86:D6:2A:29], [name=X509v3 Basic Constraints, short_name=basicConstraints, oid=2.5.29.19, critical=T, value=CA:TRUE, pathlen:0], [name=X509v3 Key Usage, short_name=keyUsage, oid=2.5.29.15, critical=T, value=Certificate Sign, CRL Sign], [name=X509v3 CRL Distribution Points, short_name=crlDistributionPoints, oid=2.5.29.31, critical=F, value=\x0aFull Name:\x0a URI:http://g.symcb.com/crls/gtglobal.crl\x0a], [name=Authority Information Access, short_name=authorityInfoAccess, oid=1.3.6.1.5.5.7.1.1, critical=F, value=OCSP - URI:http://g.symcd.com\x0a], [name=X509v3 Certificate Policies, short_name=certificatePolicies, oid=2.5.29.32, critical=F, value=Policy: 2.16.840.1.113733.1.7.54\x0a CPS: http://www.geotrust.com/resources/cps\x0a]], san=, basic_constraints=[ca=T, path_len=0]], extracted=, extracted_cutoff=, extracted_size=]], cert_chain_fuids=[F1vce92FT1oRjKI328, Fxp53s3wA5G3zdEJg8], client_cert_chain=[], client_cert_chain_fuids=[], subject=C=US,ST=California,O=Apple Inc.,OU=management:idms.group.506364,CN=*.icloud.com, issuer=C=US,O=Apple Inc.,OU=Certification Authority,CN=Apple IST CA 2 - G1, client_subject=, client_issuer=, server_depth=0, client_depth=0], http=, http_state=, irc=, krb=, modbus=, mysql=, ntlm=, radius=, rdp=, rfb=, sip=, sip_state=, snmp=, smb_state=, smtp=, smtp_state=, socks=, ssh=, syslog=] -1437831800.217854 bro_done +1437831800.217854 zeek_done 1437831800.217854 ChecksumOffloading::check diff --git a/testing/btest/bifs/all_set.bro b/testing/btest/bifs/all_set.bro index 56f7b6e7f2..86a56ed9fa 100644 --- a/testing/btest/bifs/all_set.bro +++ b/testing/btest/bifs/all_set.bro @@ -2,7 +2,7 @@ # @TEST-EXEC: bro -b %INPUT >out # @TEST-EXEC: btest-diff out -event bro_init() +event zeek_init() { local a = vector( T, F, T ); print all_set(a); diff --git a/testing/btest/bifs/analyzer_name.bro b/testing/btest/bifs/analyzer_name.bro index 266d1c159f..b763aabe08 100644 --- a/testing/btest/bifs/analyzer_name.bro +++ b/testing/btest/bifs/analyzer_name.bro @@ -2,7 +2,7 @@ # @TEST-EXEC: bro -b %INPUT >out # @TEST-EXEC: btest-diff out -event bro_init() +event zeek_init() { local a = Analyzer::ANALYZER_PIA_TCP; print Analyzer::name(a); diff --git a/testing/btest/bifs/any_set.bro b/testing/btest/bifs/any_set.bro index b3e9e3c711..e19a467206 100644 --- a/testing/btest/bifs/any_set.bro +++ b/testing/btest/bifs/any_set.bro @@ -2,7 +2,7 @@ # @TEST-EXEC: bro -b %INPUT >out # @TEST-EXEC: btest-diff out -event bro_init() +event zeek_init() { local a = vector( F, T, F ); print any_set(a); diff --git a/testing/btest/bifs/bloomfilter-seed.bro b/testing/btest/bifs/bloomfilter-seed.bro index 436638e2af..24531de915 100644 --- a/testing/btest/bifs/bloomfilter-seed.bro +++ b/testing/btest/bifs/bloomfilter-seed.bro @@ -34,7 +34,7 @@ function test_bloom_filter() } -event bro_init() +event zeek_init() { test_bloom_filter(); } diff --git a/testing/btest/bifs/bloomfilter.bro b/testing/btest/bifs/bloomfilter.bro index c0ccc2a552..dbad5acf5a 100644 --- a/testing/btest/bifs/bloomfilter.bro +++ b/testing/btest/bifs/bloomfilter.bro @@ -88,7 +88,7 @@ function test_counting_bloom_filter() print bloomfilter_lookup(bf_merged, "baz"); } -event bro_init() +event zeek_init() { test_basic_bloom_filter(); test_counting_bloom_filter(); diff --git a/testing/btest/bifs/bro_version.bro b/testing/btest/bifs/bro_version.bro index 35975559a5..f4de22e09d 100644 --- a/testing/btest/bifs/bro_version.bro +++ b/testing/btest/bifs/bro_version.bro @@ -1,7 +1,7 @@ # # @TEST-EXEC: bro -b %INPUT -event bro_init() +event zeek_init() { local a = bro_version(); if ( |a| == 0 ) diff --git a/testing/btest/bifs/bytestring_to_count.bro b/testing/btest/bifs/bytestring_to_count.bro index db50929cb7..5d15bde38b 100644 --- a/testing/btest/bifs/bytestring_to_count.bro +++ b/testing/btest/bifs/bytestring_to_count.bro @@ -3,7 +3,7 @@ # @TEST-EXEC: btest-diff out -event bro_init() +event zeek_init() { # unsupported byte lengths diff --git a/testing/btest/bifs/bytestring_to_double.bro b/testing/btest/bifs/bytestring_to_double.bro index 78820b207c..6ebcbe503b 100644 --- a/testing/btest/bifs/bytestring_to_double.bro +++ b/testing/btest/bifs/bytestring_to_double.bro @@ -2,7 +2,7 @@ # @TEST-EXEC: bro -b %INPUT >out # @TEST-EXEC: btest-diff out -event bro_init() +event zeek_init() { local s1 = "\x43\x26\x4f\xa0\x71\x30\x80\x00"; # 3.14e15 local s2 = "\xc3\x26\x4f\xa0\x71\x30\x80\x00"; #-3.14e15 diff --git a/testing/btest/bifs/bytestring_to_hexstr.bro b/testing/btest/bifs/bytestring_to_hexstr.bro index 4087047f40..0b3e8154ab 100644 --- a/testing/btest/bifs/bytestring_to_hexstr.bro +++ b/testing/btest/bifs/bytestring_to_hexstr.bro @@ -2,7 +2,7 @@ # @TEST-EXEC: bro -b %INPUT >out # @TEST-EXEC: btest-diff out -event bro_init() +event zeek_init() { print bytestring_to_hexstr("04"); print bytestring_to_hexstr(""); diff --git a/testing/btest/bifs/capture_state_updates.bro b/testing/btest/bifs/capture_state_updates.bro index 6a44e0f86f..17d015a661 100644 --- a/testing/btest/bifs/capture_state_updates.bro +++ b/testing/btest/bifs/capture_state_updates.bro @@ -3,7 +3,7 @@ # @TEST-EXEC: btest-diff out # @TEST-EXEC: test -f testfile -event bro_init() +event zeek_init() { print capture_state_updates("testfile"); } diff --git a/testing/btest/bifs/cat.bro b/testing/btest/bifs/cat.bro index e923d5d066..5e811f147e 100644 --- a/testing/btest/bifs/cat.bro +++ b/testing/btest/bifs/cat.bro @@ -2,7 +2,7 @@ # @TEST-EXEC: bro -b %INPUT >out # @TEST-EXEC: btest-diff out -event bro_init() +event zeek_init() { local a = "foo"; local b = 3; diff --git a/testing/btest/bifs/cat_string_array.bro b/testing/btest/bifs/cat_string_array.bro index e799f4b282..f9aa3f266d 100644 --- a/testing/btest/bifs/cat_string_array.bro +++ b/testing/btest/bifs/cat_string_array.bro @@ -2,7 +2,7 @@ # @TEST-EXEC: bro -b %INPUT >out # @TEST-EXEC: btest-diff out -event bro_init() +event zeek_init() { local a: string_array = { [0] = "this", [1] = "is", [2] = "a", [3] = "test" diff --git a/testing/btest/bifs/check_subnet.bro b/testing/btest/bifs/check_subnet.bro index b725cae73c..d476be1bc8 100644 --- a/testing/btest/bifs/check_subnet.bro +++ b/testing/btest/bifs/check_subnet.bro @@ -30,7 +30,7 @@ function check_member(s: subnet) } -event bro_init() +event zeek_init() { check_member(10.2.0.2/32); check_member(10.2.0.2/31); diff --git a/testing/btest/bifs/checkpoint_state.bro b/testing/btest/bifs/checkpoint_state.bro index 7a46516ba0..e9eeeccb75 100644 --- a/testing/btest/bifs/checkpoint_state.bro +++ b/testing/btest/bifs/checkpoint_state.bro @@ -2,7 +2,7 @@ # @TEST-EXEC: bro -b %INPUT # @TEST-EXEC: test -f .state/state.bst -event bro_init() +event zeek_init() { local a = checkpoint_state(); if ( a != T ) diff --git a/testing/btest/bifs/clear_table.bro b/testing/btest/bifs/clear_table.bro index 9485eba1f5..a6c2e67341 100644 --- a/testing/btest/bifs/clear_table.bro +++ b/testing/btest/bifs/clear_table.bro @@ -2,7 +2,7 @@ # @TEST-EXEC: bro -b %INPUT > out # @TEST-EXEC: btest-diff out -event bro_init() +event zeek_init() { local mytable: table[string] of string = { ["key1"] = "val1" }; diff --git a/testing/btest/bifs/convert_for_pattern.bro b/testing/btest/bifs/convert_for_pattern.bro index b99b010f97..1828284f37 100644 --- a/testing/btest/bifs/convert_for_pattern.bro +++ b/testing/btest/bifs/convert_for_pattern.bro @@ -2,7 +2,7 @@ # @TEST-EXEC: bro -b %INPUT >out # @TEST-EXEC: btest-diff out -event bro_init() +event zeek_init() { print convert_for_pattern("foo"); print convert_for_pattern(""); diff --git a/testing/btest/bifs/count_to_addr.bro b/testing/btest/bifs/count_to_addr.bro index 993a701bc8..4abbaf8d1e 100644 --- a/testing/btest/bifs/count_to_addr.bro +++ b/testing/btest/bifs/count_to_addr.bro @@ -2,7 +2,7 @@ # @TEST-EXEC: bro -b %INPUT >out # @TEST-EXEC: btest-diff out -event bro_init() +event zeek_init() { local a = "1"; print count_to_v4_addr(to_count(a)); diff --git a/testing/btest/bifs/create_file.bro b/testing/btest/bifs/create_file.bro index af2cfb4979..db7d38d087 100644 --- a/testing/btest/bifs/create_file.bro +++ b/testing/btest/bifs/create_file.bro @@ -5,7 +5,7 @@ # @TEST-EXEC: btest-diff testfile2 # @TEST-EXEC: test -f testdir/testfile4 -event bro_init() +event zeek_init() { # Test that creating a file works as expected local a = open("testfile"); diff --git a/testing/btest/bifs/current_analyzer.bro b/testing/btest/bifs/current_analyzer.bro index e221d7aed0..8678907320 100644 --- a/testing/btest/bifs/current_analyzer.bro +++ b/testing/btest/bifs/current_analyzer.bro @@ -1,7 +1,7 @@ # # @TEST-EXEC: bro -b %INPUT -event bro_init() +event zeek_init() { local a = current_analyzer(); if ( a != 0 ) diff --git a/testing/btest/bifs/current_time.bro b/testing/btest/bifs/current_time.bro index 9d4899aa06..4d2712ae98 100644 --- a/testing/btest/bifs/current_time.bro +++ b/testing/btest/bifs/current_time.bro @@ -1,7 +1,7 @@ # # @TEST-EXEC: bro -b %INPUT -event bro_init() +event zeek_init() { local a = current_time(); if ( a <= double_to_time(0) ) diff --git a/testing/btest/bifs/directory_operations.bro b/testing/btest/bifs/directory_operations.bro index 9db34511b2..0a5a8b0413 100644 --- a/testing/btest/bifs/directory_operations.bro +++ b/testing/btest/bifs/directory_operations.bro @@ -2,7 +2,7 @@ # @TEST-EXEC: bro -b %INPUT >out # @TEST-EXEC: btest-diff out -event bro_init() +event zeek_init() { # Test succesful operations... print mkdir("testdir"); diff --git a/testing/btest/bifs/edit.bro b/testing/btest/bifs/edit.bro index 346c0bdbf7..ba6ebdef38 100644 --- a/testing/btest/bifs/edit.bro +++ b/testing/btest/bifs/edit.bro @@ -2,7 +2,7 @@ # @TEST-EXEC: bro -b %INPUT >out # @TEST-EXEC: btest-diff out -event bro_init() +event zeek_init() { local a = "hello there"; diff --git a/testing/btest/bifs/enable_raw_output.test b/testing/btest/bifs/enable_raw_output.test index ebaff36c8f..14bd2110ee 100644 --- a/testing/btest/bifs/enable_raw_output.test +++ b/testing/btest/bifs/enable_raw_output.test @@ -6,7 +6,7 @@ # @TEST-EXEC: btest-diff output # @TEST-EXEC: cmp myfile hookfile -event bro_init() +event zeek_init() { local myfile: file; myfile = open("myfile"); diff --git a/testing/btest/bifs/entropy_test.bro b/testing/btest/bifs/entropy_test.bro index 2a2dd422d1..11effd1159 100644 --- a/testing/btest/bifs/entropy_test.bro +++ b/testing/btest/bifs/entropy_test.bro @@ -2,7 +2,7 @@ # @TEST-EXEC: bro -b %INPUT >out # @TEST-EXEC: btest-diff out -event bro_init() +event zeek_init() { local a = "dh3Hie02uh^s#Sdf9L3frd243h$d78r2G4cM6*Q05d(7rh46f!0|4-f"; local handle = entropy_test_init(); diff --git a/testing/btest/bifs/enum_to_int.bro b/testing/btest/bifs/enum_to_int.bro index 3d577d2920..b48c925c8f 100644 --- a/testing/btest/bifs/enum_to_int.bro +++ b/testing/btest/bifs/enum_to_int.bro @@ -16,7 +16,7 @@ export { }; } -event bro_init() +event zeek_init() { diff --git a/testing/btest/bifs/escape_string.bro b/testing/btest/bifs/escape_string.bro index fd796497be..4ae79a869a 100644 --- a/testing/btest/bifs/escape_string.bro +++ b/testing/btest/bifs/escape_string.bro @@ -2,7 +2,7 @@ # @TEST-EXEC: bro -b %INPUT >out # @TEST-EXEC: btest-diff out -event bro_init() +event zeek_init() { local a = "Test \0string"; diff --git a/testing/btest/bifs/exit.bro b/testing/btest/bifs/exit.bro index b942a5e81c..03ea13efd3 100644 --- a/testing/btest/bifs/exit.bro +++ b/testing/btest/bifs/exit.bro @@ -2,7 +2,7 @@ # @TEST-EXEC: bro -b %INPUT >out || test $? -eq 7 # @TEST-EXEC: btest-diff out -event bro_init() +event zeek_init() { print "hello"; exit(7); diff --git a/testing/btest/bifs/file_mode.bro b/testing/btest/bifs/file_mode.bro index 62bee05c6c..de43439080 100644 --- a/testing/btest/bifs/file_mode.bro +++ b/testing/btest/bifs/file_mode.bro @@ -2,7 +2,7 @@ # @TEST-EXEC: bro -b %INPUT >out # @TEST-EXEC: btest-diff out -event bro_init() +event zeek_init() { local a = 420; # octal: 0644 print file_mode(a); diff --git a/testing/btest/bifs/filter_subnet_table.bro b/testing/btest/bifs/filter_subnet_table.bro index 7659096a71..79829bc252 100644 --- a/testing/btest/bifs/filter_subnet_table.bro +++ b/testing/btest/bifs/filter_subnet_table.bro @@ -32,7 +32,7 @@ global testb: table[subnet] of string = { }; -event bro_init() +event zeek_init() { local c = filter_subnet_table(10.2.0.2/32, testa); print c; diff --git a/testing/btest/bifs/find_all.bro b/testing/btest/bifs/find_all.bro index 4fe451a9d4..cb7e7b35d0 100644 --- a/testing/btest/bifs/find_all.bro +++ b/testing/btest/bifs/find_all.bro @@ -2,7 +2,7 @@ # @TEST-EXEC: bro -b %INPUT >out # @TEST-EXEC: btest-diff out -event bro_init() +event zeek_init() { local a = "this is a test"; local pat = /hi|es/; diff --git a/testing/btest/bifs/find_entropy.bro b/testing/btest/bifs/find_entropy.bro index 2eb24fe118..771a6221f7 100644 --- a/testing/btest/bifs/find_entropy.bro +++ b/testing/btest/bifs/find_entropy.bro @@ -2,7 +2,7 @@ # @TEST-EXEC: bro -b %INPUT >out # @TEST-EXEC: btest-diff out -event bro_init() +event zeek_init() { local a = "dh3Hie02uh^s#Sdf9L3frd243h$d78r2G4cM6*Q05d(7rh46f!0|4-f"; local b = "0011000aaabbbbcccc000011111000000000aaaabbbbcccc0000000"; diff --git a/testing/btest/bifs/find_last.bro b/testing/btest/bifs/find_last.bro index 00ae2a874d..0eab201464 100644 --- a/testing/btest/bifs/find_last.bro +++ b/testing/btest/bifs/find_last.bro @@ -2,7 +2,7 @@ # @TEST-EXEC: bro -b %INPUT >out # @TEST-EXEC: btest-diff out -event bro_init() +event zeek_init() { local a = "this is a test"; local pat = /hi|es/; diff --git a/testing/btest/bifs/fmt.bro b/testing/btest/bifs/fmt.bro index 7fc4dc38d7..979dbafe67 100644 --- a/testing/btest/bifs/fmt.bro +++ b/testing/btest/bifs/fmt.bro @@ -4,7 +4,7 @@ type color: enum { Red, Blue }; -event bro_init() +event zeek_init() { local a = Blue; local b = vector( 1, 2, 3); diff --git a/testing/btest/bifs/fmt_ftp_port.bro b/testing/btest/bifs/fmt_ftp_port.bro index 6a7b4d20c7..b265c0ad67 100644 --- a/testing/btest/bifs/fmt_ftp_port.bro +++ b/testing/btest/bifs/fmt_ftp_port.bro @@ -2,7 +2,7 @@ # @TEST-EXEC: bro -b %INPUT >out # @TEST-EXEC: btest-diff out -event bro_init() +event zeek_init() { local a = 192.168.0.2; local b = 257/tcp; diff --git a/testing/btest/bifs/get_matcher_stats.bro b/testing/btest/bifs/get_matcher_stats.bro index eeaa8cb86a..76d019caca 100644 --- a/testing/btest/bifs/get_matcher_stats.bro +++ b/testing/btest/bifs/get_matcher_stats.bro @@ -10,7 +10,7 @@ signature my_ftp_client { } @TEST-END-FILE -event bro_init() +event zeek_init() { local a = get_matcher_stats(); if ( a$matchers == 0 ) diff --git a/testing/btest/bifs/get_port_transport_proto.bro b/testing/btest/bifs/get_port_transport_proto.bro index ae3c496d88..18dfdd4974 100644 --- a/testing/btest/bifs/get_port_transport_proto.bro +++ b/testing/btest/bifs/get_port_transport_proto.bro @@ -2,7 +2,7 @@ # @TEST-EXEC: bro -b %INPUT >out # @TEST-EXEC: btest-diff out -event bro_init() +event zeek_init() { local a = 123/tcp; local b = 123/udp; diff --git a/testing/btest/bifs/gethostname.bro b/testing/btest/bifs/gethostname.bro index 1d760525cb..b30407190d 100644 --- a/testing/btest/bifs/gethostname.bro +++ b/testing/btest/bifs/gethostname.bro @@ -1,7 +1,7 @@ # # @TEST-EXEC: bro -b %INPUT -event bro_init() +event zeek_init() { local a = gethostname(); if ( |a| == 0 ) diff --git a/testing/btest/bifs/getpid.bro b/testing/btest/bifs/getpid.bro index 1852b1287e..a7348d4743 100644 --- a/testing/btest/bifs/getpid.bro +++ b/testing/btest/bifs/getpid.bro @@ -1,7 +1,7 @@ # # @TEST-EXEC: bro -b %INPUT -event bro_init() +event zeek_init() { local a = getpid(); if ( a == 0 ) diff --git a/testing/btest/bifs/getsetenv.bro b/testing/btest/bifs/getsetenv.bro index d217a14ea9..24fecb7800 100644 --- a/testing/btest/bifs/getsetenv.bro +++ b/testing/btest/bifs/getsetenv.bro @@ -2,7 +2,7 @@ # @TEST-EXEC: TESTBRO=testvalue bro -b %INPUT >out # @TEST-EXEC: btest-diff out -event bro_init() +event zeek_init() { local a = getenv("NOTDEFINED"); local b = getenv("TESTBRO"); diff --git a/testing/btest/bifs/global_ids.bro b/testing/btest/bifs/global_ids.bro index 2dcb6e844d..a6d7b306cb 100644 --- a/testing/btest/bifs/global_ids.bro +++ b/testing/btest/bifs/global_ids.bro @@ -2,7 +2,7 @@ # @TEST-EXEC: bro -b %INPUT >out # @TEST-EXEC: btest-diff out -event bro_init() +event zeek_init() { local a = global_ids(); for ( i in a ) diff --git a/testing/btest/bifs/global_sizes.bro b/testing/btest/bifs/global_sizes.bro index 4b0805172c..1eb2abbd87 100644 --- a/testing/btest/bifs/global_sizes.bro +++ b/testing/btest/bifs/global_sizes.bro @@ -2,7 +2,7 @@ # @TEST-EXEC: bro -b %INPUT >out # @TEST-EXEC: btest-diff out -event bro_init() +event zeek_init() { local a = global_sizes(); for ( i in a ) diff --git a/testing/btest/bifs/haversine_distance.bro b/testing/btest/bifs/haversine_distance.bro index b0a87a2c2d..0d2e7891c0 100644 --- a/testing/btest/bifs/haversine_distance.bro +++ b/testing/btest/bifs/haversine_distance.bro @@ -7,7 +7,7 @@ function test(la1: double, lo1: double, la2: double, lo2: double) print fmt("%.4e", haversine_distance(la1, lo1, la2, lo2)); } -event bro_init() +event zeek_init() { # Test two arbitrary locations. test(37.866798, -122.253601, 48.25, 11.65); diff --git a/testing/btest/bifs/hexdump.bro b/testing/btest/bifs/hexdump.bro index 1c86ce0db8..10e1855a19 100644 --- a/testing/btest/bifs/hexdump.bro +++ b/testing/btest/bifs/hexdump.bro @@ -2,7 +2,7 @@ # @TEST-EXEC: bro -b %INPUT >out # @TEST-EXEC: btest-diff out -event bro_init() +event zeek_init() { local a = "abc\xffdefghijklmnopqrstuvwxyz"; diff --git a/testing/btest/bifs/hexstr_to_bytestring.bro b/testing/btest/bifs/hexstr_to_bytestring.bro index f0815a6269..0d41ca00a1 100644 --- a/testing/btest/bifs/hexstr_to_bytestring.bro +++ b/testing/btest/bifs/hexstr_to_bytestring.bro @@ -3,7 +3,7 @@ # @TEST-EXEC: btest-diff out # @TEST-EXEC: btest-diff .stderr -event bro_init() +event zeek_init() { print hexstr_to_bytestring("3034"); print hexstr_to_bytestring(""); diff --git a/testing/btest/bifs/hll_cardinality.bro b/testing/btest/bifs/hll_cardinality.bro index d1b0807416..6bb9c83708 100644 --- a/testing/btest/bifs/hll_cardinality.bro +++ b/testing/btest/bifs/hll_cardinality.bro @@ -3,7 +3,7 @@ # @TEST-EXEC: btest-diff out # @TEST-EXEC: btest-diff .stderr -event bro_init() +event zeek_init() { local c1 = hll_cardinality_init(0.01, 0.95); local c2 = hll_cardinality_init(0.01, 0.95); diff --git a/testing/btest/bifs/hll_large_estimate.bro b/testing/btest/bifs/hll_large_estimate.bro index b17b50678d..520b9633e3 100644 --- a/testing/btest/bifs/hll_large_estimate.bro +++ b/testing/btest/bifs/hll_large_estimate.bro @@ -6,7 +6,7 @@ # @TEST-EXEC: head -n1 out2 >> out # @TEST-EXEC: btest-diff out -event bro_init() +event zeek_init() { local cp: opaque of cardinality = hll_cardinality_init(0.1, 1.0); local base: count = 2130706432; # 127.0.0.0 diff --git a/testing/btest/bifs/identify_data.bro b/testing/btest/bifs/identify_data.bro index 048c409553..283c50fc86 100644 --- a/testing/btest/bifs/identify_data.bro +++ b/testing/btest/bifs/identify_data.bro @@ -2,7 +2,7 @@ # @TEST-EXEC: bro -b %INPUT | sed 's/; charset=.*//g' >out # @TEST-EXEC: btest-diff out -event bro_init() +event zeek_init() { # plain text local a = "This is a test"; diff --git a/testing/btest/bifs/install_src_addr_filter.test b/testing/btest/bifs/install_src_addr_filter.test index 5b387832de..0ee0c85c43 100644 --- a/testing/btest/bifs/install_src_addr_filter.test +++ b/testing/btest/bifs/install_src_addr_filter.test @@ -1,7 +1,7 @@ # @TEST-EXEC: bro -C -r $TRACES/wikipedia.trace %INPUT >output # @TEST-EXEC: btest-diff output -event bro_init() +event zeek_init() { install_src_addr_filter(141.142.220.118, TH_SYN, 100.0); } diff --git a/testing/btest/bifs/is_ascii.bro b/testing/btest/bifs/is_ascii.bro index fa2d39d2d8..7930dafa58 100644 --- a/testing/btest/bifs/is_ascii.bro +++ b/testing/btest/bifs/is_ascii.bro @@ -2,7 +2,7 @@ # @TEST-EXEC: bro -b %INPUT >out # @TEST-EXEC: btest-diff out -event bro_init() +event zeek_init() { local a = "this is a test\xfe"; local b = "this is a test\x7f"; diff --git a/testing/btest/bifs/is_local_interface.bro b/testing/btest/bifs/is_local_interface.bro index ac21b04bd3..8667babb85 100644 --- a/testing/btest/bifs/is_local_interface.bro +++ b/testing/btest/bifs/is_local_interface.bro @@ -2,7 +2,7 @@ # @TEST-EXEC: bro -b %INPUT >out # @TEST-EXEC: btest-diff out -event bro_init() +event zeek_init() { print is_local_interface(127.0.0.1); print is_local_interface(1.2.3.4); diff --git a/testing/btest/bifs/is_port.bro b/testing/btest/bifs/is_port.bro index 2fe4964913..709c142070 100644 --- a/testing/btest/bifs/is_port.bro +++ b/testing/btest/bifs/is_port.bro @@ -2,7 +2,7 @@ # @TEST-EXEC: bro -b %INPUT >out # @TEST-EXEC: btest-diff out -event bro_init() +event zeek_init() { local a = 123/tcp; local b = 123/udp; diff --git a/testing/btest/bifs/join_string.bro b/testing/btest/bifs/join_string.bro index 0b2d94029a..1ea1afa5c2 100644 --- a/testing/btest/bifs/join_string.bro +++ b/testing/btest/bifs/join_string.bro @@ -2,7 +2,7 @@ # @TEST-EXEC: bro -b %INPUT >out # @TEST-EXEC: btest-diff out -event bro_init() +event zeek_init() { local a: string_array = { [1] = "this", [2] = "is", [3] = "a", [4] = "test" diff --git a/testing/btest/bifs/levenshtein_distance.bro b/testing/btest/bifs/levenshtein_distance.bro index 86d5e386f4..b877a68a22 100644 --- a/testing/btest/bifs/levenshtein_distance.bro +++ b/testing/btest/bifs/levenshtein_distance.bro @@ -2,7 +2,7 @@ # @TEST-EXEC: bro -b %INPUT >out # @TEST-EXEC: btest-diff out -event bro_init() +event zeek_init() { local a = "this is a string"; local b = "this is a tring"; diff --git a/testing/btest/bifs/lookup_ID.bro b/testing/btest/bifs/lookup_ID.bro index e263c192da..94e7bf0180 100644 --- a/testing/btest/bifs/lookup_ID.bro +++ b/testing/btest/bifs/lookup_ID.bro @@ -4,7 +4,7 @@ global a = "bro test"; -event bro_init() +event zeek_init() { local b = "local value"; diff --git a/testing/btest/bifs/lowerupper.bro b/testing/btest/bifs/lowerupper.bro index 77e6b1c9d1..2cb04bfdaa 100644 --- a/testing/btest/bifs/lowerupper.bro +++ b/testing/btest/bifs/lowerupper.bro @@ -2,7 +2,7 @@ # @TEST-EXEC: bro -b %INPUT >out # @TEST-EXEC: btest-diff out -event bro_init() +event zeek_init() { local a = "this is a Test"; diff --git a/testing/btest/bifs/matching_subnets.bro b/testing/btest/bifs/matching_subnets.bro index 87effed19f..3d38d32182 100644 --- a/testing/btest/bifs/matching_subnets.bro +++ b/testing/btest/bifs/matching_subnets.bro @@ -16,7 +16,7 @@ global testt: set[subnet] = { [2607:f8b0:4007:807::200e]/128 }; -event bro_init() +event zeek_init() { print testt; local c = matching_subnets(10.2.0.2/32, testt); diff --git a/testing/btest/bifs/math.bro b/testing/btest/bifs/math.bro index 84ace8620c..288838ffc1 100644 --- a/testing/btest/bifs/math.bro +++ b/testing/btest/bifs/math.bro @@ -2,7 +2,7 @@ # @TEST-EXEC: bro -b %INPUT >out # @TEST-EXEC: btest-diff out -event bro_init() +event zeek_init() { local a = 3.14; local b = 2.71; diff --git a/testing/btest/bifs/merge_pattern.bro b/testing/btest/bifs/merge_pattern.bro index de4a3afd6a..2d99137b56 100644 --- a/testing/btest/bifs/merge_pattern.bro +++ b/testing/btest/bifs/merge_pattern.bro @@ -2,7 +2,7 @@ # @TEST-EXEC: bro -b %INPUT >out # @TEST-EXEC: btest-diff out -event bro_init() +event zeek_init() { local a = /foo/; local b = /b[a-z]+/; diff --git a/testing/btest/bifs/net_stats_trace.test b/testing/btest/bifs/net_stats_trace.test index cd9ee52a27..1cc1ba5567 100644 --- a/testing/btest/bifs/net_stats_trace.test +++ b/testing/btest/bifs/net_stats_trace.test @@ -2,7 +2,7 @@ # @TEST-EXEC: bro -r $TRACES/wikipedia.trace >output %INPUT # @TEST-EXEC: btest-diff output -event bro_done() +event zeek_done() { print get_net_stats(); } diff --git a/testing/btest/bifs/netbios-functions.bro b/testing/btest/bifs/netbios-functions.bro index 9b075e8729..8e65f1d5ec 100644 --- a/testing/btest/bifs/netbios-functions.bro +++ b/testing/btest/bifs/netbios-functions.bro @@ -2,7 +2,7 @@ # @TEST-EXEC: bro -b %INPUT >out # @TEST-EXEC: btest-diff out -event bro_init() +event zeek_init() { local names_to_decode = set( "ejfdebfeebfacacacacacacacacacaaa", # ISATAP diff --git a/testing/btest/bifs/order.bro b/testing/btest/bifs/order.bro index cb4b050686..34c8e8c101 100644 --- a/testing/btest/bifs/order.bro +++ b/testing/btest/bifs/order.bro @@ -20,7 +20,7 @@ function myfunc2(a: double, b: double): int return 1; } -event bro_init() +event zeek_init() { # Tests without supplying a comparison function diff --git a/testing/btest/bifs/parse_ftp.bro b/testing/btest/bifs/parse_ftp.bro index a8993fa6e0..1e982def27 100644 --- a/testing/btest/bifs/parse_ftp.bro +++ b/testing/btest/bifs/parse_ftp.bro @@ -2,7 +2,7 @@ # @TEST-EXEC: bro -b %INPUT >out # @TEST-EXEC: btest-diff out -event bro_init() +event zeek_init() { print parse_ftp_port("192,168,0,2,1,1"); diff --git a/testing/btest/bifs/rand.bro b/testing/btest/bifs/rand.bro index caf3f16031..591f0bf035 100644 --- a/testing/btest/bifs/rand.bro +++ b/testing/btest/bifs/rand.bro @@ -6,7 +6,7 @@ const do_seed = T &redef; -event bro_init() +event zeek_init() { local a = rand(1000); local b = rand(1000); diff --git a/testing/btest/bifs/raw_bytes_to_v4_addr.bro b/testing/btest/bifs/raw_bytes_to_v4_addr.bro index bd685216ef..9ac266a0bd 100644 --- a/testing/btest/bifs/raw_bytes_to_v4_addr.bro +++ b/testing/btest/bifs/raw_bytes_to_v4_addr.bro @@ -2,7 +2,7 @@ # @TEST-EXEC: bro -b %INPUT >out # @TEST-EXEC: btest-diff out -event bro_init() +event zeek_init() { print raw_bytes_to_v4_addr("ABCD"); print raw_bytes_to_v4_addr("ABC"); diff --git a/testing/btest/bifs/reading_traces.bro b/testing/btest/bifs/reading_traces.bro index 46ad04c25f..e6fa21999e 100644 --- a/testing/btest/bifs/reading_traces.bro +++ b/testing/btest/bifs/reading_traces.bro @@ -4,7 +4,7 @@ # @TEST-EXEC: bro -r $TRACES/web.trace %INPUT >out2 # @TEST-EXEC: btest-diff out2 -event bro_init() +event zeek_init() { print reading_traces(); } diff --git a/testing/btest/bifs/record_type_to_vector.bro b/testing/btest/bifs/record_type_to_vector.bro index 9795ce886b..e5e79a4f49 100644 --- a/testing/btest/bifs/record_type_to_vector.bro +++ b/testing/btest/bifs/record_type_to_vector.bro @@ -7,7 +7,7 @@ type myrecord: record { str1: string; }; -event bro_init() +event zeek_init() { print record_type_to_vector("myrecord"); } diff --git a/testing/btest/bifs/records_fields.bro b/testing/btest/bifs/records_fields.bro index 88df239b57..a130a63267 100644 --- a/testing/btest/bifs/records_fields.bro +++ b/testing/btest/bifs/records_fields.bro @@ -24,7 +24,7 @@ type r: record { type mystring: string; -event bro_init() +event zeek_init() { local x: r = [$a=42, $d="Bar", $e=tt]; print x; diff --git a/testing/btest/bifs/resize.bro b/testing/btest/bifs/resize.bro index f4067f31c7..97c3b8c20b 100644 --- a/testing/btest/bifs/resize.bro +++ b/testing/btest/bifs/resize.bro @@ -2,7 +2,7 @@ # @TEST-EXEC: bro -b %INPUT >out # @TEST-EXEC: btest-diff out -event bro_init() +event zeek_init() { local a = vector( 5, 3, 8 ); diff --git a/testing/btest/bifs/reverse.bro b/testing/btest/bifs/reverse.bro index bbb386bb80..b6831ef3a7 100644 --- a/testing/btest/bifs/reverse.bro +++ b/testing/btest/bifs/reverse.bro @@ -2,7 +2,7 @@ # @TEST-EXEC: bro -b %INPUT >out # @TEST-EXEC: btest-diff out -event bro_init() +event zeek_init() { local s1 = "hello world!"; local s2 = "rise to vote sir"; diff --git a/testing/btest/bifs/rotate_file.bro b/testing/btest/bifs/rotate_file.bro index a6109ff677..a7c3bf3971 100644 --- a/testing/btest/bifs/rotate_file.bro +++ b/testing/btest/bifs/rotate_file.bro @@ -2,7 +2,7 @@ # @TEST-EXEC: bro -b %INPUT >out # @TEST-EXEC: btest-diff out -event bro_init() +event zeek_init() { local a = open("testfile"); write_file(a, "this is a test\n"); diff --git a/testing/btest/bifs/rotate_file_by_name.bro b/testing/btest/bifs/rotate_file_by_name.bro index f647edefe2..b02d4011be 100644 --- a/testing/btest/bifs/rotate_file_by_name.bro +++ b/testing/btest/bifs/rotate_file_by_name.bro @@ -2,7 +2,7 @@ # @TEST-EXEC: bro -b %INPUT >out # @TEST-EXEC: btest-diff out -event bro_init() +event zeek_init() { local a = open("testfile"); write_file(a, "this is a test\n"); diff --git a/testing/btest/bifs/same_object.bro b/testing/btest/bifs/same_object.bro index dddfd80d3d..8e38912f58 100644 --- a/testing/btest/bifs/same_object.bro +++ b/testing/btest/bifs/same_object.bro @@ -2,7 +2,7 @@ # @TEST-EXEC: bro -b %INPUT >out # @TEST-EXEC: btest-diff out -event bro_init() +event zeek_init() { local a = "This is a test"; local b: string; diff --git a/testing/btest/bifs/sort.bro b/testing/btest/bifs/sort.bro index 2ddb44b8be..2f3789c8a9 100644 --- a/testing/btest/bifs/sort.bro +++ b/testing/btest/bifs/sort.bro @@ -20,7 +20,7 @@ function myfunc2(a: double, b: double): int return 1; } -event bro_init() +event zeek_init() { # Tests without supplying a comparison function diff --git a/testing/btest/bifs/sort_string_array.bro b/testing/btest/bifs/sort_string_array.bro index 1916f93d0c..3d3949d89b 100644 --- a/testing/btest/bifs/sort_string_array.bro +++ b/testing/btest/bifs/sort_string_array.bro @@ -2,7 +2,7 @@ # @TEST-EXEC: bro -b %INPUT >out # @TEST-EXEC: btest-diff out -event bro_init() +event zeek_init() { local a: string_array = { [1] = "this", [2] = "is", [3] = "a", [4] = "test" diff --git a/testing/btest/bifs/split.bro b/testing/btest/bifs/split.bro index b117844645..2485c3af1f 100644 --- a/testing/btest/bifs/split.bro +++ b/testing/btest/bifs/split.bro @@ -2,7 +2,7 @@ # @TEST-EXEC: bro -b %INPUT >out # @TEST-EXEC: btest-diff out -event bro_init() +event zeek_init() { local a = "this is a test"; local pat = /hi|es/; diff --git a/testing/btest/bifs/split_string.bro b/testing/btest/bifs/split_string.bro index e4d32b7f73..2f67921a04 100644 --- a/testing/btest/bifs/split_string.bro +++ b/testing/btest/bifs/split_string.bro @@ -8,7 +8,7 @@ function print_string_vector(v: string_vec) print v[i]; } -event bro_init() +event zeek_init() { local a = "this is a test"; local pat = /hi|es/; diff --git a/testing/btest/bifs/str_shell_escape.bro b/testing/btest/bifs/str_shell_escape.bro index e631458bc1..9079ef3953 100644 --- a/testing/btest/bifs/str_shell_escape.bro +++ b/testing/btest/bifs/str_shell_escape.bro @@ -2,7 +2,7 @@ # @TEST-EXEC: bro -b %INPUT >out # @TEST-EXEC: btest-diff out -event bro_init() +event zeek_init() { local a = "echo ${TEST} > \"my file\""; diff --git a/testing/btest/bifs/strcmp.bro b/testing/btest/bifs/strcmp.bro index 92d0430f1d..6893656e69 100644 --- a/testing/btest/bifs/strcmp.bro +++ b/testing/btest/bifs/strcmp.bro @@ -2,7 +2,7 @@ # @TEST-EXEC: bro -b %INPUT >out # @TEST-EXEC: btest-diff out -event bro_init() +event zeek_init() { local a = "this"; local b = "testing"; diff --git a/testing/btest/bifs/strftime.bro b/testing/btest/bifs/strftime.bro index 3d9e388c90..8a9f42d8b3 100644 --- a/testing/btest/bifs/strftime.bro +++ b/testing/btest/bifs/strftime.bro @@ -2,7 +2,7 @@ # @TEST-EXEC: bro -b %INPUT >out # @TEST-EXEC: btest-diff out -event bro_init() +event zeek_init() { local f1 = "%Y-%m-%d %H:%M:%S"; local f2 = "%H%M%S %Y%m%d"; diff --git a/testing/btest/bifs/string_fill.bro b/testing/btest/bifs/string_fill.bro index 0968215cc0..81a447ed47 100644 --- a/testing/btest/bifs/string_fill.bro +++ b/testing/btest/bifs/string_fill.bro @@ -2,7 +2,7 @@ # @TEST-EXEC: bro -b %INPUT >out # @TEST-EXEC: btest-diff out -event bro_init() +event zeek_init() { local a = "test "; diff --git a/testing/btest/bifs/string_to_pattern.bro b/testing/btest/bifs/string_to_pattern.bro index 4bd04bbcea..089cc3c557 100644 --- a/testing/btest/bifs/string_to_pattern.bro +++ b/testing/btest/bifs/string_to_pattern.bro @@ -2,7 +2,7 @@ # @TEST-EXEC: bro -b %INPUT >out # @TEST-EXEC: btest-diff out -event bro_init() +event zeek_init() { print string_to_pattern("foo", F); print string_to_pattern("", F); diff --git a/testing/btest/bifs/strip.bro b/testing/btest/bifs/strip.bro index e508f20e3d..ae80811a30 100644 --- a/testing/btest/bifs/strip.bro +++ b/testing/btest/bifs/strip.bro @@ -2,7 +2,7 @@ # @TEST-EXEC: bro -b %INPUT >out # @TEST-EXEC: btest-diff out -event bro_init() +event zeek_init() { local a = " this is a test "; local b = ""; diff --git a/testing/btest/bifs/strptime.bro b/testing/btest/bifs/strptime.bro index 215299b300..c8f57b1dfc 100644 --- a/testing/btest/bifs/strptime.bro +++ b/testing/btest/bifs/strptime.bro @@ -2,7 +2,7 @@ # @TEST-EXEC: bro -b %INPUT >out 2>&1 # @TEST-EXEC: btest-diff out -event bro_init() +event zeek_init() { print strptime("%Y-%m-%d", "2012-10-19"); print strptime("%m", "1980-10-24"); diff --git a/testing/btest/bifs/strstr.bro b/testing/btest/bifs/strstr.bro index 40cd8aa5fd..75a362375a 100644 --- a/testing/btest/bifs/strstr.bro +++ b/testing/btest/bifs/strstr.bro @@ -2,7 +2,7 @@ # @TEST-EXEC: bro -b %INPUT >out # @TEST-EXEC: btest-diff out -event bro_init() +event zeek_init() { local a = "this is a test"; local b = "his"; diff --git a/testing/btest/bifs/sub.bro b/testing/btest/bifs/sub.bro index 773530ac74..f83113ad19 100644 --- a/testing/btest/bifs/sub.bro +++ b/testing/btest/bifs/sub.bro @@ -2,7 +2,7 @@ # @TEST-EXEC: bro -b %INPUT >out # @TEST-EXEC: btest-diff out -event bro_init() +event zeek_init() { local a = "this is a test"; local pat = /is|ss/; diff --git a/testing/btest/bifs/subst_string.bro b/testing/btest/bifs/subst_string.bro index 6ebed72321..186ca7f921 100644 --- a/testing/btest/bifs/subst_string.bro +++ b/testing/btest/bifs/subst_string.bro @@ -2,7 +2,7 @@ # @TEST-EXEC: bro -b %INPUT >out # @TEST-EXEC: btest-diff out -event bro_init() +event zeek_init() { local a = "this is another test"; local b = "is"; diff --git a/testing/btest/bifs/system.bro b/testing/btest/bifs/system.bro index bd27fc3db5..e488601ee5 100644 --- a/testing/btest/bifs/system.bro +++ b/testing/btest/bifs/system.bro @@ -2,7 +2,7 @@ # @TEST-EXEC: bro -b %INPUT # @TEST-EXEC: btest-diff out -event bro_init() +event zeek_init() { local a = system("echo thistest > out"); if ( a != 0 ) diff --git a/testing/btest/bifs/system_env.bro b/testing/btest/bifs/system_env.bro index cfe4e7dd2a..beece2e2c6 100644 --- a/testing/btest/bifs/system_env.bro +++ b/testing/btest/bifs/system_env.bro @@ -2,7 +2,7 @@ # @TEST-EXEC: bro -b %INPUT # @TEST-EXEC: btest-diff testfile -event bro_init() +event zeek_init() { local vars: table[string] of string = { ["TESTBRO"] = "helloworld" }; diff --git a/testing/btest/bifs/to_count.bro b/testing/btest/bifs/to_count.bro index 8de8c5c674..dc87fe94b9 100644 --- a/testing/btest/bifs/to_count.bro +++ b/testing/btest/bifs/to_count.bro @@ -2,7 +2,7 @@ # @TEST-EXEC: bro -b %INPUT >out # @TEST-EXEC: btest-diff out -event bro_init() +event zeek_init() { local a: int = -2; print int_to_count(a); diff --git a/testing/btest/bifs/to_double.bro b/testing/btest/bifs/to_double.bro index b6fb9917a7..b2d2d65f4d 100644 --- a/testing/btest/bifs/to_double.bro +++ b/testing/btest/bifs/to_double.bro @@ -2,7 +2,7 @@ # @TEST-EXEC: bro -b %INPUT >out # @TEST-EXEC: btest-diff out -event bro_init() +event zeek_init() { local a = 1 usec; print interval_to_double(a); diff --git a/testing/btest/bifs/to_int.bro b/testing/btest/bifs/to_int.bro index e65a555cc4..fe7d530835 100644 --- a/testing/btest/bifs/to_int.bro +++ b/testing/btest/bifs/to_int.bro @@ -2,7 +2,7 @@ # @TEST-EXEC: bro -b %INPUT >out # @TEST-EXEC: btest-diff out -event bro_init() +event zeek_init() { print to_int("1"); print to_int("-1"); diff --git a/testing/btest/bifs/to_interval.bro b/testing/btest/bifs/to_interval.bro index 71d73fed62..b877cedacc 100644 --- a/testing/btest/bifs/to_interval.bro +++ b/testing/btest/bifs/to_interval.bro @@ -2,7 +2,7 @@ # @TEST-EXEC: bro -b %INPUT >out # @TEST-EXEC: btest-diff out -event bro_init() +event zeek_init() { local a = 1234563.14; print double_to_interval(a); diff --git a/testing/btest/bifs/to_port.bro b/testing/btest/bifs/to_port.bro index b2289b8a21..9c53de7297 100644 --- a/testing/btest/bifs/to_port.bro +++ b/testing/btest/bifs/to_port.bro @@ -2,7 +2,7 @@ # @TEST-EXEC: bro -b %INPUT >out # @TEST-EXEC: btest-diff out -event bro_init() +event zeek_init() { print to_port("123/tcp"); print to_port("123/udp"); diff --git a/testing/btest/bifs/to_time.bro b/testing/btest/bifs/to_time.bro index d5a81b0934..b286d92ea4 100644 --- a/testing/btest/bifs/to_time.bro +++ b/testing/btest/bifs/to_time.bro @@ -2,7 +2,7 @@ # @TEST-EXEC: bro -b %INPUT >out # @TEST-EXEC: btest-diff out -event bro_init() +event zeek_init() { local a = 1234563.14; print double_to_time(a); diff --git a/testing/btest/bifs/topk.bro b/testing/btest/bifs/topk.bro index 1e650335a7..06246da4ac 100644 --- a/testing/btest/bifs/topk.bro +++ b/testing/btest/bifs/topk.bro @@ -2,7 +2,7 @@ # @TEST-EXEC: btest-diff out # @TEST-EXEC: btest-diff .stderr -event bro_init() +event zeek_init() { local k1 = topk_init(2); diff --git a/testing/btest/bifs/type_name.bro b/testing/btest/bifs/type_name.bro index f331fe6aa9..7377558db2 100644 --- a/testing/btest/bifs/type_name.bro +++ b/testing/btest/bifs/type_name.bro @@ -9,7 +9,7 @@ type myrecord: record { s: string; }; -event bro_init() +event zeek_init() { local a = "foo"; local b = 3; diff --git a/testing/btest/bifs/uuid_to_string.bro b/testing/btest/bifs/uuid_to_string.bro index dc84f349fa..2df9d2f0f0 100644 --- a/testing/btest/bifs/uuid_to_string.bro +++ b/testing/btest/bifs/uuid_to_string.bro @@ -2,7 +2,7 @@ # @TEST-EXEC: bro -b %INPUT >out # @TEST-EXEC: btest-diff out -event bro_init() +event zeek_init() { local a = "\xfe\x80abcdefg0123456"; print uuid_to_string(a); diff --git a/testing/btest/bifs/val_size.bro b/testing/btest/bifs/val_size.bro index 57b512b776..8757bde285 100644 --- a/testing/btest/bifs/val_size.bro +++ b/testing/btest/bifs/val_size.bro @@ -1,7 +1,7 @@ # # @TEST-EXEC: bro -b %INPUT -event bro_init() +event zeek_init() { local a = T; local b = 12; diff --git a/testing/btest/broker/connect-on-retry.bro b/testing/btest/broker/connect-on-retry.bro index 56e479b7ea..7a7db81da9 100644 --- a/testing/btest/broker/connect-on-retry.bro +++ b/testing/btest/broker/connect-on-retry.bro @@ -16,7 +16,7 @@ global event_count = 0; global ping: event(msg: string, c: count); -event bro_init() +event zeek_init() { Broker::subscribe("bro/event/my_topic"); Broker::auto_publish("bro/event/my_topic", ping); @@ -65,7 +65,7 @@ event delayed_listen() Broker::listen("127.0.0.1", to_port(getenv("BROKER_PORT"))); } -event bro_init() +event zeek_init() { Broker::subscribe("bro/event/my_topic"); Broker::auto_publish("bro/event/my_topic", pong); diff --git a/testing/btest/broker/disconnect.bro b/testing/btest/broker/disconnect.bro index 08d80f0441..34d98d20e8 100644 --- a/testing/btest/broker/disconnect.bro +++ b/testing/btest/broker/disconnect.bro @@ -24,7 +24,7 @@ event my_event(i: count) print "sender got event", i; } -event bro_init() +event zeek_init() { Broker::subscribe(test_topic); Broker::peer("127.0.0.1", to_port(getenv("BROKER_PORT"))); @@ -60,7 +60,7 @@ event my_event(i: count) terminate(); } -event bro_init() +event zeek_init() { Broker::subscribe(test_topic); Broker::listen("127.0.0.1", to_port(getenv("BROKER_PORT"))); diff --git a/testing/btest/broker/error.bro b/testing/btest/broker/error.bro index aa413ea2ac..2955997e1f 100644 --- a/testing/btest/broker/error.bro +++ b/testing/btest/broker/error.bro @@ -27,7 +27,7 @@ event Broker::error(code: Broker::ErrorCode, msg: string) print "error", code, msg; } -event bro_init() +event zeek_init() { Broker::subscribe("bro/event/my_topic"); diff --git a/testing/btest/broker/remote_event.bro b/testing/btest/broker/remote_event.bro index a9e22ec25f..548cdb6e5e 100644 --- a/testing/btest/broker/remote_event.bro +++ b/testing/btest/broker/remote_event.bro @@ -15,7 +15,7 @@ global event_count = 0; global ping: event(msg: string, c: count); -event bro_init() +event zeek_init() { Broker::subscribe("bro/event/my_topic"); Broker::peer("127.0.0.1", to_port(getenv("BROKER_PORT"))); @@ -64,7 +64,7 @@ global auto_handler: event(msg: string, c: count); global pong: event(msg: string, c: count); -event bro_init() +event zeek_init() { Broker::subscribe("bro/event/my_topic"); Broker::listen("127.0.0.1", to_port(getenv("BROKER_PORT"))); diff --git a/testing/btest/broker/remote_event_any.bro b/testing/btest/broker/remote_event_any.bro index b45e5017ef..6e111dbbdc 100644 --- a/testing/btest/broker/remote_event_any.bro +++ b/testing/btest/broker/remote_event_any.bro @@ -15,7 +15,7 @@ global event_count = 0; global ping: event(msg: string, c: any); -event bro_init() +event zeek_init() { Broker::subscribe("bro/event/my_topic"); Broker::peer("127.0.0.1", to_port(getenv("BROKER_PORT"))); @@ -67,7 +67,7 @@ global auto_handler: event(msg: string, c: count); global pong: event(msg: string, c: any); -event bro_init() +event zeek_init() { Broker::subscribe("bro/event/my_topic"); Broker::listen("127.0.0.1", to_port(getenv("BROKER_PORT"))); diff --git a/testing/btest/broker/remote_event_auto.bro b/testing/btest/broker/remote_event_auto.bro index 04570b9e6d..0bfcd2ab43 100644 --- a/testing/btest/broker/remote_event_auto.bro +++ b/testing/btest/broker/remote_event_auto.bro @@ -15,7 +15,7 @@ global event_count = 0; global ping: event(msg: string, c: count); -event bro_init() +event zeek_init() { Broker::subscribe("bro/event/my_topic"); Broker::auto_publish("bro/event/my_topic", ping); @@ -59,7 +59,7 @@ global auto_handler: event(msg: string, c: count); global pong: event(msg: string, c: count); -event bro_init() +event zeek_init() { Broker::subscribe("bro/event/my_topic"); Broker::auto_publish("bro/event/my_topic", pong); diff --git a/testing/btest/broker/remote_event_ssl_auth.bro b/testing/btest/broker/remote_event_ssl_auth.bro index 2422638416..f5e2cef26b 100644 --- a/testing/btest/broker/remote_event_ssl_auth.bro +++ b/testing/btest/broker/remote_event_ssl_auth.bro @@ -174,7 +174,7 @@ global event_count = 0; global ping: event(msg: string, c: count); -event bro_init() +event zeek_init() { Broker::subscribe("bro/event/my_topic"); Broker::peer("127.0.0.1", to_port(getenv("BROKER_PORT"))); @@ -225,7 +225,7 @@ global auto_handler: event(msg: string, c: count); global pong: event(msg: string, c: count); -event bro_init() +event zeek_init() { Broker::subscribe("bro/event/my_topic"); Broker::listen("127.0.0.1", to_port(getenv("BROKER_PORT"))); diff --git a/testing/btest/broker/remote_event_vector_any.bro b/testing/btest/broker/remote_event_vector_any.bro index 6f03d97c56..dfd6cfb754 100644 --- a/testing/btest/broker/remote_event_vector_any.bro +++ b/testing/btest/broker/remote_event_vector_any.bro @@ -20,7 +20,7 @@ type myrec: record { global bar: event(x: any); -event bro_init() +event zeek_init() { Broker::subscribe("test"); Broker::peer("127.0.0.1", to_port(getenv("BROKER_PORT"))); @@ -91,7 +91,7 @@ event bar(x: any) process(x); } -event bro_init() +event zeek_init() { Broker::subscribe("test"); Broker::listen("127.0.0.1", to_port(getenv("BROKER_PORT"))); diff --git a/testing/btest/broker/remote_id.bro b/testing/btest/broker/remote_id.bro index 62cddb9f25..dad98ee44a 100644 --- a/testing/btest/broker/remote_id.bro +++ b/testing/btest/broker/remote_id.bro @@ -10,7 +10,7 @@ const test_var = "init" &redef; -event bro_init() +event zeek_init() { Broker::peer("127.0.0.1", to_port(getenv("BROKER_PORT"))); } @@ -44,7 +44,7 @@ event check_var() } } -event bro_init() +event zeek_init() { print "intial val", test_var; Broker::subscribe("bro/ids"); diff --git a/testing/btest/broker/remote_log.bro b/testing/btest/broker/remote_log.bro index dae89d42b2..f5c320dc20 100644 --- a/testing/btest/broker/remote_log.bro +++ b/testing/btest/broker/remote_log.bro @@ -25,7 +25,7 @@ export { }; } -event bro_init() &priority=5 +event zeek_init() &priority=5 { Log::create_stream(Test::LOG, [$columns=Test::Info]); } @@ -42,7 +42,7 @@ event Broker::peer_lost(endpoint: Broker::EndpointInfo, msg: string) @load ./common.bro -event bro_init() +event zeek_init() { Broker::subscribe("bro/"); Broker::listen("127.0.0.1", to_port(getenv("BROKER_PORT"))); @@ -61,7 +61,7 @@ event Broker::peer_removed(endpoint: Broker::EndpointInfo, msg: string) @load ./common.bro -event bro_init() +event zeek_init() { Broker::peer("127.0.0.1", to_port(getenv("BROKER_PORT"))); } diff --git a/testing/btest/broker/remote_log_late_join.bro b/testing/btest/broker/remote_log_late_join.bro index aea7846996..52bcab7d86 100644 --- a/testing/btest/broker/remote_log_late_join.bro +++ b/testing/btest/broker/remote_log_late_join.bro @@ -25,7 +25,7 @@ export { }; } -event bro_init() &priority=5 +event zeek_init() &priority=5 { Log::create_stream(Test::LOG, [$columns=Test::Info]); } @@ -42,7 +42,7 @@ event Broker::peer_lost(endpoint: Broker::EndpointInfo, msg: string) @load ./common.bro -event bro_init() +event zeek_init() { Broker::subscribe("bro/"); Broker::listen("127.0.0.1", to_port(getenv("BROKER_PORT"))); @@ -68,7 +68,7 @@ event doconnect() global n = 0; -event bro_init() +event zeek_init() { schedule 2secs { doconnect() }; Log::write(Test::LOG, [$msg = "ping", $num = n]); diff --git a/testing/btest/broker/remote_log_types.bro b/testing/btest/broker/remote_log_types.bro index 8bbc66eaa2..1a2d04b130 100644 --- a/testing/btest/broker/remote_log_types.bro +++ b/testing/btest/broker/remote_log_types.bro @@ -47,7 +47,7 @@ export { } -event bro_init() &priority=5 +event zeek_init() &priority=5 { Log::create_stream(Test::LOG, [$columns=Test::Info]); } @@ -58,7 +58,7 @@ event bro_init() &priority=5 @load ./common.bro -event bro_init() +event zeek_init() { Broker::subscribe("bro/"); Broker::listen("127.0.0.1", to_port(getenv("BROKER_PORT"))); @@ -77,7 +77,7 @@ event quit_receiver() @load ./common.bro -event bro_init() +event zeek_init() { Broker::peer("127.0.0.1", to_port(getenv("BROKER_PORT"))); } diff --git a/testing/btest/broker/ssl_auth_failure.bro b/testing/btest/broker/ssl_auth_failure.bro index bc90d86298..45138dc15e 100644 --- a/testing/btest/broker/ssl_auth_failure.bro +++ b/testing/btest/broker/ssl_auth_failure.bro @@ -103,7 +103,7 @@ event do_terminate() terminate(); } -event bro_init() +event zeek_init() { Broker::subscribe("bro/event/my_topic"); Broker::peer("127.0.0.1", to_port(getenv("BROKER_PORT"))); @@ -145,7 +145,7 @@ event do_terminate() terminate(); } -event bro_init() +event zeek_init() { Broker::listen("127.0.0.1", to_port(getenv("BROKER_PORT"))); schedule 10secs { do_terminate() }; diff --git a/testing/btest/broker/store/clone.bro b/testing/btest/broker/store/clone.bro index 5620303410..a499d11ea6 100644 --- a/testing/btest/broker/store/clone.bro +++ b/testing/btest/broker/store/clone.bro @@ -48,7 +48,7 @@ event inserted() schedule 6secs { done() }; } -event bro_init() +event zeek_init() { Broker::auto_publish("bro/events", done); Broker::subscribe("bro/"); @@ -129,7 +129,7 @@ event lookup(stage: count) schedule 4sec { done() }; } -event bro_init() +event zeek_init() { Broker::auto_publish("bro/events", inserted); Broker::subscribe("bro/"); diff --git a/testing/btest/broker/store/local.bro b/testing/btest/broker/store/local.bro index b352df93f2..1846d8c2c3 100644 --- a/testing/btest/broker/store/local.bro +++ b/testing/btest/broker/store/local.bro @@ -13,7 +13,7 @@ event done() terminate(); } -event bro_init() +event zeek_init() { h = Broker::create_master("master"); Broker::put(h, "one", "110"); diff --git a/testing/btest/broker/store/ops.bro b/testing/btest/broker/store/ops.bro index 070a0f2ed3..4e89f365bf 100644 --- a/testing/btest/broker/store/ops.bro +++ b/testing/btest/broker/store/ops.bro @@ -83,7 +83,7 @@ event pk1() schedule 1sec { pk2() }; } -event bro_init() +event zeek_init() { h = Broker::create_master("master"); Broker::put(h, "one", "110"); diff --git a/testing/btest/broker/store/record.bro b/testing/btest/broker/store/record.bro index ab862012a6..62ee4735ba 100644 --- a/testing/btest/broker/store/record.bro +++ b/testing/btest/broker/store/record.bro @@ -8,7 +8,7 @@ type R: record { c: count; }; -event bro_init() +event zeek_init() { local cr = Broker::record_create(3); print Broker::record_size(cr); diff --git a/testing/btest/broker/store/set.bro b/testing/btest/broker/store/set.bro index 056b46e221..c2524cec6a 100644 --- a/testing/btest/broker/store/set.bro +++ b/testing/btest/broker/store/set.bro @@ -3,7 +3,7 @@ # @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-sort btest-diff master/out -event bro_init() +event zeek_init() { local cs = Broker::set_create(); diff --git a/testing/btest/broker/store/sqlite.bro b/testing/btest/broker/store/sqlite.bro index fbce1a693a..8adde597f5 100644 --- a/testing/btest/broker/store/sqlite.bro +++ b/testing/btest/broker/store/sqlite.bro @@ -27,7 +27,7 @@ event done() terminate(); } -event bro_init() +event zeek_init() { h = Broker::create_master("master", Broker::SQLITE); diff --git a/testing/btest/broker/store/table.bro b/testing/btest/broker/store/table.bro index 11bd00028b..6fdf7615a6 100644 --- a/testing/btest/broker/store/table.bro +++ b/testing/btest/broker/store/table.bro @@ -3,7 +3,7 @@ # @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-sort btest-diff master/out -event bro_init() +event zeek_init() { local ct = Broker::table_create(); diff --git a/testing/btest/broker/store/type-conversion.bro b/testing/btest/broker/store/type-conversion.bro index c92c1ea4c9..fa9e16d587 100644 --- a/testing/btest/broker/store/type-conversion.bro +++ b/testing/btest/broker/store/type-conversion.bro @@ -11,7 +11,7 @@ type R2: record { r1: R1; }; -event bro_init() +event zeek_init() { ### Print every broker data type print Broker::data_type(Broker::data(T)); diff --git a/testing/btest/broker/store/vector.bro b/testing/btest/broker/store/vector.bro index 7edc4ba050..7c44640334 100644 --- a/testing/btest/broker/store/vector.bro +++ b/testing/btest/broker/store/vector.bro @@ -3,7 +3,7 @@ # @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-sort btest-diff master/out -event bro_init() +event zeek_init() { local cv = Broker::vector_create(); print Broker::vector_size(cv); diff --git a/testing/btest/broker/unpeer.bro b/testing/btest/broker/unpeer.bro index b591815955..5251c9eb60 100644 --- a/testing/btest/broker/unpeer.bro +++ b/testing/btest/broker/unpeer.bro @@ -34,7 +34,7 @@ event unpeer(endpoint: Broker::EndpointInfo) schedule 4secs { do_terminate() }; } -event bro_init() +event zeek_init() { Broker::subscribe("bro/event/my_topic"); Broker::auto_publish("bro/event/my_topic", print_something); @@ -65,7 +65,7 @@ event print_something(i: int) print "Something receiver", i; } -event bro_init() +event zeek_init() { Broker::subscribe("bro/event/my_topic"); Broker::listen("127.0.0.1", to_port(getenv("BROKER_PORT"))); diff --git a/testing/btest/core/discarder.bro b/testing/btest/core/discarder.bro index 9e8f5e7a2f..9c48526bac 100644 --- a/testing/btest/core/discarder.bro +++ b/testing/btest/core/discarder.bro @@ -6,7 +6,7 @@ @TEST-START-FILE discarder-ip.bro -event bro_init() +event zeek_init() { print "################ IP Discarder ################"; } @@ -28,7 +28,7 @@ event new_packet(c: connection, p: pkt_hdr) @TEST-START-FILE discarder-tcp.bro -event bro_init() +event zeek_init() { print "################ TCP Discarder ################"; } @@ -50,7 +50,7 @@ event new_packet(c: connection, p: pkt_hdr) @TEST-START-FILE discarder-udp.bro -event bro_init() +event zeek_init() { print "################ UDP Discarder ################"; } @@ -72,7 +72,7 @@ event new_packet(c: connection, p: pkt_hdr) @TEST-START-FILE discarder-icmp.bro -event bro_init() +event zeek_init() { print "################ ICMP Discarder ################"; } diff --git a/testing/btest/core/div-by-zero.bro b/testing/btest/core/div-by-zero.bro index d1221638d6..da06569c2f 100644 --- a/testing/btest/core/div-by-zero.bro +++ b/testing/btest/core/div-by-zero.bro @@ -26,7 +26,7 @@ event mod_count(a: count, b: count) print a % b; } -event bro_init() +event zeek_init() { event div_int(10, 0); event div_count(10, 0); diff --git a/testing/btest/core/embedded-null.bro b/testing/btest/core/embedded-null.bro index 95a4c965a9..c85da21541 100644 --- a/testing/btest/core/embedded-null.bro +++ b/testing/btest/core/embedded-null.bro @@ -1,7 +1,7 @@ # @TEST-EXEC: bro -b %INPUT 2>&1 # @TEST-EXEC: btest-diff .stdout -event bro_init() +event zeek_init() { local a = "hi\x00there"; unique_id(a); diff --git a/testing/btest/core/event-arg-reuse.bro b/testing/btest/core/event-arg-reuse.bro index ba8e0f0677..3ad5f82cab 100644 --- a/testing/btest/core/event-arg-reuse.bro +++ b/testing/btest/core/event-arg-reuse.bro @@ -14,7 +14,7 @@ event f(a: int) &priority=-5 print "f2", a; } -event bro_init() +event zeek_init() { event f(1); } diff --git a/testing/btest/core/fake_dns.bro b/testing/btest/core/fake_dns.bro index f4d8c46777..f5cd4d2067 100644 --- a/testing/btest/core/fake_dns.bro +++ b/testing/btest/core/fake_dns.bro @@ -19,7 +19,7 @@ function check_terminate() terminate(); } -event bro_init() +event zeek_init() { print addrs; diff --git a/testing/btest/core/file-caching-serialization.test b/testing/btest/core/file-caching-serialization.test index 7ff1d8be8d..c6edeb55c2 100644 --- a/testing/btest/core/file-caching-serialization.test +++ b/testing/btest/core/file-caching-serialization.test @@ -42,7 +42,7 @@ event file_opened(f: file) print f, "opened"; } -event bro_init() +event zeek_init() { for ( i in iterations ) write_to_file(iterations[i]); diff --git a/testing/btest/core/global_opaque_val.bro b/testing/btest/core/global_opaque_val.bro index 84087d8295..0232271ced 100644 --- a/testing/btest/core/global_opaque_val.bro +++ b/testing/btest/core/global_opaque_val.bro @@ -3,7 +3,7 @@ global test = md5_hash_init(); -event bro_init() +event zeek_init() { md5_hash_update(test, "one"); md5_hash_update(test, "two"); diff --git a/testing/btest/core/leaks/basic-cluster.bro b/testing/btest/core/leaks/basic-cluster.bro index fa73fb9a96..d6c017090e 100644 --- a/testing/btest/core/leaks/basic-cluster.bro +++ b/testing/btest/core/leaks/basic-cluster.bro @@ -24,7 +24,7 @@ redef Log::default_rotation_interval = 0secs; global n = 0; -event bro_init() &priority=5 +event zeek_init() &priority=5 { local r1: SumStats::Reducer = [$stream="test", $apply=set(SumStats::SUM, SumStats::MIN, SumStats::MAX, SumStats::AVERAGE, SumStats::STD_DEV, SumStats::VARIANCE, SumStats::UNIQUE)]; SumStats::create([$name="test", @@ -48,7 +48,7 @@ event Broker::peer_lost(endpoint: Broker::EndpointInfo, msg: string) global ready_for_data: event(); -event bro_init() +event zeek_init() { Broker::auto_publish(Cluster::worker_topic, ready_for_data); } diff --git a/testing/btest/core/leaks/broker/clone_store.bro b/testing/btest/core/leaks/broker/clone_store.bro index 68235c7bab..9ee9ee2cd9 100644 --- a/testing/btest/core/leaks/broker/clone_store.bro +++ b/testing/btest/core/leaks/broker/clone_store.bro @@ -49,7 +49,7 @@ event inserted() schedule 2secs { done() }; } -event bro_init() +event zeek_init() { Broker::auto_publish("bro/events", done); Broker::subscribe("bro/"); @@ -127,7 +127,7 @@ event done() terminate(); } -event bro_init() +event zeek_init() { Broker::auto_publish("bro/events", inserted); Broker::subscribe("bro/"); diff --git a/testing/btest/core/leaks/broker/master_store.bro b/testing/btest/core/leaks/broker/master_store.bro index 583f80413b..08919bb461 100644 --- a/testing/btest/core/leaks/broker/master_store.bro +++ b/testing/btest/core/leaks/broker/master_store.bro @@ -85,7 +85,7 @@ event pk1() schedule 1sec { pk2() }; } -event bro_init() +event zeek_init() { h = Broker::create_master("master"); Broker::put(h, "one", "110"); diff --git a/testing/btest/core/leaks/broker/remote_event.test b/testing/btest/core/leaks/broker/remote_event.test index 5000bd98d7..7eb84c94ef 100644 --- a/testing/btest/core/leaks/broker/remote_event.test +++ b/testing/btest/core/leaks/broker/remote_event.test @@ -16,7 +16,7 @@ redef exit_only_after_terminate = T; global event_handler: event(msg: string, c: count); global auto_event_handler: event(msg: string, c: count); -event bro_init() +event zeek_init() { Broker::subscribe("bro/event/"); Broker::auto_publish("bro/event/my_topic", auto_event_handler); @@ -50,7 +50,7 @@ redef exit_only_after_terminate = T; global event_handler: event(msg: string, c: count); global auto_event_handler: event(msg: string, c: count); -event bro_init() +event zeek_init() { Broker::subscribe("bro/event/my_topic"); Broker::peer("127.0.0.1", to_port(getenv("BROKER_PORT")), 1secs); diff --git a/testing/btest/core/leaks/broker/remote_log.test b/testing/btest/core/leaks/broker/remote_log.test index 12abc1a313..0c50856b9b 100644 --- a/testing/btest/core/leaks/broker/remote_log.test +++ b/testing/btest/core/leaks/broker/remote_log.test @@ -27,7 +27,7 @@ export { }; } -event bro_init() &priority=5 +event zeek_init() &priority=5 { Log::create_stream(Test::LOG, [$columns=Test::Info]); } @@ -43,7 +43,7 @@ event Broker::peer_lost(endpoint: Broker::EndpointInfo, msg: string) @load ./common.bro -event bro_init() +event zeek_init() { Broker::subscribe("bro/"); Broker::listen("127.0.0.1", to_port(getenv("BROKER_PORT"))); @@ -60,7 +60,7 @@ event Broker::peer_removed(endpoint: Broker::EndpointInfo, msg: string) @load ./common.bro -event bro_init() +event zeek_init() { Broker::peer("127.0.0.1", to_port(getenv("BROKER_PORT"))); } diff --git a/testing/btest/core/leaks/exec.test b/testing/btest/core/leaks/exec.test index 4cc8240012..d9d96b5693 100644 --- a/testing/btest/core/leaks/exec.test +++ b/testing/btest/core/leaks/exec.test @@ -31,7 +31,7 @@ function test_cmd(label: string, cmd: Exec::Command) } } -event bro_init() +event zeek_init() { test_cmd("test1", [$cmd="bash ../somescript.sh", $read_files=set("out1", "out2")]); diff --git a/testing/btest/core/leaks/hll_cluster.bro b/testing/btest/core/leaks/hll_cluster.bro index e565778fbc..2fae13adad 100644 --- a/testing/btest/core/leaks/hll_cluster.bro +++ b/testing/btest/core/leaks/hll_cluster.bro @@ -31,7 +31,7 @@ global hll_data: event(data: opaque of cardinality); @if ( Cluster::local_node_type() == Cluster::WORKER ) -event bro_init() +event zeek_init() { Broker::auto_publish(Cluster::manager_topic, hll_data); } @@ -94,7 +94,7 @@ event Broker::peer_added(endpoint: Broker::EndpointInfo, msg: string) global result_count = 0; global hll: opaque of cardinality; -event bro_init() +event zeek_init() { hll = hll_cardinality_init(0.01, 0.95); } diff --git a/testing/btest/core/leaks/input-basic.bro b/testing/btest/core/leaks/input-basic.bro index 2f2ecf802d..177cbc5e26 100644 --- a/testing/btest/core/leaks/input-basic.bro +++ b/testing/btest/core/leaks/input-basic.bro @@ -50,7 +50,7 @@ type Val: record { global servers: table[int] of Val = table(); -event bro_init() +event zeek_init() { outfile = open("../out"); # first read in the old stuff into the table... diff --git a/testing/btest/core/leaks/input-errors.bro b/testing/btest/core/leaks/input-errors.bro index 589579779f..93a143c8d5 100644 --- a/testing/btest/core/leaks/input-errors.bro +++ b/testing/btest/core/leaks/input-errors.bro @@ -152,7 +152,7 @@ event kill_me() terminate(); } -event bro_init() +event zeek_init() { outfile = open("out"); Input::add_event([$source="input.log", $name="file", $fields=FileVal, $ev=line_file, $want_record=T]); diff --git a/testing/btest/core/leaks/input-missing-enum.bro b/testing/btest/core/leaks/input-missing-enum.bro index 9037e15ed0..5f931a35f3 100644 --- a/testing/btest/core/leaks/input-missing-enum.bro +++ b/testing/btest/core/leaks/input-missing-enum.bro @@ -26,7 +26,7 @@ type Val: record { global etable: table[int] of Log::ID = table(); -event bro_init() +event zeek_init() { # first read in the old stuff into the table... Input::add_table([$source="../input.log", $name="enum", $idx=Idx, $val=Val, $destination=etable, $want_record=F]); diff --git a/testing/btest/core/leaks/input-optional-event.bro b/testing/btest/core/leaks/input-optional-event.bro index ca141e1c4e..df8d591769 100644 --- a/testing/btest/core/leaks/input-optional-event.bro +++ b/testing/btest/core/leaks/input-optional-event.bro @@ -50,7 +50,7 @@ event servers(desc: Input::EventDescription, tpe: Input::Event, item: Val) print outfile, item; } -event bro_init() +event zeek_init() { outfile = open("../out"); # first read in the old stuff into the table... diff --git a/testing/btest/core/leaks/input-optional-table.bro b/testing/btest/core/leaks/input-optional-table.bro index 95871b1516..f3e4c05fb4 100644 --- a/testing/btest/core/leaks/input-optional-table.bro +++ b/testing/btest/core/leaks/input-optional-table.bro @@ -50,7 +50,7 @@ type Val: record { global servers: table[int] of Val = table(); -event bro_init() +event zeek_init() { outfile = open("../out"); # first read in the old stuff into the table... diff --git a/testing/btest/core/leaks/input-raw.bro b/testing/btest/core/leaks/input-raw.bro index 608ea25030..39ab13adfd 100644 --- a/testing/btest/core/leaks/input-raw.bro +++ b/testing/btest/core/leaks/input-raw.bro @@ -63,7 +63,7 @@ event line(description: Input::EventDescription, tpe: Input::Event, s: string) } } -event bro_init() +event zeek_init() { outfile = open("../out"); try = 0; diff --git a/testing/btest/core/leaks/input-reread.bro b/testing/btest/core/leaks/input-reread.bro index 8b6295c15d..c15a91a6aa 100644 --- a/testing/btest/core/leaks/input-reread.bro +++ b/testing/btest/core/leaks/input-reread.bro @@ -118,7 +118,7 @@ event line(description: Input::TableDescription, tpe: Input::Event, left: Idx, r print outfile, right; } -event bro_init() +event zeek_init() { outfile = open("../out"); try = 0; diff --git a/testing/btest/core/leaks/input-sqlite.bro b/testing/btest/core/leaks/input-sqlite.bro index ae1df163c8..d278a00533 100644 --- a/testing/btest/core/leaks/input-sqlite.bro +++ b/testing/btest/core/leaks/input-sqlite.bro @@ -87,7 +87,7 @@ event line(description: Input::EventDescription, tpe: Input::Event, r: Conn::Inf print outfile, |r$tunnel_parents|; # to make sure I got empty right } -event bro_init() +event zeek_init() { local config_strings: table[string] of string = { ["query"] = "select * from conn;", diff --git a/testing/btest/core/leaks/input-with-remove.bro b/testing/btest/core/leaks/input-with-remove.bro index ba58d7b2f6..59e3f28c0a 100644 --- a/testing/btest/core/leaks/input-with-remove.bro +++ b/testing/btest/core/leaks/input-with-remove.bro @@ -52,7 +52,7 @@ event do_term() { terminate(); } -event bro_init() { +event zeek_init() { schedule 1sec { do() }; diff --git a/testing/btest/core/leaks/returnwhen.bro b/testing/btest/core/leaks/returnwhen.bro index f5160ef250..cf1115a738 100644 --- a/testing/btest/core/leaks/returnwhen.bro +++ b/testing/btest/core/leaks/returnwhen.bro @@ -63,7 +63,7 @@ event do_another() } } -event bro_init() +event zeek_init() { local local_dummy = dummyfunc; diff --git a/testing/btest/core/old_comm_usage.bro b/testing/btest/core/old_comm_usage.bro index 0e9ae2f1f6..8f4e3854aa 100644 --- a/testing/btest/core/old_comm_usage.bro +++ b/testing/btest/core/old_comm_usage.bro @@ -1,7 +1,7 @@ # @TEST-EXEC-FAIL: bro -b %INPUT >out 2>&1 # @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-remove-abspath btest-diff out -event bro_init() +event zeek_init() { terminate_communication(); } diff --git a/testing/btest/core/option-priorities.bro b/testing/btest/core/option-priorities.bro index fd352a5459..088d82ea9f 100644 --- a/testing/btest/core/option-priorities.bro +++ b/testing/btest/core/option-priorities.bro @@ -16,7 +16,7 @@ function option_changed_two(ID: string, new_value: bool, location: string): bool return T; } -event bro_init() +event zeek_init() { print "Old value", testbool; Option::set_change_handler("testbool", option_changed); diff --git a/testing/btest/core/option-redef.bro b/testing/btest/core/option-redef.bro index 3d67a9a755..30d381306a 100644 --- a/testing/btest/core/option-redef.bro +++ b/testing/btest/core/option-redef.bro @@ -9,7 +9,7 @@ redef testopt = 6; option anotheropt = 6; redef anotheropt = 7; -event bro_init() { +event zeek_init() { print testopt; print anotheropt; } diff --git a/testing/btest/core/pcap/dynamic-filter.bro b/testing/btest/core/pcap/dynamic-filter.bro index c1b48155c1..caebaf0558 100644 --- a/testing/btest/core/pcap/dynamic-filter.bro +++ b/testing/btest/core/pcap/dynamic-filter.bro @@ -21,7 +21,7 @@ event new_packet(c: connection, p: pkt_hdr) print "error 4"; } -event bro_init() +event zeek_init() { if ( ! Pcap::precompile_pcap_filter(A, "port 80") ) print "error 1"; diff --git a/testing/btest/core/pcap/filter-error.bro b/testing/btest/core/pcap/filter-error.bro index 10270ed53f..b83b8879a0 100644 --- a/testing/btest/core/pcap/filter-error.bro +++ b/testing/btest/core/pcap/filter-error.bro @@ -7,7 +7,7 @@ redef enum PcapFilterID += { A }; -event bro_init() +event zeek_init() { if ( ! Pcap::precompile_pcap_filter(A, "kaputt, too") ) print "error", Pcap::error(); diff --git a/testing/btest/core/pcap/input-error.bro b/testing/btest/core/pcap/input-error.bro index 44788b3391..5e469e08e8 100644 --- a/testing/btest/core/pcap/input-error.bro +++ b/testing/btest/core/pcap/input-error.bro @@ -5,7 +5,7 @@ redef enum PcapFilterID += { A }; -event bro_init() +event zeek_init() { if ( ! Pcap::precompile_pcap_filter(A, "kaputt, too") ) print "error", Pcap::error(); diff --git a/testing/btest/core/pcap/pseudo-realtime.bro b/testing/btest/core/pcap/pseudo-realtime.bro index 625706f321..c51b5cc32b 100644 --- a/testing/btest/core/pcap/pseudo-realtime.bro +++ b/testing/btest/core/pcap/pseudo-realtime.bro @@ -31,7 +31,7 @@ event new_packet(c: connection, p: pkt_hdr) # print fmt("num=%d agg_delta_network=%.1f agg_delta_real=%.1f", cnt, an, ac); } -event bro_done() +event zeek_done() { local d = (an - ac); if ( d < 0 secs) diff --git a/testing/btest/core/reassembly.bro b/testing/btest/core/reassembly.bro index 30cfaa727e..53489008de 100644 --- a/testing/btest/core/reassembly.bro +++ b/testing/btest/core/reassembly.bro @@ -5,7 +5,7 @@ # @TEST-EXEC: bro -C -r $TRACES/tcp/reassembly.pcap %INPUT >>output # @TEST-EXEC: btest-diff output -event bro_init() +event zeek_init() { print "----------------------"; } diff --git a/testing/btest/core/recursive-event.bro b/testing/btest/core/recursive-event.bro index 245e994cd6..63cb05eb6f 100644 --- a/testing/btest/core/recursive-event.bro +++ b/testing/btest/core/recursive-event.bro @@ -26,7 +26,7 @@ event test() event test(); } -event bro_init() +event zeek_init() { event test(); } diff --git a/testing/btest/core/reporter-error-in-handler.bro b/testing/btest/core/reporter-error-in-handler.bro index c4a21d5902..fc0517ab2a 100644 --- a/testing/btest/core/reporter-error-in-handler.bro +++ b/testing/btest/core/reporter-error-in-handler.bro @@ -23,7 +23,7 @@ event reporter_error(t: time, msg: string, location: string) } } -event bro_init() +event zeek_init() { print a[1]; } diff --git a/testing/btest/core/reporter-fmt-strings.bro b/testing/btest/core/reporter-fmt-strings.bro index 0e0be77844..09c03cf721 100644 --- a/testing/btest/core/reporter-fmt-strings.bro +++ b/testing/btest/core/reporter-fmt-strings.bro @@ -4,7 +4,7 @@ # @TEST-EXEC-FAIL: bro %INPUT >output 2>&1 # @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-remove-abspath btest-diff output -event bro_init() +event zeek_init() { event dont_interpret_this("%s"); } diff --git a/testing/btest/core/reporter-parse-error.bro b/testing/btest/core/reporter-parse-error.bro index 25f33e2785..d57917ff26 100644 --- a/testing/btest/core/reporter-parse-error.bro +++ b/testing/btest/core/reporter-parse-error.bro @@ -2,7 +2,7 @@ # @TEST-EXEC-FAIL: bro %INPUT >output 2>&1 # @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-remove-abspath btest-diff output -event bro_init() +event zeek_init() { print TESTFAILURE; } diff --git a/testing/btest/core/reporter-runtime-error.bro b/testing/btest/core/reporter-runtime-error.bro index f8dd8c504c..9caeddb258 100644 --- a/testing/btest/core/reporter-runtime-error.bro +++ b/testing/btest/core/reporter-runtime-error.bro @@ -4,7 +4,7 @@ global a: table[count] of count; -event bro_init() +event zeek_init() { print a[2]; } diff --git a/testing/btest/core/reporter-type-mismatch.bro b/testing/btest/core/reporter-type-mismatch.bro index 0faa9b85e2..1a375ea84b 100644 --- a/testing/btest/core/reporter-type-mismatch.bro +++ b/testing/btest/core/reporter-type-mismatch.bro @@ -6,7 +6,7 @@ event foo(a: string) { } -event bro_init() +event zeek_init() { event foo(42); } diff --git a/testing/btest/core/reporter.bro b/testing/btest/core/reporter.bro index aa660ef495..bc79ca73d8 100644 --- a/testing/btest/core/reporter.bro +++ b/testing/btest/core/reporter.bro @@ -3,14 +3,14 @@ # @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-remove-abspath btest-diff output # @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-remove-abspath btest-diff logger-test.log -event bro_init() +event zeek_init() { Reporter::info("init test-info"); Reporter::warning("init test-warning"); Reporter::error("init test-error"); } -event bro_done() +event zeek_done() { Reporter::info("done test-info"); Reporter::warning("done test-warning"); diff --git a/testing/btest/core/vector-assignment.bro b/testing/btest/core/vector-assignment.bro index d1f02c124f..9c5cc4e0f6 100644 --- a/testing/btest/core/vector-assignment.bro +++ b/testing/btest/core/vector-assignment.bro @@ -13,7 +13,7 @@ function set_me(val: any) { print a; } -event bro_init() { +event zeek_init() { local b: vector of count = {1, 2, 3}; set_me(b); } diff --git a/testing/btest/core/when-interpreter-exceptions.bro b/testing/btest/core/when-interpreter-exceptions.bro index f259a46bda..f6a1d8a73b 100644 --- a/testing/btest/core/when-interpreter-exceptions.bro +++ b/testing/btest/core/when-interpreter-exceptions.bro @@ -79,7 +79,7 @@ function g(do_exception: bool): bool return F; } -event bro_init() +event zeek_init() { local cmd = Exec::Command($cmd="echo 'bro_init()'"); local stall = Exec::Command($cmd="sleep 30"); diff --git a/testing/btest/doc/broxygen/all_scripts.test b/testing/btest/doc/broxygen/all_scripts.test deleted file mode 100644 index 238ba3a4f3..0000000000 --- a/testing/btest/doc/broxygen/all_scripts.test +++ /dev/null @@ -1,14 +0,0 @@ -# This test is mostly just checking that there's no errors that result -# from loading all scripts and generated docs for each. - -# This must be serialized with communication tests because it does load -# listen.bro in order to document it. - -# @TEST-PORT: BROKER_PORT -# @TEST-EXEC: unset BRO_DISABLE_BROXYGEN; bro -X broxygen.config broxygen DumpEvents::include=/NOTHING_MATCHES/ Broker::default_port=$BROKER_PORT -# @TEST-EXEC: btest-diff .stdout -# @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-remove-abspath btest-diff .stderr - -@TEST-START-FILE broxygen.config -script * scripts/ -@TEST-END-FILE diff --git a/testing/btest/doc/broxygen/command_line.bro b/testing/btest/doc/broxygen/command_line.bro deleted file mode 100644 index d009667b7e..0000000000 --- a/testing/btest/doc/broxygen/command_line.bro +++ /dev/null @@ -1,7 +0,0 @@ -# Shouldn't emit any warnings about not being able to document something -# that's supplied via command line script. - -# @TEST-EXEC: unset BRO_DISABLE_BROXYGEN; bro %INPUT -e 'redef myvar=10; print myvar' >output 2>&1 -# @TEST-EXEC: btest-diff output - -const myvar = 5 &redef; diff --git a/testing/btest/doc/broxygen/comment_retrieval_bifs.bro b/testing/btest/doc/broxygen/comment_retrieval_bifs.bro deleted file mode 100644 index f3c1be6b14..0000000000 --- a/testing/btest/doc/broxygen/comment_retrieval_bifs.bro +++ /dev/null @@ -1,111 +0,0 @@ -# @TEST-EXEC: unset BRO_DISABLE_BROXYGEN; bro -b %INPUT >out -# @TEST-EXEC: btest-diff out - -##! This is a test script. -##! With some summary comments. - -## Hello world. This is an option. -## With some more description here. -## And here. -const myvar = 7 &redef; ##< Maybe just one more. - -## This function prints a string line by line. -## -## lines: A string to print line by line, w/ lines delimited by newline chars. -global print_lines: function(lines: string, prefix: string &default=""); - -## And some more comments on the function implementation. -function print_lines(lines: string, prefix: string) - { - local v: vector of string; - local line_table = split(lines, /\n/); - - for ( i in line_table ) - v[i] = line_table[i]; - - for ( i in v ) - print fmt("%s%s", prefix, v[i]); - } - -function print_comments(name: string, func: function(name: string): string) - { - print fmt("%s:", name); - print_lines(func(name), " "); - } - -## This is an alias for count. -type mytype: count; - -## My record type. -type myrecord: record { - ## The first field. - ## Does something... - aaa: count; ##< Done w/ aaa. - ## The second field. - bbb: string; ##< Done w/ bbb. - ##< No really, done w/ bbb. - ## Third field. - ccc: int; ##< Done w/ ccc. - ## Fourth field. - ddd: interval; ##< Done w/ ddd. -}; - - -## My enum type; -type myenum: enum { - ## First enum value. - ## I know, the name isn't clever. - FIRST, ##< Done w/ first. - ## Second enum value. - SECOND, ##< Done w/ second. - ## Third enum value. - THIRD, ##< Done w/ third. - ##< Done w/ third again. - ## SIC. - ## It's a programming language. - FORTH ##< Using Reverse Polish Notation. - ##< Done w/ forth. -}; - -redef record myrecord += { - ## First redef'd field. - ## With two lines of comments. - eee: count &optional; ##< And two post-notation comments. - ##< Done w/ eee. - ## Second redef'd field. - fff: count &optional; ##< Done w/ fff. - ## Third redef'd field. - ggg: count &optional; ##< Done w/ ggg. -}; - -redef enum myenum += { - ## First redef'd enum val. - FIFTH, ##< Done w/ fifth. - ## Second redef'd enum val. - SIXTH, ##< Done w/ sixth. - ## Third redef'd enum val. - ## Lucky number seven. - SEVENTH, ##< Still works with comma. - ##< Done w/ seventh. -}; - -print_lines(get_script_comments(@DIR + "/" + @FILENAME)); -print_comments("myvar", get_identifier_comments); -print_comments("print_lines", get_identifier_comments); -print_comments("mytype", get_identifier_comments); -print_comments("myrecord", get_identifier_comments); -print_comments("myrecord$aaa", get_record_field_comments); -print_comments("myrecord$bbb", get_record_field_comments); -print_comments("myrecord$ccc", get_record_field_comments); -print_comments("myrecord$ddd", get_record_field_comments); -print_comments("myrecord$eee", get_record_field_comments); -print_comments("myrecord$fff", get_record_field_comments); -print_comments("myrecord$ggg", get_record_field_comments); -print_comments("myenum", get_identifier_comments); -print_comments("FIRST", get_identifier_comments); -print_comments("SECOND", get_identifier_comments); -print_comments("THIRD", get_identifier_comments); -print_comments("FORTH", get_identifier_comments); -print_comments("FIFTH", get_identifier_comments); -print_comments("SIXTH", get_identifier_comments); -print_comments("SEVENTH", get_identifier_comments); diff --git a/testing/btest/doc/broxygen/enums.bro b/testing/btest/doc/broxygen/enums.bro deleted file mode 100644 index 8fbdb11ab6..0000000000 --- a/testing/btest/doc/broxygen/enums.bro +++ /dev/null @@ -1,43 +0,0 @@ -# @TEST-EXEC: unset BRO_DISABLE_BROXYGEN; bro -b -X broxygen.config %INPUT -# @TEST-EXEC: btest-diff autogen-reST-enums.rst - -@TEST-START-FILE broxygen.config -identifier TestEnum* autogen-reST-enums.rst -@TEST-END-FILE - -## There's tons of ways an enum can look... -type TestEnum1: enum { - ## like this - ONE, - TWO, ##< or like this - ## multiple - ## comments - THREE, ##< and even - ##< more comments -}; - -## The final comma is optional -type TestEnum2: enum { - ## like this - A, - B, ##< or like this - ## multiple - ## comments - C ##< and even - ##< more comments -}; - -## redefs should also work -redef enum TestEnum1 += { - ## adding another - FOUR ##< value -}; - -## now with a comma -redef enum TestEnum1 += { - ## adding another - FIVE, ##< value -}; - -## this should reference the TestEnum1 type and not a generic "enum" type -const TestEnumVal = ONE &redef; diff --git a/testing/btest/doc/broxygen/example.bro b/testing/btest/doc/broxygen/example.bro deleted file mode 100644 index 22a6fc7418..0000000000 --- a/testing/btest/doc/broxygen/example.bro +++ /dev/null @@ -1,8 +0,0 @@ -# @TEST-EXEC: unset BRO_DISABLE_BROXYGEN; bro -X broxygen.config %INPUT -# @TEST-EXEC: btest-diff example.rst - -@TEST-START-FILE broxygen.config -script broxygen/example.bro example.rst -@TEST-END-FILE - -@load broxygen/example.bro diff --git a/testing/btest/doc/broxygen/func-params.bro b/testing/btest/doc/broxygen/func-params.bro deleted file mode 100644 index e53ca475f1..0000000000 --- a/testing/btest/doc/broxygen/func-params.bro +++ /dev/null @@ -1,24 +0,0 @@ -# @TEST-EXEC: unset BRO_DISABLE_BROXYGEN; bro -b -X broxygen.config %INPUT -# @TEST-EXEC: btest-diff autogen-reST-func-params.rst - -@TEST-START-FILE broxygen.config -identifier test_func_params* autogen-reST-func-params.rst -@TEST-END-FILE - -## This is a global function declaration. -## -## i: First param. -## j: Second param. -## -## Returns: A string. -global test_func_params_func: function(i: int, j: int): string; - -type test_func_params_rec: record { - ## This is a record field function. - ## - ## i: First param. - ## j: Second param. - ## - ## Returns: A string. - field_func: function(i: int, j: int): string; -}; diff --git a/testing/btest/doc/broxygen/identifier.bro b/testing/btest/doc/broxygen/identifier.bro deleted file mode 100644 index ae49d812a0..0000000000 --- a/testing/btest/doc/broxygen/identifier.bro +++ /dev/null @@ -1,9 +0,0 @@ -# @TEST-PORT: BROKER_PORT -# @TEST-EXEC: unset BRO_DISABLE_BROXYGEN; bro -b -X broxygen.config %INPUT Broker::default_port=$BROKER_PORT -# @TEST-EXEC: btest-diff test.rst - -@TEST-START-FILE broxygen.config -identifier BroxygenExample::* test.rst -@TEST-END-FILE - -@load broxygen diff --git a/testing/btest/doc/broxygen/package.bro b/testing/btest/doc/broxygen/package.bro deleted file mode 100644 index 6a9957804a..0000000000 --- a/testing/btest/doc/broxygen/package.bro +++ /dev/null @@ -1,9 +0,0 @@ -# @TEST-PORT: BROKER_PORT -# @TEST-EXEC: unset BRO_DISABLE_BROXYGEN; bro -b -X broxygen.config %INPUT Broker::default_port=$BROKER_PORT -# @TEST-EXEC: btest-diff test.rst - -@TEST-START-FILE broxygen.config -package broxygen test.rst -@TEST-END-FILE - -@load broxygen diff --git a/testing/btest/doc/broxygen/package_index.bro b/testing/btest/doc/broxygen/package_index.bro deleted file mode 100644 index 49c367aa48..0000000000 --- a/testing/btest/doc/broxygen/package_index.bro +++ /dev/null @@ -1,9 +0,0 @@ -# @TEST-PORT: BROKER_PORT -# @TEST-EXEC: unset BRO_DISABLE_BROXYGEN; bro -b -X broxygen.config %INPUT Broker::default_port=$BROKER_PORT -# @TEST-EXEC: btest-diff test.rst - -@TEST-START-FILE broxygen.config -package_index broxygen test.rst -@TEST-END-FILE - -@load broxygen diff --git a/testing/btest/doc/broxygen/records.bro b/testing/btest/doc/broxygen/records.bro deleted file mode 100644 index fbaa957a9f..0000000000 --- a/testing/btest/doc/broxygen/records.bro +++ /dev/null @@ -1,26 +0,0 @@ -# @TEST-EXEC: unset BRO_DISABLE_BROXYGEN; bro -b -X broxygen.config %INPUT -# @TEST-EXEC: btest-diff autogen-reST-records.rst - -@TEST-START-FILE broxygen.config -identifier TestRecord* autogen-reST-records.rst -@TEST-END-FILE - -# undocumented record -type TestRecord1: record { - field1: bool; - field2: count; -}; - -## Here's the ways records and record fields can be documented. -type TestRecord2: record { - ## document ``A`` - A: count; - - B: bool; ##< document ``B`` - - ## and now ``C`` - C: TestRecord1; ##< is a declared type - - ## sets/tables should show the index types - D: set[count, bool]; -}; diff --git a/testing/btest/doc/broxygen/script_index.bro b/testing/btest/doc/broxygen/script_index.bro deleted file mode 100644 index ab257ad35d..0000000000 --- a/testing/btest/doc/broxygen/script_index.bro +++ /dev/null @@ -1,9 +0,0 @@ -# @TEST-PORT: BROKER_PORT -# @TEST-EXEC: unset BRO_DISABLE_BROXYGEN; bro -b -X broxygen.config %INPUT Broker::default_port=$BROKER_PORT -# @TEST-EXEC: btest-diff test.rst - -@TEST-START-FILE broxygen.config -script_index broxygen/* test.rst -@TEST-END-FILE - -@load broxygen diff --git a/testing/btest/doc/broxygen/script_summary.bro b/testing/btest/doc/broxygen/script_summary.bro deleted file mode 100644 index a517a08072..0000000000 --- a/testing/btest/doc/broxygen/script_summary.bro +++ /dev/null @@ -1,9 +0,0 @@ -# @TEST-PORT: BROKER_PORT -# @TEST-EXEC: unset BRO_DISABLE_BROXYGEN; bro -b -X broxygen.config %INPUT Broker::default_port=$BROKER_PORT -# @TEST-EXEC: btest-diff test.rst - -@TEST-START-FILE broxygen.config -script_summary broxygen/example.bro test.rst -@TEST-END-FILE - -@load broxygen diff --git a/testing/btest/doc/broxygen/type-aliases.bro b/testing/btest/doc/broxygen/type-aliases.bro deleted file mode 100644 index 0971327c2b..0000000000 --- a/testing/btest/doc/broxygen/type-aliases.bro +++ /dev/null @@ -1,34 +0,0 @@ -# @TEST-EXEC: unset BRO_DISABLE_BROXYGEN; bro -b -X broxygen.config %INPUT -# @TEST-EXEC: btest-diff autogen-reST-type-aliases.rst - -@TEST-START-FILE broxygen.config -identifier BroxygenTest::* autogen-reST-type-aliases.rst -@TEST-END-FILE - -module BroxygenTest; - -export { - ## This is just an alias for a builtin type ``bool``. - type TypeAlias: bool; - - ## This type should get its own comments, not associated w/ TypeAlias. - type NotTypeAlias: bool; - - ## This cross references ``bool`` in the description of its type - ## instead of ``TypeAlias`` just because it seems more useful -- - ## one doesn't have to click through the full type alias chain to - ## find out what the actual type is... - type OtherTypeAlias: TypeAlias; - - ## But this should reference a type of ``TypeAlias``. - global a: TypeAlias; - - ## And this should reference a type of ``OtherTypeAlias``. - global b: OtherTypeAlias; - - type MyRecord: record { - f1: TypeAlias; - f2: OtherTypeAlias; - f3: bool; - }; -} diff --git a/testing/btest/doc/broxygen/vectors.bro b/testing/btest/doc/broxygen/vectors.bro deleted file mode 100644 index 7c18225357..0000000000 --- a/testing/btest/doc/broxygen/vectors.bro +++ /dev/null @@ -1,20 +0,0 @@ -# @TEST-EXEC: unset BRO_DISABLE_BROXYGEN; bro -b -X broxygen.config %INPUT -# @TEST-EXEC: btest-diff autogen-reST-vectors.rst - -@TEST-START-FILE broxygen.config -identifier test_vector* autogen-reST-vectors.rst -@TEST-END-FILE - -type TestRecord: record { - field1: bool; - field2: count; -}; - -## Yield type is documented/cross-referenced for primitize types. -global test_vector0: vector of string; - -## Yield type is documented/cross-referenced for composite types. -global test_vector1: vector of TestRecord; - -## Just showing an even fancier yield type. -global test_vector2: vector of vector of TestRecord; diff --git a/testing/btest/doc/record-add.bro b/testing/btest/doc/record-add.bro deleted file mode 100644 index 284ea22959..0000000000 --- a/testing/btest/doc/record-add.bro +++ /dev/null @@ -1,36 +0,0 @@ -# @TEST-EXEC: bro -b %INPUT - -# To support documentation of type aliases, Bro clones declared types -# (see add_type() in Var.cc) in order to keep track of type names and aliases. -# This test makes sure that the cloning is done in a way that's compatible -# with adding fields to a record type -- we want to be sure that cloning -# a type that contains record types will correctly see field additions to -# those contained-records. - -type my_record: record { - field1: bool; - field2: string; -}; - -type super_record: record { - rec: my_record; -}; -type my_table: table[count] of my_record; -type my_vector: vector of my_record; - -redef record my_record += { - field3: count &optional; -}; - -global a: my_record; -global b: super_record; -global c: my_table; -global d: my_vector; - -function test_func() - { - a?$field3; - b$rec?$field3; - c[0]$field3; - d[0]$field3; - } diff --git a/testing/btest/doc/record-attr-check.bro b/testing/btest/doc/record-attr-check.bro deleted file mode 100644 index c7dc74631d..0000000000 --- a/testing/btest/doc/record-attr-check.bro +++ /dev/null @@ -1,9 +0,0 @@ -# @TEST-EXEC: bro -b %INPUT - -type Tag: enum { - SOMETHING -}; - -type R: record { - field1: set[Tag] &default=set(); -}; diff --git a/testing/btest/language/addr.bro b/testing/btest/language/addr.bro index dd7e5e1dff..dff376ec4a 100644 --- a/testing/btest/language/addr.bro +++ b/testing/btest/language/addr.bro @@ -7,7 +7,7 @@ function test_case(msg: string, expect: bool) } -event bro_init() +event zeek_init() { # IPv4 addresses local a1: addr = 0.0.0.0; diff --git a/testing/btest/language/any.bro b/testing/btest/language/any.bro index fca23f6db8..32daa36903 100644 --- a/testing/btest/language/any.bro +++ b/testing/btest/language/any.bro @@ -11,7 +11,7 @@ function anyarg(arg1: any, arg1type: string) test_case( arg1type, type_name(arg1) == arg1type ); } -event bro_init() +event zeek_init() { local any1: any = 5; local any2: any = "bar"; diff --git a/testing/btest/language/at-if-event.bro b/testing/btest/language/at-if-event.bro index 0dd9815908..2ac757810d 100644 --- a/testing/btest/language/at-if-event.bro +++ b/testing/btest/language/at-if-event.bro @@ -12,7 +12,7 @@ lalala } @if ( 1==1 ) -event bro_init() +event zeek_init() @else lalala @endif @@ -24,7 +24,7 @@ lalala @if ( 1==0 ) lalala @else -event bro_init() +event zeek_init() @endif { print "3"; @@ -32,7 +32,7 @@ event bro_init() @if ( 1==1 ) @if ( 1==1 ) -event bro_init() +event zeek_init() @endif @else lalala @@ -42,7 +42,7 @@ lalala } @if ( 1==1 ) -event bro_init() &priority=10 +event zeek_init() &priority=10 @else lalala @endif diff --git a/testing/btest/language/at-if-invalid.bro b/testing/btest/language/at-if-invalid.bro index 1be2b94304..e2e5e2c699 100644 --- a/testing/btest/language/at-if-invalid.bro +++ b/testing/btest/language/at-if-invalid.bro @@ -6,7 +6,7 @@ function foo(c: count): bool global TRUE_CONDITION = T; -event bro_init() +event zeek_init() { local xyz = 0; local local_true_condition = T; diff --git a/testing/btest/language/at-if.bro b/testing/btest/language/at-if.bro index dddf9a22a5..1aba7b9ded 100644 --- a/testing/btest/language/at-if.bro +++ b/testing/btest/language/at-if.bro @@ -11,7 +11,7 @@ function foo(c: count): bool global TRUE_CONDITION = T; -event bro_init() +event zeek_init() { local xyz = 0; diff --git a/testing/btest/language/at-ifdef.bro b/testing/btest/language/at-ifdef.bro index e7bb961833..ebc59f7056 100644 --- a/testing/btest/language/at-ifdef.bro +++ b/testing/btest/language/at-ifdef.bro @@ -8,7 +8,7 @@ function test_case(msg: string, expect: bool) global thisisdefined = 123; -event bro_init() +event zeek_init() { local xyz = 0; diff --git a/testing/btest/language/at-ifndef.bro b/testing/btest/language/at-ifndef.bro index 8bff0c456b..6e4df4dd86 100644 --- a/testing/btest/language/at-ifndef.bro +++ b/testing/btest/language/at-ifndef.bro @@ -8,7 +8,7 @@ function test_case(msg: string, expect: bool) global thisisdefined = 123; -event bro_init() +event zeek_init() { local xyz = 0; diff --git a/testing/btest/language/at-load.bro b/testing/btest/language/at-load.bro index 7427cd639a..ae14eba436 100644 --- a/testing/btest/language/at-load.bro +++ b/testing/btest/language/at-load.bro @@ -5,7 +5,7 @@ @load secondtestfile -event bro_init() +event zeek_init() { test_case( "function", T ); test_case( "global variable", num == 123 ); diff --git a/testing/btest/language/attr-default-coercion.bro b/testing/btest/language/attr-default-coercion.bro index 14590d0033..8304169cfb 100644 --- a/testing/btest/language/attr-default-coercion.bro +++ b/testing/btest/language/attr-default-coercion.bro @@ -16,7 +16,7 @@ function foo(i: int &default = 237, d: double &default = 101) print i, d; } -event bro_init() +event zeek_init() { print t["nope"]; print r; diff --git a/testing/btest/language/bool.bro b/testing/btest/language/bool.bro index 8a1404459c..be54a442d9 100644 --- a/testing/btest/language/bool.bro +++ b/testing/btest/language/bool.bro @@ -7,7 +7,7 @@ function test_case(msg: string, expect: bool) } -event bro_init() +event zeek_init() { local b1: bool = T; local b2: bool = F; diff --git a/testing/btest/language/conditional-expression.bro b/testing/btest/language/conditional-expression.bro index ea0acf009f..4938b87b4d 100644 --- a/testing/btest/language/conditional-expression.bro +++ b/testing/btest/language/conditional-expression.bro @@ -21,7 +21,7 @@ function f2(): bool } -event bro_init() +event zeek_init() { local a: count; local b: count; diff --git a/testing/btest/language/const.bro b/testing/btest/language/const.bro index ee938e8d45..c30a9cec18 100644 --- a/testing/btest/language/const.bro +++ b/testing/btest/language/const.bro @@ -21,7 +21,7 @@ redef foo = 10; const bar = 9; -event bro_init() +event zeek_init() { const baz = 7; local i = foo; @@ -48,7 +48,7 @@ redef foo = 10; const bar = 9; -event bro_init() +event zeek_init() { const baz = 7; local s = 0; diff --git a/testing/btest/language/copy.bro b/testing/btest/language/copy.bro index 3ddbc15e23..e3d6b80d5b 100644 --- a/testing/btest/language/copy.bro +++ b/testing/btest/language/copy.bro @@ -8,7 +8,7 @@ function test_case(msg: string, expect: bool) -event bro_init() +event zeek_init() { # "b" is not a copy of "a" local a: set[string] = set("this", "test"); diff --git a/testing/btest/language/count.bro b/testing/btest/language/count.bro index 39a3786dfb..6e5dca8bc2 100644 --- a/testing/btest/language/count.bro +++ b/testing/btest/language/count.bro @@ -7,7 +7,7 @@ function test_case(msg: string, expect: bool) } -event bro_init() +event zeek_init() { local c1: count = 0; local c2: count = 5; diff --git a/testing/btest/language/deprecated.bro b/testing/btest/language/deprecated.bro index ec9c3c9e1e..9ac6996145 100644 --- a/testing/btest/language/deprecated.bro +++ b/testing/btest/language/deprecated.bro @@ -24,7 +24,7 @@ type my_other_enum: enum { TWO = 2 &deprecated }; -event bro_init() +event zeek_init() { print ZERO; print ONE; diff --git a/testing/btest/language/double.bro b/testing/btest/language/double.bro index f85b216828..f1338ca16d 100644 --- a/testing/btest/language/double.bro +++ b/testing/btest/language/double.bro @@ -7,7 +7,7 @@ function test_case(msg: string, expect: bool) } -event bro_init() +event zeek_init() { local d1: double = 3; local d2: double = +3; diff --git a/testing/btest/language/enum.bro b/testing/btest/language/enum.bro index 6de7d345da..c4aa2d71a1 100644 --- a/testing/btest/language/enum.bro +++ b/testing/btest/language/enum.bro @@ -14,7 +14,7 @@ type color: enum { Red, White, Blue, }; type city: enum { Rome, Paris }; -event bro_init() +event zeek_init() { local e1: color = Blue; local e2: color = White; diff --git a/testing/btest/language/event-local-var.bro b/testing/btest/language/event-local-var.bro index d4dd9d19a5..337cd37bac 100644 --- a/testing/btest/language/event-local-var.bro +++ b/testing/btest/language/event-local-var.bro @@ -7,7 +7,7 @@ event e1(num: count) print fmt("event 1: %s", num); } -event bro_init() +event zeek_init() { # Test assigning a local event variable to an event local v: event(num: count); diff --git a/testing/btest/language/event.bro b/testing/btest/language/event.bro index d4eef24731..5f9f552e0d 100644 --- a/testing/btest/language/event.bro +++ b/testing/btest/language/event.bro @@ -32,7 +32,7 @@ event e3(test: string) global e5: event(num: count); -event bro_init() +event zeek_init() { # Test calling an event with "event" statement event e1(); diff --git a/testing/btest/language/expire-expr-error.bro b/testing/btest/language/expire-expr-error.bro index 7c9a3aa318..b2ac4d7c55 100644 --- a/testing/btest/language/expire-expr-error.bro +++ b/testing/btest/language/expire-expr-error.bro @@ -20,7 +20,7 @@ event do_it() } -event bro_init() &priority=-10 +event zeek_init() &priority=-10 { data[0] = "some data"; schedule 1sec { do_it() }; diff --git a/testing/btest/language/expire-func-undef.bro b/testing/btest/language/expire-func-undef.bro index eb864d2390..2da735a9be 100644 --- a/testing/btest/language/expire-func-undef.bro +++ b/testing/btest/language/expire-func-undef.bro @@ -29,7 +29,7 @@ event new_connection(c: connection) } -event bro_done() +event zeek_done() { for (o in distinct_peers) diff --git a/testing/btest/language/expire-redef.bro b/testing/btest/language/expire-redef.bro index 5cbb00f313..552e26cce0 100644 --- a/testing/btest/language/expire-redef.bro +++ b/testing/btest/language/expire-redef.bro @@ -30,7 +30,7 @@ function expired(tbl: table[int] of string, idx: int): interval return 0sec; } -event bro_init() &priority=-10 +event zeek_init() &priority=-10 { data[0] = "some data"; schedule 4sec { do_it() }; diff --git a/testing/btest/language/expire_func.test b/testing/btest/language/expire_func.test index 653a4d9a86..c66a901a4f 100644 --- a/testing/btest/language/expire_func.test +++ b/testing/btest/language/expire_func.test @@ -9,7 +9,7 @@ function inform_me(s: set[string], idx: string): interval global s: set[string] &create_expire=1secs &expire_func=inform_me; -event bro_init() +event zeek_init() { add s["i"]; add s["am"]; diff --git a/testing/btest/language/expire_func_mod.bro b/testing/btest/language/expire_func_mod.bro index 4790a9650e..8b14dad74c 100644 --- a/testing/btest/language/expire_func_mod.bro +++ b/testing/btest/language/expire_func_mod.bro @@ -33,7 +33,7 @@ function table_expire_func(t: table[string] of count, s: string): interval return 0 secs; } -event bro_init() +event zeek_init() { local s="ashish"; t[s] = 1 ; diff --git a/testing/btest/language/expire_subnet.test b/testing/btest/language/expire_subnet.test index 12d5e56b5a..f0bf388ad0 100644 --- a/testing/btest/language/expire_subnet.test +++ b/testing/btest/language/expire_subnet.test @@ -55,7 +55,7 @@ function execute_test() ### Events ### -event bro_init() +event zeek_init() { step = 0; diff --git a/testing/btest/language/file.bro b/testing/btest/language/file.bro index 47430b6813..80d10a4d1f 100644 --- a/testing/btest/language/file.bro +++ b/testing/btest/language/file.bro @@ -3,7 +3,7 @@ # @TEST-EXEC: btest-diff out2 -event bro_init() +event zeek_init() { local f1: file = open( "out1" ); print f1, 20; diff --git a/testing/btest/language/for.bro b/testing/btest/language/for.bro index 5f0c211597..acf9612927 100644 --- a/testing/btest/language/for.bro +++ b/testing/btest/language/for.bro @@ -8,7 +8,7 @@ function test_case(msg: string, expect: bool) -event bro_init() +event zeek_init() { local vv: vector of string = vector( "a", "b", "c" ); local ct: count = 0; diff --git a/testing/btest/language/func-assignment.bro b/testing/btest/language/func-assignment.bro index 576d7f3270..724eac38ae 100644 --- a/testing/btest/language/func-assignment.bro +++ b/testing/btest/language/func-assignment.bro @@ -16,7 +16,7 @@ type sample_function: record { f: function(str: string): string; }; -event bro_init() +event zeek_init() { local test_sf: sample_function; test_sf$s = "Brogrammers, like bowties, are cool."; diff --git a/testing/btest/language/function.bro b/testing/btest/language/function.bro index ab60c4fa62..db2ac675b0 100644 --- a/testing/btest/language/function.bro +++ b/testing/btest/language/function.bro @@ -45,7 +45,7 @@ function f7(test: string): bool return F; } -event bro_init() +event zeek_init() { f1(); f2(); diff --git a/testing/btest/language/hook.bro b/testing/btest/language/hook.bro index 3edfd9556c..c14e153577 100644 --- a/testing/btest/language/hook.bro +++ b/testing/btest/language/hook.bro @@ -91,7 +91,7 @@ function printMe(s: string): bool return T; } -event bro_init() +event zeek_init() { print hook myhook([$a=1156, $b="hello world"]); diff --git a/testing/btest/language/hook_calls.bro b/testing/btest/language/hook_calls.bro index 41ef6f52ae..0e9e873662 100644 --- a/testing/btest/language/hook_calls.bro +++ b/testing/btest/language/hook_calls.bro @@ -33,7 +33,7 @@ global t: table[count] of hook(i: count) = { [0] = myhook, }; -event bro_init() +event zeek_init() { hook myhook(3); print hook myhook(3); @@ -66,7 +66,7 @@ hook myhook(i: count) if ( i == 0 ) break; } -event bro_init() +event zeek_init() { myhook(3); print myhook(3); diff --git a/testing/btest/language/if.bro b/testing/btest/language/if.bro index 785030a012..9f3be4dd1b 100644 --- a/testing/btest/language/if.bro +++ b/testing/btest/language/if.bro @@ -8,7 +8,7 @@ function test_case(msg: string, expect: bool) -event bro_init() +event zeek_init() { # Test "if" without "else" diff --git a/testing/btest/language/index-assignment-invalid.bro b/testing/btest/language/index-assignment-invalid.bro index 68458eb149..662b73ff91 100644 --- a/testing/btest/language/index-assignment-invalid.bro +++ b/testing/btest/language/index-assignment-invalid.bro @@ -27,7 +27,7 @@ function foo(s: string, c: count) bar(c + 42); } -event bro_init() +event zeek_init() { Queue::put(q, "hello"); Queue::put(q, "goodbye"); diff --git a/testing/btest/language/init-in-anon-function.bro b/testing/btest/language/init-in-anon-function.bro index 45f5f09f09..4da70dd2f4 100644 --- a/testing/btest/language/init-in-anon-function.bro +++ b/testing/btest/language/init-in-anon-function.bro @@ -3,7 +3,7 @@ module Foo; -event bro_init() { +event zeek_init() { Log::remove_default_filter(HTTP::LOG); diff --git a/testing/btest/language/int.bro b/testing/btest/language/int.bro index f511d82bbb..d4314c8367 100644 --- a/testing/btest/language/int.bro +++ b/testing/btest/language/int.bro @@ -7,7 +7,7 @@ function test_case(msg: string, expect: bool) } -event bro_init() +event zeek_init() { local i1: int = 3; local i2: int = +3; diff --git a/testing/btest/language/interval.bro b/testing/btest/language/interval.bro index 0bb912c4d9..c8b975e637 100644 --- a/testing/btest/language/interval.bro +++ b/testing/btest/language/interval.bro @@ -12,7 +12,7 @@ function approx_equal(x: double, y: double): bool return |(x - y)/x| < 1e-6 ? T : F; } -event bro_init() +event zeek_init() { # Constants without space and no letter "s" diff --git a/testing/btest/language/module.bro b/testing/btest/language/module.bro index 3278697a8d..7f2512741f 100644 --- a/testing/btest/language/module.bro +++ b/testing/btest/language/module.bro @@ -30,7 +30,7 @@ event testevent(msg: string) # In this source file, we try to access each exported object from the module -event bro_init() +event zeek_init() { thisisatest::test_case( "function", T ); thisisatest::test_case( "global variable", thisisatest::num == 123 ); diff --git a/testing/btest/language/named-table-ctors.bro b/testing/btest/language/named-table-ctors.bro index 1fad56e30f..45d0974832 100644 --- a/testing/btest/language/named-table-ctors.bro +++ b/testing/btest/language/named-table-ctors.bro @@ -17,7 +17,7 @@ global mytablecomp: FooTableComp = FooTableComp(["test", 1] = "test1", ["cool", 2] = "cool2"); global mytabley: FooTableY = FooTableY(["one"] = 1, ["two"] = 2, ["three"] = 3) &default=0; -event bro_init() +event zeek_init() { print mytable; print mytablerec; diff --git a/testing/btest/language/next-test.bro b/testing/btest/language/next-test.bro index d46ad187c4..83523dd59b 100644 --- a/testing/btest/language/next-test.bro +++ b/testing/btest/language/next-test.bro @@ -4,7 +4,7 @@ # This script tests "next" being called during the last iteration of a # for loop -event bro_done() +event zeek_done() { local number_set: set[count]; diff --git a/testing/btest/language/no-module.bro b/testing/btest/language/no-module.bro index fff55d3854..4d1372f10c 100644 --- a/testing/btest/language/no-module.bro +++ b/testing/btest/language/no-module.bro @@ -23,7 +23,7 @@ event testevent(msg: string) # In this script, we try to access each object defined in the other script -event bro_init() +event zeek_init() { test_case( "function", T ); test_case( "global variable", num == 123 ); diff --git a/testing/btest/language/null-statement.bro b/testing/btest/language/null-statement.bro index 20c70f4876..69861ce96e 100644 --- a/testing/btest/language/null-statement.bro +++ b/testing/btest/language/null-statement.bro @@ -7,7 +7,7 @@ function f1(test: string) ; # null statement in function } -event bro_init() +event zeek_init() { local s1: set[string] = set( "this", "test" ); diff --git a/testing/btest/language/outer_param_binding.bro b/testing/btest/language/outer_param_binding.bro index fb37fd4712..a197cb87fb 100644 --- a/testing/btest/language/outer_param_binding.bro +++ b/testing/btest/language/outer_param_binding.bro @@ -21,7 +21,7 @@ function bar(b: string, c: string) print f$x("2"); } -event bro_init() +event zeek_init() { bar("1", "20"); } diff --git a/testing/btest/language/pattern.bro b/testing/btest/language/pattern.bro index e427b70e80..ae9cb15bf7 100644 --- a/testing/btest/language/pattern.bro +++ b/testing/btest/language/pattern.bro @@ -7,7 +7,7 @@ function test_case(msg: string, expect: bool) } -event bro_init() +event zeek_init() { local p1: pattern = /foo|bar/; local p2: pattern = /oob/; diff --git a/testing/btest/language/port.bro b/testing/btest/language/port.bro index a9c7fd33e7..81d7704c14 100644 --- a/testing/btest/language/port.bro +++ b/testing/btest/language/port.bro @@ -7,7 +7,7 @@ function test_case(msg: string, expect: bool) } -event bro_init() +event zeek_init() { local p1: port = 1/icmp; local p2: port = 2/udp; diff --git a/testing/btest/language/precedence.bro b/testing/btest/language/precedence.bro index 27fc1e024a..9d74c67262 100644 --- a/testing/btest/language/precedence.bro +++ b/testing/btest/language/precedence.bro @@ -9,7 +9,7 @@ function test_case(msg: string, expect: bool) # This is an incomplete set of tests to demonstrate the order of precedence # of bro script operators -event bro_init() +event zeek_init() { local n1: int; local n2: int; diff --git a/testing/btest/language/raw_output_attr.test b/testing/btest/language/raw_output_attr.test index 8bcd479fbf..3af94dc727 100644 --- a/testing/btest/language/raw_output_attr.test +++ b/testing/btest/language/raw_output_attr.test @@ -8,7 +8,7 @@ # first check local variable of file type w/ &raw_output -event bro_init() +event zeek_init() { local myfile: file; myfile = open("myfile"); diff --git a/testing/btest/language/record-ceorce-orphan.bro b/testing/btest/language/record-ceorce-orphan.bro index 126b99d5ff..d72f447a12 100644 --- a/testing/btest/language/record-ceorce-orphan.bro +++ b/testing/btest/language/record-ceorce-orphan.bro @@ -12,7 +12,7 @@ function myfunc(rec: myrec) print rec; } -event bro_init() +event zeek_init() { # Orhpaned fields in a record coercion reflect a programming error, like a typo, so should # be reported at parse-time to prevent unexpected run-time behavior. diff --git a/testing/btest/language/record-coerce-clash.bro b/testing/btest/language/record-coerce-clash.bro index a0bd6f21ad..5dab9ded8a 100644 --- a/testing/btest/language/record-coerce-clash.bro +++ b/testing/btest/language/record-coerce-clash.bro @@ -7,7 +7,7 @@ type myrec: record { cid: conn_id; }; -event bro_init() +event zeek_init() { local mr: myrec; mr = [$cid = [$orig_h=1.2.3.4,$orig_p=0/tcp,$resp_h=0.0.0.0,$resp_p=wrong]]; diff --git a/testing/btest/language/record-function-recursion.bro b/testing/btest/language/record-function-recursion.bro index 90832bfa69..d6a1587962 100644 --- a/testing/btest/language/record-function-recursion.bro +++ b/testing/btest/language/record-function-recursion.bro @@ -13,7 +13,7 @@ redef record Outer += { inner: Inner &optional; }; -event bro_init() { +event zeek_init() { local o = Outer(); print o; print type_name(o); diff --git a/testing/btest/language/record-recursive-coercion.bro b/testing/btest/language/record-recursive-coercion.bro index 0eb24a70d9..4d17c0dee3 100644 --- a/testing/btest/language/record-recursive-coercion.bro +++ b/testing/btest/language/record-recursive-coercion.bro @@ -32,7 +32,7 @@ function foo_func(fc: FooContainer) print fc; } -event bro_init() +event zeek_init() { for ( sw in matched_software ) print matched_software[sw]$version; diff --git a/testing/btest/language/record-type-checking.bro b/testing/btest/language/record-type-checking.bro index d58937d577..5e50a4d8bc 100644 --- a/testing/btest/language/record-type-checking.bro +++ b/testing/btest/language/record-type-checking.bro @@ -13,7 +13,7 @@ global gren: MyRec = MyRec($a = 1); # type clash in init # global, type deduction, anon ctor global grda = [$a = 2]; # fine -event bro_init() +event zeek_init() { grda = MyRec($a = 2); # type clash in assignment } @@ -22,26 +22,26 @@ event bro_init() global grea: MyRec = [$a = 3]; # type clash # local, type deduction, named ctor -event bro_init() +event zeek_init() { local lrdn = MyRec($a = 1000); # type clash } # local, type explicit, named ctor -event bro_init() +event zeek_init() { local lren: MyRec = MyRec($a = 1001); # type clash } # local, type deduction, anon ctor -event bro_init() +event zeek_init() { local lrda = [$a = 1002]; # fine lrda = MyRec($a = 1002); # type clash } # local, type explicit, anon ctor -event bro_init() +event zeek_init() { local lrea: MyRec = [$a = 1003]; # type clash } diff --git a/testing/btest/language/redef-same-prefixtable-idx.bro b/testing/btest/language/redef-same-prefixtable-idx.bro index 13cf27cc0f..e0e16060f4 100644 --- a/testing/btest/language/redef-same-prefixtable-idx.bro +++ b/testing/btest/language/redef-same-prefixtable-idx.bro @@ -10,7 +10,7 @@ redef my_table[3.0.0.0/8] = 2.0.0.0/8; # redef my_table += { [3.0.0.0/8] = 1.0.0.0/8 }; # redef my_table += { [3.0.0.0/8] = 2.0.0.0/8 }; -event bro_init() +event zeek_init() { print my_table; print my_table[3.0.0.0/8]; diff --git a/testing/btest/language/returnwhen.bro b/testing/btest/language/returnwhen.bro index 593841eb7e..79f55fbfc2 100644 --- a/testing/btest/language/returnwhen.bro +++ b/testing/btest/language/returnwhen.bro @@ -58,7 +58,7 @@ event do_another() } } -event bro_init() +event zeek_init() { local local_dummy = dummyfunc; diff --git a/testing/btest/language/set-opt-record-index.bro b/testing/btest/language/set-opt-record-index.bro index d42de8b041..f22c144595 100644 --- a/testing/btest/language/set-opt-record-index.bro +++ b/testing/btest/language/set-opt-record-index.bro @@ -8,7 +8,7 @@ type FOO: record { b: count &optional; }; -event bro_init() +event zeek_init() { local set_of_foo: set[FOO] = set(); diff --git a/testing/btest/language/set-type-checking.bro b/testing/btest/language/set-type-checking.bro index 3c82a29730..3518b8a02d 100644 --- a/testing/btest/language/set-type-checking.bro +++ b/testing/btest/language/set-type-checking.bro @@ -11,7 +11,7 @@ global gen: MySet = MySet(1); # type clash in init # global, type deduction, anon ctor global gda = set(2); # fine -event bro_init() +event zeek_init() { gda = MySet(2); # type clash in assignment } @@ -20,26 +20,26 @@ event bro_init() global gea: MySet = set(3); # type clash # local, type deduction, named ctor -event bro_init() +event zeek_init() { local ldn = MySet(1000); # type clash } # local, type explicit, named ctor -event bro_init() +event zeek_init() { local len: MySet = MySet(1001); # type clash } # local, type deduction, anon ctor -event bro_init() +event zeek_init() { local lda = set(1002); # fine lda = MySet(1002); # type clash } # local, type explicit, anon ctor -event bro_init() +event zeek_init() { local lea: MySet = set(1003); # type clash } @@ -53,7 +53,7 @@ type MyRecord: record { global set_of_records: set[MyRecord]; -event bro_init() +event zeek_init() { # Set ctor w/ anonymous record ctor should coerce. set_of_records = set([$user="testuser", $host="testhost", $path="testpath"]); diff --git a/testing/btest/language/set.bro b/testing/btest/language/set.bro index 56cd649b49..53cf400795 100644 --- a/testing/btest/language/set.bro +++ b/testing/btest/language/set.bro @@ -13,7 +13,7 @@ global sg2: set[port, string, bool] = { [10/udp, "curly", F], [11/udp, "braces", T] }; global sg3 = { "more", "curly", "braces" }; -event bro_init() +event zeek_init() { local s1: set[string] = set( "test", "example" ); local s2: set[string] = set(); diff --git a/testing/btest/language/short-circuit.bro b/testing/btest/language/short-circuit.bro index 598ac8da35..70928f6441 100644 --- a/testing/btest/language/short-circuit.bro +++ b/testing/btest/language/short-circuit.bro @@ -21,7 +21,7 @@ function f_func(): bool } -event bro_init() +event zeek_init() { local res: bool; diff --git a/testing/btest/language/string.bro b/testing/btest/language/string.bro index abaa556b26..936ac3e493 100644 --- a/testing/btest/language/string.bro +++ b/testing/btest/language/string.bro @@ -7,7 +7,7 @@ function test_case(msg: string, expect: bool) } -event bro_init() +event zeek_init() { local s1: string = "a\ty"; # tab local s2: string = "a\nb"; # newline diff --git a/testing/btest/language/strings.bro b/testing/btest/language/strings.bro index f601797978..992fb2c5b3 100644 --- a/testing/btest/language/strings.bro +++ b/testing/btest/language/strings.bro @@ -4,7 +4,7 @@ # Demo policy for string functions # -event bro_init() +event zeek_init() { local s1: string = "broisaveryneatids"; diff --git a/testing/btest/language/subnet.bro b/testing/btest/language/subnet.bro index b3b50e085f..32cf11701e 100644 --- a/testing/btest/language/subnet.bro +++ b/testing/btest/language/subnet.bro @@ -7,7 +7,7 @@ function test_case(msg: string, expect: bool) } -event bro_init() +event zeek_init() { # IPv4 addr local a1: addr = 192.1.2.3; diff --git a/testing/btest/language/switch-incomplete.bro b/testing/btest/language/switch-incomplete.bro index 7ee800b274..dedf529ccb 100644 --- a/testing/btest/language/switch-incomplete.bro +++ b/testing/btest/language/switch-incomplete.bro @@ -1,7 +1,7 @@ # @TEST-EXEC-FAIL: bro -b %INPUT >out 2>&1 # @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-remove-abspath btest-diff out -event bro_init() +event zeek_init() { switch ( 1 ) { case 1: diff --git a/testing/btest/language/switch-statement.bro b/testing/btest/language/switch-statement.bro index 152b14f87d..1035cb4b2e 100644 --- a/testing/btest/language/switch-statement.bro +++ b/testing/btest/language/switch-statement.bro @@ -219,7 +219,7 @@ function test_switch(actual: string, expect: string) print fmt("%s != %s", actual, expect); } -event bro_init() +event zeek_init() { test_switch( switch_bool(T) , "true" ); test_switch( switch_bool(F) , "false" ); diff --git a/testing/btest/language/switch-types-vars.bro b/testing/btest/language/switch-types-vars.bro index 1b0ca5591b..3e33e1c17f 100644 --- a/testing/btest/language/switch-types-vars.bro +++ b/testing/btest/language/switch-types-vars.bro @@ -36,7 +36,7 @@ function switch_one(v: any) } } -event bro_init() +event zeek_init() { switch_one("My StrIng"); switch_one(42); diff --git a/testing/btest/language/switch-types.bro b/testing/btest/language/switch-types.bro index 468ba93922..2ebddea6f0 100644 --- a/testing/btest/language/switch-types.bro +++ b/testing/btest/language/switch-types.bro @@ -30,7 +30,7 @@ function switch_one_no_default(v: any): string } -event bro_init() +event zeek_init() { print switch_one("string"); print switch_one(42); diff --git a/testing/btest/language/table-init-attrs.bro b/testing/btest/language/table-init-attrs.bro index 76d98b9fed..9d3403642a 100644 --- a/testing/btest/language/table-init-attrs.bro +++ b/testing/btest/language/table-init-attrs.bro @@ -51,7 +51,7 @@ global inception_table2: table[count] of table[count] of string = { [0] = table([13] = "bar") &default="forty-two", } &default=table() &default="we need to go deeper"; -event bro_init() +event zeek_init() { print "my_set_ctor_init"; print my_set_ctor_init; diff --git a/testing/btest/language/table-init.bro b/testing/btest/language/table-init.bro index 7419a50879..cc94589974 100644 --- a/testing/btest/language/table-init.bro +++ b/testing/btest/language/table-init.bro @@ -6,7 +6,7 @@ global global_table: table[count] of string = { [2] = "two" } &default = "global table default"; -event bro_init() +event zeek_init() { local local_table: table[count] of string = { [3] = "three", diff --git a/testing/btest/language/table-type-checking.bro b/testing/btest/language/table-type-checking.bro index f579a83d37..639a2d021d 100644 --- a/testing/btest/language/table-type-checking.bro +++ b/testing/btest/language/table-type-checking.bro @@ -12,7 +12,7 @@ global gen: MyTable = MyTable(["one"] = 1); # type clash in init # global, type deduction, anon ctor global gda = table(["two"] = 2); # fine global gda2 = MyTable([2/tcp] = 2); # fine -event bro_init() +event zeek_init() { gda = gda2; # type clash } @@ -21,26 +21,26 @@ event bro_init() global gea: MyTable = table(["three"] = 3); # type clash # local, type deduction, named ctor -event bro_init() +event zeek_init() { local ldn = MyTable(["thousand"] = 1000); # type clash } # local, type explicit, named ctor -event bro_init() +event zeek_init() { local len: MyTable = MyTable(["thousand-one"] = 1001); # type clash } # local, type deduction, anon ctor -event bro_init() +event zeek_init() { local lda = table(["thousand-two"] = 1002); # fine lda = MyTable(["thousand-two"] = 1002); # type clash } # local, type explicit, anon ctor -event bro_init() +event zeek_init() { local lea: MyTable = table(["thousand-three"] = 1003); # type clash } diff --git a/testing/btest/language/table.bro b/testing/btest/language/table.bro index 3c8e8db280..98f7daa8e3 100644 --- a/testing/btest/language/table.bro +++ b/testing/btest/language/table.bro @@ -10,7 +10,7 @@ function test_case(msg: string, expect: bool) # type is not explicitly specified global tg1 = { [1] = "type", [2] = "inference", [3] = "test" }; -event bro_init() +event zeek_init() { local t1: table[count] of string = table( [5] = "test", [0] = "example" ); local t2: table[count] of string = table(); diff --git a/testing/btest/language/time.bro b/testing/btest/language/time.bro index dd4b6336fe..e8b71219ca 100644 --- a/testing/btest/language/time.bro +++ b/testing/btest/language/time.bro @@ -7,7 +7,7 @@ function test_case(msg: string, expect: bool) } -event bro_init() +event zeek_init() { local t1: time = current_time(); local t2: time = t1 + 3 sec; diff --git a/testing/btest/language/timeout.bro b/testing/btest/language/timeout.bro index 632ab18b5f..47906b35fb 100644 --- a/testing/btest/language/timeout.bro +++ b/testing/btest/language/timeout.bro @@ -2,7 +2,7 @@ # @TEST-EXEC: btest-diff out -event bro_init() +event zeek_init() { local h1: addr = 1.2.3.4; diff --git a/testing/btest/language/type-cast-any.bro b/testing/btest/language/type-cast-any.bro index ddd4ea2dbe..ad18a28646 100644 --- a/testing/btest/language/type-cast-any.bro +++ b/testing/btest/language/type-cast-any.bro @@ -27,7 +27,7 @@ function cast_to_X(a: any, b: X) print a, P, P is X, fmt("%s==%s => %s", b, P, Cmp); } -event bro_init() +event zeek_init() { local x: X; x = [$a = 1.2.3.4, $b=1947/tcp]; diff --git a/testing/btest/language/type-cast-error-dynamic.bro b/testing/btest/language/type-cast-error-dynamic.bro index c18548b0c4..fb0605b196 100644 --- a/testing/btest/language/type-cast-error-dynamic.bro +++ b/testing/btest/language/type-cast-error-dynamic.bro @@ -11,7 +11,7 @@ function cast_to_string(a: any) print a as string; } -event bro_init() +event zeek_init() { cast_to_string(42); } diff --git a/testing/btest/language/type-cast-error-static.bro b/testing/btest/language/type-cast-error-static.bro index 3533fef3cb..3d1afbe095 100644 --- a/testing/btest/language/type-cast-error-static.bro +++ b/testing/btest/language/type-cast-error-static.bro @@ -6,7 +6,7 @@ type X: record { b: port; }; -event bro_init() +event zeek_init() { local x: X; x = [$a = 1.2.3.4, $b=1947/tcp]; diff --git a/testing/btest/language/type-cast-same.bro b/testing/btest/language/type-cast-same.bro index 93c3b633fa..58e98bb0c0 100644 --- a/testing/btest/language/type-cast-same.bro +++ b/testing/btest/language/type-cast-same.bro @@ -6,7 +6,7 @@ type X: record { b: port; }; -event bro_init() +event zeek_init() { local x: X; x = [$a = 1.2.3.4, $b=1947/tcp]; diff --git a/testing/btest/language/type-check-any.bro b/testing/btest/language/type-check-any.bro index 5d882c8997..1b681a3420 100644 --- a/testing/btest/language/type-check-any.bro +++ b/testing/btest/language/type-check-any.bro @@ -11,7 +11,7 @@ function check(a: any) print a, a is string, a is count, a is X; } -event bro_init() +event zeek_init() { local x: X; x = [$a = 1.2.3.4, $b=1947/tcp]; diff --git a/testing/btest/language/type-check-vector.bro b/testing/btest/language/type-check-vector.bro index 461fb312fb..b92c654fb6 100644 --- a/testing/btest/language/type-check-vector.bro +++ b/testing/btest/language/type-check-vector.bro @@ -9,7 +9,7 @@ function check(a: any) print a as myvec; } -event bro_init() +event zeek_init() { local v = myvec("one", "two", 3); check(v); diff --git a/testing/btest/language/type-type-error.bro b/testing/btest/language/type-type-error.bro index 047e4b34ef..2f3e3913ef 100644 --- a/testing/btest/language/type-type-error.bro +++ b/testing/btest/language/type-type-error.bro @@ -5,7 +5,7 @@ type r: record { a: string; }; -event bro_init() +event zeek_init() { # This should generate a parse error indicating that the type identifier # is incorrectly used in an expression expecting a real value and not diff --git a/testing/btest/language/undefined-delete-field.bro b/testing/btest/language/undefined-delete-field.bro index 8271f016fe..a45e093527 100644 --- a/testing/btest/language/undefined-delete-field.bro +++ b/testing/btest/language/undefined-delete-field.bro @@ -7,7 +7,7 @@ type MyRecordType: record b: count; }; -event bro_init() +event zeek_init() { local x = MyRecordType($a=1, $b=2); diff --git a/testing/btest/language/uninitialized-local.bro b/testing/btest/language/uninitialized-local.bro index ae486ebf1f..ec4a6e61de 100644 --- a/testing/btest/language/uninitialized-local.bro +++ b/testing/btest/language/uninitialized-local.bro @@ -16,7 +16,7 @@ event testit() my_vector[0] = my_string; } -event bro_init() +event zeek_init() { event testit(); } diff --git a/testing/btest/language/uninitialized-local2.bro b/testing/btest/language/uninitialized-local2.bro index f11a5fda10..ed4045a1a3 100644 --- a/testing/btest/language/uninitialized-local2.bro +++ b/testing/btest/language/uninitialized-local2.bro @@ -19,7 +19,7 @@ event test() print "var_b is", var_b; } -event bro_init() +event zeek_init() { event test(); } diff --git a/testing/btest/language/vector-any-append.bro b/testing/btest/language/vector-any-append.bro index 816627fbf1..d501af6b15 100644 --- a/testing/btest/language/vector-any-append.bro +++ b/testing/btest/language/vector-any-append.bro @@ -11,7 +11,7 @@ function append(v: vector of any) v += |v|; } -event bro_init() +event zeek_init() { local v: vector of count; assign(v); diff --git a/testing/btest/language/vector-type-checking.bro b/testing/btest/language/vector-type-checking.bro index b4c75118d1..c0003503a4 100644 --- a/testing/btest/language/vector-type-checking.bro +++ b/testing/btest/language/vector-type-checking.bro @@ -12,7 +12,7 @@ global gen: MyVec = MyVec("one"); # type clash in init # global, type deduction, anon ctor global gda = vector("two"); # fine global gda2 = MyVec(2); # fine -event bro_init() +event zeek_init() { gda = gda2; # type clash } @@ -21,26 +21,26 @@ event bro_init() global gea: MyVec = vector("three"); # type clash # local, type deduction, named ctor -event bro_init() +event zeek_init() { local ldn = MyVec("thousand"); # type clash } # local, type explicit, named ctor -event bro_init() +event zeek_init() { local len: MyVec = MyVec("thousand-one"); # type clash } # local, type deduction, anon ctor -event bro_init() +event zeek_init() { local lda = vector("thousand-two"); # fine lda = MyVec("thousand-two"); # type clash } # local, type explicit, anon ctor -event bro_init() +event zeek_init() { local lea: MyVec = vector("thousand-three"); # type clash } diff --git a/testing/btest/language/vector.bro b/testing/btest/language/vector.bro index 0eafd6c60c..36ff7c0267 100644 --- a/testing/btest/language/vector.bro +++ b/testing/btest/language/vector.bro @@ -10,7 +10,7 @@ function test_case(msg: string, expect: bool) # Note: only global vectors can be initialized with curly braces global vg1: vector of string = { "curly", "braces" }; -event bro_init() +event zeek_init() { local v1: vector of string = vector( "test", "example" ); local v2: vector of string = vector(); diff --git a/testing/btest/language/when-unitialized-rhs.bro b/testing/btest/language/when-unitialized-rhs.bro index 21b94c6e02..196834c2ae 100644 --- a/testing/btest/language/when-unitialized-rhs.bro +++ b/testing/btest/language/when-unitialized-rhs.bro @@ -4,7 +4,7 @@ global crashMe: function(): string; global x: int; -event bro_init() +event zeek_init() { when( local result = crashMe() ) { diff --git a/testing/btest/language/when.bro b/testing/btest/language/when.bro index a2bad6a620..36914ce993 100644 --- a/testing/btest/language/when.bro +++ b/testing/btest/language/when.bro @@ -5,7 +5,7 @@ redef exit_only_after_terminate = T; -event bro_init() +event zeek_init() { local h: addr = 127.0.0.1; diff --git a/testing/btest/language/while.bro b/testing/btest/language/while.bro index 6828b00b41..d6588589f7 100644 --- a/testing/btest/language/while.bro +++ b/testing/btest/language/while.bro @@ -67,7 +67,7 @@ function test_return(): vector of string return rval; } -event bro_init() +event zeek_init() { test_noop(); test_it(); diff --git a/testing/btest/plugins/bifs-and-scripts-install.sh b/testing/btest/plugins/bifs-and-scripts-install.sh index 60c754f8ff..09013a0876 100644 --- a/testing/btest/plugins/bifs-and-scripts-install.sh +++ b/testing/btest/plugins/bifs-and-scripts-install.sh @@ -18,7 +18,7 @@ cat >scripts/demo/foo/__load__.bro <scripts/demo/foo/manually.bro <scripts/demo/foo/base/at-startup.bro <scripts/demo/foo/__load__.bro <scripts/demo/foo/manually.bro <scripts/demo/foo/base/at-startup.bro <&1 # @TEST-EXEC: btest-diff .stdout -event bro_init() +event zeek_init() { print "This should fail but not crash"; print Files::lookup_file("asdf"); diff --git a/testing/btest/scripts/base/frameworks/file-analysis/bifs/register_mime_type.bro b/testing/btest/scripts/base/frameworks/file-analysis/bifs/register_mime_type.bro index 9b6d11ce0d..df4573e418 100644 --- a/testing/btest/scripts/base/frameworks/file-analysis/bifs/register_mime_type.bro +++ b/testing/btest/scripts/base/frameworks/file-analysis/bifs/register_mime_type.bro @@ -1,7 +1,7 @@ # @TEST-EXEC: bro -r $TRACES/http/get.trace %INPUT # @TEST-EXEC: btest-diff files.log -event bro_init() +event zeek_init() { Files::register_for_mime_type(Files::ANALYZER_MD5, "text/plain"); }; diff --git a/testing/btest/scripts/base/frameworks/file-analysis/input/basic.bro b/testing/btest/scripts/base/frameworks/file-analysis/input/basic.bro index 053341c840..8598d3c1f4 100644 --- a/testing/btest/scripts/base/frameworks/file-analysis/input/basic.bro +++ b/testing/btest/scripts/base/frameworks/file-analysis/input/basic.bro @@ -18,7 +18,7 @@ redef test_get_file_name = function(f: fa_file): string T -42 SSH::LOG 21 123 10.0.0.0/24 1.2.3.4 3.14 1315801931.273616 100.000000 hurz 2,4,1,3 CC,AA,BB EMPTY 10,20,30 EMPTY 4242 @TEST-END-FILE -event bro_init() +event zeek_init() { local source: string = "../input.log"; Input::add_analysis([$source=source, $reader=Input::READER_BINARY, diff --git a/testing/btest/scripts/base/frameworks/input/basic.bro b/testing/btest/scripts/base/frameworks/input/basic.bro index 356b87d70b..02c3b4ff79 100644 --- a/testing/btest/scripts/base/frameworks/input/basic.bro +++ b/testing/btest/scripts/base/frameworks/input/basic.bro @@ -47,7 +47,7 @@ type Val: record { global servers: table[int] of Val = table(); -event bro_init() +event zeek_init() { outfile = open("../out"); # first read in the old stuff into the table... diff --git a/testing/btest/scripts/base/frameworks/input/bignumber.bro b/testing/btest/scripts/base/frameworks/input/bignumber.bro index 15d711b1c4..b5b9d3fcae 100644 --- a/testing/btest/scripts/base/frameworks/input/bignumber.bro +++ b/testing/btest/scripts/base/frameworks/input/bignumber.bro @@ -26,7 +26,7 @@ type Val: record { global servers: table[int] of Val = table(); -event bro_init() +event zeek_init() { outfile = open("../out"); # first read in the old stuff into the table... diff --git a/testing/btest/scripts/base/frameworks/input/binary.bro b/testing/btest/scripts/base/frameworks/input/binary.bro index 11701fbd8a..072db53e11 100644 --- a/testing/btest/scripts/base/frameworks/input/binary.bro +++ b/testing/btest/scripts/base/frameworks/input/binary.bro @@ -45,7 +45,7 @@ event line(description: Input::EventDescription, tpe: Input::Event, a: string, b } } -event bro_init() +event zeek_init() { try = 0; outfile = open("../out"); diff --git a/testing/btest/scripts/base/frameworks/input/config/basic.bro b/testing/btest/scripts/base/frameworks/input/config/basic.bro index c8d68fc822..a0a7df017f 100644 --- a/testing/btest/scripts/base/frameworks/input/config/basic.bro +++ b/testing/btest/scripts/base/frameworks/input/config/basic.bro @@ -67,7 +67,7 @@ event Input::end_of_data(name: string, source:string) terminate(); } -event bro_init() +event zeek_init() { outfile = open("../out"); Input::add_table([$reader=Input::READER_CONFIG, $source="../configfile", $name="configuration", $idx=Idx, $val=Val, $destination=currconfig, $want_record=F]); diff --git a/testing/btest/scripts/base/frameworks/input/config/errors.bro b/testing/btest/scripts/base/frameworks/input/config/errors.bro index 4f398956dc..262b4ff36d 100644 --- a/testing/btest/scripts/base/frameworks/input/config/errors.bro +++ b/testing/btest/scripts/base/frameworks/input/config/errors.bro @@ -58,7 +58,7 @@ event Input::end_of_data(name: string, source:string) terminate(); } -event bro_init() +event zeek_init() { outfile = open("../out"); Input::add_table([$reader=Input::READER_CONFIG, $source="../configfile", $name="configuration", $idx=Idx, $val=Val, $destination=currconfig, $want_record=F]); diff --git a/testing/btest/scripts/base/frameworks/input/default.bro b/testing/btest/scripts/base/frameworks/input/default.bro index c5b0e2f967..3c9880696d 100644 --- a/testing/btest/scripts/base/frameworks/input/default.bro +++ b/testing/btest/scripts/base/frameworks/input/default.bro @@ -33,7 +33,7 @@ event line(description: Input::EventDescription, tpe: Input::Event, val: Val) print outfile, val; } -event bro_init() +event zeek_init() { outfile = open("../out"); Input::add_event([$source="../input.log", $name="input", $fields=Val, $ev=line, $want_record=T]); diff --git a/testing/btest/scripts/base/frameworks/input/empty-values-hashing.bro b/testing/btest/scripts/base/frameworks/input/empty-values-hashing.bro index b46c299c2c..b43044b963 100644 --- a/testing/btest/scripts/base/frameworks/input/empty-values-hashing.bro +++ b/testing/btest/scripts/base/frameworks/input/empty-values-hashing.bro @@ -52,7 +52,7 @@ event line(description: Input::TableDescription, tpe: Input::Event, left: Idx, r print outfile, right; } -event bro_init() +event zeek_init() { outfile = open("../out"); try = 0; diff --git a/testing/btest/scripts/base/frameworks/input/emptyvals.bro b/testing/btest/scripts/base/frameworks/input/emptyvals.bro index 57e79dd977..6e45f56e8d 100644 --- a/testing/btest/scripts/base/frameworks/input/emptyvals.bro +++ b/testing/btest/scripts/base/frameworks/input/emptyvals.bro @@ -29,7 +29,7 @@ type Val: record { global servers: table[int] of Val = table(); -event bro_init() +event zeek_init() { outfile = open("../out"); # first read in the old stuff into the table... diff --git a/testing/btest/scripts/base/frameworks/input/errors.bro b/testing/btest/scripts/base/frameworks/input/errors.bro index 0d0376694a..296c43f450 100644 --- a/testing/btest/scripts/base/frameworks/input/errors.bro +++ b/testing/btest/scripts/base/frameworks/input/errors.bro @@ -148,7 +148,7 @@ event kill_me() terminate(); } -event bro_init() +event zeek_init() { outfile = open("out"); Input::add_event([$source="input.log", $name="file", $fields=FileVal, $ev=line_file, $want_record=T]); diff --git a/testing/btest/scripts/base/frameworks/input/event.bro b/testing/btest/scripts/base/frameworks/input/event.bro index 6b6a391939..1ac4e38af5 100644 --- a/testing/btest/scripts/base/frameworks/input/event.bro +++ b/testing/btest/scripts/base/frameworks/input/event.bro @@ -35,7 +35,7 @@ event line(description: Input::EventDescription, tpe: Input::Event, i: int, b: b print outfile, b; } -event bro_init() +event zeek_init() { outfile = open("../out"); Input::add_event([$source="../input.log", $name="input", $fields=Val, $ev=line, $want_record=F]); diff --git a/testing/btest/scripts/base/frameworks/input/invalid-lines.bro b/testing/btest/scripts/base/frameworks/input/invalid-lines.bro index 83be1efd09..2a2e2b1e63 100644 --- a/testing/btest/scripts/base/frameworks/input/invalid-lines.bro +++ b/testing/btest/scripts/base/frameworks/input/invalid-lines.bro @@ -50,7 +50,7 @@ type Val: record { global servers: table[int] of Val = table(); global servers2: table[int] of Val = table(); -event bro_init() +event zeek_init() { outfile = open("../out"); # first read in the old stuff into the table... diff --git a/testing/btest/scripts/base/frameworks/input/invalidnumbers.bro b/testing/btest/scripts/base/frameworks/input/invalidnumbers.bro index f2fefaa5d0..4acaa63ee6 100644 --- a/testing/btest/scripts/base/frameworks/input/invalidnumbers.bro +++ b/testing/btest/scripts/base/frameworks/input/invalidnumbers.bro @@ -30,7 +30,7 @@ type Val: record { global servers: table[int] of Val = table(); -event bro_init() +event zeek_init() { outfile = open("../out"); # first read in the old stuff into the table... diff --git a/testing/btest/scripts/base/frameworks/input/invalidset.bro b/testing/btest/scripts/base/frameworks/input/invalidset.bro index 932060424e..d1ca5e3262 100644 --- a/testing/btest/scripts/base/frameworks/input/invalidset.bro +++ b/testing/btest/scripts/base/frameworks/input/invalidset.bro @@ -45,7 +45,7 @@ event line(description: Input::EventDescription, tpe: Input::Event, v: Val) print outfile, "Event", v; } -event bro_init() +event zeek_init() { outfile = open("../out"); # first read in the old stuff into the table... diff --git a/testing/btest/scripts/base/frameworks/input/invalidtext.bro b/testing/btest/scripts/base/frameworks/input/invalidtext.bro index 3f5b590dec..3a30da30c8 100644 --- a/testing/btest/scripts/base/frameworks/input/invalidtext.bro +++ b/testing/btest/scripts/base/frameworks/input/invalidtext.bro @@ -46,7 +46,7 @@ event line(description: Input::EventDescription, tpe: Input::Event, v: Val) print outfile, "Event", v; } -event bro_init() +event zeek_init() { outfile = open("../out"); # first read in the old stuff into the table... diff --git a/testing/btest/scripts/base/frameworks/input/missing-enum.bro b/testing/btest/scripts/base/frameworks/input/missing-enum.bro index 0d37aae453..abdc608447 100644 --- a/testing/btest/scripts/base/frameworks/input/missing-enum.bro +++ b/testing/btest/scripts/base/frameworks/input/missing-enum.bro @@ -22,7 +22,7 @@ type Val: record { global etable: table[int] of Log::ID = table(); -event bro_init() +event zeek_init() { # first read in the old stuff into the table... Input::add_table([$source="../input.log", $name="enum", $idx=Idx, $val=Val, $destination=etable, $want_record=F]); diff --git a/testing/btest/scripts/base/frameworks/input/missing-file-initially.bro b/testing/btest/scripts/base/frameworks/input/missing-file-initially.bro index 7c9f51994c..0fed78d120 100644 --- a/testing/btest/scripts/base/frameworks/input/missing-file-initially.bro +++ b/testing/btest/scripts/base/frameworks/input/missing-file-initially.bro @@ -50,7 +50,7 @@ event line2(description: Input::EventDescription, tpe: Input::Event, v: Val) } -event bro_init() +event zeek_init() { Input::add_event([$source="../does-not-exist.dat", $name="input", $reader=Input::READER_ASCII, $mode=Input::REREAD, $fields=Val, $ev=line, $want_record=T]); Input::add_event([$source="../does-not-exist.dat", $name="inputstream", $reader=Input::READER_ASCII, $mode=Input::STREAM, $fields=Val, $ev=line, $want_record=T]); diff --git a/testing/btest/scripts/base/frameworks/input/missing-file.bro b/testing/btest/scripts/base/frameworks/input/missing-file.bro index 2ec3bb937f..90fbeb175e 100644 --- a/testing/btest/scripts/base/frameworks/input/missing-file.bro +++ b/testing/btest/scripts/base/frameworks/input/missing-file.bro @@ -19,7 +19,7 @@ event line(description: Input::EventDescription, tpe: Input::Event, i: int, b: b { } -event bro_init() +event zeek_init() { try = 0; outfile = open("../out"); diff --git a/testing/btest/scripts/base/frameworks/input/onecolumn-norecord.bro b/testing/btest/scripts/base/frameworks/input/onecolumn-norecord.bro index c38c4efd85..723227a1c3 100644 --- a/testing/btest/scripts/base/frameworks/input/onecolumn-norecord.bro +++ b/testing/btest/scripts/base/frameworks/input/onecolumn-norecord.bro @@ -28,7 +28,7 @@ type Val: record { global servers: table[int] of bool = table(); -event bro_init() +event zeek_init() { outfile = open("../out"); Input::add_table([$source="../input.log", $name="input", $idx=Idx, $val=Val, $destination=servers, $want_record=F]); diff --git a/testing/btest/scripts/base/frameworks/input/onecolumn-record.bro b/testing/btest/scripts/base/frameworks/input/onecolumn-record.bro index 3ee82983ff..33da194d84 100644 --- a/testing/btest/scripts/base/frameworks/input/onecolumn-record.bro +++ b/testing/btest/scripts/base/frameworks/input/onecolumn-record.bro @@ -28,7 +28,7 @@ type Val: record { global servers: table[int] of Val = table(); -event bro_init() +event zeek_init() { outfile = open("../out"); Input::add_table([$name="input", $source="../input.log", $idx=Idx, $val=Val, $destination=servers]); diff --git a/testing/btest/scripts/base/frameworks/input/optional.bro b/testing/btest/scripts/base/frameworks/input/optional.bro index 56c261999d..9b9d569ffe 100644 --- a/testing/btest/scripts/base/frameworks/input/optional.bro +++ b/testing/btest/scripts/base/frameworks/input/optional.bro @@ -35,7 +35,7 @@ type Val: record { global servers: table[int] of Val = table(); -event bro_init() +event zeek_init() { outfile = open("../out"); # first read in the old stuff into the table... diff --git a/testing/btest/scripts/base/frameworks/input/port-embedded.bro b/testing/btest/scripts/base/frameworks/input/port-embedded.bro index 8aab733069..32feb47c34 100644 --- a/testing/btest/scripts/base/frameworks/input/port-embedded.bro +++ b/testing/btest/scripts/base/frameworks/input/port-embedded.bro @@ -32,7 +32,7 @@ event line(description: Input::TableDescription, tpe: Input::Event, left: Idx, r print left, right; } -event bro_init() +event zeek_init() { Input::add_table([$source="../input.log", $name="input", $idx=Idx, $val=Val, $ev=line, $destination=servers]); } diff --git a/testing/btest/scripts/base/frameworks/input/port.bro b/testing/btest/scripts/base/frameworks/input/port.bro index 48571c5ecd..d0bb823b74 100644 --- a/testing/btest/scripts/base/frameworks/input/port.bro +++ b/testing/btest/scripts/base/frameworks/input/port.bro @@ -27,7 +27,7 @@ type Val: record { global servers: table[addr] of Val = table(); -event bro_init() +event zeek_init() { outfile = open("../out"); Input::add_table([$source="../input.log", $name="input", $idx=Idx, $val=Val, $destination=servers]); diff --git a/testing/btest/scripts/base/frameworks/input/predicate-stream.bro b/testing/btest/scripts/base/frameworks/input/predicate-stream.bro index aac44fb8ee..f8e7f8fdf3 100644 --- a/testing/btest/scripts/base/frameworks/input/predicate-stream.bro +++ b/testing/btest/scripts/base/frameworks/input/predicate-stream.bro @@ -64,7 +64,7 @@ event line(description: Input::TableDescription, tpe: Input::Event, left: Idx, r terminate(); } -event bro_init() +event zeek_init() { outfile = open("../out"); ct = 0; diff --git a/testing/btest/scripts/base/frameworks/input/predicate.bro b/testing/btest/scripts/base/frameworks/input/predicate.bro index 9946e72211..171e1d42de 100644 --- a/testing/btest/scripts/base/frameworks/input/predicate.bro +++ b/testing/btest/scripts/base/frameworks/input/predicate.bro @@ -34,7 +34,7 @@ type Val: record { global servers: table[int] of bool = table(); -event bro_init() +event zeek_init() { outfile = open("../out"); # first read in the old stuff into the table... diff --git a/testing/btest/scripts/base/frameworks/input/predicatemodify.bro b/testing/btest/scripts/base/frameworks/input/predicatemodify.bro index 13ed38d6ba..80e8c6aac8 100644 --- a/testing/btest/scripts/base/frameworks/input/predicatemodify.bro +++ b/testing/btest/scripts/base/frameworks/input/predicatemodify.bro @@ -31,7 +31,7 @@ type Val: record { global servers: table[int, string] of Val = table(); -event bro_init() +event zeek_init() { outfile = open("../out"); diff --git a/testing/btest/scripts/base/frameworks/input/predicatemodifyandreread.bro b/testing/btest/scripts/base/frameworks/input/predicatemodifyandreread.bro index 2c6b58ff2d..53708b4fdd 100644 --- a/testing/btest/scripts/base/frameworks/input/predicatemodifyandreread.bro +++ b/testing/btest/scripts/base/frameworks/input/predicatemodifyandreread.bro @@ -75,7 +75,7 @@ global servers: table[int, string] of Val = table(); global outfile: file; global try: count; -event bro_init() +event zeek_init() { try = 0; outfile = open("../out"); diff --git a/testing/btest/scripts/base/frameworks/input/predicaterefusesecondsamerecord.bro b/testing/btest/scripts/base/frameworks/input/predicaterefusesecondsamerecord.bro index ae756431cd..6d4147ad06 100644 --- a/testing/btest/scripts/base/frameworks/input/predicaterefusesecondsamerecord.bro +++ b/testing/btest/scripts/base/frameworks/input/predicaterefusesecondsamerecord.bro @@ -35,7 +35,7 @@ type Val: record { global servers: table[addr] of Val = table(); -event bro_init() +event zeek_init() { outfile = open("../out"); # first read in the old stuff into the table... diff --git a/testing/btest/scripts/base/frameworks/input/raw/basic.bro b/testing/btest/scripts/base/frameworks/input/raw/basic.bro index 377e34aca7..cb9e0269ea 100644 --- a/testing/btest/scripts/base/frameworks/input/raw/basic.bro +++ b/testing/btest/scripts/base/frameworks/input/raw/basic.bro @@ -38,7 +38,7 @@ event line(description: Input::EventDescription, tpe: Input::Event, s: string) } } -event bro_init() +event zeek_init() { try = 0; outfile = open("../out"); diff --git a/testing/btest/scripts/base/frameworks/input/raw/execute.bro b/testing/btest/scripts/base/frameworks/input/raw/execute.bro index 783b974c0f..018b62d75b 100644 --- a/testing/btest/scripts/base/frameworks/input/raw/execute.bro +++ b/testing/btest/scripts/base/frameworks/input/raw/execute.bro @@ -32,7 +32,7 @@ event line(description: Input::EventDescription, tpe: Input::Event, s: string) terminate(); } -event bro_init() +event zeek_init() { outfile = open("../out.tmp"); Input::add_event([$source="wc -l ../input.log |", $reader=Input::READER_RAW, $name="input", $fields=Val, $ev=line, $want_record=F]); diff --git a/testing/btest/scripts/base/frameworks/input/raw/executestdin.bro b/testing/btest/scripts/base/frameworks/input/raw/executestdin.bro index b78dd4e0e3..1c24c3ab8a 100644 --- a/testing/btest/scripts/base/frameworks/input/raw/executestdin.bro +++ b/testing/btest/scripts/base/frameworks/input/raw/executestdin.bro @@ -72,7 +72,7 @@ function more_input(name_prefix: string) $config=config_strings]); } -event bro_init() +event zeek_init() { outfile = open("../out"); ++total_processes; diff --git a/testing/btest/scripts/base/frameworks/input/raw/executestream.bro b/testing/btest/scripts/base/frameworks/input/raw/executestream.bro index 240761ee03..ded6588269 100644 --- a/testing/btest/scripts/base/frameworks/input/raw/executestream.bro +++ b/testing/btest/scripts/base/frameworks/input/raw/executestream.bro @@ -56,7 +56,7 @@ event line(description: Input::EventDescription, tpe: Input::Event, s: string) } } -event bro_init() +event zeek_init() { outfile = open("../out"); try = 0; diff --git a/testing/btest/scripts/base/frameworks/input/raw/long.bro b/testing/btest/scripts/base/frameworks/input/raw/long.bro index 266021ae28..40f84c8597 100644 --- a/testing/btest/scripts/base/frameworks/input/raw/long.bro +++ b/testing/btest/scripts/base/frameworks/input/raw/long.bro @@ -29,7 +29,7 @@ event line(description: Input::EventDescription, tpe: Input::Event, s: string) } } -event bro_init() +event zeek_init() { try = 0; outfile = open("../out"); diff --git a/testing/btest/scripts/base/frameworks/input/raw/offset.bro b/testing/btest/scripts/base/frameworks/input/raw/offset.bro index f37fb9c28a..0fdb6d65e9 100644 --- a/testing/btest/scripts/base/frameworks/input/raw/offset.bro +++ b/testing/btest/scripts/base/frameworks/input/raw/offset.bro @@ -33,7 +33,7 @@ event line(description: Input::EventDescription, tpe: Input::Event, s: string) } } -event bro_init() +event zeek_init() { try = 0; outfile = open("../out"); diff --git a/testing/btest/scripts/base/frameworks/input/raw/rereadraw.bro b/testing/btest/scripts/base/frameworks/input/raw/rereadraw.bro index f3dfb11ea5..ae977b4b2d 100644 --- a/testing/btest/scripts/base/frameworks/input/raw/rereadraw.bro +++ b/testing/btest/scripts/base/frameworks/input/raw/rereadraw.bro @@ -38,7 +38,7 @@ event line(description: Input::EventDescription, tpe: Input::Event, s: string) } } -event bro_init() +event zeek_init() { try = 0; outfile = open("../out"); diff --git a/testing/btest/scripts/base/frameworks/input/raw/stderr.bro b/testing/btest/scripts/base/frameworks/input/raw/stderr.bro index 8ff4cc7f1b..b62b135e43 100644 --- a/testing/btest/scripts/base/frameworks/input/raw/stderr.bro +++ b/testing/btest/scripts/base/frameworks/input/raw/stderr.bro @@ -54,7 +54,7 @@ event InputRaw::process_finished(name: string, source:string, exit_code:count, s terminate(); } -event bro_init() +event zeek_init() { local config_strings: table[string] of string = { ["read_stderr"] = "1" diff --git a/testing/btest/scripts/base/frameworks/input/raw/streamraw.bro b/testing/btest/scripts/base/frameworks/input/raw/streamraw.bro index 331db7eeb8..923428717f 100644 --- a/testing/btest/scripts/base/frameworks/input/raw/streamraw.bro +++ b/testing/btest/scripts/base/frameworks/input/raw/streamraw.bro @@ -56,7 +56,7 @@ event line(description: Input::EventDescription, tpe: Input::Event, s: string) } } -event bro_init() +event zeek_init() { outfile = open("../out"); try = 0; diff --git a/testing/btest/scripts/base/frameworks/input/repeat.bro b/testing/btest/scripts/base/frameworks/input/repeat.bro index 5093e30351..86245ef9f0 100644 --- a/testing/btest/scripts/base/frameworks/input/repeat.bro +++ b/testing/btest/scripts/base/frameworks/input/repeat.bro @@ -31,7 +31,7 @@ global destination: table[int] of bool = table(); const one_to_32: vector of count = {1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32}; -event bro_init() +event zeek_init() { try = 0; outfile = open("../out"); diff --git a/testing/btest/scripts/base/frameworks/input/reread.bro b/testing/btest/scripts/base/frameworks/input/reread.bro index 53cb2a91a8..e34ae0a5ae 100644 --- a/testing/btest/scripts/base/frameworks/input/reread.bro +++ b/testing/btest/scripts/base/frameworks/input/reread.bro @@ -103,7 +103,7 @@ event line(description: Input::TableDescription, tpe: Input::Event, left: Idx, r print outfile, right; } -event bro_init() +event zeek_init() { outfile = open("../out"); try = 0; diff --git a/testing/btest/scripts/base/frameworks/input/set.bro b/testing/btest/scripts/base/frameworks/input/set.bro index d79e9ae17a..52c0b8feef 100644 --- a/testing/btest/scripts/base/frameworks/input/set.bro +++ b/testing/btest/scripts/base/frameworks/input/set.bro @@ -27,7 +27,7 @@ type Idx: record { global servers: set[addr] = set(); -event bro_init() +event zeek_init() { outfile = open("../out"); # first read in the old stuff into the table... diff --git a/testing/btest/scripts/base/frameworks/input/setseparator.bro b/testing/btest/scripts/base/frameworks/input/setseparator.bro index 39a785236a..3e052c4b44 100644 --- a/testing/btest/scripts/base/frameworks/input/setseparator.bro +++ b/testing/btest/scripts/base/frameworks/input/setseparator.bro @@ -27,7 +27,7 @@ type Val: record { global servers: table[int] of Val = table(); -event bro_init() +event zeek_init() { outfile = open("../out"); # first read in the old stuff into the table... diff --git a/testing/btest/scripts/base/frameworks/input/setspecialcases.bro b/testing/btest/scripts/base/frameworks/input/setspecialcases.bro index 40a708f772..801a3229c5 100644 --- a/testing/btest/scripts/base/frameworks/input/setspecialcases.bro +++ b/testing/btest/scripts/base/frameworks/input/setspecialcases.bro @@ -31,7 +31,7 @@ type Val: record { global servers: table[int] of Val = table(); -event bro_init() +event zeek_init() { outfile = open("../out"); # first read in the old stuff into the table... diff --git a/testing/btest/scripts/base/frameworks/input/sqlite/basic.bro b/testing/btest/scripts/base/frameworks/input/sqlite/basic.bro index eb1411970b..fdb946e02c 100644 --- a/testing/btest/scripts/base/frameworks/input/sqlite/basic.bro +++ b/testing/btest/scripts/base/frameworks/input/sqlite/basic.bro @@ -86,7 +86,7 @@ event line(description: Input::EventDescription, tpe: Input::Event, r: Conn::Inf print outfile, |r$tunnel_parents|; # to make sure I got empty right } -event bro_init() +event zeek_init() { local config_strings: table[string] of string = { ["query"] = "select * from conn;", diff --git a/testing/btest/scripts/base/frameworks/input/sqlite/error.bro b/testing/btest/scripts/base/frameworks/input/sqlite/error.bro index 08938e6df5..7a46160dc0 100644 --- a/testing/btest/scripts/base/frameworks/input/sqlite/error.bro +++ b/testing/btest/scripts/base/frameworks/input/sqlite/error.bro @@ -79,7 +79,7 @@ event term_me() terminate(); } -event bro_init() +event zeek_init() { local config_strings: table[string] of string = { ["query"] = "select * from ssh;", diff --git a/testing/btest/scripts/base/frameworks/input/sqlite/port.bro b/testing/btest/scripts/base/frameworks/input/sqlite/port.bro index 6fc18139fe..ddf4a844bb 100644 --- a/testing/btest/scripts/base/frameworks/input/sqlite/port.bro +++ b/testing/btest/scripts/base/frameworks/input/sqlite/port.bro @@ -35,7 +35,7 @@ event line(description: Input::EventDescription, tpe: Input::Event, p: port) print outfile, p; } -event bro_init() +event zeek_init() { local config_strings: table[string] of string = { ["query"] = "select port as p, proto from port;", diff --git a/testing/btest/scripts/base/frameworks/input/sqlite/types.bro b/testing/btest/scripts/base/frameworks/input/sqlite/types.bro index 42f8717c12..894db886b5 100644 --- a/testing/btest/scripts/base/frameworks/input/sqlite/types.bro +++ b/testing/btest/scripts/base/frameworks/input/sqlite/types.bro @@ -73,7 +73,7 @@ event line(description: Input::EventDescription, tpe: Input::Event, p: SSH::Log) print outfile, |p$vs|; } -event bro_init() +event zeek_init() { local config_strings: table[string] of string = { ["query"] = "select * from ssh;", diff --git a/testing/btest/scripts/base/frameworks/input/stream.bro b/testing/btest/scripts/base/frameworks/input/stream.bro index 8ed498f074..20f1b682fa 100644 --- a/testing/btest/scripts/base/frameworks/input/stream.bro +++ b/testing/btest/scripts/base/frameworks/input/stream.bro @@ -80,7 +80,7 @@ event line(description: Input::TableDescription, tpe: Input::Event, left: Idx, r } } -event bro_init() +event zeek_init() { outfile = open("../out"); try = 0; diff --git a/testing/btest/scripts/base/frameworks/input/subrecord-event.bro b/testing/btest/scripts/base/frameworks/input/subrecord-event.bro index ec1cc37efc..fdcef27d68 100644 --- a/testing/btest/scripts/base/frameworks/input/subrecord-event.bro +++ b/testing/btest/scripts/base/frameworks/input/subrecord-event.bro @@ -64,7 +64,7 @@ event line(description: Input::EventDescription, tpe: Input::Event, value: Val) } } -event bro_init() +event zeek_init() { try = 0; outfile = open("../out"); diff --git a/testing/btest/scripts/base/frameworks/input/subrecord.bro b/testing/btest/scripts/base/frameworks/input/subrecord.bro index 0f960c6d3c..797768a7a7 100644 --- a/testing/btest/scripts/base/frameworks/input/subrecord.bro +++ b/testing/btest/scripts/base/frameworks/input/subrecord.bro @@ -51,7 +51,7 @@ type Val: record { global servers: table[int] of Val = table(); -event bro_init() +event zeek_init() { outfile = open("../out"); # first read in the old stuff into the table... diff --git a/testing/btest/scripts/base/frameworks/input/tableevent.bro b/testing/btest/scripts/base/frameworks/input/tableevent.bro index 760b19d24f..370265508d 100644 --- a/testing/btest/scripts/base/frameworks/input/tableevent.bro +++ b/testing/btest/scripts/base/frameworks/input/tableevent.bro @@ -47,7 +47,7 @@ event line(description: Input::TableDescription, tpe: Input::Event, left: Idx, r } } -event bro_init() +event zeek_init() { try = 0; outfile = open("../out"); diff --git a/testing/btest/scripts/base/frameworks/input/twotables.bro b/testing/btest/scripts/base/frameworks/input/twotables.bro index 5b6d833da3..12d5394a54 100644 --- a/testing/btest/scripts/base/frameworks/input/twotables.bro +++ b/testing/btest/scripts/base/frameworks/input/twotables.bro @@ -81,7 +81,7 @@ event line(description: Input::TableDescription, tpe: Input::Event, left: Idx, r # print event_out, right; } -event bro_init() +event zeek_init() { event_out = open ("../event.out"); pred1_out = open ("../pred1.out"); diff --git a/testing/btest/scripts/base/frameworks/input/unsupported_types.bro b/testing/btest/scripts/base/frameworks/input/unsupported_types.bro index beedc0a633..3090cf10c9 100644 --- a/testing/btest/scripts/base/frameworks/input/unsupported_types.bro +++ b/testing/btest/scripts/base/frameworks/input/unsupported_types.bro @@ -45,7 +45,7 @@ type Val: record { global servers: table[int] of Val = table(); -event bro_init() +event zeek_init() { outfile = open("../out"); # first read in the old stuff into the table... diff --git a/testing/btest/scripts/base/frameworks/input/windows.bro b/testing/btest/scripts/base/frameworks/input/windows.bro index 275f5e0713..8addf0c6ad 100644 --- a/testing/btest/scripts/base/frameworks/input/windows.bro +++ b/testing/btest/scripts/base/frameworks/input/windows.bro @@ -7,11 +7,11 @@ redef exit_only_after_terminate = T; @TEST-START-FILE input.log -#separator \x09 -#path ssh -#fields b i e c p sn a d t iv s sc ss se vc ve ns -#types bool int enum count port subnet addr double time interval string table table table vector vector string -T -42 SSH::LOG 21 123 10.0.0.0/24 1.2.3.4 3.14 1315801931.273616 100.000000 hurz 2,4,1,3 CC,AA,BB EMPTY 10,20,30 EMPTY 4242 +#separator \x09 +#path ssh +#fields b i e c p sn a d t iv s sc ss se vc ve ns +#types bool int enum count port subnet addr double time interval string table table table vector vector string +T -42 SSH::LOG 21 123 10.0.0.0/24 1.2.3.4 3.14 1315801931.273616 100.000000 hurz 2,4,1,3 CC,AA,BB EMPTY 10,20,30 EMPTY 4242 @TEST-END-FILE @load base/protocols/ssh @@ -47,7 +47,7 @@ type Val: record { global servers: table[int] of Val = table(); -event bro_init() +event zeek_init() { outfile = open("../out"); # first read in the old stuff into the table... diff --git a/testing/btest/scripts/base/frameworks/intel/expire-item.bro b/testing/btest/scripts/base/frameworks/intel/expire-item.bro index 08d80714bc..a3a45cd1c0 100644 --- a/testing/btest/scripts/base/frameworks/intel/expire-item.bro +++ b/testing/btest/scripts/base/frameworks/intel/expire-item.bro @@ -61,7 +61,7 @@ hook Intel::item_expired(indicator: string, indicator_type: Intel::Type, print fmt("Expired: %s", indicator); } -event bro_init() &priority=-10 +event zeek_init() &priority=-10 { schedule 1.5sec { do_it() }; } diff --git a/testing/btest/scripts/base/frameworks/intel/input-and-match.bro b/testing/btest/scripts/base/frameworks/intel/input-and-match.bro index 8f74117201..bea8abfd88 100644 --- a/testing/btest/scripts/base/frameworks/intel/input-and-match.bro +++ b/testing/btest/scripts/base/frameworks/intel/input-and-match.bro @@ -32,7 +32,7 @@ event Intel::log_intel(rec: Intel::Info) terminate(); } -event bro_init() &priority=-10 +event zeek_init() &priority=-10 { schedule 1sec { do_it() }; } diff --git a/testing/btest/scripts/base/frameworks/intel/match-subnet.bro b/testing/btest/scripts/base/frameworks/intel/match-subnet.bro index 8e3fe74116..9c46dd7c93 100644 --- a/testing/btest/scripts/base/frameworks/intel/match-subnet.bro +++ b/testing/btest/scripts/base/frameworks/intel/match-subnet.bro @@ -29,7 +29,7 @@ event do_it() $where=SOMEWHERE]); } -event bro_init() &priority=-10 +event zeek_init() &priority=-10 { schedule 1sec { do_it() }; } diff --git a/testing/btest/scripts/base/frameworks/intel/read-file-dist-cluster.bro b/testing/btest/scripts/base/frameworks/intel/read-file-dist-cluster.bro index a4becfb2b3..22ff478aa3 100644 --- a/testing/btest/scripts/base/frameworks/intel/read-file-dist-cluster.bro +++ b/testing/btest/scripts/base/frameworks/intel/read-file-dist-cluster.bro @@ -45,7 +45,7 @@ event do_it() Intel::seen([$indicator="e@mail.com", $indicator_type=Intel::EMAIL, $where=Intel::IN_A_TEST]); } -event bro_init() +event zeek_init() { # Delay the workers searching for hits briefly to allow for the data distribution # mechanism to distribute the data to the workers. diff --git a/testing/btest/scripts/base/frameworks/intel/remove-non-existing.bro b/testing/btest/scripts/base/frameworks/intel/remove-non-existing.bro index 1885f5bcf8..7bc071c17a 100644 --- a/testing/btest/scripts/base/frameworks/intel/remove-non-existing.bro +++ b/testing/btest/scripts/base/frameworks/intel/remove-non-existing.bro @@ -25,7 +25,7 @@ event do_it() terminate(); } -event bro_init() &priority=-10 +event zeek_init() &priority=-10 { schedule 1sec { do_it() }; } diff --git a/testing/btest/scripts/base/frameworks/logging/adapt-filter.bro b/testing/btest/scripts/base/frameworks/logging/adapt-filter.bro index 2db881deea..d342186ca3 100644 --- a/testing/btest/scripts/base/frameworks/logging/adapt-filter.bro +++ b/testing/btest/scripts/base/frameworks/logging/adapt-filter.bro @@ -19,7 +19,7 @@ export { } &log; } -event bro_init() +event zeek_init() { Log::create_stream(SSH::LOG, [$columns=Info]); diff --git a/testing/btest/scripts/base/frameworks/logging/ascii-binary.bro b/testing/btest/scripts/base/frameworks/logging/ascii-binary.bro index fcbac3be58..1df620e19b 100644 --- a/testing/btest/scripts/base/frameworks/logging/ascii-binary.bro +++ b/testing/btest/scripts/base/frameworks/logging/ascii-binary.bro @@ -15,7 +15,7 @@ export { redef LogAscii::separator = "|"; -event bro_init() +event zeek_init() { Log::create_stream(SSH::LOG, [$columns=Info]); Log::write(SSH::LOG, [$data="abc\n\xffdef", $data2="DATA2"]); diff --git a/testing/btest/scripts/base/frameworks/logging/ascii-double.bro b/testing/btest/scripts/base/frameworks/logging/ascii-double.bro index b824d93676..1b310fd8ff 100644 --- a/testing/btest/scripts/base/frameworks/logging/ascii-double.bro +++ b/testing/btest/scripts/base/frameworks/logging/ascii-double.bro @@ -23,7 +23,7 @@ function logwrite(val: double) Log::write(Test::LOG, [$d=val]); } -event bro_init() +event zeek_init() { local d: double; local dmax: double = 1.79e308; diff --git a/testing/btest/scripts/base/frameworks/logging/ascii-empty.bro b/testing/btest/scripts/base/frameworks/logging/ascii-empty.bro index 0bb5900e30..bb38f988ae 100644 --- a/testing/btest/scripts/base/frameworks/logging/ascii-empty.bro +++ b/testing/btest/scripts/base/frameworks/logging/ascii-empty.bro @@ -23,7 +23,7 @@ export { } &log; } -event bro_init() +event zeek_init() { Log::create_stream(SSH::LOG, [$columns=Log]); diff --git a/testing/btest/scripts/base/frameworks/logging/ascii-escape-binary.bro b/testing/btest/scripts/base/frameworks/logging/ascii-escape-binary.bro index 3df3ea1d25..d7e7739547 100644 --- a/testing/btest/scripts/base/frameworks/logging/ascii-escape-binary.bro +++ b/testing/btest/scripts/base/frameworks/logging/ascii-escape-binary.bro @@ -12,7 +12,7 @@ export { } &log; } -event bro_init() +event zeek_init() { local a = "abc\0def"; local b = escape_string(a); diff --git a/testing/btest/scripts/base/frameworks/logging/ascii-escape-empty-str.bro b/testing/btest/scripts/base/frameworks/logging/ascii-escape-empty-str.bro index e18926a194..0145c52243 100644 --- a/testing/btest/scripts/base/frameworks/logging/ascii-escape-empty-str.bro +++ b/testing/btest/scripts/base/frameworks/logging/ascii-escape-empty-str.bro @@ -14,7 +14,7 @@ export { } &log; } -event bro_init() +event zeek_init() { Log::create_stream(test::LOG, [$columns=Log]); diff --git a/testing/btest/scripts/base/frameworks/logging/ascii-escape-notset-str.bro b/testing/btest/scripts/base/frameworks/logging/ascii-escape-notset-str.bro index 8c1401b179..c42a92fdac 100644 --- a/testing/btest/scripts/base/frameworks/logging/ascii-escape-notset-str.bro +++ b/testing/btest/scripts/base/frameworks/logging/ascii-escape-notset-str.bro @@ -14,7 +14,7 @@ export { } &log; } -event bro_init() +event zeek_init() { Log::create_stream(Test::LOG, [$columns=Log]); Log::write(Test::LOG, [$x=LogAscii::unset_field, $z=""]); diff --git a/testing/btest/scripts/base/frameworks/logging/ascii-escape-set-separator.bro b/testing/btest/scripts/base/frameworks/logging/ascii-escape-set-separator.bro index f5fb7a6259..03139bf2b8 100644 --- a/testing/btest/scripts/base/frameworks/logging/ascii-escape-set-separator.bro +++ b/testing/btest/scripts/base/frameworks/logging/ascii-escape-set-separator.bro @@ -11,7 +11,7 @@ export { } &log; } -event bro_init() +event zeek_init() { Log::create_stream(Test::LOG, [$columns=Log]); diff --git a/testing/btest/scripts/base/frameworks/logging/ascii-escape.bro b/testing/btest/scripts/base/frameworks/logging/ascii-escape.bro index d73464777a..9fa6555391 100644 --- a/testing/btest/scripts/base/frameworks/logging/ascii-escape.bro +++ b/testing/btest/scripts/base/frameworks/logging/ascii-escape.bro @@ -18,7 +18,7 @@ export { } &log; } -event bro_init() +event zeek_init() { Log::create_stream(SSH::LOG, [$columns=Log]); diff --git a/testing/btest/scripts/base/frameworks/logging/ascii-gz-rotate.bro b/testing/btest/scripts/base/frameworks/logging/ascii-gz-rotate.bro index 2a1c388322..3e73b56500 100644 --- a/testing/btest/scripts/base/frameworks/logging/ascii-gz-rotate.bro +++ b/testing/btest/scripts/base/frameworks/logging/ascii-gz-rotate.bro @@ -17,7 +17,7 @@ export { redef Log::default_rotation_interval = 1hr; redef LogAscii::gzip_level = 1; -event bro_init() +event zeek_init() { Log::create_stream(Test::LOG, [$columns=Log]); diff --git a/testing/btest/scripts/base/frameworks/logging/ascii-gz.bro b/testing/btest/scripts/base/frameworks/logging/ascii-gz.bro index 9563f42c40..74573fe3d4 100644 --- a/testing/btest/scripts/base/frameworks/logging/ascii-gz.bro +++ b/testing/btest/scripts/base/frameworks/logging/ascii-gz.bro @@ -42,7 +42,7 @@ function foo(i : count) : string return "Bar"; } -event bro_init() +event zeek_init() { Log::create_stream(SSH::LOG, [$columns=Log]); local filter = Log::Filter($name="ssh-uncompressed", $path="ssh-uncompressed", diff --git a/testing/btest/scripts/base/frameworks/logging/ascii-json-iso-timestamps.bro b/testing/btest/scripts/base/frameworks/logging/ascii-json-iso-timestamps.bro index 8cb1210a68..bfe998a78e 100644 --- a/testing/btest/scripts/base/frameworks/logging/ascii-json-iso-timestamps.bro +++ b/testing/btest/scripts/base/frameworks/logging/ascii-json-iso-timestamps.bro @@ -17,7 +17,7 @@ export { } &log; } -event bro_init() +event zeek_init() { Log::create_stream(SSH::LOG, [$columns=Log]); Log::write(SSH::LOG, [ diff --git a/testing/btest/scripts/base/frameworks/logging/ascii-json-optional.bro b/testing/btest/scripts/base/frameworks/logging/ascii-json-optional.bro index c26683a338..01662e1442 100644 --- a/testing/btest/scripts/base/frameworks/logging/ascii-json-optional.bro +++ b/testing/btest/scripts/base/frameworks/logging/ascii-json-optional.bro @@ -17,7 +17,7 @@ export { global log_test: event(rec: Info); } -event bro_init() &priority=5 +event zeek_init() &priority=5 { Log::create_stream(testing::LOG, [$columns=testing::Info, $ev=log_test]); local info: Info; diff --git a/testing/btest/scripts/base/frameworks/logging/ascii-json.bro b/testing/btest/scripts/base/frameworks/logging/ascii-json.bro index 2b6055930f..8985715d1d 100644 --- a/testing/btest/scripts/base/frameworks/logging/ascii-json.bro +++ b/testing/btest/scripts/base/frameworks/logging/ascii-json.bro @@ -40,7 +40,7 @@ function foo(i : count) : string return "Bar"; } -event bro_init() +event zeek_init() { Log::create_stream(SSH::LOG, [$columns=Log]); diff --git a/testing/btest/scripts/base/frameworks/logging/ascii-line-like-comment.bro b/testing/btest/scripts/base/frameworks/logging/ascii-line-like-comment.bro index 4670811b2a..33de6e720a 100644 --- a/testing/btest/scripts/base/frameworks/logging/ascii-line-like-comment.bro +++ b/testing/btest/scripts/base/frameworks/logging/ascii-line-like-comment.bro @@ -13,7 +13,7 @@ export { }; } -event bro_init() +event zeek_init() { Log::create_stream(Test::LOG, [$columns=Info]); Log::write(Test::LOG, [$data="Test1"]); diff --git a/testing/btest/scripts/base/frameworks/logging/ascii-options.bro b/testing/btest/scripts/base/frameworks/logging/ascii-options.bro index 474b179536..b72f077c81 100644 --- a/testing/btest/scripts/base/frameworks/logging/ascii-options.bro +++ b/testing/btest/scripts/base/frameworks/logging/ascii-options.bro @@ -19,7 +19,7 @@ export { } &log; } -event bro_init() +event zeek_init() { Log::create_stream(SSH::LOG, [$columns=Log]); diff --git a/testing/btest/scripts/base/frameworks/logging/ascii-timestamps.bro b/testing/btest/scripts/base/frameworks/logging/ascii-timestamps.bro index e63e30f6c6..2e786f4927 100644 --- a/testing/btest/scripts/base/frameworks/logging/ascii-timestamps.bro +++ b/testing/btest/scripts/base/frameworks/logging/ascii-timestamps.bro @@ -12,7 +12,7 @@ export { }; } -event bro_init() +event zeek_init() { Log::create_stream(Test::LOG, [$columns=Info]); Log::write(Test::LOG, [$data=double_to_time(1234567890)]); diff --git a/testing/btest/scripts/base/frameworks/logging/ascii-tsv.bro b/testing/btest/scripts/base/frameworks/logging/ascii-tsv.bro index 09276a08fd..c29b291003 100644 --- a/testing/btest/scripts/base/frameworks/logging/ascii-tsv.bro +++ b/testing/btest/scripts/base/frameworks/logging/ascii-tsv.bro @@ -17,7 +17,7 @@ export { } &log; } -event bro_init() +event zeek_init() { Log::create_stream(SSH::LOG, [$columns=Log]); diff --git a/testing/btest/scripts/base/frameworks/logging/attr-extend.bro b/testing/btest/scripts/base/frameworks/logging/attr-extend.bro index 7f58f3f8c1..7aece07642 100644 --- a/testing/btest/scripts/base/frameworks/logging/attr-extend.bro +++ b/testing/btest/scripts/base/frameworks/logging/attr-extend.bro @@ -26,7 +26,7 @@ redef record Log += { } &log; -event bro_init() +event zeek_init() { Log::create_stream(SSH::LOG, [$columns=Log]); diff --git a/testing/btest/scripts/base/frameworks/logging/attr.bro b/testing/btest/scripts/base/frameworks/logging/attr.bro index 8ec3d1c385..84287cc280 100644 --- a/testing/btest/scripts/base/frameworks/logging/attr.bro +++ b/testing/btest/scripts/base/frameworks/logging/attr.bro @@ -15,7 +15,7 @@ export { }; } -event bro_init() +event zeek_init() { Log::create_stream(SSH::LOG, [$columns=Log]); diff --git a/testing/btest/scripts/base/frameworks/logging/disable-stream.bro b/testing/btest/scripts/base/frameworks/logging/disable-stream.bro index c2f64da8e6..e3b2aa2b93 100644 --- a/testing/btest/scripts/base/frameworks/logging/disable-stream.bro +++ b/testing/btest/scripts/base/frameworks/logging/disable-stream.bro @@ -15,7 +15,7 @@ export { } &log; } -event bro_init() +event zeek_init() { Log::create_stream(SSH::LOG, [$columns=Log]); diff --git a/testing/btest/scripts/base/frameworks/logging/empty-event.bro b/testing/btest/scripts/base/frameworks/logging/empty-event.bro index 6aa867220f..e7928de5c7 100644 --- a/testing/btest/scripts/base/frameworks/logging/empty-event.bro +++ b/testing/btest/scripts/base/frameworks/logging/empty-event.bro @@ -17,7 +17,7 @@ export { global log_ssh: event(rec: Log); -event bro_init() +event zeek_init() { Log::create_stream(SSH::LOG, [$columns=Log, $ev=log_ssh]); diff --git a/testing/btest/scripts/base/frameworks/logging/enable-stream.bro b/testing/btest/scripts/base/frameworks/logging/enable-stream.bro index 0f525eced1..95d02068d8 100644 --- a/testing/btest/scripts/base/frameworks/logging/enable-stream.bro +++ b/testing/btest/scripts/base/frameworks/logging/enable-stream.bro @@ -15,7 +15,7 @@ export { } &log; } -event bro_init() +event zeek_init() { Log::create_stream(SSH::LOG, [$columns=Log]); diff --git a/testing/btest/scripts/base/frameworks/logging/events.bro b/testing/btest/scripts/base/frameworks/logging/events.bro index bf156e6d60..d1cf0fba7e 100644 --- a/testing/btest/scripts/base/frameworks/logging/events.bro +++ b/testing/btest/scripts/base/frameworks/logging/events.bro @@ -20,7 +20,7 @@ export { global ssh_log: event(rec: Log); -event bro_init() +event zeek_init() { Log::create_stream(SSH::LOG, [$columns=Log, $ev=ssh_log]); diff --git a/testing/btest/scripts/base/frameworks/logging/exclude.bro b/testing/btest/scripts/base/frameworks/logging/exclude.bro index 7b245541ab..b776cf91a4 100644 --- a/testing/btest/scripts/base/frameworks/logging/exclude.bro +++ b/testing/btest/scripts/base/frameworks/logging/exclude.bro @@ -15,7 +15,7 @@ export { } &log; } -event bro_init() +event zeek_init() { Log::create_stream(SSH::LOG, [$columns=Log]); diff --git a/testing/btest/scripts/base/frameworks/logging/field-extension-cluster-error.bro b/testing/btest/scripts/base/frameworks/logging/field-extension-cluster-error.bro index dd30ad4c6f..4c3d1016d3 100644 --- a/testing/btest/scripts/base/frameworks/logging/field-extension-cluster-error.bro +++ b/testing/btest/scripts/base/frameworks/logging/field-extension-cluster-error.bro @@ -62,7 +62,7 @@ event kill_worker() Broker::publish("death", slow_death); } -event bro_init() +event zeek_init() { if ( Cluster::node == "worker-1" ) { diff --git a/testing/btest/scripts/base/frameworks/logging/field-extension-cluster.bro b/testing/btest/scripts/base/frameworks/logging/field-extension-cluster.bro index d38b5b744b..61e322c026 100644 --- a/testing/btest/scripts/base/frameworks/logging/field-extension-cluster.bro +++ b/testing/btest/scripts/base/frameworks/logging/field-extension-cluster.bro @@ -55,7 +55,7 @@ event kill_worker() Broker::publish("death", slow_death); } -event bro_init() +event zeek_init() { if ( Cluster::node == "worker-1" ) { diff --git a/testing/btest/scripts/base/frameworks/logging/file.bro b/testing/btest/scripts/base/frameworks/logging/file.bro index 94bdad6b1b..011c9bbe82 100644 --- a/testing/btest/scripts/base/frameworks/logging/file.bro +++ b/testing/btest/scripts/base/frameworks/logging/file.bro @@ -15,7 +15,7 @@ export { const foo_log = open_log_file("Foo") &redef; -event bro_init() +event zeek_init() { Log::create_stream(SSH::LOG, [$columns=Log]); Log::write(SSH::LOG, [$t=network_time(), $f=foo_log]); diff --git a/testing/btest/scripts/base/frameworks/logging/include.bro b/testing/btest/scripts/base/frameworks/logging/include.bro index d0fea93c99..7179c54338 100644 --- a/testing/btest/scripts/base/frameworks/logging/include.bro +++ b/testing/btest/scripts/base/frameworks/logging/include.bro @@ -15,7 +15,7 @@ export { } &log; } -event bro_init() +event zeek_init() { Log::create_stream(SSH::LOG, [$columns=Log]); diff --git a/testing/btest/scripts/base/frameworks/logging/no-local.bro b/testing/btest/scripts/base/frameworks/logging/no-local.bro index 9ae7d32d61..9418afea14 100644 --- a/testing/btest/scripts/base/frameworks/logging/no-local.bro +++ b/testing/btest/scripts/base/frameworks/logging/no-local.bro @@ -17,7 +17,7 @@ export { redef Log::enable_local_logging = F; -event bro_init() +event zeek_init() { Log::create_stream(SSH::LOG, [$columns=Log]); diff --git a/testing/btest/scripts/base/frameworks/logging/none-debug.bro b/testing/btest/scripts/base/frameworks/logging/none-debug.bro index 5d2e98323a..9a9f73d8f9 100644 --- a/testing/btest/scripts/base/frameworks/logging/none-debug.bro +++ b/testing/btest/scripts/base/frameworks/logging/none-debug.bro @@ -20,7 +20,7 @@ export { } &log; } -event bro_init() +event zeek_init() { local config: table[string] of string; config["foo"]="bar"; diff --git a/testing/btest/scripts/base/frameworks/logging/path-func-column-demote.bro b/testing/btest/scripts/base/frameworks/logging/path-func-column-demote.bro index aff886c2f4..ebb514042e 100644 --- a/testing/btest/scripts/base/frameworks/logging/path-func-column-demote.bro +++ b/testing/btest/scripts/base/frameworks/logging/path-func-column-demote.bro @@ -16,7 +16,7 @@ function split_log(id: Log::ID, path: string, rec: record {id:conn_id;}): string return Site::is_local_addr(rec$id$orig_h) ? "local" : "remote"; } -event bro_init() +event zeek_init() { # Add a new filter to the Conn::LOG stream that logs only # timestamp and originator address. diff --git a/testing/btest/scripts/base/frameworks/logging/path-func.bro b/testing/btest/scripts/base/frameworks/logging/path-func.bro index 684aa03ed6..fa52cccc48 100644 --- a/testing/btest/scripts/base/frameworks/logging/path-func.bro +++ b/testing/btest/scripts/base/frameworks/logging/path-func.bro @@ -28,7 +28,7 @@ function path_func(id: Log::ID, path: string, rec: Log) : string return fmt("%s-%d-%s", path, c, rec$country); } -event bro_init() +event zeek_init() { Log::create_stream(SSH::LOG, [$columns=Log]); Log::remove_default_filter(SSH::LOG); diff --git a/testing/btest/scripts/base/frameworks/logging/pred.bro b/testing/btest/scripts/base/frameworks/logging/pred.bro index e13c726656..c6f85183b4 100644 --- a/testing/btest/scripts/base/frameworks/logging/pred.bro +++ b/testing/btest/scripts/base/frameworks/logging/pred.bro @@ -24,7 +24,7 @@ function fail(rec: Log): bool return rec$status != "success"; } -event bro_init() +event zeek_init() { Log::create_stream(Test::LOG, [$columns=Log]); Log::remove_default_filter(Test::LOG); diff --git a/testing/btest/scripts/base/frameworks/logging/remove.bro b/testing/btest/scripts/base/frameworks/logging/remove.bro index 3b80d24e9f..2247648e7c 100644 --- a/testing/btest/scripts/base/frameworks/logging/remove.bro +++ b/testing/btest/scripts/base/frameworks/logging/remove.bro @@ -20,7 +20,7 @@ export { } &log; } -event bro_init() +event zeek_init() { Log::create_stream(SSH::LOG, [$columns=Log]); Log::add_filter(SSH::LOG, [$name="f1", $path="ssh.failure", $pred=function(rec: Log): bool { return rec$status == "failure"; }]); diff --git a/testing/btest/scripts/base/frameworks/logging/rotate-custom.bro b/testing/btest/scripts/base/frameworks/logging/rotate-custom.bro index c0f0ef8643..89264fa6e5 100644 --- a/testing/btest/scripts/base/frameworks/logging/rotate-custom.bro +++ b/testing/btest/scripts/base/frameworks/logging/rotate-custom.bro @@ -28,7 +28,7 @@ function custom_rotate(info: Log::RotationInfo) : bool return T; } -event bro_init() +event zeek_init() { Log::create_stream(Test::LOG, [$columns=Log]); Log::add_filter(Test::LOG, [$name="2nd", $path="test2", $interv=30mins, $postprocessor=custom_rotate]); diff --git a/testing/btest/scripts/base/frameworks/logging/rotate.bro b/testing/btest/scripts/base/frameworks/logging/rotate.bro index 501c0db8ea..2a988a88f0 100644 --- a/testing/btest/scripts/base/frameworks/logging/rotate.bro +++ b/testing/btest/scripts/base/frameworks/logging/rotate.bro @@ -21,7 +21,7 @@ export { redef Log::default_rotation_interval = 1hr; redef Log::default_rotation_postprocessor_cmd = "echo"; -event bro_init() +event zeek_init() { Log::create_stream(Test::LOG, [$columns=Log]); } diff --git a/testing/btest/scripts/base/frameworks/logging/sqlite/error.bro b/testing/btest/scripts/base/frameworks/logging/sqlite/error.bro index e48e066c6c..d453804858 100644 --- a/testing/btest/scripts/base/frameworks/logging/sqlite/error.bro +++ b/testing/btest/scripts/base/frameworks/logging/sqlite/error.bro @@ -73,7 +73,7 @@ function foo(i : count) : string return "Bar"; } -event bro_init() +event zeek_init() { Log::create_stream(SSH::LOG, [$columns=Log]); Log::remove_filter(SSH::LOG, "default"); diff --git a/testing/btest/scripts/base/frameworks/logging/sqlite/set.bro b/testing/btest/scripts/base/frameworks/logging/sqlite/set.bro index 0cceb7af08..8612cd5765 100644 --- a/testing/btest/scripts/base/frameworks/logging/sqlite/set.bro +++ b/testing/btest/scripts/base/frameworks/logging/sqlite/set.bro @@ -32,7 +32,7 @@ function foo(i : count) : string return "Bar"; } -event bro_init() +event zeek_init() { Log::create_stream(SSH::LOG, [$columns=Log]); Log::remove_filter(SSH::LOG, "default"); diff --git a/testing/btest/scripts/base/frameworks/logging/sqlite/simultaneous-writes.bro b/testing/btest/scripts/base/frameworks/logging/sqlite/simultaneous-writes.bro index 2e864aa791..7f9ea2d870 100644 --- a/testing/btest/scripts/base/frameworks/logging/sqlite/simultaneous-writes.bro +++ b/testing/btest/scripts/base/frameworks/logging/sqlite/simultaneous-writes.bro @@ -47,7 +47,7 @@ function foo(i : count) : string return "Bar"; } -event bro_init() +event zeek_init() { Log::create_stream(SSH::LOG, [$columns=Log]); Log::create_stream(SSH::LOG2, [$columns=Log]); diff --git a/testing/btest/scripts/base/frameworks/logging/sqlite/types.bro b/testing/btest/scripts/base/frameworks/logging/sqlite/types.bro index 6c088e9f2f..e878ec32d3 100644 --- a/testing/btest/scripts/base/frameworks/logging/sqlite/types.bro +++ b/testing/btest/scripts/base/frameworks/logging/sqlite/types.bro @@ -45,7 +45,7 @@ function foo(i : count) : string return "Bar"; } -event bro_init() +event zeek_init() { Log::create_stream(SSH::LOG, [$columns=Log]); Log::remove_filter(SSH::LOG, "default"); diff --git a/testing/btest/scripts/base/frameworks/logging/stdout.bro b/testing/btest/scripts/base/frameworks/logging/stdout.bro index f431a5b6c9..bce55fd0ca 100644 --- a/testing/btest/scripts/base/frameworks/logging/stdout.bro +++ b/testing/btest/scripts/base/frameworks/logging/stdout.bro @@ -16,7 +16,7 @@ export { } &log; } -event bro_init() +event zeek_init() { Log::create_stream(SSH::LOG, [$columns=Log]); diff --git a/testing/btest/scripts/base/frameworks/logging/test-logging.bro b/testing/btest/scripts/base/frameworks/logging/test-logging.bro index 9f90d515fb..f7d07e843a 100644 --- a/testing/btest/scripts/base/frameworks/logging/test-logging.bro +++ b/testing/btest/scripts/base/frameworks/logging/test-logging.bro @@ -15,7 +15,7 @@ export { } &log; } -event bro_init() +event zeek_init() { Log::create_stream(SSH::LOG, [$columns=Log]); diff --git a/testing/btest/scripts/base/frameworks/logging/types.bro b/testing/btest/scripts/base/frameworks/logging/types.bro index d79c667e50..9d208335ad 100644 --- a/testing/btest/scripts/base/frameworks/logging/types.bro +++ b/testing/btest/scripts/base/frameworks/logging/types.bro @@ -40,7 +40,7 @@ function foo(i : count) : string return "Bar"; } -event bro_init() +event zeek_init() { Log::create_stream(SSH::LOG, [$columns=Log]); diff --git a/testing/btest/scripts/base/frameworks/logging/unset-record.bro b/testing/btest/scripts/base/frameworks/logging/unset-record.bro index bb922dc9c8..00f97ffc1a 100644 --- a/testing/btest/scripts/base/frameworks/logging/unset-record.bro +++ b/testing/btest/scripts/base/frameworks/logging/unset-record.bro @@ -14,7 +14,7 @@ type Bar: record { b: count &log; }; -event bro_init() +event zeek_init() { Log::create_stream(TESTING, [$columns=Bar]); diff --git a/testing/btest/scripts/base/frameworks/logging/vec.bro b/testing/btest/scripts/base/frameworks/logging/vec.bro index 00c5ff5117..6809e132bc 100644 --- a/testing/btest/scripts/base/frameworks/logging/vec.bro +++ b/testing/btest/scripts/base/frameworks/logging/vec.bro @@ -12,7 +12,7 @@ export { }; } -event bro_init() +event zeek_init() { Log::create_stream(SSH::LOG, [$columns=Log]); diff --git a/testing/btest/scripts/base/frameworks/logging/writer-path-conflict.bro b/testing/btest/scripts/base/frameworks/logging/writer-path-conflict.bro index 908fb43c72..916e5a6775 100644 --- a/testing/btest/scripts/base/frameworks/logging/writer-path-conflict.bro +++ b/testing/btest/scripts/base/frameworks/logging/writer-path-conflict.bro @@ -7,7 +7,7 @@ @load base/protocols/http -event bro_init() +event zeek_init() { # Both the default filter for the http stream and this new one will # attempt to have the same writer write to path "http", which will diff --git a/testing/btest/scripts/base/frameworks/netcontrol/acld-hook.bro b/testing/btest/scripts/base/frameworks/netcontrol/acld-hook.bro index 9e0db8531a..c391d9ecc1 100644 --- a/testing/btest/scripts/base/frameworks/netcontrol/acld-hook.bro +++ b/testing/btest/scripts/base/frameworks/netcontrol/acld-hook.bro @@ -14,7 +14,7 @@ redef exit_only_after_terminate = T; global have_peer = F; global did_init = F; -event bro_init() +event zeek_init() { suspend_processing(); } @@ -101,7 +101,7 @@ event die() terminate(); } -event bro_init() +event zeek_init() { Broker::subscribe("bro/event/netcontroltest"); Broker::listen("127.0.0.1", to_port(getenv("BROKER_PORT"))); diff --git a/testing/btest/scripts/base/frameworks/netcontrol/acld.bro b/testing/btest/scripts/base/frameworks/netcontrol/acld.bro index 243e5e9b7c..8647ca92e2 100644 --- a/testing/btest/scripts/base/frameworks/netcontrol/acld.bro +++ b/testing/btest/scripts/base/frameworks/netcontrol/acld.bro @@ -15,7 +15,7 @@ redef exit_only_after_terminate = T; global have_peer = F; global did_init = F; -event bro_init() +event zeek_init() { suspend_processing(); } @@ -106,7 +106,7 @@ event die() terminate(); } -event bro_init() +event zeek_init() { Broker::subscribe("bro/event/netcontroltest"); Broker::listen("127.0.0.1", to_port(getenv("BROKER_PORT"))); diff --git a/testing/btest/scripts/base/frameworks/netcontrol/basic-cluster.bro b/testing/btest/scripts/base/frameworks/netcontrol/basic-cluster.bro index 50c04433ad..91dfd05217 100644 --- a/testing/btest/scripts/base/frameworks/netcontrol/basic-cluster.bro +++ b/testing/btest/scripts/base/frameworks/netcontrol/basic-cluster.bro @@ -26,7 +26,7 @@ redef Log::default_rotation_interval = 0secs; @load base/frameworks/netcontrol @if ( Cluster::local_node_type() == Cluster::WORKER ) -event bro_init() +event zeek_init() { suspend_processing(); } diff --git a/testing/btest/scripts/base/frameworks/netcontrol/broker.bro b/testing/btest/scripts/base/frameworks/netcontrol/broker.bro index 4d232c3325..08cc38ed78 100644 --- a/testing/btest/scripts/base/frameworks/netcontrol/broker.bro +++ b/testing/btest/scripts/base/frameworks/netcontrol/broker.bro @@ -15,7 +15,7 @@ redef exit_only_after_terminate = T; global have_peer = F; global did_init = F; -event bro_init() +event zeek_init() { suspend_processing(); } @@ -90,7 +90,7 @@ event die() terminate(); } -event bro_init() +event zeek_init() { Broker::subscribe("bro/event/netcontroltest"); Broker::listen("127.0.0.1", to_port(getenv("BROKER_PORT"))); diff --git a/testing/btest/scripts/base/frameworks/notice/suppression-disable.bro b/testing/btest/scripts/base/frameworks/notice/suppression-disable.bro index 96b932caf8..5eeab5bff2 100644 --- a/testing/btest/scripts/base/frameworks/notice/suppression-disable.bro +++ b/testing/btest/scripts/base/frameworks/notice/suppression-disable.bro @@ -18,7 +18,7 @@ event second_notice() NOTICE([$note=Test_Notice, $msg="another test", $identifier="static"]); } -event bro_init() +event zeek_init() { NOTICE([$note=Test_Notice, $msg="test", $identifier="static"]); schedule 1msec { second_notice() }; diff --git a/testing/btest/scripts/base/frameworks/notice/suppression.bro b/testing/btest/scripts/base/frameworks/notice/suppression.bro index 87ce3672b6..d91aa17a2e 100644 --- a/testing/btest/scripts/base/frameworks/notice/suppression.bro +++ b/testing/btest/scripts/base/frameworks/notice/suppression.bro @@ -15,7 +15,7 @@ event second_notice() NOTICE([$note=Test_Notice, $msg="another test", $identifier="static"]); } -event bro_init() +event zeek_init() { NOTICE([$note=Test_Notice, $msg="test", $identifier="static"]); schedule 1msec { second_notice() }; diff --git a/testing/btest/scripts/base/frameworks/openflow/broker-basic.bro b/testing/btest/scripts/base/frameworks/openflow/broker-basic.bro index 9d43089b93..db73f22e51 100644 --- a/testing/btest/scripts/base/frameworks/openflow/broker-basic.bro +++ b/testing/btest/scripts/base/frameworks/openflow/broker-basic.bro @@ -15,7 +15,7 @@ redef exit_only_after_terminate = T; global of_controller: OpenFlow::Controller; -event bro_init() +event zeek_init() { suspend_processing(); of_controller = OpenFlow::broker_new("broker1", 127.0.0.1, to_port(getenv("BROKER_PORT")), "bro/openflow", 42); @@ -80,7 +80,7 @@ event die() terminate(); } -event bro_init() +event zeek_init() { Broker::subscribe("bro/openflow"); Broker::listen("127.0.0.1", to_port(getenv("BROKER_PORT"))); diff --git a/testing/btest/scripts/base/frameworks/openflow/log-basic.bro b/testing/btest/scripts/base/frameworks/openflow/log-basic.bro index d4f08e7822..5aa615f691 100644 --- a/testing/btest/scripts/base/frameworks/openflow/log-basic.bro +++ b/testing/btest/scripts/base/frameworks/openflow/log-basic.bro @@ -8,7 +8,7 @@ global of_controller: OpenFlow::Controller; global cookie_id: count = 42; -event bro_init() +event zeek_init() { of_controller = OpenFlow::log_new(42); diff --git a/testing/btest/scripts/base/frameworks/openflow/log-cluster.bro b/testing/btest/scripts/base/frameworks/openflow/log-cluster.bro index 33f20f8ce5..50b6c976b5 100644 --- a/testing/btest/scripts/base/frameworks/openflow/log-cluster.bro +++ b/testing/btest/scripts/base/frameworks/openflow/log-cluster.bro @@ -22,7 +22,7 @@ redef Log::default_rotation_interval = 0secs; global of_controller: OpenFlow::Controller; @if ( Cluster::local_node_type() == Cluster::WORKER ) -event bro_init() +event zeek_init() { suspend_processing(); } @@ -33,7 +33,7 @@ event Broker::peer_added(endpoint: Broker::EndpointInfo, msg: string) } @endif -event bro_init() +event zeek_init() { of_controller = OpenFlow::log_new(42); } diff --git a/testing/btest/scripts/base/frameworks/openflow/ryu-basic.bro b/testing/btest/scripts/base/frameworks/openflow/ryu-basic.bro index 3bfaa4c076..9df9822450 100644 --- a/testing/btest/scripts/base/frameworks/openflow/ryu-basic.bro +++ b/testing/btest/scripts/base/frameworks/openflow/ryu-basic.bro @@ -6,7 +6,7 @@ global of_controller: OpenFlow::Controller; -event bro_init() +event zeek_init() { of_controller = OpenFlow::ryu_new(127.0.0.1, 8080, 42); of_controller$state$ryu_debug=T; diff --git a/testing/btest/scripts/base/frameworks/reporter/disable-stderr.bro b/testing/btest/scripts/base/frameworks/reporter/disable-stderr.bro index b1afb99b5c..bf449e886d 100644 --- a/testing/btest/scripts/base/frameworks/reporter/disable-stderr.bro +++ b/testing/btest/scripts/base/frameworks/reporter/disable-stderr.bro @@ -7,7 +7,7 @@ redef Reporter::errors_to_stderr = F; global test: table[count] of string = {}; -event bro_init() +event zeek_init() { print test[3]; } diff --git a/testing/btest/scripts/base/frameworks/reporter/stderr.bro b/testing/btest/scripts/base/frameworks/reporter/stderr.bro index ef01c9fdf9..6b878ceef5 100644 --- a/testing/btest/scripts/base/frameworks/reporter/stderr.bro +++ b/testing/btest/scripts/base/frameworks/reporter/stderr.bro @@ -4,7 +4,7 @@ global test: table[count] of string = {}; -event bro_init() +event zeek_init() { print test[3]; } diff --git a/testing/btest/scripts/base/frameworks/software/version-parsing.bro b/testing/btest/scripts/base/frameworks/software/version-parsing.bro index 806a058a03..fd43145826 100644 --- a/testing/btest/scripts/base/frameworks/software/version-parsing.bro +++ b/testing/btest/scripts/base/frameworks/software/version-parsing.bro @@ -133,7 +133,7 @@ global matched_software: table[string] of Software::Description = { [$name="Android (Google Pixel)", $version=[$major=9], $unparsed_version=""], }; -event bro_init() +event zeek_init() { for ( sw in matched_software ) { diff --git a/testing/btest/scripts/base/frameworks/sumstats/basic-cluster.bro b/testing/btest/scripts/base/frameworks/sumstats/basic-cluster.bro index 8f4bd26ef1..31e2a68fd3 100644 --- a/testing/btest/scripts/base/frameworks/sumstats/basic-cluster.bro +++ b/testing/btest/scripts/base/frameworks/sumstats/basic-cluster.bro @@ -21,7 +21,7 @@ redef Log::default_rotation_interval = 0secs; global n = 0; -event bro_init() &priority=5 +event zeek_init() &priority=5 { local r1: SumStats::Reducer = [$stream="test", $apply=set(SumStats::SUM, SumStats::MIN, SumStats::MAX, SumStats::AVERAGE, SumStats::STD_DEV, SumStats::VARIANCE, SumStats::UNIQUE, SumStats::HLL_UNIQUE)]; SumStats::create([$name="test", @@ -71,7 +71,7 @@ event ready_for_data() @if ( Cluster::local_node_type() == Cluster::MANAGER ) -event bro_init() &priority=100 +event zeek_init() &priority=100 { Broker::auto_publish(Cluster::worker_topic, ready_for_data); } diff --git a/testing/btest/scripts/base/frameworks/sumstats/basic.bro b/testing/btest/scripts/base/frameworks/sumstats/basic.bro index 40f269ab1a..1362c739cf 100644 --- a/testing/btest/scripts/base/frameworks/sumstats/basic.bro +++ b/testing/btest/scripts/base/frameworks/sumstats/basic.bro @@ -4,7 +4,7 @@ redef exit_only_after_terminate=T; -event bro_init() &priority=5 +event zeek_init() &priority=5 { local r1: SumStats::Reducer = [$stream="test.metric", $apply=set(SumStats::SUM, diff --git a/testing/btest/scripts/base/frameworks/sumstats/cluster-intermediate-update.bro b/testing/btest/scripts/base/frameworks/sumstats/cluster-intermediate-update.bro index 949fcb3644..81a3a1c0e2 100644 --- a/testing/btest/scripts/base/frameworks/sumstats/cluster-intermediate-update.bro +++ b/testing/btest/scripts/base/frameworks/sumstats/cluster-intermediate-update.bro @@ -18,7 +18,7 @@ redef Cluster::nodes = { redef Log::default_rotation_interval = 0secs; -event bro_init() &priority=5 +event zeek_init() &priority=5 { local r1: SumStats::Reducer = [$stream="test.metric", $apply=set(SumStats::SUM)]; SumStats::create([$name="test", diff --git a/testing/btest/scripts/base/frameworks/sumstats/last-cluster.bro b/testing/btest/scripts/base/frameworks/sumstats/last-cluster.bro index da8f8fb80f..55b0e30069 100644 --- a/testing/btest/scripts/base/frameworks/sumstats/last-cluster.bro +++ b/testing/btest/scripts/base/frameworks/sumstats/last-cluster.bro @@ -27,7 +27,7 @@ event do_observe() schedule 0.1secs { do_observe() }; } -event bro_init() +event zeek_init() { local r1 = SumStats::Reducer($stream="test", $apply=set(SumStats::LAST), diff --git a/testing/btest/scripts/base/frameworks/sumstats/on-demand-cluster.bro b/testing/btest/scripts/base/frameworks/sumstats/on-demand-cluster.bro index bb429a52cb..225b3951f2 100644 --- a/testing/btest/scripts/base/frameworks/sumstats/on-demand-cluster.bro +++ b/testing/btest/scripts/base/frameworks/sumstats/on-demand-cluster.bro @@ -22,7 +22,7 @@ redef Log::default_rotation_interval = 0secs; global n = 0; -event bro_init() &priority=5 +event zeek_init() &priority=5 { local r1 = SumStats::Reducer($stream="test", $apply=set(SumStats::SUM, SumStats::MIN, SumStats::MAX, SumStats::AVERAGE, SumStats::STD_DEV, SumStats::VARIANCE, SumStats::UNIQUE)); SumStats::create([$name="test sumstat", @@ -37,7 +37,7 @@ event Broker::peer_lost(endpoint: Broker::EndpointInfo, msg: string) global ready_for_data: event(); -event bro_init() +event zeek_init() { Broker::auto_publish(Cluster::worker_topic, ready_for_data); } diff --git a/testing/btest/scripts/base/frameworks/sumstats/on-demand.bro b/testing/btest/scripts/base/frameworks/sumstats/on-demand.bro index 78aba726ca..99658ad7d0 100644 --- a/testing/btest/scripts/base/frameworks/sumstats/on-demand.bro +++ b/testing/btest/scripts/base/frameworks/sumstats/on-demand.bro @@ -28,7 +28,7 @@ event on_demand_key() } } -event bro_init() &priority=5 +event zeek_init() &priority=5 { local r1: SumStats::Reducer = [$stream="test.reducer", $apply=set(SumStats::SUM)]; diff --git a/testing/btest/scripts/base/frameworks/sumstats/sample-cluster.bro b/testing/btest/scripts/base/frameworks/sumstats/sample-cluster.bro index 227313635a..36a1859f99 100644 --- a/testing/btest/scripts/base/frameworks/sumstats/sample-cluster.bro +++ b/testing/btest/scripts/base/frameworks/sumstats/sample-cluster.bro @@ -18,7 +18,7 @@ redef Cluster::nodes = { redef Log::default_rotation_interval = 0secs; -event bro_init() &priority=5 +event zeek_init() &priority=5 { local r1: SumStats::Reducer = [$stream="test", $apply=set(SumStats::SAMPLE), $num_samples=5]; SumStats::create([$name="test", @@ -47,7 +47,7 @@ event Broker::peer_lost(endpoint: Broker::EndpointInfo, msg: string) global ready_for_data: event(); -event bro_init() +event zeek_init() { Broker::auto_publish(Cluster::worker_topic, ready_for_data); diff --git a/testing/btest/scripts/base/frameworks/sumstats/sample.bro b/testing/btest/scripts/base/frameworks/sumstats/sample.bro index 4ba395b463..30e80b1b49 100644 --- a/testing/btest/scripts/base/frameworks/sumstats/sample.bro +++ b/testing/btest/scripts/base/frameworks/sumstats/sample.bro @@ -1,7 +1,7 @@ # @TEST-EXEC: bro %INPUT # @TEST-EXEC: btest-diff .stdout -event bro_init() &priority=5 +event zeek_init() &priority=5 { local r1: SumStats::Reducer = [$stream="test.metric", $apply=set(SumStats::SAMPLE), $num_samples=2]; diff --git a/testing/btest/scripts/base/frameworks/sumstats/thresholding.bro b/testing/btest/scripts/base/frameworks/sumstats/thresholding.bro index b7bb826446..f751a85e98 100644 --- a/testing/btest/scripts/base/frameworks/sumstats/thresholding.bro +++ b/testing/btest/scripts/base/frameworks/sumstats/thresholding.bro @@ -5,7 +5,7 @@ redef enum Notice::Type += { Test_Notice, }; -event bro_init() &priority=5 +event zeek_init() &priority=5 { local r1: SumStats::Reducer = [$stream="test.metric", $apply=set(SumStats::SUM)]; SumStats::create([$name="test1", diff --git a/testing/btest/scripts/base/frameworks/sumstats/topk-cluster.bro b/testing/btest/scripts/base/frameworks/sumstats/topk-cluster.bro index 8a3a9bcf1b..d3ced7f692 100644 --- a/testing/btest/scripts/base/frameworks/sumstats/topk-cluster.bro +++ b/testing/btest/scripts/base/frameworks/sumstats/topk-cluster.bro @@ -20,7 +20,7 @@ redef Cluster::nodes = { redef Log::default_rotation_interval = 0secs; -event bro_init() &priority=5 +event zeek_init() &priority=5 { local r1: SumStats::Reducer = [$stream="test.metric", $apply=set(SumStats::TOPK)]; @@ -53,7 +53,7 @@ event Broker::peer_lost(endpoint: Broker::EndpointInfo, msg: string) global ready_for_data: event(); -event bro_init() +event zeek_init() { Broker::auto_publish(Cluster::worker_topic, ready_for_data); } diff --git a/testing/btest/scripts/base/frameworks/sumstats/topk.bro b/testing/btest/scripts/base/frameworks/sumstats/topk.bro index 99c301c669..1a1ef7870a 100644 --- a/testing/btest/scripts/base/frameworks/sumstats/topk.bro +++ b/testing/btest/scripts/base/frameworks/sumstats/topk.bro @@ -1,7 +1,7 @@ # @TEST-EXEC: bro %INPUT # @TEST-EXEC: btest-diff .stdout -event bro_init() &priority=5 +event zeek_init() &priority=5 { local r1: SumStats::Reducer = [$stream="test.metric", $apply=set(SumStats::TOPK)]; diff --git a/testing/btest/scripts/base/protocols/http/content-range-gap-skip.bro b/testing/btest/scripts/base/protocols/http/content-range-gap-skip.bro index b96b8f02a6..74ce213505 100644 --- a/testing/btest/scripts/base/protocols/http/content-range-gap-skip.bro +++ b/testing/btest/scripts/base/protocols/http/content-range-gap-skip.bro @@ -19,7 +19,7 @@ event content_gap(c: connection, is_orig: bool, seq: count, length: count) got_gap = T; } -event bro_done() +event zeek_done() { if ( ! got_data_after_gap ) exit(1); diff --git a/testing/btest/scripts/base/protocols/http/http-pipelining.bro b/testing/btest/scripts/base/protocols/http/http-pipelining.bro index bb392b1c4b..afb1a7f33e 100644 --- a/testing/btest/scripts/base/protocols/http/http-pipelining.bro +++ b/testing/btest/scripts/base/protocols/http/http-pipelining.bro @@ -2,7 +2,7 @@ # @TEST-EXEC: btest-diff http.log # mime type is irrelevant to this test, so filter it out -event bro_init() +event zeek_init() { Log::remove_default_filter(HTTP::LOG); Log::add_filter(HTTP::LOG, [$name="less-mime-types", $exclude=set("mime_type")]); diff --git a/testing/btest/scripts/base/protocols/irc/basic.test b/testing/btest/scripts/base/protocols/irc/basic.test index 618f4d9079..d4fb893e2c 100644 --- a/testing/btest/scripts/base/protocols/irc/basic.test +++ b/testing/btest/scripts/base/protocols/irc/basic.test @@ -6,7 +6,7 @@ # @TEST-EXEC: btest-diff conn.log # dcc mime types are irrelevant to this test, so filter it out -event bro_init() +event zeek_init() { Log::remove_default_filter(IRC::LOG); Log::add_filter(IRC::LOG, [$name="remove-mime", $exclude=set("dcc_mime_type")]); diff --git a/testing/btest/scripts/base/protocols/krb/smb2_krb.test b/testing/btest/scripts/base/protocols/krb/smb2_krb.test index 08c05d83f1..32c2a6e58d 100644 --- a/testing/btest/scripts/base/protocols/krb/smb2_krb.test +++ b/testing/btest/scripts/base/protocols/krb/smb2_krb.test @@ -11,7 +11,7 @@ redef KRB::keytab = "smb2_krb.keytab"; global monitor_ports: set[port] = { 445/tcp, 139/tcp } &redef; -event bro_init() &priority=5{ +event zeek_init() &priority=5{ Analyzer::register_for_ports(Analyzer::ANALYZER_SMB, monitor_ports); } diff --git a/testing/btest/scripts/base/protocols/krb/smb2_krb_nokeytab.test b/testing/btest/scripts/base/protocols/krb/smb2_krb_nokeytab.test index 0d2c68d142..d08543a0fb 100644 --- a/testing/btest/scripts/base/protocols/krb/smb2_krb_nokeytab.test +++ b/testing/btest/scripts/base/protocols/krb/smb2_krb_nokeytab.test @@ -10,7 +10,7 @@ global monitor_ports: set[port] = { 445/tcp, 139/tcp } &redef; -event bro_init() &priority=5{ +event zeek_init() &priority=5{ Analyzer::register_for_ports(Analyzer::ANALYZER_SMB, monitor_ports); } diff --git a/testing/btest/scripts/base/protocols/mount/basic.test b/testing/btest/scripts/base/protocols/mount/basic.test index 8576874ce3..bd6fd5d5db 100644 --- a/testing/btest/scripts/base/protocols/mount/basic.test +++ b/testing/btest/scripts/base/protocols/mount/basic.test @@ -4,7 +4,7 @@ global mount_ports: set[port] = { 635/tcp, 635/udp, 20048/tcp, 20048/udp } &redef; redef ignore_checksums = T; -event bro_init() +event zeek_init() { Analyzer::register_for_ports(Analyzer::ANALYZER_MOUNT, mount_ports); Analyzer::enable_analyzer(Analyzer::ANALYZER_MOUNT); diff --git a/testing/btest/scripts/base/protocols/ncp/event.bro b/testing/btest/scripts/base/protocols/ncp/event.bro index acb4bf0a0c..2333544b05 100644 --- a/testing/btest/scripts/base/protocols/ncp/event.bro +++ b/testing/btest/scripts/base/protocols/ncp/event.bro @@ -3,7 +3,7 @@ redef likely_server_ports += { 524/tcp }; -event bro_init() +event zeek_init() { const ports = { 524/tcp }; Analyzer::register_for_ports(Analyzer::ANALYZER_NCP, ports); diff --git a/testing/btest/scripts/base/protocols/ncp/frame_size_tuning.bro b/testing/btest/scripts/base/protocols/ncp/frame_size_tuning.bro index 46ad87e752..cc4a5799f2 100644 --- a/testing/btest/scripts/base/protocols/ncp/frame_size_tuning.bro +++ b/testing/btest/scripts/base/protocols/ncp/frame_size_tuning.bro @@ -3,7 +3,7 @@ redef likely_server_ports += { 524/tcp }; -event bro_init() +event zeek_init() { const ports = { 524/tcp }; Analyzer::register_for_ports(Analyzer::ANALYZER_NCP, ports); diff --git a/testing/btest/scripts/base/protocols/nfs/basic.test b/testing/btest/scripts/base/protocols/nfs/basic.test index f2d2b1862a..9b7ae91910 100755 --- a/testing/btest/scripts/base/protocols/nfs/basic.test +++ b/testing/btest/scripts/base/protocols/nfs/basic.test @@ -4,7 +4,7 @@ global nfs_ports: set[port] = { 2049/tcp, 2049/udp } &redef; redef ignore_checksums = T; -event bro_init() +event zeek_init() { Analyzer::register_for_ports(Analyzer::ANALYZER_NFS, nfs_ports); Analyzer::enable_analyzer(Analyzer::ANALYZER_NFS); diff --git a/testing/btest/scripts/base/protocols/pop3/starttls.bro b/testing/btest/scripts/base/protocols/pop3/starttls.bro index 8e0d1ab5ef..d2bfee6449 100644 --- a/testing/btest/scripts/base/protocols/pop3/starttls.bro +++ b/testing/btest/scripts/base/protocols/pop3/starttls.bro @@ -14,7 +14,7 @@ const ports = { }; redef likely_server_ports += { ports }; -event bro_init() &priority=5 +event zeek_init() &priority=5 { Analyzer::register_for_ports(Analyzer::ANALYZER_POP3, ports); } diff --git a/testing/btest/scripts/base/protocols/smb/disabled-dce-rpc.test b/testing/btest/scripts/base/protocols/smb/disabled-dce-rpc.test index 627e396517..d65ee81c41 100644 --- a/testing/btest/scripts/base/protocols/smb/disabled-dce-rpc.test +++ b/testing/btest/scripts/base/protocols/smb/disabled-dce-rpc.test @@ -6,7 +6,7 @@ # The DCE_RPC analyzer is a little weird since it's instantiated # by the SMB analyzer directly in some cases. Care needs to be # taken to handle a disabled analyzer correctly. -event bro_init() +event zeek_init() { Analyzer::disable_analyzer(Analyzer::ANALYZER_DCE_RPC); } diff --git a/testing/btest/scripts/base/protocols/ssl/dpd.test b/testing/btest/scripts/base/protocols/ssl/dpd.test index 1a16a10db4..20b6ab6b74 100644 --- a/testing/btest/scripts/base/protocols/ssl/dpd.test +++ b/testing/btest/scripts/base/protocols/ssl/dpd.test @@ -9,7 +9,7 @@ @load base/frameworks/signatures @load-sigs base/protocols/ssl/dpd.sig -event bro_init() +event zeek_init() { print "Start test run"; } diff --git a/testing/btest/scripts/base/protocols/ssl/ocsp-http-get.test b/testing/btest/scripts/base/protocols/ssl/ocsp-http-get.test index c8c8acc589..181ee34909 100644 --- a/testing/btest/scripts/base/protocols/ssl/ocsp-http-get.test +++ b/testing/btest/scripts/base/protocols/ssl/ocsp-http-get.test @@ -6,7 +6,7 @@ @load files/x509/log-ocsp -event bro_init() +event zeek_init() { Files::register_for_mime_type(Files::ANALYZER_OCSP_REQUEST, "application/ocsp-request"); Files::register_for_mime_type(Files::ANALYZER_OCSP_REPLY, "application/ocsp-response"); diff --git a/testing/btest/scripts/base/protocols/ssl/ocsp-request-only.test b/testing/btest/scripts/base/protocols/ssl/ocsp-request-only.test index 05483717b0..ff493a62a8 100644 --- a/testing/btest/scripts/base/protocols/ssl/ocsp-request-only.test +++ b/testing/btest/scripts/base/protocols/ssl/ocsp-request-only.test @@ -5,7 +5,7 @@ @load files/x509/log-ocsp -event bro_init() +event zeek_init() { Files::register_for_mime_type(Files::ANALYZER_OCSP_REQUEST, "application/ocsp-request"); Files::register_for_mime_type(Files::ANALYZER_OCSP_REPLY, "application/ocsp-response"); diff --git a/testing/btest/scripts/base/protocols/ssl/ocsp-request-response.test b/testing/btest/scripts/base/protocols/ssl/ocsp-request-response.test index b95203dfd8..cfa5b99375 100644 --- a/testing/btest/scripts/base/protocols/ssl/ocsp-request-response.test +++ b/testing/btest/scripts/base/protocols/ssl/ocsp-request-response.test @@ -6,7 +6,7 @@ @load files/x509/log-ocsp -event bro_init() +event zeek_init() { Files::register_for_mime_type(Files::ANALYZER_OCSP_REQUEST, "application/ocsp-request"); Files::register_for_mime_type(Files::ANALYZER_OCSP_REPLY, "application/ocsp-response"); diff --git a/testing/btest/scripts/base/protocols/ssl/ocsp-response-only.test b/testing/btest/scripts/base/protocols/ssl/ocsp-response-only.test index 43dbf82583..3b8c4a2d57 100644 --- a/testing/btest/scripts/base/protocols/ssl/ocsp-response-only.test +++ b/testing/btest/scripts/base/protocols/ssl/ocsp-response-only.test @@ -6,7 +6,7 @@ @load files/x509/log-ocsp -event bro_init() +event zeek_init() { Files::register_for_mime_type(Files::ANALYZER_OCSP_REQUEST, "application/ocsp-request"); Files::register_for_mime_type(Files::ANALYZER_OCSP_REPLY, "application/ocsp-response"); diff --git a/testing/btest/scripts/base/protocols/ssl/ocsp-revoked.test b/testing/btest/scripts/base/protocols/ssl/ocsp-revoked.test index e4378135ad..3ee0e96776 100644 --- a/testing/btest/scripts/base/protocols/ssl/ocsp-revoked.test +++ b/testing/btest/scripts/base/protocols/ssl/ocsp-revoked.test @@ -6,7 +6,7 @@ @load files/x509/log-ocsp -event bro_init() +event zeek_init() { Files::register_for_mime_type(Files::ANALYZER_OCSP_REQUEST, "application/ocsp-request"); Files::register_for_mime_type(Files::ANALYZER_OCSP_REPLY, "application/ocsp-response"); diff --git a/testing/btest/scripts/base/utils/active-http.test b/testing/btest/scripts/base/utils/active-http.test index 97d06448ca..9f94a14c7f 100644 --- a/testing/btest/scripts/base/utils/active-http.test +++ b/testing/btest/scripts/base/utils/active-http.test @@ -35,7 +35,7 @@ function test_request(label: string, req: ActiveHTTP::Request) } } -event bro_init() +event zeek_init() { test_request("test1", [$url="127.0.0.1:32123"]); test_request("test2", [$url="127.0.0.1:32123/empty", $method="POST"]); diff --git a/testing/btest/scripts/base/utils/addrs.test b/testing/btest/scripts/base/utils/addrs.test index 224fd9dc62..8e5580d3e5 100644 --- a/testing/btest/scripts/base/utils/addrs.test +++ b/testing/btest/scripts/base/utils/addrs.test @@ -3,7 +3,7 @@ @load base/utils/addrs -event bro_init() +event zeek_init() { local ip = "0.0.0.0"; diff --git a/testing/btest/scripts/base/utils/decompose_uri.bro b/testing/btest/scripts/base/utils/decompose_uri.bro index 6ed30e7889..074e782474 100644 --- a/testing/btest/scripts/base/utils/decompose_uri.bro +++ b/testing/btest/scripts/base/utils/decompose_uri.bro @@ -10,7 +10,7 @@ function dc(s: string) print ""; } -event bro_init() +event zeek_init() { dc("https://www.bro.org:42/documentation/faq.html?k1=v1&k2=v2"); dc(""); diff --git a/testing/btest/scripts/base/utils/dir.test b/testing/btest/scripts/base/utils/dir.test index 4cbb4a3c89..ccb56b4276 100644 --- a/testing/btest/scripts/base/utils/dir.test +++ b/testing/btest/scripts/base/utils/dir.test @@ -47,7 +47,7 @@ function new_file(fname: string) terminate(); } -event bro_init() +event zeek_init() { Dir::monitor("../testdir", new_file, .25sec); } diff --git a/testing/btest/scripts/base/utils/directions-and-hosts.test b/testing/btest/scripts/base/utils/directions-and-hosts.test index 92d1b48d3a..a955053d4a 100644 --- a/testing/btest/scripts/base/utils/directions-and-hosts.test +++ b/testing/btest/scripts/base/utils/directions-and-hosts.test @@ -40,7 +40,7 @@ function test_dir(id: conn_id, d: Direction, expect: bool) result == expect ? "SUCCESS" : "FAIL"); } -event bro_init() +event zeek_init() { test_host(local_ip, LOCAL_HOSTS, T); test_host(local_ip, REMOTE_HOSTS, F); diff --git a/testing/btest/scripts/base/utils/exec.test b/testing/btest/scripts/base/utils/exec.test index 0b926df402..b8fbe474aa 100644 --- a/testing/btest/scripts/base/utils/exec.test +++ b/testing/btest/scripts/base/utils/exec.test @@ -26,7 +26,7 @@ function test_cmd(label: string, cmd: Exec::Command) } } -event bro_init() +event zeek_init() { test_cmd("test1", [$cmd="bash ../somescript.sh", $read_files=set("out1", "out2")]); diff --git a/testing/btest/scripts/base/utils/files.test b/testing/btest/scripts/base/utils/files.test index 3324522030..402da96bed 100644 --- a/testing/btest/scripts/base/utils/files.test +++ b/testing/btest/scripts/base/utils/files.test @@ -12,9 +12,9 @@ event connection_established(c: connection) print generate_extraction_filename("", c, ""); } -event bro_init() +event zeek_init() { print extract_filename_from_content_disposition("attachment; filename=Economy"); print extract_filename_from_content_disposition("attachment; name=\"US-$ rates\""); print extract_filename_from_content_disposition("attachment; filename*=iso-8859-1'en'%A3%20rates"); - } \ No newline at end of file + } diff --git a/testing/btest/scripts/base/utils/json.test b/testing/btest/scripts/base/utils/json.test index 264151136a..968db1cefe 100644 --- a/testing/btest/scripts/base/utils/json.test +++ b/testing/btest/scripts/base/utils/json.test @@ -16,7 +16,7 @@ type myrec2: record { m: myrec1 &log; }; -event bro_init() +event zeek_init() { # ##################################### # Test the basic (non-container) types: diff --git a/testing/btest/scripts/base/utils/queue.test b/testing/btest/scripts/base/utils/queue.test index 344ea73f45..b11cac233f 100644 --- a/testing/btest/scripts/base/utils/queue.test +++ b/testing/btest/scripts/base/utils/queue.test @@ -4,7 +4,7 @@ # This is loaded by default @load base/utils/queue -event bro_init() +event zeek_init() { local q = Queue::init([$max_len=2]); Queue::put(q, 1); @@ -30,4 +30,4 @@ event bro_init() Queue::get_vector(q2, test3); for ( i in test3 ) print fmt("String queue value: %s", test3[i]); - } \ No newline at end of file + } diff --git a/testing/btest/scripts/base/utils/site.test b/testing/btest/scripts/base/utils/site.test index cfd7dd2ceb..50438a0b9c 100644 --- a/testing/btest/scripts/base/utils/site.test +++ b/testing/btest/scripts/base/utils/site.test @@ -12,7 +12,7 @@ redef Site::local_admins += { [141.142.100.0/24] = b, }; -event bro_init() +event zeek_init() { print Site::get_emails(141.142.1.1); print Site::get_emails(141.142.100.100); diff --git a/testing/btest/scripts/policy/frameworks/intel/seen/certs.bro b/testing/btest/scripts/policy/frameworks/intel/seen/certs.bro index 8571784d9a..c90c5e41f4 100644 --- a/testing/btest/scripts/policy/frameworks/intel/seen/certs.bro +++ b/testing/btest/scripts/policy/frameworks/intel/seen/certs.bro @@ -17,7 +17,7 @@ www.dresdner-privat.de Intel::DOMAIN source1 test entry http://some-data-distrib redef Intel::read_files += { "intel.dat" }; -event bro_init() +event zeek_init() { suspend_processing(); } diff --git a/testing/btest/scripts/policy/frameworks/intel/seen/smtp.bro b/testing/btest/scripts/policy/frameworks/intel/seen/smtp.bro index fd21e0f73a..6ad04e95bd 100644 --- a/testing/btest/scripts/policy/frameworks/intel/seen/smtp.bro +++ b/testing/btest/scripts/policy/frameworks/intel/seen/smtp.bro @@ -16,7 +16,7 @@ name-addr@example.com Intel::EMAIL source1 test entry http://some-data-distribut redef Intel::read_files += { "intel.dat" }; -event bro_init() +event zeek_init() { suspend_processing(); } diff --git a/testing/btest/scripts/policy/frameworks/intel/whitelisting.bro b/testing/btest/scripts/policy/frameworks/intel/whitelisting.bro index 53acd49aa9..560ba35c0a 100644 --- a/testing/btest/scripts/policy/frameworks/intel/whitelisting.bro +++ b/testing/btest/scripts/policy/frameworks/intel/whitelisting.bro @@ -23,7 +23,7 @@ redef Intel::read_files += { global total_files_read = 0; -event bro_init() +event zeek_init() { suspend_processing(); } diff --git a/testing/btest/scripts/policy/frameworks/software/version-changes.bro b/testing/btest/scripts/policy/frameworks/software/version-changes.bro index c6d2433236..493bc1d354 100644 --- a/testing/btest/scripts/policy/frameworks/software/version-changes.bro +++ b/testing/btest/scripts/policy/frameworks/software/version-changes.bro @@ -34,7 +34,7 @@ event new_software() event new_software(); } -event bro_init() +event zeek_init() { event new_software(); } diff --git a/testing/btest/scripts/policy/frameworks/software/vulnerable.bro b/testing/btest/scripts/policy/frameworks/software/vulnerable.bro index 2ea7009a21..dd233a6ffc 100644 --- a/testing/btest/scripts/policy/frameworks/software/vulnerable.bro +++ b/testing/btest/scripts/policy/frameworks/software/vulnerable.bro @@ -11,7 +11,7 @@ redef Software::vulnerable_versions += { ["Java"] = set(java_1_6_vuln, java_1_7_vuln) }; -event bro_init() +event zeek_init() { Software::found([$orig_h=1.2.3.4, $orig_p=1234/tcp, $resp_h=4.3.2.1, $resp_p=80/tcp], [$name="Java", $host=1.2.3.4, $version=[$major=1, $minor=7, $minor2=0, $minor3=15]]); diff --git a/testing/btest/scripts/policy/misc/weird-stats.bro b/testing/btest/scripts/policy/misc/weird-stats.bro index b26fce8e47..b5f7c0901b 100644 --- a/testing/btest/scripts/policy/misc/weird-stats.bro +++ b/testing/btest/scripts/policy/misc/weird-stats.bro @@ -24,7 +24,7 @@ event gen_weirds(n: count, done: bool &default = F) schedule 5sec { die() }; } -event bro_init() +event zeek_init() { event gen_weirds(1000); schedule 7.5sec { gen_weirds(2000) } ; diff --git a/testing/btest/scripts/policy/protocols/http/test-sql-injection-regex.bro b/testing/btest/scripts/policy/protocols/http/test-sql-injection-regex.bro index 2e82eb9dfb..3041abab75 100644 --- a/testing/btest/scripts/policy/protocols/http/test-sql-injection-regex.bro +++ b/testing/btest/scripts/policy/protocols/http/test-sql-injection-regex.bro @@ -3,8 +3,8 @@ @load protocols/http/detect-sqli -event bro_init () -{ +event zeek_init() + { local positive_matches: set[string]; local negative_matches: set[string]; diff --git a/testing/btest/signatures/dpd.bro b/testing/btest/signatures/dpd.bro index 39f1b01294..b6d58fb3a3 100644 --- a/testing/btest/signatures/dpd.bro +++ b/testing/btest/signatures/dpd.bro @@ -30,7 +30,7 @@ signature my_ftp_server { @load base/utils/addrs -event bro_init() +event zeek_init() { # no analyzer attached to any port by default, depends entirely on sigs print "|Analyzer::all_registered_ports()|", |Analyzer::all_registered_ports()|; diff --git a/testing/scripts/file-analysis-test.bro b/testing/scripts/file-analysis-test.bro index aa7d158b55..337bf3c1c0 100644 --- a/testing/scripts/file-analysis-test.bro +++ b/testing/scripts/file-analysis-test.bro @@ -108,7 +108,7 @@ event file_state_remove(f: fa_file) print fmt("SHA256: %s", f$info$sha256); } -event bro_init() +event zeek_init() { add test_file_analyzers[Files::ANALYZER_MD5]; add test_file_analyzers[Files::ANALYZER_SHA1];