Tim Wojtulewicz
d75a7b7be6
Merge remote-tracking branch 'origin/topic/timw/4553-debugger-stmts'
...
pre-commit / pre-commit (push) Waiting to run
* origin/topic/timw/4553-debugger-stmts:
Add versions of IfStmt and StmtList for use in debugger
2025-10-10 10:46:21 -07:00
Tim Wojtulewicz
8c9a35fb73
Merge remote-tracking branch 'origin/topic/timw/windows-gmtoff'
...
* origin/topic/timw/windows-gmtoff:
Skip setting tm_gmtoff on Windows
2025-10-10 09:20:06 -07:00
Benjamin Bannier
fed2be36fd
Merge branch 'topic/bbannier/ci-freebsd-13'
2025-10-10 12:52:42 +02:00
Arne Welzel
035bca3b62
Merge remote-tracking branch 'origin/topic/awelzel/zval-slot-record-val-size'
...
* origin/topic/awelzel/zval-slot-record-val-size:
Type: Cache tag into TypeDecl
ZAM: Drop some unneeded DeleteManagedTyped() calls
RecordVal: Replace std::vector with ZValSlot[]
RecordType: Inline FieldDecl
RecordType/RecordVal: Support ZValElement initialization
logging/Manager: Adapt RawOptField() usage for ZValElement
RecordVal: Remove rt member
RecordVal: Replace std::optional<ZVal> with ZValElement
Val: Introduce ZValElement
Modifiable: No virtual destructor
RecordVal: Use const pointer in parse_time_records
2025-10-09 20:17:31 +02:00
Johanna Amann
ba6f34d849
Merge remote-tracking branch 'origin/topic/johanna/sha512-bifs-opaqueval'
...
pre-commit / pre-commit (push) Waiting to run
* origin/topic/johanna/sha512-bifs-opaqueval:
Add SHA512 BiFs and OpaqueVals
2025-10-09 14:03:32 +01:00
Arne Welzel
54ebda2451
Merge remote-tracking branch 'origin/topic/awelzel/quic-discarded-packet-event'
...
* origin/topic/awelzel/quic-discarded-packet-event:
QUIC: Introduce discarded_packet() event
2025-10-09 13:13:30 +02:00
Arne Welzel
9345a8c84e
Merge remote-tracking branch 'origin/topic/awelzel/4847-quic-discard-fixed-bit-is-zero'
...
pre-commit / pre-commit (push) Waiting to run
* origin/topic/awelzel/4847-quic-discard-fixed-bit-is-zero:
QUIC: Skip packets with fixed_bit 0
2025-10-09 09:16:53 +02:00
Arne Welzel
050035e33e
Merge remote-tracking branch 'origin/topic/awelzel/writer-backend-no-heartbeat'
...
pre-commit / pre-commit (push) Waiting to run
* origin/topic/awelzel/writer-backend-no-heartbeat:
logging/writers: Disable heartbeats
logging/WriterBackend: Support disabling heartbeats
2025-10-08 09:21:33 +02:00
Tim Wojtulewicz
f2eb709f07
Merge remote-tracking branch 'origin/topic/vern/standalone-global-inits'
...
pre-commit / pre-commit (push) Waiting to run
* origin/topic/vern/standalone-global-inits:
Reworked initialization of globals for -O gen-standalone-C++ code
2025-10-07 09:33:44 -07:00
Tim Wojtulewicz
cd4c3bce88
Merge remote-tracking branch 'origin/topic/timw/4545-smb-gmtime'
...
* origin/topic/timw/4545-smb-gmtime:
Remove SMB_time and SMB_date record types
SMB: Init lanman time and set TZ correctly before calling mktime
2025-10-07 09:16:26 -07:00
Tim Wojtulewicz
8a1937a0e0
Merge remote-tracking branch 'origin/topic/vern/standalone-enum-fix'
...
pre-commit / pre-commit (push) Has been cancelled
* origin/topic/vern/standalone-enum-fix:
fix to enable -O gen-standalone-C++ code to extend enum types
2025-10-03 14:07:14 -07:00
Tim Wojtulewicz
73746b694e
Merge remote-tracking branch 'origin/topic/timw/coverity-fixes'
...
* origin/topic/timw/coverity-fixes:
Fix some recent Coverity findings
2025-10-03 09:13:39 -07:00
Arne Welzel
4de7a2b947
Merge remote-tracking branch 'origin/topic/awelzel/4845-get-current-packet-header-fragmented-syn'
...
pre-commit / pre-commit (push) Has been cancelled
* origin/topic/awelzel/4845-get-current-packet-header-fragmented-syn:
iosource/Packet: Allow ToRawPktHdrVal() for reassembled packets
2025-10-02 14:12:22 +02:00
Arne Welzel
4e9b40f290
Merge remote-tracking branch 'origin/topic/awelzel/conn-class-layout-packing'
...
* origin/topic/awelzel/conn-class-layout-packing:
Conn: Improve packing, drop bitfields and boolenize
Conn: Lazily initialize weird_state when needed
2025-10-02 09:15:33 +02:00
Tim Wojtulewicz
8b4707a284
Merge remote-tracking branch 'origin/topic/vern/id-redecl'
...
pre-commit / pre-commit (push) Has been cancelled
* origin/topic/vern/id-redecl:
fixes for re-declaring type identifiers in inconsistent ways - addresses GH-2686
2025-09-30 20:46:38 +00:00
Tim Wojtulewicz
99fa163db2
Merge remote-tracking branch 'origin/topic/vern/standalone-BiF-access'
...
* origin/topic/vern/standalone-BiF-access:
Fix for standalone initializations that require BiFs, and streamlining of standalone BiF-tracking
2025-09-30 20:45:28 +00:00
Tim Wojtulewicz
63291eca75
Merge remote-tracking branch 'origin/topic/vern/opt-skip-file-fix'
...
* origin/topic/vern/opt-skip-file-fix:
fixed bug in logic for including/excluding files for script optimization
2025-09-30 20:12:24 +00:00
Tim Wojtulewicz
85b4cec76e
Merge remote-tracking branch 'origin/topic/timw/remove-checks-for-very-old-openssl-versions'
...
* origin/topic/timw/remove-checks-for-very-old-openssl-versions:
Remove checks for OpenSSL 1.x versions
Remove some additional LibreSSL checks
2025-09-30 19:12:16 +00:00
Arne Welzel
6af1459f5e
Merge remote-tracking branch 'origin/topic/awelzel/4849-supervisor-signal-handle-tsan'
...
pre-commit / pre-commit (push) Waiting to run
* origin/topic/awelzel/4849-supervisor-signal-handle-tsan:
Supervisor: Make last_signal atomic to squelch data race
2025-09-29 18:04:49 +02:00
Tim Wojtulewicz
3c16ee9667
Update docs submodule [nomail]
2025-09-29 08:21:10 -07:00
Arne Welzel
3abc1116a1
Merge remote-tracking branch 'origin/topic/awelzel/zeromq-fix-block-subscribe-before-init'
...
pre-commit / pre-commit (push) Waiting to run
* origin/topic/awelzel/zeromq-fix-block-subscribe-before-init:
cluster/zeromq: Fix Cluster::subscribe() block if not initialized
2025-09-29 13:08:32 +02:00
Tim Wojtulewicz
0700427bac
Merge remote-tracking branch 'origin/topic/vern/standalone-fixes2'
...
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'
...
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'
...
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
Arne Welzel
d2cda5a68c
Merge remote-tracking branch 'origin/topic/awelzel/zeromq-handle-eintr'
...
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
Tim Wojtulewicz
69b7bcc323
Merge remote-tracking branch 'origin/topic/vern/no-opt'
...
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
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
Tim Wojtulewicz
416d997263
Merge remote-tracking branch 'origin/topic/timw/restore-settype-methods'
...
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
ef9ffda2ef
Merge remote-tracking branch 'origin/topic/vern/standalone-event-groups'
...
* origin/topic/vern/standalone-event-groups:
tracking of event groups for compilation to standalone-C++
2025-09-17 14:28:44 -07:00
Tim Wojtulewicz
938073dfed
Merge remote-tracking branch 'origin/topic/timw/4742-skip-storage-thread'
...
* origin/topic/timw/4742-skip-storage-thread:
Avoid starting up storage expiration thread with zero backends
Remove a couple of obsolete TODOs in storage manager
2025-09-17 08:44:55 -07:00
Tim Wojtulewicz
067c257480
Merge remote-tracking branch 'origin/topic/timw/windows-zeromq-support'
...
* origin/topic/timw/windows-zeromq-support:
Reword comment about when ZeroMQ is required for the build
CI: Add label for enabling the Windows build in PRs
Enable building ZeroMQ support on Windows
2025-09-16 13:31:48 -07:00
Tim Wojtulewicz
5cc5f2a275
Merge remote-tracking branch 'origin/topic/timw/4285-sqlite-threadsafe-check'
...
* origin/topic/timw/4285-sqlite-threadsafe-check:
Force SQLite to be in thread-safe mode during CMake
2025-09-16 12:42:04 -07:00
Tim Wojtulewicz
bd60c6fc15
Merge remote-tracking branch 'origin/topic/vern/gen-C++-global-characteristics'
...
* origin/topic/vern/gen-C++-global-characteristics:
full tracking of the characteristics of globals when compiling scripts to C++
2025-09-16 11:31:13 -07:00
Tim Wojtulewicz
71eca7c9e6
Merge remote-tracking branch 'origin/topic/vern/standalone-CPP-global-attrs'
...
* origin/topic/vern/standalone-CPP-global-attrs:
fix for associating attributes with globals for -O gen-standalone-C++
2025-09-16 11:02:44 -07:00
Tim Wojtulewicz
aebeae8f8a
Merge remote-tracking branch 'origin/topic/vern/standalone-id-tracking-fix'
...
* origin/topic/vern/standalone-id-tracking-fix:
fix for tracking identifiers and aggregates when compiling to standalone-C++
2025-09-16 10:53:11 -07:00
Tim Wojtulewicz
00ba3483bb
Merge remote-tracking branch 'origin/topic/vern/gen-CPP-precedence-fix'
...
* origin/topic/vern/gen-CPP-precedence-fix:
fix for '?' operator precedence when compiling scripts to C++
2025-09-16 10:52:53 -07:00
Tim Wojtulewicz
b25a844210
Merge remote-tracking branch 'origin/topic/vern/standalone-skip-fatal'
...
* origin/topic/vern/standalone-skip-fatal:
for -O gen-standalone-C++, make the presence of uncompilable functions fatal unless -O allow-cond is used
2025-09-12 09:24:58 -07:00
Tim Wojtulewicz
489681e0c3
Merge remote-tracking branch 'origin/topic/timw/bump-zeekctl'
...
* origin/topic/timw/bump-zeekctl:
Bump zeekctl for new trace-summary/pysubnettree versions
2025-09-12 09:24:26 -07:00
Tim Wojtulewicz
e1c8cbe25a
Merge remote-tracking branch 'origin/topic/timw/dns-analyzer-type-consistency'
...
* origin/topic/timw/dns-analyzer-type-consistency:
Clean up initialization of DNS_Interpreter
Switch types used in DNS analyzer to be more consistent
2025-09-11 10:57:29 -07:00
Tim Wojtulewicz
c6cf1ee3ae
Merge remote-tracking branch 'origin/topic/awelzel/btest-suspend-processing-websocket'
...
* origin/topic/awelzel/btest-suspend-processing-websocket:
btest/core/suspend_processing: Add WebSocket example
2025-09-08 11:19:45 -07:00
Tim Wojtulewicz
dd881d9cde
Merge remote-tracking branch 'origin/topic/etyp/bump-spicy-coverity'
...
* origin/topic/etyp/bump-spicy-coverity:
Bump Spicy for Coverity fixes
2025-09-08 11:02:47 -07:00
Tim Wojtulewicz
76492302ad
Merge remote-tracking branch 'origin/topic/timw/port-doctest-version-include-change-from-upstream'
...
* origin/topic/timw/port-doctest-version-include-change-from-upstream:
Update src/3rdparty submodule for doctest v2.4.12 and include fix
2025-09-08 11:02:16 -07:00
Tim Wojtulewicz
37836d1bb4
Merge remote-tracking branch 'origin/topic/timw/ci-centos-stream-10'
...
* origin/topic/timw/ci-centos-stream-10:
CI: Fix warning about ENV usage in CI dockerfiles
CI: Add centos stream 10 build
2025-09-06 04:26:51 +00:00
Christian Kreibich
a58323c367
Merge branch 'topic/christian/fix-cluster-testing-get-instances-c2a'
...
* topic/christian/fix-cluster-testing-get-instances-c2a:
Bump zeek-client to pull in more resilient controller I/O
2025-09-05 19:52:57 -07:00
Tim Wojtulewicz
b7790641ba
Merge remote-tracking branch 'origin/topic/bbannier/bump-spicy'
...
* origin/topic/bbannier/bump-spicy:
Bump auxil/spicy to latest development snapshot
2025-09-05 12:56:33 -07:00
Tim Wojtulewicz
35ad76c96b
Merge remote-tracking branch 'origin/topic/timw/testing-upstream-libkqueue'
...
* origin/topic/timw/testing-upstream-libkqueue:
libkqueue: Switch to using HEAD from upstream master
2025-09-04 16:22:04 -07:00
Tim Wojtulewicz
0dadf2af04
Merge remote-tracking branch 'origin/topic/bbannier/bump-spicy'
...
* origin/topic/bbannier/bump-spicy:
Bump auxil/spicy to latest development snapshot
2025-09-04 09:04:39 -07:00
Tim Wojtulewicz
7142b9efde
Merge remote-tracking branch 'klemensya/svcparams'
...
* klemensya/svcparams:
Parse SVCB/HTTPS SvcParams list
2025-09-03 15:36:03 -07:00
Tim Wojtulewicz
e3b22cd21f
Merge remote-tracking branch 'origin/topic/vern/emphasize-IDPtrs'
...
* origin/topic/vern/emphasize-IDPtrs:
fixup! fixup! shift much of the internal use of ID* identifier pointers over to IDPtr objects
fixup! shift much of the internal use of ID* identifier pointers over to IDPtr objects
fixup! shift much of the internal use of ID* identifier pointers over to IDPtr objects
fixup! shift much of the internal use of ID* identifier pointers over to IDPtr objects
annotate a number of BTests as unsuited for -O gen-C++ testing due to multiple Zeek runs
BTest baseline updates for -O gen-C++ - all minor tweaks
BTest updates for script optimization tracking of BiFs
regression test for former ASAN issue with script optimization of lambdas
shift much of the internal use of ID* identifier pointers over to IDPtr objects
maintenance update for script optimization's knowledge of BiFs
logger fix for interoperability with -O gen-C++ code
2025-09-03 15:33:43 -07:00