Commit graph

9501 commits

Author SHA1 Message Date
Jon Siwek
f78c697fa0 Release 2.6 2018-11-29 10:06:26 -06:00
Jon Siwek
ebd5a49916 Updating submodule(s).
[nomail]
2018-11-29 09:56:57 -06:00
Jon Siwek
fb96bc960d Updating submodule(s).
[nomail]
2018-11-22 07:59:22 -06:00
Jon Siwek
6af68638de GH-218: Add missing ICMP router advertisement counterpart 2018-11-22 07:58:41 -06:00
Jon Siwek
0b2d182f76 Updating submodule(s).
[nomail]
2018-11-21 09:27:52 -06:00
Jon Siwek
3f206cb8a9 Updating CHANGES and VERSION. 2018-11-15 08:36:07 -06:00
Jon Siwek
257d98f975 Updating submodule(s).
[nomail]
2018-11-14 17:09:42 -06:00
Jon Siwek
f31204c7c5 Updating submodule(s).
[nomail]
2018-11-13 19:45:28 -06:00
Jon Siwek
80bb792e90 Updating submodule(s).
[nomail]
2018-11-13 10:59:48 -06:00
Jon Siwek
635e030be2 Merge remote-tracking branch 'origin/master' into dev/2.7
* origin/master:
  Fix SumStats "last" plugin in cluster mode
  Remove unnessary check
  Support appending to vector of any
  Fix coding conventions nits/typos
  Updating submodule(s).
  Revert "Switch frag_timeout from redef to option"
  Improve error handling in x509_ocsp_verify function
  Updating submodule(s).
  Updating submodule(s).
  Update baseline for plugins.hooks for redef -> option changes
  Switch frag_timeout from redef to option
  Switch GridFTP options from redef to option
  Updating submodule(s).
  Fix a unit test relying on a bash-ism
2018-11-08 12:43:22 -06:00
Jon Siwek
01e17b5ea0 Fix SumStats "last" plugin in cluster mode 2018-11-08 12:27:37 -06:00
Jon Siwek
e3612960ee Merge branch 'topic/bloomfilter-performance-boost' of https://github.com/bro/bro
* 'topic/bloomfilter-performance-boost' of https://github.com/bro/bro:
  Remove unnessary check
2018-11-08 09:41:07 -06:00
Matthias Vallentin
74c6b9f54c Remove unnessary check
The call to Empty() was originally meant as an optimization in the
lookup phase. However, the performance implications are substantial:
this check operates in O(f(m/8)) where m is the number of bits in the
Bloom filters and f a function that looks for the first non-empty block
of bits.

As the Bloom filter fills up, the check for Empty() becomes no longer
negligible and can lead to serious performance degradations when Bloom
filters are used frequently.
2018-11-07 13:11:15 -08:00
Jon Siwek
ca014d6e35 Support appending to vector of any
For consistency, since it already works to assign to an index within
vector of any.
2018-11-07 11:48:43 -06:00
Jon Siwek
808f1d1524 Fix coding conventions nits/typos 2018-11-07 10:27:43 -06:00
Jon Siwek
f470dfdb92 Updating submodule(s).
[nomail]
2018-11-06 18:45:00 -06:00
Jon Siwek
c1f02aaa61 Revert "Switch frag_timeout from redef to option"
This reverts commit 38259afa8d.

The change to an option wasn't yet incomplete -- that would
require dynamic lookup of the value at the C++ layer.
2018-11-06 09:32:58 -06:00
Jon Siwek
3d12ea3353 Merge remote-tracking branch 'origin/topic/vlad/redef_to_option'
* origin/topic/vlad/redef_to_option:
  Update baseline for plugins.hooks for redef -> option changes
  Switch frag_timeout from redef to option
  Switch GridFTP options from redef to option
2018-11-06 09:20:26 -06:00
Jon Siwek
2d82fe7e2e Improve error handling in x509_ocsp_verify function 2018-11-05 17:10:21 -06:00
Jon Siwek
03f42fabf3 Updating submodule(s).
[nomail]
2018-11-05 14:53:18 -06:00
Jon Siwek
c4a1299359 Updating submodule(s).
[nomail]
2018-11-05 14:48:57 -06:00
Vlad Grigorescu
4f6db2f960 Update baseline for plugins.hooks for redef -> option changes 2018-11-05 14:00:44 -06:00
Vlad Grigorescu
38259afa8d Switch frag_timeout from redef to option 2018-11-05 13:41:13 -06:00
Vlad Grigorescu
93c094fff2 Switch GridFTP options from redef to option 2018-11-05 13:41:05 -06:00
Jon Siwek
907297ba59 Parallelize communication tests using btest TEST-PORT 2018-11-04 15:29:59 -06:00
Jon Siwek
7ec480f05d Updating submodule(s).
[nomail]
2018-11-03 10:57:25 -05:00
Jon Siwek
de640d651f Fix a unit test relying on a bash-ism 2018-11-02 18:31:45 -05:00
Jon Siwek
0249ecba4b Merge remote-tracking branch 'origin/master' into dev/2.7
* origin/master:
  Add script-layer call stack to internal errors messages that abort
2018-11-02 17:45:28 -05:00
Jon Siwek
b2560384c4 Add script-layer call stack to internal errors messages that abort 2018-11-02 17:43:34 -05:00
Jon Siwek
b54570aa98 Merge remote-tracking branch 'origin/master' into dev/2.7
* origin/master:
  Improve error message of index assignment expression failures
2018-11-02 16:42:00 -05:00
Jon Siwek
a7ba44089b Improve error message of index assignment expression failures 2018-11-02 16:40:28 -05:00
Jon Siwek
ebd8132063 Merge remote-tracking branch 'origin/master' into dev/2.7
* origin/master: (23 commits)
  Improve Travis script to show multiple core dump stacks
  Improve a weird stats unit test
  Updating submodule(s).
  Fix Travis script typo
  Add more debug output to Travis script
  Add core file search and stack trace output for Travis builds
  Updating submodule(s).
  Update license year for 2018
  GH-199: change `bro --help` exit status from 1 to 0
  Updating submodule(s).
  Add a test with an encrypted MySQL connection
  Fix parsing of MySQL NUL Strings, where we now require it to have a NUL value at the end.
  Updating submodule(s).
  Add missing record field comment
  Add missing record field comments
  Fix minor documentation mistakes
  Updating submodule(s).
  Updating submodule(s).
  Update btest baselines for fix in 46f727a6fa
  Generate ssh_auth_attempted for the 'none' authentication method.
  ...
2018-11-02 14:45:32 -05:00
Jon Siwek
802b4f876e Improve Travis script to show multiple core dump stacks 2018-11-02 09:39:01 -05:00
Jon Siwek
3251792ddb Improve a weird stats unit test 2018-11-02 08:58:08 -05:00
Jon Siwek
d3e8f2cff8 Updating submodule(s).
[nomail]
2018-11-02 08:01:05 -05:00
Jon Siwek
8544508d33 Fix Travis script typo 2018-11-01 20:39:33 -05:00
Jon Siwek
53f4e09342 Add more debug output to Travis script 2018-11-01 19:58:03 -05:00
Jon Siwek
5ddb2b37c0 Add core file search and stack trace output for Travis builds 2018-11-01 18:36:31 -05:00
Jon Siwek
32d8bbf6bd Updating submodule(s).
[nomail]
2018-11-01 16:54:43 -05:00
Vlad Grigorescu
11f7759236 Update license year for 2018 2018-11-01 13:54:07 -05:00
Jon Siwek
cbaab3d4fa GH-199: change bro --help exit status from 1 to 0
Fixes #199
2018-10-31 22:28:38 -05:00
Jon Siwek
6e3ff156e0 Updating submodule(s).
[nomail]
2018-10-31 18:52:27 -05:00
Jon Siwek
8c02aa5211 Merge remote-tracking branch 'origin/topic/vladg/mysql_nul_string_fix'
* origin/topic/vladg/mysql_nul_string_fix:
  Add a test with an encrypted MySQL connection
  Fix parsing of MySQL NUL Strings, where we now require it to have a NUL value at the end.
2018-10-30 10:00:39 -05:00
Vlad Grigorescu
b0638dbdcf Add a test with an encrypted MySQL connection 2018-10-29 15:58:06 -05:00
Vlad Grigorescu
6144ac536f Fix parsing of MySQL NUL Strings, where we now require it to have a NUL value at the end.
We don't pass that NUL to the script layer, so we moved away from bytestring_to_val for those.
2018-10-29 15:56:51 -05:00
Jon Siwek
80c7f3f4e2 Updating submodule(s).
[nomail]
2018-10-29 14:06:56 -05:00
Jon Siwek
0cc5e4e044 Add missing record field comment 2018-10-26 10:42:05 -05:00
Jon Siwek
8d0087154a Add missing record field comments 2018-10-26 10:24:30 -05:00
Jon Siwek
6a059a1cf7 Fix minor documentation mistakes 2018-10-25 18:56:38 -05:00
Jon Siwek
cbb5fdffaa Updating submodule(s).
[nomail]
2018-10-25 14:05:29 -05:00