Commit graph

19611 commits

Author SHA1 Message Date
Vern Paxson
7278b7f40e fixup! Reworked initialization of globals for -O gen-standalone-C++ code 2025-09-30 12:03:27 -07:00
Vern Paxson
eb13ff3110 Reworked initialization of globals for -O gen-standalone-C++ code 2025-09-30 11:27:53 -07:00
Tim Wojtulewicz
0700427bac Merge remote-tracking branch 'origin/topic/vern/standalone-fixes2'
Some checks failed
pre-commit / pre-commit (push) Has been cancelled
* origin/topic/vern/standalone-fixes2:
  Fixes for -O gen-standalone-C++ for tracking BiFs, lambdas, attribute types, and independent globals
2025-09-26 14:19:49 -07:00
Tim Wojtulewicz
483d9a3a93 Merge remote-tracking branch 'klemensn/openbsd-libressl'
Some checks are pending
pre-commit / pre-commit (push) Waiting to run
* klemensn/openbsd-libressl:
  OpaqueVal, OCSP, X509: drop outdated LibreSSL guards to fix OpenBSD build
2025-09-26 11:21:17 -07:00
Tim Wojtulewicz
83f05dde34 Merge remote-tracking branch 'origin/topic/timw/merge-3rdparty-repo-into-main'
Some checks are pending
pre-commit / pre-commit (push) Waiting to run
* origin/topic/timw/merge-3rdparty-repo-into-main: (30 commits)
  Ignore src/3rdparty for pre-commit
  src/3rdparty: Port doctest fix for including <ciso646> from upstream
  src/3rdparty: Update doctest to v2.4.12
  src/3rdparty: Move jthread/stop_token out of std namespace to prevent collisions
  src/3rdparty: Fix clang-tidy bugprone-casting-through-void warning
  src/3rdparty: Add jthread and stop_token headers
  src/3rdparty: Update SQLite to 3.47.1
  src/3rdparty: Upgrade sqlite3 to 3.45.0
  src/3rdparty: modp: Disable deprecation warning for sprintf
  src/3rdparty: Update SQLite to 3.41.2
  src/3rdparty: Handle zeek-inet-ntop snprintf() return value correctly
  src/3rdparty: Rework inet-ntop change to build on Windows
  src/3rdparty: Use snprintf in zeek_inet_ntop.c to silence macOS compiler warnings
  src/3rdparty: Use snprintf in patricia.cc to silence macOS compiler warnings
  src/3rdparty: Update ConvertUTF Unicode license as per request from LLVM upstream
  src/3rdparty: Update doctest to 2.4.9 and sqlite to 3.39.4
  src/3rdparty: Fix rampant off-by-one error in last change
  src/3rdparty: numeric conversion functions now return the number of characters added
  src/3rdparty: Fix GCC 12.2 warning in access to patricia_t members
  src/3rdparty: Rebase patricia.{h,c} on upstream version
  ...
2025-09-26 02:57:42 +00:00
Tim Wojtulewicz
7627022f92 Ignore src/3rdparty for pre-commit 2025-09-25 18:39:07 -07:00
Tim Wojtulewicz
663fc2931c src/3rdparty: Port doctest fix for including <ciso646> from upstream
This has been failing on our weekly builds for a bit. It's fixed upstream
but there's no idea when they'll release a new version that includes it.

This cherry-picks 5eb20178ba
2025-09-25 18:39:07 -07:00
Tim Wojtulewicz
08b018cc61 src/3rdparty: Update doctest to v2.4.12 2025-09-25 18:39:07 -07:00
Tim Wojtulewicz
21fc299131 src/3rdparty: Move jthread/stop_token out of std namespace to prevent collisions 2025-09-25 18:39:07 -07:00
Tim Wojtulewicz
3046be57da src/3rdparty: Fix clang-tidy bugprone-casting-through-void warning 2025-09-25 18:39:07 -07:00
Tim Wojtulewicz
b2746226d5 src/3rdparty: Add jthread and stop_token headers 2025-09-25 18:39:07 -07:00
Christian Kreibich
d6d0fe0ff0 src/3rdparty: Update SQLite to 3.47.1 2025-09-25 18:39:03 -07:00
Tim Wojtulewicz
1cb75ffff3 src/3rdparty: Upgrade sqlite3 to 3.45.0 2025-09-25 18:39:03 -07:00
Tim Wojtulewicz
6a060588c2 src/3rdparty: modp: Disable deprecation warning for sprintf 2025-09-25 18:39:03 -07:00
Johanna Amann
dfd32b3b37 src/3rdparty: Update SQLite to 3.41.2 2025-09-25 18:39:03 -07:00
Tim Wojtulewicz
ee0c73f8f6 src/3rdparty: Handle zeek-inet-ntop snprintf() return value correctly 2025-09-25 18:39:03 -07:00
Tim Wojtulewicz
6936364b3c src/3rdparty: Rework inet-ntop change to build on Windows 2025-09-25 18:39:03 -07:00
Tim Wojtulewicz
b8248d07e9 src/3rdparty: Use snprintf in zeek_inet_ntop.c to silence macOS compiler warnings 2025-09-25 18:39:03 -07:00
Tim Wojtulewicz
a2abb40af6 src/3rdparty: Use snprintf in patricia.cc to silence macOS compiler warnings 2025-09-25 18:39:03 -07:00
Christian Kreibich
2d9eb155d5 src/3rdparty: Update ConvertUTF Unicode license as per request from LLVM upstream
This replicates the following commit in our copy of ConvertUTF:
20451cb06b
2025-09-25 18:39:03 -07:00
Tim Wojtulewicz
942450c293 src/3rdparty: Update doctest to 2.4.9 and sqlite to 3.39.4 2025-09-25 18:39:03 -07:00
Vern Paxson
ce75863344 src/3rdparty: Fix rampant off-by-one error in last change 2025-09-25 18:39:03 -07:00
Vern Paxson
790e920d66 src/3rdparty: numeric conversion functions now return the number of characters added 2025-09-25 18:39:03 -07:00
Christian Kreibich
3e4512bc80 src/3rdparty: Fix GCC 12.2 warning in access to patricia_t members
Access to members of the larger prefix_t, while safe, throws warnings
when the compiler knows it previously allocated the smaller prefix4_t.

Adapted from 11ae12079ca716f8cfac42cccfd905dad45da18f in the upstream repo.
2025-09-25 18:39:03 -07:00
Tim Wojtulewicz
01c31e9917 src/3rdparty: Rebase patricia.{h,c} on upstream version
This updates to a clang-formatted version that was merged recently.
2025-09-25 18:39:03 -07:00
Tim Wojtulewicz
c4d015369b src/3rdparty: Deprecate bro_inet_ntop.{c,h} 2025-09-25 18:39:03 -07:00
Johanna Amann
fa88e30796 src/3rdparty: Update SQLite to 3.38.4 2025-09-25 18:39:03 -07:00
Tim Wojtulewicz
ea7e91857a src/3rdparty: Update doctest to v2.4.8 2025-09-25 18:39:03 -07:00
Tim Wojtulewicz
c1598a33c4 src/3rdparty: Add missing externs in bsd-getopt-long.h 2025-09-25 18:39:03 -07:00
Benjamin Bannier
982d3b56a1 src/3rdparty: Add 3rdparty files from Zeek's src/ 2025-09-25 18:39:03 -07:00
Robin Sommer
f0cfaaaa78 src/3rdparty: Update doctest to 2.4.6.
Our old version didn't support compilation on Apple's M1 yet.
2025-09-25 18:39:03 -07:00
Johanna Amann
2dbd912088 src/3rdparty: Update SQLite to 3.36.0 2025-09-25 18:38:55 -07:00
Dominik Charousset
eb3aeb75ab src/3rdparty: Add doctest header 2025-09-25 18:38:24 -07:00
Bernhard Amann
3c65c3ecb0 src/3rdparty: Update sqlite to 3.28.0 2025-09-25 18:38:24 -07:00
Tim Wojtulewicz
086416706d Remove zeek-3rdparty submodule 2025-09-25 18:37:24 -07:00
Arne Welzel
d2cda5a68c Merge remote-tracking branch 'origin/topic/awelzel/zeromq-handle-eintr'
Some checks are pending
pre-commit / pre-commit (push) Waiting to run
* origin/topic/awelzel/zeromq-handle-eintr:
  cluster/zeromq: Improve EINTR handling
2025-09-25 13:53:04 +02:00
Arne Welzel
a318463c1c cluster/zeromq: Improve EINTR handling
When using ZeroMQ also within the Supervisor process, zmq::poll() and
recv() were observed to return EINTR, handle these.
2025-09-25 13:52:12 +02:00
Vern Paxson
550c7eb0a7 Fixes for -O gen-standalone-C++ for tracking BiFs, lambdas, attribute types, and independent globals 2025-09-24 17:34:35 -07:00
Tim Wojtulewicz
69b7bcc323 Merge remote-tracking branch 'origin/topic/vern/no-opt'
Some checks failed
pre-commit / pre-commit (push) Has been cancelled
* origin/topic/vern/no-opt:
  BTests & baselines for testing selective skipping of script optimization
  added &no_ZAM_opt/&no_CPP_opt attributes and --no-opt-files/--no-opt-funcs for controlling skipping script optimization
2025-09-23 09:06:02 -07:00
Vern Paxson
dc7f4dca1c BTests & baselines for testing selective skipping of script optimization 2025-09-23 09:05:40 -07:00
Vern Paxson
441baaf2c1 added &no_ZAM_opt/&no_CPP_opt attributes and --no-opt-files/--no-opt-funcs for controlling skipping script optimization 2025-09-23 09:05:40 -07:00
Arne Welzel
2bde66c9d6 Merge remote-tracking branch 'origin/topic/awelzel/4842-decompose-uri-ipv6'
* origin/topic/awelzel/4842-decompose-uri-ipv6:
  utils/decompose_uri: Support URIs containing IPv6 addresses
2025-09-23 13:08:14 +02:00
Arne Welzel
b3b0c3db7d utils/decompose_uri: Support URIs containing IPv6 addresses
An URI containing a bracketed or non-bracketed IPv6 address of the form
http://[::1]:42 was previously split on the first colon for port extraction,
causing a subsequent to_count() call to fail. Harden this to check for a
digits in the last :[0-9]+ component.

Fixes #4842
2025-09-23 13:04:29 +02:00
Klemens Nanni
54634ae241
OpaqueVal, OCSP, X509: drop outdated LibreSSL guards to fix OpenBSD
build

Whatever is used with recent OpenSSL is also available with latest LibreSSL
on OpenBSD 7.8-beta as of today.

Some of these hunks have been in the net/bro port for years, others I
recently added whilst gradually updating from 6.0.5 to 8.0.1.
2025-09-23 01:51:49 +03:00
Tim Wojtulewicz
416d997263 Merge remote-tracking branch 'origin/topic/timw/restore-settype-methods'
Some checks are pending
pre-commit / pre-commit (push) Waiting to run
* origin/topic/timw/restore-settype-methods:
  Restore the SetType constructor and destructor
2025-09-22 07:46:06 -07:00
Tim Wojtulewicz
c741e8f489 Merge remote-tracking branch 'origin/topic/timw/update-libkqueue'
* origin/topic/timw/update-libkqueue:
  Bump libkqueue to latest upstream master
2025-09-22 07:34:03 -07:00
Tim Wojtulewicz
5f8a89ea40 Bump libkqueue to latest upstream master 2025-09-22 07:33:13 -07:00
Tim Wojtulewicz
210737f36e Restore the SetType constructor and destructor 2025-09-21 17:13:14 +00:00
zeek-bot
d6c7a479e2 Update doc submodule [nomail] [skip ci] 2025-09-20 00:13:40 +00:00
Tim Wojtulewicz
9fb0f5e76d Fix clang-tidy finding in recent script_opt changes 2025-09-17 16:34:26 -07:00