Commit graph

9059 commits

Author SHA1 Message Date
Jon Siwek
cada0d5e6e GH-161: fix segfault in &default type checking for sets
Fixes GH-161
2019-01-14 14:03:15 -06:00
Jon Siwek
02783692d8 Merge branch 'topic/jazoff/expire-reuse-fix' of https://github.com/JustinAzoff/zeek
* 'topic/jazoff/expire-reuse-fix' of https://github.com/JustinAzoff/zeek:
  Fix variable reuse in table expiration
2019-01-14 10:28:56 -06:00
Justin Azoff
665d8b01d2 Fix variable reuse in table expiration
While expiring a table, DoExpire checks at the end to see if NextEntry
returned nothing to determine if it should sleep for the short
table_expire_delay or the long table_expire_interval.

However, the check to see if the expire_func deleted the entry
re-assigns the same variable.  This means that:

  If you have a large table that is behind on expiring values
& The table defines an expire_func
& That expire_func deletes the item
& It so happens that the last item checked in the batch of
table_incremental_step size had expired

then DoExpire will reset the cookie and sleep for table_expire_interval
2019-01-12 16:36:56 -05:00
Robert Clark
a72e9a8126
Tell OpenSSL that MD5 is not used for security in order to allow bro to work properly on a FIPS system 2019-01-11 16:09:42 -05:00
Stu H
9081e976ce Merge branch 'master' into stu-h/erspan 2019-01-11 10:58:42 +00:00
Jon Siwek
fa6e7219ff Updating submodule(s).
[nomail]
2019-01-10 18:00:48 -06:00
Jon Siwek
ffaee8b607 Updating submodule(s).
[nomail]
2019-01-10 17:08:06 -06:00
Jon Siwek
c46b018fdb Reorganize documentation index
Moved examples and use cases into a common subdir so those topics will
get grouped together in the main sidebar/TOC
2019-01-10 15:46:58 -06:00
Jon Siwek
b1b7027982 Merge remote-tracking branch 'origin/rtd-test'
* origin/rtd-test:
  Disable RTD pdf format due to exceeded capacity
  Add RTD pdf format
  Add RTD yaml config file
  Remove some Bro usages in main TOC entries
  Remove "contents" Sphinx directive usages
  Add a `make livehtml` target
  Use sourcecode Sphinx directive more widely
  Use Sphinx RTD theme for user manual
  Replace some code-block Sphinx directives
  Remove unused Sphinx extensions
  Remove broxygen Sphinx integration
  Remove Sphinx btest integrations and tests
  Fix a Sphinx deprecation

These are all changes required to build documentation from a static
Sphinx tree (e.g. on Read the Docs)
2019-01-10 14:08:40 -06:00
Jon Siwek
bc05af6e3f Disable RTD pdf format due to exceeded capacity 2019-01-10 13:35:01 -06:00
Jon Siwek
f98a0215d5 Add RTD pdf format 2019-01-10 13:11:57 -06:00
Jon Siwek
eb1e598460 Add RTD yaml config file 2019-01-10 12:55:35 -06:00
Johanna Amann
540fa3779d Updating CHANGES and VERSION. 2019-01-10 09:11:02 -08:00
Johanna Amann
60fd0e1b8d Baseline update for catch-and-release change. 2019-01-10 09:10:08 -08:00
Johanna Amann
1cee5d0f9d Merge branch 'topic/jazoff/catch-and-release-perf' of https://github.com/JustinAzoff/zeek
* 'topic/jazoff/catch-and-release-perf' of https://github.com/JustinAzoff/zeek:
  improve performance of catch and release script
2019-01-10 08:38:17 -08:00
Jon Siwek
2982765128 Pre-allocate and re-use Vals for bool, int, count, enum and empty string 2019-01-09 18:29:23 -06:00
Stu H
d9533e9616 Implement ERSPAN type II and ERSPAN type III support 2019-01-09 22:51:00 +00:00
Justin Azoff
cc2981ab3b improve performance of catch and release script
Defer allocation of the Entity record until it will be used.
2019-01-09 13:58:39 -05:00
Justin Azoff
dcbef9cbe3 Preallocate booleans and small counts
Like PortManager, preallocate Vals for booleans and counts < 4096
2019-01-07 13:40:17 -06:00
Johanna Amann
a27ab672d9 Merge remote-tracking branch 'origin/topic/jsiwek/libressl-fixes'
* origin/topic/jsiwek/libressl-fixes:
  GH-227: Improve LibreSSL support
2019-01-07 10:37:52 -08:00
Jon Siwek
fc43d06955 GH-227: Improve LibreSSL support 2019-01-07 11:35:17 -06:00
Jon Siwek
e0b8b4b6b1 Replace some bro.org usages with zeek.org 2019-01-04 17:51:25 -06:00
Jon Siwek
a411225219 Updating submodule(s).
[nomail]
2019-01-04 13:19:05 -06:00
Jon Siwek
15bfdbe952 Merge branch 'master' of https://github.com/hosom/zeek
* 'master' of https://github.com/hosom/zeek:
  Call FatalErrorWithCore instead of FatalError
  Fix syntax error
  Add fatal_error_with_core bif
2019-01-02 11:29:18 -06:00
Jon Siwek
70990a5b59 Updating submodule(s).
[nomail]
2018-12-20 10:28:06 -06:00
Jon Siwek
879f327d4b Remove some Bro usages in main TOC entries 2018-12-19 17:38:19 -06:00
Jon Siwek
5ebe47ec23 Remove "contents" Sphinx directive usages
Seems redundant: same info is always available in RTD theme's
floating sidebar.
2018-12-19 17:28:17 -06:00
Jon Siwek
a46967bad8 Add a make livehtml target 2018-12-19 17:25:59 -06:00
Jon Siwek
a80d7ead6c Use sourcecode Sphinx directive more widely
It looks better by default with the RTD theme, Bro syntax highlighting
is supported well enough, and I think will be more more consistent
with the literalinclude usages, so being able to drop the extra Sphinx
extension seems good.
2018-12-19 17:04:26 -06:00
Jon Siwek
9f642bfe5b Use Sphinx RTD theme for user manual 2018-12-19 16:32:03 -06:00
Jon Siwek
ce320ce984 Replace some code-block Sphinx directives
Simplifying to either code or console directives
2018-12-19 15:33:57 -06:00
Jon Siwek
2a3a66fce2 Remove unused Sphinx extensions 2018-12-19 15:33:23 -06:00
Jon Siwek
bb97b96587 Updating submodule(s).
[nomail]
2018-12-19 15:13:22 -06:00
Jon Siwek
9d7a278870 Updating submodule(s).
[nomail]
2018-12-19 09:59:00 -06:00
Jon Siwek
288e1722d1 Updating submodule(s).
[nomail]
2018-12-19 09:49:01 -06:00
Stephen Hosom
6be5151291 Call FatalErrorWithCore instead of FatalError
Previously, this bif didn't reference the correct function.
2018-12-19 10:33:41 -05:00
Stephen Hosom
96999f5687 Fix syntax error 2018-12-19 08:58:41 -05:00
Stephen Hosom
2357717e37 Add fatal_error_with_core bif
This patch adds a bif for aborting and obtaining a core file from
script land.
2018-12-19 08:33:04 -05:00
Jon Siwek
7e9d48f532 Remove broxygen Sphinx integration
The broxygen-generated files now live in the git repo, have tests
that check that they are up-to-date, and a script to re-generate
them on-demand.
2018-12-18 10:15:22 -06:00
Jon Siwek
9e5e9d04b7 Remove Sphinx btest integrations and tests 2018-12-14 16:32:35 -06:00
Jon Siwek
be0d3021fa Fix a Sphinx deprecation 2018-12-14 16:26:09 -06:00
Jon Siwek
73ccc0f4ac Updating submodule(s).
[nomail]
2018-12-13 10:46:35 -06:00
Jon Siwek
866a967c46 Updating submodule(s).
[nomail]
2018-12-12 16:18:37 -06:00
Jon Siwek
1f826b94b8 Updating submodule(s).
[nomail]
2018-12-10 15:08:46 -06:00
Jon Siwek
918c5f67de Updating submodule(s).
[nomail]
2018-12-10 13:11:07 -06:00
Jon Siwek
002191ab62 Merge remote-tracking branch 'origin/topic/jsiwek/alpine-support'
* origin/topic/jsiwek/alpine-support:
  Add FTS dependency when building on Alpine
  Remove unnecessary header include
  Improve default DNS resolution support for Alpine/musl
  Add dns_resolver option
2018-12-10 11:55:40 -06:00
Jon Siwek
1ce5a3becb Merge remote-tracking branch 'origin/topic/johanna/static'
* origin/topic/johanna/static:
  Introduce --enable-static-broker configuration option.
2018-12-10 11:17:36 -06:00
Jon Siwek
9736182fbc Update github/download links 2018-12-07 16:36:51 -06:00
Jon Siwek
f287b2bdf9 Fix Travis git clone command 2018-12-07 07:27:42 -06:00
Jon Siwek
34e577c4f0 Update external test suite locations 2018-12-06 20:11:57 -06:00