* master: (21 commits)
Fixing default policy search path.
Small tweaks for doc generation.
The hostname notice email extension now only add hostnames for emailed noticed.
Attempt at cleaning up doc generation.
Hopefully the last major script reorganization.
Updating submodule(s).
Fixing compiler warning.
Fixing crash in memory profiling.
Fix compiler warning.
Fixing memory (and CPU) leak in log writer.
Fixing missing sync in cluster setup.
Update script doc-generation README.
Omission of bro.init from doc generation fixed.
Fixing docstrings to make docutils happy.
Updated submodules to current master
Updating submodule(s).
Updating submodule(s).
Fix genDocSourcesList script lack of explicit sorting
Fix &raw_output and enable_raw_output interpretation of NUL characters
Fix PktSrc::Statistics returning bogus stats.
...
Conflicts:
scripts/base/bro.init
- policy/ renamed to scripts/
- By default BROPATH now contains:
- scripts/
- scripts/policy
- scripts/site
- *Nearly* all tests pass.
- All of scripts/base/ is loaded by main.cc
- Can be disabled by setting $BRO_NO_BASE_SCRIPTS
- Scripts in scripts/base/ don't use relative path loading to ease use of BRO_NO_BASE_SCRIPTS (to copy and paste that script).
- The scripts in scripts/base/protocols/ only (or soon will only) do logging and state building.
- The scripts in scripts/base/frameworks/ add functionality without causing any additional overhead.
- All "detection" activity happens through scripts in scripts/policy/.
- Communications framework modified temporarily to need an environment variable to actually enable (ENABLE_COMMUNICATION=1)
- This is so the communications framework can be loaded as part
of the base without causing trouble when it's not needed.
- This will be removed once a resolution to ticket #540 is reached.
* origin/fastpath:
Update script doc-generation README.
Omission of bro.init from doc generation fixed.
Fixing docstrings to make docutils happy.
Updated submodules to current master
Checkpoint.
Decapsulation happens after IP Defragmentation. The "identity" of the
enclosing tunnel (the "parent") is added to the connection record of the
child (tunneled) connection as an optional field $tunnel_parent.
When using a `print` statement to write to a file that has raw output
enabled, NUL characters in string are no longer interpreted into "\0",
no newline is appended afterwards, and each argument to `print` is
written to the file without any additional separation.
(Re)Assigning to identifiers with the &raw_output attribute should also
now correctly apply the attribute to the file value being assigned.
Note that the write_file BiF should already be capable of raw string
data to a file, expect it bypasses the print_hook event.
Addresses #474
When reading from trace files, 'dropped' and 'link' fields are now
just zeroed.
When reading from an interface, the values filled in by pcap_stats()
are now only used when that function indicates success.
Closes#500.
* origin/topic/jsiwek/unit-tests:
Fix utils/conn-ids test due to renamed conn-ids.bro
Moving the test for site.bro to live w/ other utils/ tests.
Fix test due to moving of site.bro
More policy/utils unit tests and documentation.
Updating documentation for some utils/ policy scripts
Add unit tests for utils/paths.bro with some changes
Adding unit tests for utils.
Adding test for utils/addrs.bro.
Add unit test for site.bro.
Conflicts:
policy/utils/site.bro
Closes#525.
