Commit graph

13201 commits

Author SHA1 Message Date
Tim Wojtulewicz
6f61463a48 Add early bail-outs to same_type() 2021-12-10 19:49:51 +00:00
Vern Paxson
8c59626eb9 reintroduction of "-O add-C++" option 2021-12-10 10:19:23 -08:00
Tim Wojtulewicz
8816547964 Fix types for Analyzer::register_for_port(s) to be the same 2021-12-10 17:48:19 +00:00
Vern Paxson
ac74943f26 fixes for vector operations 2021-12-10 09:32:42 -08:00
Vern Paxson
6788be94c9 flag globals initialized to opaque values as non-compilable 2021-12-10 09:31:41 -08:00
Vern Paxson
53342fdd29 skip type signatures for lambdas 2021-12-10 09:27:58 -08:00
Vern Paxson
474a2edc98 fix for translating filenames beginning with numbers to C++ variable names 2021-12-10 09:27:21 -08:00
Vern Paxson
9d884c0285 remove unnecessary includes 2021-12-10 09:27:07 -08:00
Tim Wojtulewicz
7a6a81c200 Merge remote-tracking branch 'origin/topic/timw/1740-table-key-error'
* origin/topic/timw/1740-table-key-error:
  GH-1741: Print error if calling a non-hook with hook keyword
  GH-1740: Report a better error message if table key is not a list
2021-12-10 09:28:34 -07:00
Christian Kreibich
bce709fc2c Bump cmake submodule [nomail] [skip ci] 2021-12-09 16:13:03 -08:00
Tim Wojtulewicz
b64a700838 Merge remote-tracking branch 'origin/topic/timw/1125-gre-aruba'
* origin/topic/timw/1125-gre-aruba:
  GH-1125: Support GRE ARUBA headers
  Fix ethertype for ARP in Geneve forwarding rules
2021-12-09 14:59:13 -07:00
Tim Wojtulewicz
5f81c50e0f GH-1125: Support GRE ARUBA headers 2021-12-09 14:58:09 -07:00
Tim Wojtulewicz
248325e301 Fix ethertype for ARP in Geneve forwarding rules 2021-12-09 14:58:08 -07:00
Christian Kreibich
3b3a812477 Merge branch 'topic/christian/json-configurable-absent-fields'
* topic/christian/json-configurable-absent-fields:
  Add LogAscii::json_include_unset_fields flag to control unset field rendering
2021-12-09 13:45:49 -08:00
Tim Wojtulewicz
b966a3876f GH-1741: Print error if calling a non-hook with hook keyword 2021-12-09 14:35:40 -07:00
Tim Wojtulewicz
c15a9eab7f GH-1740: Report a better error message if table key is not a list 2021-12-09 14:35:21 -07:00
Johanna Amann
c02e33c811 Merge remote-tracking branch 'origin/topic/johanna/gh-1832'
* origin/topic/johanna/gh-1832:
  Improve error message for clash between variable and function name
2021-12-09 19:57:16 +00:00
Johanna Amann
e1dc09e230 Improve error message for clash between variable and function name
The previous error message was very cryptic and led to an abort.

Fixes GH-1832
2021-12-09 19:15:33 +00:00
Christian Kreibich
1aaed1cc2e Add LogAscii::json_include_unset_fields flag to control unset field rendering
The flag controls whether JSON rendering includes unset &optional log fields
(F, the default), or includes them with a null value (T).
2021-12-08 17:29:07 -08:00
Tim Wojtulewicz
7a6501296b Restore --disable-zeekctl configure argument 2021-12-08 09:18:54 -07:00
Tim Wojtulewicz
c7eef7b094 Update plugin.hooks baseline for recent Geneve change 2021-12-07 10:43:46 -07:00
Tim Wojtulewicz
8df195e35f Merge remote-tracking branch 'origin/topic/timw/1764-geneve-to-ip'
* origin/topic/timw/1764-geneve-to-ip:
  GH-1764: Update mappings for Geneve analyzer to IP4/IP6/ARP
2021-12-07 09:35:00 -07:00
Christian Kreibich
ea20b8e55e Merge branch 'topic/christian/doctest-in-packages'
* topic/christian/doctest-in-packages:
  Update cmake and auxil/zeek-aux submodules
  Remove the --enable-cpp-tests configure flag in Cirrus CI
  Add testcases for plugin with doctest usage
  Flip unit tests to being enabled by default
  Support for unit tests in plugins
  Alphabetically sort configure's enable/disable/with options
2021-12-06 17:08:27 -08:00
Christian Kreibich
33cd1cf65f Update cmake and auxil/zeek-aux submodules 2021-12-06 12:17:22 -08:00
Christian Kreibich
a1eb36de95 Remove the --enable-cpp-tests configure flag in Cirrus CI
We no longer need it given that unit tests are now enabled by default.
2021-12-06 12:17:22 -08:00
Christian Kreibich
78803b04fc Add testcases for plugin with doctest usage 2021-12-06 12:17:22 -08:00
Christian Kreibich
5c44dfbb9e Flip unit tests to being enabled by default
This flips --enable-cpp-tests to --disable-cpp-tests, enabling unit testing by
default. The help output has a minor corresponding tweak as well.
2021-12-06 12:17:22 -08:00
Christian Kreibich
f20f8ad4a8 Support for unit tests in plugins
This pushes the unit test kickoff down in the Zeek startup sequence, to give
plugins a chance to register. It also enforces deterministic mode for unit
testing, since without it some unit tests start to have nondeterministic results
at that stage.
2021-12-06 12:17:22 -08:00
Christian Kreibich
f8b8401d84 Alphabetically sort configure's enable/disable/with options 2021-12-06 12:17:20 -08:00
Tim Wojtulewicz
368dec8372 GH-1764: Update mappings for Geneve analyzer to IP4/IP6/ARP 2021-12-06 12:26:16 -07:00
Tim Wojtulewicz
f44ea32df8 Merge remote-tracking branch 'origin/topic/timw/remove-tag-types'
* origin/topic/timw/remove-tag-types:
  Remove separate Tag types, note breaking change in NEWS
2021-12-06 11:29:49 -07:00
Tim Wojtulewicz
acb5e5dd26 Remove separate Tag types, note breaking change in NEWS 2021-12-06 11:25:13 -07:00
Tim Wojtulewicz
fbb411780a Merge remote-tracking branch 'origin/topic/timw/1768-log-stream-crash'
* origin/topic/timw/1768-log-stream-crash:
  GH-1768: Properly cleanup existing log stream when recreated on with the same ID
2021-12-06 09:15:34 -07:00
Vern Paxson
a1324a882d update script-to-C++ compilation for new record constructor internals 2021-12-06 09:39:58 -05:00
Vern Paxson
3f9f47980a updates to ZAM to track recent changes in script semantics 2021-12-04 20:24:39 -05:00
Craig Leres
47a267130b Set JEMALLOC_FOUND when on FreeBSD (suggested by Tim Wojtulewicz) 2021-12-03 15:23:50 -08:00
Craig Leres
1778bc5fa8 FreeBSD: don't look for jemalloc as a package, it's in the base system 2021-12-03 14:46:09 -08:00
Tim Wojtulewicz
d50dade24c GH-1768: Properly cleanup existing log stream when recreated on with the same ID 2021-12-03 13:46:28 -07:00
Tim Wojtulewicz
e7412e257f Merge remote-tracking branch 'bbannier/topic/bbannier/more-autoformating'
* bbannier/topic/bbannier/more-autoformating:
  Format Python scripts with yapf.
  Format shell scripts with shfmt.
2021-12-01 10:33:22 -07:00
Tim Wojtulewicz
6a7bbd5268 Merge remote-tracking branch 'origin/topic/vern/CPP-cond'
* origin/topic/vern/CPP-cond:
  fix btest comment to more accurately describe the test
  clang-format issue
  btests for erroneous script conditionals
  avoid compiling-to-C++ for functions potentially influenced by conditionals
  track the use of conditionals in functions and files
  AST profiles track the associated function/body/expression
2021-12-01 10:25:58 -07:00
Tim Wojtulewicz
6392ca0fec Merge remote-tracking branch 'origin/topic/timw/1873-tag-deprecations'
* origin/topic/timw/1873-tag-deprecations:
  GH-1873: Deprecate the tag types differently to avoid type clashes
2021-12-01 09:44:22 -07:00
Tim Wojtulewicz
328411e807 GH-1873: Deprecate the tag types differently to avoid type clashes 2021-12-01 09:43:28 -07:00
Johanna Amann
94ee837398 Fix for the recent patch that allows segment offloaded packets.
We recently added support for segment offloaded packets. It turns out
that this can lead to problems in UDP/ICMP based parsers since I missed
correctly also updating the payloadlength there, and using the capture
length instead when segment offloading is enabled.

Credit to OSS-Fuzz for discovery
https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=41391
https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=41394
https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=41395
(Link to details becomes public 30 days after patch release)
2021-11-30 11:55:30 -07:00
Vern Paxson
417f9ffe98 fix btest comment to more accurately describe the test 2021-11-29 13:17:57 -08:00
Vern Paxson
46f46e7803 clang-format issue 2021-11-29 13:17:46 -08:00
Tim Wojtulewicz
6a5b51eba8 Merge remote-tracking branch 'origin/topic/timw/coverity-fixes'
* origin/topic/timw/coverity-fixes:
  Fix a number of Coverity findings
2021-11-29 13:47:08 -07:00
Tim Wojtulewicz
fbcebb85a1 Merge remote-tracking branch 'origin/topic/vern/CPP-trim'
* origin/topic/vern/CPP-trim:
  suppress unneeded initializations
  address clang 10 warnings
2021-11-29 13:46:14 -07:00
Tim Wojtulewicz
72604f866b Fix a number of Coverity findings
1466460: Uninitialized field in gtp-analyzer.pac
1462465: Null pointer dereference in CompositeHash::SingleValHash
1462463: Copy/paste error in TCPSessionAdapter::build_syn_packet_val
1462067: Uninitialized fields in Zinst
2021-11-29 10:43:34 -07:00
zeek-bot
d2a9fcda0c Update doc submodule [nomail] [skip ci] 2021-11-25 04:26:38 +00:00
Vern Paxson
8f8c594220 btests for erroneous script conditionals 2021-11-24 15:19:44 -08:00