Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-07 09:08:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1
9258 commits 387 branches 195 tags 259 MiB
Commit graph

9258 commits

This branch
This branch
All branches
Author SHA1 Message Date
Jon Siwek
5cece12333 Merge remote-tracking branch 'origin/topic/neverlord/intrusive-ptr' 
* origin/topic/neverlord/intrusive-ptr:
  Add API documentation to IntrusivePtr
  Rename make{ Counted => _intrusive }
  Remove braces around single return statements
  Integrate review feedback
  Add and use new IntrusivePt type in Zeek
 2019-11-05 09:56:07 -08:00
Jon Siwek
872adda5b1 Merge branch 'topic/jsbarber/ftp-cluster-fix-patch' of https://github.com/jsbarber/zeek 
Minor cleanup in merge: remove print statements and unnecessary @if
directive.

* 'topic/jsbarber/ftp-cluster-fix-patch' of https://github.com/jsbarber/zeek:
  Publish ftp_data_expected updates to other workers for synchronization
 2019-11-04 17:31:59 -08:00
Jon Siwek
1afcb5c993 Merge remote-tracking branch 'origin/topic/neverlord/object-libraries' 
* origin/topic/neverlord/object-libraries:
  Update CMake submodule
  Use object libraries for subdir libs and plugins
 2019-11-04 16:57:37 -08:00
Jon Siwek
e34562df48 Fix error handling in decode_base64() 2019-11-04 10:00:17 -08:00
Jon Siwek
b6def63167 Revert "Merge remote-tracking branch 'origin/topic/dev/bugrpone-narrowing-conversions-base64'" 
This reverts commit 705210a035.
The original changes broke the Base64.h API which may be used by
external plugins.

Fixes GH-676
 2019-11-04 09:47:56 -08:00
Jon Siwek
33c26e9ea3 Use #pragma once in Base64.h 2019-11-01 15:59:15 -07:00
Jon Siwek
63fe835acf Allow record_fields() string arguments that name a record type 2019-11-01 12:46:17 -07:00
Jon Siwek
295c28b48e Merge remote-tracking branch 'origin/topic/jsiwek/fix-coverity-ci' 
* origin/topic/jsiwek/fix-coverity-ci:
  Fix Travis CI script to run Coverity build in container
 2019-10-31 12:18:49 -07:00
Jon Siwek
8d31baf3b7 Fix Travis CI script to run Coverity build in container 
It was previously running on the host and didn't have adequate compiler
to do C++17.
 2019-10-31 12:09:18 -07:00
Dominik Charousset
3338cfb1cb Update CMake submodule 2019-10-31 11:22:36 +01:00
Dominik Charousset
25aadd82ef Use object libraries for subdir libs and plugins 2019-10-31 10:58:51 +01:00
Johanna Amann
6775463f13 Merge remote-tracking branch 'origin/topic/jsiwek/remove-header-usings' 
* origin/topic/jsiwek/remove-header-usings:
  Remove "using namespace std" from header files
 2019-10-31 06:37:52 +01:00
Jon Siwek
49c59ceb99 GH-649: define missing DLT_NFLOG to support OpenBSD 2019-10-30 15:05:53 -07:00
Jeff Barber
d698bddc7d Publish ftp_data_expected updates to other workers for synchronization 2019-10-30 15:50:22 -06:00
Jon Siwek
90771d4aba Merge remote-tracking branch 'origin/topic/johanna/configure-libdir' 
* origin/topic/johanna/configure-libdir:
  Add --libdir convenience flag to configure.
 2019-10-30 13:33:36 -07:00
Johanna Amann
1eb22bd53b Update submodule 
[nomail]
 2019-10-30 21:26:58 +01:00
Dominik Charousset
fadaa40e04 Add API documentation to IntrusivePtr 2019-10-30 21:02:06 +01:00
Dominik Charousset
054a4f4612 Rename make{ Counted => _intrusive } 2019-10-30 20:27:57 +01:00
Jon Siwek
62161dcc34 Remove "using namespace std" from header files 2019-10-30 12:26:10 -07:00
Dominik Charousset
21b6159e70 Remove braces around single return statements 2019-10-30 20:25:08 +01:00
Jon Siwek
13a431f9fb Merge branch 'master' of https://github.com/redsand/zeek 
- Simplified this to just return result of inet_pton

* 'master' of https://github.com/redsand/zeek:
  adds missing ipv6 support for patricia trie index (white/blacklist) under *nix. only worked for nt before..
 2019-10-30 11:03:59 -07:00
Johanna Amann
f98d4cb9e9 Add --libdir convenience flag to configure. 
The flag sets the library installation directory.
 2019-10-30 10:42:16 -07:00
Tim Shelton
338e15cc38 adds missing ipv6 support for patricia trie index (white/blacklist) under *nix. only worked for nt before.. 2019-10-30 16:00:18 +00:00
Robin Sommer
82f656ec9c Merge remote-tracking branch 'origin/topic/jsiwek/gh-664-tcp-syn-data-signatures' 
* origin/topic/jsiwek/gh-664-tcp-syn-data-signatures:
  GH-664: fix signature matching for payload-carrying SYN packets
 2019-10-30 08:07:47 +00:00
Jon Siwek
9c4e44924f GH-664: fix signature matching for payload-carrying SYN packets 
Or more generally, signatures would not work correctly for any case
where the first TCP packet seen contained payload data, regardless of
its TCP flags.
 2019-10-29 17:20:08 -07:00
Dominik Charousset
72e15fe4d4 Integrate review feedback 2019-10-29 21:24:56 +01:00
Jon Siwek
7b9a27c96a Merge remote-tracking branch 'origin/topic/johanna/remove-build-unique' 
* origin/topic/johanna/remove-build-unique:
  Replace build_unique with make_unique
 2019-10-29 09:42:55 -07:00
Dominik Charousset
0f41b063b2 Add and use new IntrusivePt type in Zeek 
Manual memory management via Ref/Unref is verbose and prone to error. An
intrusive smart pointer automates the reference counting, makes code
more robust (in particular w.r.t. to exceptions) and reduces boilerplate
code. A big benefit of the intrusive smart pointers for Zeek is that
they can co-exist with the manual memory management. Rather than having
to port the entire code base at once, we can migrate components
one-by-one. In this first step, we add the new template
`IntrusivePtr<T>` and start using it in the Broker Manager. This makes
the previous `unref_guard` obsolete.
 2019-10-29 16:49:27 +01:00
Johanna Amann
0ab72e5983 Update submodules 
[nomail]
 2019-10-29 12:21:27 +01:00
Johanna Amann
e2a8dd4db1 Replace build_unique with make_unique 
This was a rarely used convenience function from when we did not yet
have c++17 support.
 2019-10-29 11:50:30 +01:00
Johanna Amann
ff612876c5 Revert "Fix compilation on OS-X." 
This reverts commit cde28074a1.

We now have a c++14 compiler.

Fixes GH-626
 2019-10-29 11:42:45 +01:00
Jon Siwek
6f3a695b3f Updating submodule(s). 
[nomail]
 2019-10-28 22:24:16 -07:00
Jon Siwek
36d7628bcb Install cmake3 from EPEL on CentOS CI system 2019-10-28 20:18:45 -07:00
Jon Siwek
2613640abe Merge remote-tracking branch 'origin/topic/neverlord/cmake3' 
* origin/topic/neverlord/cmake3:
  Fix position of project(), require CMake 3
 2019-10-28 18:31:51 -07:00
Johanna Amann
44086c1f03 Merge remote-tracking branch 'origin/topic/jsiwek/gh-654-coerce-unspecified-table-defaults' 
* origin/topic/jsiwek/gh-654-coerce-unspecified-table-defaults:
  GH-654: allow table() in function &default expressions
  GH-654: allow table() in record &default expressions

Fixes GH-654
 2019-10-28 20:59:39 +01:00
Johanna Amann
8b789f7c31 Merge branch 'fix-typo' of https://github.com/keithjjones/zeek 
* 'fix-typo' of https://github.com/keithjjones/zeek:
  Fix up some documentation.
 2019-10-28 20:42:29 +01:00
Keith J. Jones
05788a2c02 Fix up some documentation. 2019-10-28 09:29:35 -04:00
Dominik Charousset
24d5ffa7a1 Fix position of project(), require CMake 3 
The call to `project` must come after `cmake_minimum_required` in CMake
in order to get the correct policy settings.
 2019-10-28 13:31:46 +01:00
Robin Sommer
505ed8f32f Updating submodule(s). 
[nomail]
 2019-10-28 10:59:29 +00:00
Robin Sommer
d0060df0fe Updating submodules. 2019-10-28 10:09:42 +00:00
Robin Sommer
29164c5992 Merge remote-tracking branch 'origin/topic/jsiwek/gh-585-c++17' 
* origin/topic/jsiwek/gh-585-c++17:
  Update Travis CI config for C++17
  GH-585: Require C++17
 2019-10-28 10:06:16 +00:00
Robin Sommer
9d7c9f37d4 Merge branch 'Fix_http_build_url' of ssh://github.com/Olerdrive/zeek 
I changed the format string of the port to %d and added a test.
 2019-10-28 09:32:32 +00:00
Robin Sommer
7796e6398c Merge branch 'minor-plugin-fixes' of ssh://github.com/awelzel/zeek 2019-10-28 08:55:45 +00:00
Arne Welzel
9b881a1e6f Free memory allocated by glob() in plugin/Manager 2019-10-27 10:23:17 +01:00
Arne Welzel
9e5e7084e6 Remove always false condition in plugin/Manager 
`((m->second + "/").empty())` always evaluates to false. Combine
it with the previously check.
 2019-10-27 10:23:15 +01:00
Alexey Mokeev
6ba1d1dcd3 Make http::build_url work correctly 2019-10-27 11:17:53 +03:00
Johanna Amann
1f9bdceaaf Update submodule 
[nomail]
 2019-10-26 16:58:54 +02:00
Jon Siwek
b698c5507a GH-654: allow table() in function &default expressions 
Table parameters of functions previously did not coerce unspecified
tables used in their &default attribute to the correct type.
 2019-10-25 13:00:46 -07:00
Jon Siwek
34bf78984b GH-654: allow table() in record &default expressions 
Table fields of records previously did not coerce unspecified tables
used in their &default attribute to the correct type.
 2019-10-25 12:48:52 -07:00
Jon Siwek
691fd5c9a4 Change usage of old bro:see directive to zeek:see 2019-10-25 10:42:05 -07:00