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
691fd5c9a4
Change usage of old bro:see directive to zeek:see
2019-10-25 10:42:05 -07:00
Jon Siwek
81ab0b0d05
Use explicit path name for NTP log stream
...
For consistency (we do this for all other logs) and just to avoid
the extra path function calls.
2019-10-25 10:38:58 -07:00
Jon Siwek
cf05b1d7dc
Merge branch 'fix-typo' of https://github.com/keithjjones/zeek
...
* 'fix-typo' of https://github.com/keithjjones/zeek :
Fixed typo.
2019-10-25 10:13:14 -07:00
Keith J. Jones
67499979c8
Fixed typo.
2019-10-25 10:33:20 -04:00
Jon Siwek
08e2f97393
Update Travis CI config for C++17
...
Several platforms didn't have a C++17 compiler in their default repos.
Also moved from Fedora 28 to Fedora 30 since that will soon be the
oldest, still-supported version.
2019-10-24 22:27:54 -07:00
Jon Siwek
2c6cb6e5f3
GH-585: Require C++17
2019-10-24 12:51:06 -07:00
Jon Siwek
e2bc662fbb
Updating submodule(s).
...
[nomail]
2019-10-23 09:18:10 -07:00
Jon Siwek
17076936f7
Updating submodule(s).
...
[nomail]
2019-10-21 17:45:25 -07:00
Jon Siwek
6184a495f0
Update embedded CAF in Broker to 0.17.2
2019-10-21 09:35:25 -07:00
Johanna Amann
808f726fd0
Update submodule
...
[nomail]
2019-10-21 11:43:16 +02:00
Johanna Amann
50f7969e15
Merge remote-tracking branch 'origin/topic/neverlord/select-cmake'
...
* origin/topic/neverlord/select-cmake:
Fix check for cmake commands on POSIX shells
Prefer cmake3 command, add --cmake=PATH option
2019-10-21 11:43:10 +02:00
Dominik Charousset
e380a12a8b
Fix check for cmake commands on POSIX shells
2019-10-21 08:44:46 +02:00
Dominik Charousset
2885f3ead4
Prefer cmake3 command, add --cmake=PATH option
2019-10-19 17:42:00 +02:00
Johanna Amann
af76637c96
Update zeekctl submodule pointer.
...
This changes the gzip compression level to the default from 9.
Fixes GH-614
[nomail]
2019-10-17 16:33:37 -07:00
Jon Siwek
1a4aeb91e2
Merge remote-tracking branch 'origin/topic/jsiwek/update-pybind11'
...
* origin/topic/jsiwek/update-pybind11:
Update broker submodule to use pybind11 v2.4.3
2019-10-16 10:03:35 -07:00
Jon Siwek
79c18ea81b
Update broker submodule to use pybind11 v2.4.3
2019-10-15 19:21:56 -07:00
Johanna Amann
63a3957e48
Merge remote-tracking branch 'origin/topic/jsiwek/misc-attr-improvements'
...
* origin/topic/jsiwek/misc-attr-improvements:
Improve &default validation for global vars: exclude sets
Remove unnecessary &optional from a Config::set_value() parameter
Remove check for redundant attributes
2019-10-15 19:18:26 -07:00
Jon Siwek
4bf3c6ff22
Improve &default validation for global vars: exclude sets
2019-10-15 18:24:35 -07:00
Jon Siwek
4c066ca914
Remove unnecessary &optional from a Config::set_value() parameter
2019-10-15 17:46:05 -07:00
Jon Siwek
1a0a2f16ce
Remove check for redundant attributes
...
Letting there be redundant attributes serves no purpose. It could
also potentially cause long attribute lists containing many useless
&redef or &optional attributes (e.g. think that may happen if you
use redef enough times and the new attributes keep getting merged
into the old ones).
2019-10-15 17:45:59 -07:00
Johanna Amann
5265613a9e
Merge remote-tracking branch 'origin/topic/jsiwek/gh-618-tcp-option-values'
...
* origin/topic/jsiwek/gh-618-tcp-option-values:
Add weirds for invalid TCP option lengths
GH-618: add "tcp_options" event containing TCP option values
Fix tcp_option event
2019-10-15 16:50:43 -07:00
Jon Siwek
84754bad05
Add weirds for invalid TCP option lengths
2019-10-15 14:28:14 -07:00
Johanna Amann
f62a51b41b
Merge remote-tracking branch 'origin/topic/jsiwek/fix-table-default-redef'
...
* origin/topic/jsiwek/fix-table-default-redef:
Fix redef'ing a table with a new &default attribute
2019-10-14 22:06:35 -07:00
Johanna Amann
66effde97d
Merge remote-tracking branch 'origin/topic/seth/624'
...
* origin/topic/seth/624:
Support whitespace at end of line for config reader.
This merge fixes a failing test; it also sprinkles a few more spaces
into another test file.
The main change is that this now also works with configuration lines
that don't have a value.
2019-10-14 21:47:59 -07:00
Johanna Amann
705210a035
Merge remote-tracking branch 'origin/topic/dev/bugrpone-narrowing-conversions-base64'
...
* origin/topic/dev/bugrpone-narrowing-conversions-base64:
Proof of Concept on Bugprone Narrowing Conversions: Base64
I fixed a few bugs in this while merging; Decode now signals success or
error (which did not work before). I removed the new variables in
mime.cc and just switched more to size_t - the new variables introduced
a bug because they shadowed the changes of the Decode call.
GH-616
2019-10-14 20:19:02 -07:00
Seth Hall
cd06cb24cc
Support whitespace at end of line for config reader.
...
This commit addresses issue #624
2019-10-14 11:43:16 -04:00
Jon Siwek
6a99567a79
Merge remote-tracking branch 'origin/topic/jsiwek/travis-dist-trusty'
...
* origin/topic/jsiwek/travis-dist-trusty:
Use Ubuntu 14.04 for Travis CI environment
2019-10-12 10:40:55 -07:00
Jon Siwek
42b6040952
Fix redef'ing a table with a new &default attribute
2019-10-11 18:57:03 -07:00
Jon Siwek
a5771cd3d6
Use Ubuntu 14.04 for Travis CI environment
2019-10-08 20:58:54 -07:00
Jon Siwek
8773f93325
Updating submodule(s).
...
[nomail]
2019-10-08 19:36:29 -07:00
Johanna Amann
916205e254
Merge remote-tracking branch 'origin/topic/jsiwek/print-raw-bif'
...
* origin/topic/jsiwek/print-raw-bif:
Add new BIF: print_raw()
2019-10-08 15:15:55 -07:00
Johanna Amann
cde28074a1
Fix compilation on OS-X.
...
OS X complains about std::pair not having a constexpr constructor. Which
seems to be the case for C++11. Hence, let's make it static const for
the moment.
This commit should be reverted when we move to C++17.
2019-10-07 18:52:11 -07:00
Dev Bali
cad6f881eb
Proof of Concept on Bugprone Narrowing Conversions: Base64
2019-10-07 12:02:41 -07:00
Johanna Amann
e615d1f4a8
Merge remote-tracking branch 'origin/topic/jsiwek/gh-589-sub-microsecond-printing'
...
* origin/topic/jsiwek/gh-589-sub-microsecond-printing:
GH-589: improve printing of sub-microsecond intervals
2019-10-07 10:51:40 -07:00
Johanna Amann
09f4053dbc
Merge remote-tracking branch 'origin/topic/jsiwek/gh-591-set-enum-config'
...
* origin/topic/jsiwek/gh-591-set-enum-config:
GH-591: allow Config::set_value() to use empty/unspecified table/sets
GH-591: fix reading set[enum] values from input files
2019-10-07 10:46:45 -07:00
Jon Siwek
052feacbda
GH-618: add "tcp_options" event containing TCP option values
2019-10-03 18:59:02 -07:00
Jon Siwek
222e3ad3ea
Fix tcp_option event
...
It was not being raised in all the cases it should have been due to
an incorrect/unnecessary truncation check.
2019-10-03 17:55:07 -07:00
Jon Siwek
39b06e3cee
GH-591: allow Config::set_value() to use empty/unspecified table/sets
2019-10-02 22:13:43 -07:00
Jon Siwek
fd66e7b9f6
GH-591: fix reading set[enum] values from input files
2019-10-02 22:09:16 -07:00
Jon Siwek
5622df4d1b
Add new BIF: print_raw()
...
This is a convenience function to make it easier to print literal byte
sequences to stdout without additional escaping like what may be added
by the default `print` statement behavior.
For example, related to GH-596, `print` currently escapes even valid
UTF-8 byte sequences and makes it difficult to output valid JSON strings
containing such.
2019-10-02 15:21:24 -07:00
Jon Siwek
8ba19cd7d1
Merge remote-tracking branch 'origin/topic/neverlord/issue/612'
...
* origin/topic/neverlord/issue/612:
Fix build with external CAF but bundled Broker
2019-10-02 11:04:47 -07:00
Jon Siwek
63c6265201
Updating submodule(s).
...
[nomail]
2019-10-01 18:46:06 -07:00