Commit graph

16357 commits

Author SHA1 Message Date
Johanna Amann
83a1165675 Merge remote-tracking branch 'origin/master' into topic/johanna/spicy-tls
* origin/master: (352 commits)
  Bump Spicy.
  Remove support for old Spicy versions from QUIC analyzer.
  Make sure that vcpkg isn't preferred if pcap_root_dir is passed in
  Remove some unused Spicy state.
  Bump Spicy.
  ZAM fix for concretizing vectors in record constructors
  improve ZAM's estimation of profiling overheads
  CI: Remove commented openssl 1.1 workaround from macOS preparation script
  CI: Fix installation of python package on macOS
  Address review feedback for configure error change
  Raise configure error message for unsupported archives
  fix ZAM "cat" of doubles/times to include trailing ".0" per normal BiF behavior
  CI: Specify the xcode version of the macOS Sonoma instance
  Remove vestigial Conan bit in CMakeLists.txt
  When configuring Spicy, be prepated for zeek_lib or zeek_exe targets.
  Fix a typo in CMakeLists.txt when building Zeek as a library
  Bump Spicy to current `main`.
  tie into updates to gen-zam
  ZAM documentation updated to reflect finer-grained profiling
  ZAM-specific BTest baseline changes for tweak to how ZAM bodies print
  ...
2024-04-16 08:08:16 +01:00
Robin Sommer
5236c73e39
Merge remote-tracking branch 'origin/topic/robin/bump-spicy'
* origin/topic/robin/bump-spicy:
  Bump Spicy.
  Remove support for old Spicy versions from QUIC analyzer.
2024-04-15 17:53:26 +02:00
Robin Sommer
ed4aed40c1
Bump Spicy.
Includes a couple of updates for the QUIC analyzer.
2024-04-15 17:25:12 +02:00
Robin Sommer
cfbe8de3e8
Remove support for old Spicy versions from QUIC analyzer.
Seems too old to be worth the trouble.
2024-04-15 11:18:38 +02:00
Tim Wojtulewicz
6c88bd115c Merge remote-tracking branch 'origin/topic/timw/fix-pcap-override'
* origin/topic/timw/fix-pcap-override:
  Make sure that vcpkg isn't preferred if pcap_root_dir is passed in
2024-04-11 15:28:18 -07:00
Tim Wojtulewicz
eedd0fbe8c Make sure that vcpkg isn't preferred if pcap_root_dir is passed in 2024-04-11 15:25:49 -07:00
Robin Sommer
da7457340c
Merge remote-tracking branch 'origin/topic/robin/bump-spicy'
* origin/topic/robin/bump-spicy:
  Remove some unused Spicy state.
  Bump Spicy.
2024-04-10 11:03:46 +02:00
Robin Sommer
da21712fb9
Remove some unused Spicy state. 2024-04-10 09:44:20 +02:00
Robin Sommer
46ecd8305d
Bump Spicy.
Includes necessary changes to work with current Spicy version.
2024-04-10 09:44:19 +02:00
Tim Wojtulewicz
06b6df48a8 Merge remote-tracking branch 'origin/topic/vern/script-opt-maint.Apr24'
* origin/topic/vern/script-opt-maint.Apr24:
  ZAM fix for concretizing vectors in record constructors
  improve ZAM's estimation of profiling overheads
2024-04-09 15:12:22 -07:00
Vern Paxson
641b7de3ad ZAM fix for concretizing vectors in record constructors 2024-04-09 15:12:00 -07:00
Vern Paxson
a474106fce improve ZAM's estimation of profiling overheads 2024-04-09 15:12:00 -07:00
Tim Wojtulewicz
0438c8944d Merge remote-tracking branch 'origin/topic/timw/fix-macos-build-again'
* origin/topic/timw/fix-macos-build-again:
  CI: Remove commented openssl 1.1 workaround from macOS preparation script
  CI: Fix installation of python package on macOS
2024-04-08 12:02:13 -07:00
Tim Wojtulewicz
2491650873 CI: Remove commented openssl 1.1 workaround from macOS preparation script 2024-04-08 12:01:49 -07:00
Tim Wojtulewicz
167cbaf6e4 CI: Fix installation of python package on macOS 2024-04-08 12:01:49 -07:00
Johanna Amann
ddf63778c3 Merge remote-tracking branch 'origin/topic/johanna/configure-check-submodules'
* origin/topic/johanna/configure-check-submodules:
  Address review feedback for configure error change
  Raise configure error message for unsupported archives
2024-04-03 12:40:59 +01:00
Johanna Amann
83ee47d769 Address review feedback for configure error change
See GH-3669
2024-04-02 16:49:43 +01:00
Tim Wojtulewicz
da0c1ca089 Merge remote-tracking branch 'origin/topic/vern/zam-cat-time-fix'
* origin/topic/vern/zam-cat-time-fix:
  fix ZAM "cat" of doubles/times to include trailing ".0" per normal BiF behavior
2024-04-02 08:17:18 -07:00
Johanna Amann
b1ee78faf8 Raise configure error message for unsupported archives
Github lets users download archives of our repos. These do not contain
the necessary submodules. We regularly encounter users who stumble
across this.

We already do have an error message that is raised when a non-recursive
git checkout was done. This commit adds an error message for a non-git
download that does not contain the necessary files.
2024-04-02 15:25:15 +01:00
Tim Wojtulewicz
32c7fececc Merge branch 'topic/timw/fix-macos-build'
* topic/timw/fix-macos-build:
  CI: Specify the xcode version of the macOS Sonoma instance
2024-03-29 11:15:37 -07:00
Vern Paxson
4cafacf90b fix ZAM "cat" of doubles/times to include trailing ".0" per normal BiF behavior 2024-03-28 16:43:06 -07:00
Tim Wojtulewicz
00e9306ac1 CI: Specify the xcode version of the macOS Sonoma instance 2024-03-28 12:45:39 -07:00
Christian Kreibich
a928bd98a2 Merge branch 'topic/christian/zeek-lib-fix'
* topic/christian/zeek-lib-fix:
  Remove vestigial Conan bit in CMakeLists.txt
  When configuring Spicy, be prepated for zeek_lib or zeek_exe targets.
  Fix a typo in CMakeLists.txt when building Zeek as a library
2024-03-28 11:11:30 -07:00
Christian Kreibich
250d913dda Remove vestigial Conan bit in CMakeLists.txt
This is no longer required since we switched Conan to vcpkg a while back.
2024-03-27 16:50:08 -07:00
Christian Kreibich
602b1f88fb When configuring Spicy, be prepated for zeek_lib or zeek_exe targets.
This avoids a configuration error where zeek_exe is not defined (i.e. when
building (only) as a library). It anticipates building both the executable and
the library, which we used to do when using Conan but currently don't.
2024-03-27 16:49:07 -07:00
Christian Kreibich
e1ba20a878 Fix a typo in CMakeLists.txt when building Zeek as a library
This caused an error at configuration time since zeek_lie isn't a thing.
2024-03-27 16:12:10 -07:00
Robin Sommer
c4499d8552
Merge remote-tracking branch 'origin/topic/robin/bump-spicy'
* origin/topic/robin/bump-spicy:
  Bump Spicy to current `main`.
2024-03-25 11:26:02 +01:00
Robin Sommer
a51e823bc0
Bump Spicy to current main. 2024-03-25 11:09:30 +01:00
Tim Wojtulewicz
86d1812d49 Merge remote-tracking branch 'origin/topic/vern/fine-grained-ZAM-profiling'
* origin/topic/vern/fine-grained-ZAM-profiling:
  tie into updates to gen-zam
  ZAM documentation updated to reflect finer-grained profiling
  ZAM-specific BTest baseline changes for tweak to how ZAM bodies print
  BTest baseline changes for tweak to how ZAM bodies print
  ZAM execution changes to support richer profiling
  use richer block-aware location information for ZAM instructions
  better isolation of ZAM instruction elements hooks for tracking extended ZAM profiling location
  framework for --enable-ZAM-profiling configuration profiles go to zprof.log rather than stdout
  ZAM classes in support of finer-grained profiling
  refined ZAM function profiling to include (correct) statement line number blocks
  avoid potentially expensive mallinfo() call if result won't be used
2024-03-19 14:39:38 -07:00
Vern Paxson
ecf42e11c7 tie into updates to gen-zam 2024-03-19 10:59:49 -07:00
Vern Paxson
593355cf2c ZAM documentation updated to reflect finer-grained profiling 2024-03-19 10:59:49 -07:00
Vern Paxson
0538c68221 ZAM-specific BTest baseline changes for tweak to how ZAM bodies print 2024-03-19 10:59:49 -07:00
Vern Paxson
378627448d BTest baseline changes for tweak to how ZAM bodies print 2024-03-19 10:59:49 -07:00
Vern Paxson
c29db63fdd ZAM execution changes to support richer profiling 2024-03-19 10:59:49 -07:00
Vern Paxson
c8d15f1eaa use richer block-aware location information for ZAM instructions 2024-03-19 10:59:49 -07:00
Vern Paxson
9f9f01580f better isolation of ZAM instruction elements
hooks for tracking extended ZAM profiling location
2024-03-19 10:59:49 -07:00
Vern Paxson
dc376953fa framework for --enable-ZAM-profiling configuration
profiles go to zprof.log rather than stdout
2024-03-19 10:59:49 -07:00
Vern Paxson
8d762eea54 ZAM classes in support of finer-grained profiling 2024-03-19 10:59:49 -07:00
Vern Paxson
037f76e384 refined ZAM function profiling to include (correct) statement line number blocks 2024-03-19 10:59:49 -07:00
Vern Paxson
f88862f6ce avoid potentially expensive mallinfo() call if result won't be used 2024-03-19 10:59:49 -07:00
Tim Wojtulewicz
5402f22d48 Merge remote-tracking branch 'origin/topic/timw/fix-std-function-stmt'
* origin/topic/timw/fix-std-function-stmt:
  Remove variant from StdFunctionStmt
2024-03-19 10:59:31 -07:00
Tim Wojtulewicz
9de1dd16d5 Remove variant from StdFunctionStmt
The variant ended up conflicting with std::bind, which resulted in failures
on the btest invoking it. Change back to a single function that takes a
flow, and default it to a value in Exec.
2024-03-19 09:07:45 -07:00
Tim Wojtulewicz
8bfe32e931 Merge remote-tracking branch 'origin/topic/timw/std-function-event-handler'
* origin/topic/timw/std-function-event-handler:
  Add a method to register an event handler to a std::function via C++
2024-03-18 16:38:14 -07:00
Tim Wojtulewicz
39890fda5e Add a method to register an event handler to a std::function via C++ 2024-03-18 16:36:25 -07:00
Tim Wojtulewicz
aac723cfe5 Merge remote-tracking branch 'origin/topic/neverlord/broker-bump'
* origin/topic/neverlord/broker-bump:
  Update Broker submodule
2024-03-18 16:16:18 -07:00
Dominik Charousset
015fddd8a1 Update Broker submodule 2024-03-18 15:39:48 -07:00
Arne Welzel
fe91b7f51f Merge remote-tracking branch 'origin/topic/awelzel/remove-superflous-aws-ecr-username'
* origin/topic/awelzel/remove-superflous-aws-ecr-username:
  cirrus: Remove misleading and always empty AWS_ECR_USERNAME
2024-03-18 10:59:21 +01:00
Arne Welzel
bbeb1bf3d9 cirrus: Remove misleading and always empty AWS_ECR_USERNAME 2024-03-18 10:46:59 +01:00
Arne Welzel
a45489de90 Merge remote-tracking branch 'origin/topic/awelzel/3442-evt-port-deprecation'
* origin/topic/awelzel/3442-evt-port-deprecation:
  btest/spicy: Remove most port usages
  spicy: Deprecate port/ports in .evt files
2024-03-18 10:07:54 +01:00
Arne Welzel
f83a1e9109 Merge remote-tracking branch 'origin/topic/awelzel/generate-docs-spicy-pygments-use-cached'
* origin/topic/awelzel/generate-docs-spicy-pygments-use-cached:
  Update doc submodule
2024-03-18 09:55:07 +01:00