Commit graph

1051 commits

Author SHA1 Message Date
Robin Sommer
b9538045d5 Updating submodule. 2019-06-27 16:58:00 +00:00
Johanna Amann
10e25bd625 Update submodules
[nomail]
2019-06-25 10:47:07 -07:00
Johanna Amann
5f9a9bbcbe Merge branch 'paraglob' of https://github.com/ZekeMedley/zeek
* 'paraglob' of https://github.com/ZekeMedley/zeek:
  Add leak test to paraglob.
  Catch paraglob serialization errors in DoClone.
  Update paraglob serialization.
  Stop execution on paraglob error.
  Update paraglob submodule
  Change C++11 detection in paraglob.
  Make paraglob serializable and copyable.
  Initial paraglob integration.

I made a bunch of small changes:
 * paraglob now deals better with \0 characters
 * I rolled back the changes to Binary Serialization format,
 * there were some small formatting issue
 * the error output was slightly unsafe
 * build_unique is now in util.h.

and perhaps a few more small things.
2019-06-24 15:21:46 -07:00
Jon Siwek
6918e54936 Updating submodule(s).
[nomail]
2019-06-21 09:56:57 -07:00
Zeke Medley
a5f6757d7d Merge remote-tracking branch 'upstream/master' into paraglob 2019-06-20 14:14:48 -07:00
Jon Siwek
8f668ce82c Merge remote-tracking branch 'origin/topic/dnthayer/rename-to-zeek'
* origin/topic/dnthayer/rename-to-zeek:
  Rename bro to zeek in error messages
2019-06-17 20:27:42 -07:00
Jon Siwek
b33926a8e1 Merge remote-tracking branch 'origin/topic/dnthayer/gh-313'
* origin/topic/dnthayer/gh-313:
  Create local.zeek as symlink for upgrade installs
  Rename directories from bro to zeek
2019-06-12 15:11:04 -07:00
Jon Siwek
0ab1f0fe25 Updating submodule(s).
[nomail]
2019-06-12 10:34:27 -07:00
Jon Siwek
e0f9b0829e Adapt bro_plugin CMake macros to use zeek_plugin 2019-06-07 20:07:39 -07:00
Jon Siwek
05a58f90a2 Merge remote-tracking branch 'origin/topic/johanna/tls13-details'
* origin/topic/johanna/tls13-details:
  Update SSL documentation.
  support the newer TLS 1.3 key_share extension.
  Include all data of the server-hello random
  Parse pre-shared-key extension.

Added a small portability fix for the gmt_unix_time byte-swapping.
2019-06-07 14:06:11 -07:00
Jon Siwek
c6378c56e2 Update plugin unit tests to use --zeek-dist 2019-06-06 20:02:47 -07:00
Zeke Medley
145bfe50af Update paraglob submodule 2019-06-06 15:35:02 -07:00
ZekeMedley
e100558658 Change C++11 detection in paraglob. 2019-06-05 12:33:20 -07:00
ZekeMedley
42b1f4fd2e Make paraglob serializable and copyable. 2019-06-04 14:56:48 -07:00
ZekeMedley
e1520a0d67 Initial paraglob integration. 2019-06-04 14:24:51 -07:00
Jon Siwek
39c201f88e Updating submodule(s).
[nomail]
2019-05-30 21:35:40 -07:00
Jon Siwek
c25520cf3f Updating submodule(s).
[nomail]
2019-05-29 14:55:51 -07:00
Jon Siwek
574d2c363a Merge remote-tracking branch 'origin/topic/jsiwek/broker-less-copies'
* origin/topic/jsiwek/broker-less-copies:
  Reduce data copying in Broker message processing
2019-05-28 17:58:59 -07:00
Jon Siwek
4ff473a596 Updating submodule(s).
[nomail]
2019-05-28 14:07:35 -07:00
Jon Siwek
580822a32c Merge remote-tracking branch 'origin/topic/dnthayer/gh-339'
* origin/topic/dnthayer/gh-339:
  Rename all BRO-prefixed environment variables
2019-05-23 20:23:14 -07:00
Jon Siwek
ce17ae8ea2 Update broker unit test output.
Due to string representation of Broker vectors changing (they now
use parentheses instead of square brackets).

Related to https://github.com/zeek/broker/issues/43
2019-05-23 18:06:47 -07:00
Jon Siwek
8d49b5abf0 Merge remote-tracking branch 'origin/topic/dnthayer/bro-to-zeek'
* origin/topic/dnthayer/bro-to-zeek:
  Additional Bro to Zeek renaming
2019-05-20 21:00:19 -07:00
Jon Siwek
ef484c388a Updating submodule(s).
[nomail]
2019-05-20 13:23:38 -07:00
Johanna Amann
85e2a6ad90 Update binpac submodule.
[nomail]
2019-05-20 09:07:48 -07:00
Jon Siwek
72b46268f7 Updating submodule(s).
[nomail]
2019-05-15 15:53:26 -07:00
Jon Siwek
bf42dd02bd Merge remote-tracking branch 'origin/topic/dnthayer/gh-359'
* origin/topic/dnthayer/gh-359:
  Changes needed due to bro-to-zeek renaming in broker
2019-05-15 15:03:31 -07:00
Jon Siwek
fcc840044d Updating submodule(s).
[nomail]
2019-05-14 19:31:51 -07:00
Jon Siwek
bee69222b1 Update NEWS 2019-05-14 18:21:58 -07:00
Jon Siwek
f37a16b715 Rename broctl submodule to zeekctl 2019-05-14 17:42:01 -07:00
Jon Siwek
6ad7099f7e Merge remote-tracking branch 'origin/topic/robin/gh-239'
* origin/topic/robin/gh-239:
  Undo a change to btest.cfg from a recent commit
  Updating submodule.
  Fix zeek-wrapper
  Update for renaming BroControl to ZeekControl.
  Updating submodule.
  GH-239: Rename bro to zeek, bro-config to zeek-config, and bro-path-dev to zeek-path-dev.
2019-05-14 13:27:40 -07:00
Robin Sommer
b953a5516f Updating submodule. 2019-05-12 16:02:37 +00:00
Jon Siwek
aced89ac9e Updating submodule(s).
[nomail]
2019-05-10 19:18:50 -07:00
Robin Sommer
89b8d6e7ba Update for renaming BroControl to ZeekControl. 2019-05-06 21:22:19 +00:00
Johanna Amann
dcd6454530 Remove RemoteSerializer and related code/types.
Also removes broccoli from the source tree.
2019-05-03 15:00:13 -07:00
Robin Sommer
6a726afed9 Updating submodule. 2019-05-02 00:12:03 +00:00
Johanna Amann
29d9b5b554 Merge remote-tracking branch 'origin/topic/jsiwek/plist-and-event-cleanup'
* origin/topic/jsiwek/plist-and-event-cleanup:
  Add comments to QueueEvent() and ConnectionEvent()
  Add methods to queue events without handler existence check
  Cleanup/improve PList usage and Event API
2019-05-01 08:41:13 -07:00
Jon Siwek
cc83b8ce8e Updating submodule(s).
[nomail]
2019-04-26 09:43:57 -07:00
Jon Siwek
a994be9eeb Merge remote-tracking branch 'origin/topic/seth/zeek_init'
* origin/topic/seth/zeek_init:
  Some more testing fixes.
  Update docs and tests for bro_(init|done) -> zeek_(init|done)
  Implement the zeek_init handler.
2019-04-19 11:24:29 -07:00
Jon Siwek
31e9ae0fed Updating submodule(s).
[nomail]
2019-04-17 16:02:38 -07:00
Jon Siwek
ae4129d2b6 Updating submodule(s).
[nomail]
2019-04-16 18:06:55 -07:00
Jon Siwek
93d384adeb Updating submodule(s).
[nomail]
2019-04-16 12:43:44 -07:00
Jon Siwek
4574799609 Merge branch 'master' of https://github.com/dnthayer/zeek
* 'master' of https://github.com/dnthayer/zeek:
  Update tests and baselines due to renaming all scripts
  Rename all scripts to have ".zeek" file extension
  Update a few tests due to scripts with new file extension
  Add test cases to verify new file extension is recognized
  Fix the core/load-duplicates.bro test
  Update script search logic for new file extension
  Remove unnecessary ".bro" from @load directives
2019-04-16 11:57:16 -07:00
Jon Siwek
f96bc81f85 Updating submodule(s).
[nomail]
2019-04-12 16:44:14 -07:00
Jon Siwek
1c7e41e506 Updating submodule(s).
[nomail]
2019-04-12 13:21:10 -07:00
Jon Siwek
b6862c5c59 Add methods to queue events without handler existence check
Added ConnectionEventFast() and QueueEventFast() methods to avoid
redundant event handler existence checks.

It's common practice for caller to already check for event handler
existence before doing all the work of constructing the arguments, so
it's desirable to not have to check for existence again.

E.g. going through ConnectionEvent() means 3 existence checks:
one you do yourself before calling it, one in ConnectionEvent(), and then
another in QueueEvent().

The existence check itself can be more than a few operations sometimes
as it needs to check a few flags that determine if it's enabled, has
a local body, or has any remote receivers in the old comm. system or
has been flagged as something to publish in the new comm. system.
2019-04-11 20:30:25 -07:00
Jon Siwek
78dcbcc71a Merge remote-tracking branch 'origin/topic/jsiwek/flowbuffer-policy'
* origin/topic/jsiwek/flowbuffer-policy:
  Use a default binpac flowbuffer policy

Added options to tune binpac flowbuffer policy
2019-04-10 09:55:27 -07:00
Jon Siwek
5e9b119a08 Use a default binpac flowbuffer policy 2019-04-05 12:35:50 -07:00
Jon Siwek
ee00483ee6 Update now-broken Broker API usages
Related to the changes from https://github.com/zeek/broker/pull/38
2019-03-27 10:55:31 -07:00
Jon Siwek
b2930a6ec3 Updating submodule(s).
[nomail]
2019-03-22 16:35:28 -07:00
Jon Siwek
2b79c7af16 Updating submodule(s).
[nomail]
2019-03-22 13:07:52 -07:00