* origin/topic/jsiwek/misc:
Unlock mutex in raw input reader error cases - BIT-1060
Fix a deadlock w/ SQLite.
Fix a unit test.
Make mem leak tests able to time out.
Fix a compiler warning regarding strncat misuse.
Add a diff canonifier to a test in need of it.
Input framework unit test adjustments.
Raw input reader command execution "fixes".
* origin/topic/seth/sumstats-updates:
Fixing a problem with resetting sumstats on managers in the wrong location.
Changing how threshold reseting happens (actually do it on managers!)
Fix some reporter.log errors by adding a few extra key membership checks.
Note this is another submodule change, you'll need to init the new
module:
git submodule update --recursive --init
BIT-1059 #merged
* origin/topic/bernhard/3rdparty:
add external 3rdparty submodule
step 1 - delete 3rdparty
- Generally increased the time allowed before they timeout.
- For tests w/ a clear termination condition (most of them), made
timeouts result in a test failure.
- Seemed to be a race in some cases between tests generating output and
the input reader stream getting removed/closed, so moved stream removal
closer to termination time, when all output should be available.
* topic/robin/unified2-analyzer-merge:
Fixed a problem where the Unified2 analyzer was attached to every file.
Fixes in case a packet isn't seen that matches an event.
Finished work on unified2 analyzer.
Fixed some tests.
Working unified2 analyzer.
Unified2 file analyzer updated to new plugin style.
Adding the unified2 analyzer.
* origin/topic/seth/unified2-analyzer:
Fixed a problem where the Unified2 analyzer was attached to every file.
Fixing intel framework tests.
Updating submodule(s).
Add file name support to intel framework.
Add file support to intel framework and slightly restructure intel http handling.
Conflicts:
CHANGES
VERSION
scripts/base/files/unified2/main.bro
testing/btest/Baseline/coverage.bare-load-baseline/canonified_loaded_scripts.log
testing/btest/Baseline/coverage.default-load-baseline/canonified_loaded_scripts.log
- Primarily working around an issue that occurs when threads
concurrently create pipes and fork a child process. See comment in
code...
- Other minor cleanup of the code: making sure the child process calls
_exit() versus exit(), limits itself to few select system calls before
the exec(), and closes more unused file descriptors.
* origin/topic/seth/intel-updates:
Fixing intel framework tests.
Add file name support to intel framework.
Add file support to intel framework and slightly restructure intel http handling.
BIT-1054 #merged
* origin/topic/seth/unified2-analyzer:
Fixes in case a packet isn't seen that matches an event.
Finished work on unified2 analyzer.
Fixed some tests.
Working unified2 analyzer.
Unified2 file analyzer updated to new plugin style.
Adding the unified2 analyzer.
Conflicts:
testing/btest/Baseline/coverage.bare-load-baseline/canonified_loaded_scripts.log
testing/btest/Baseline/coverage.default-load-baseline/canonified_loaded_scripts.log
