Tim Wojtulewicz
cc79afd24f
Merge remote-tracking branch 'origin/topic/timw/include-cleanup-part-2'
...
* origin/topic/timw/include-cleanup-part-2:
Remove unnecessary #includes in script_opt
Remove unnecessary #includes in telemetry and supervisor
Remove unnecessary #includes in cluster/broker/iosource/probabilistic/session
Remove unnecessary #includes in zeekygen and base plugin files
Remove unnecessary #includes in input/logging/threading
Remove unnecessary #includes in analyzer/packet analyzer/file analyzer source files
Remove unnecessary #includes in analyzer/packet analyzer/file analyzer headers
Remove unnecessary #includes in base files in repo
2025-05-19 10:26:05 -07:00
Tim Wojtulewicz
12356a6393
Remove unnecessary #includes in script_opt
2025-05-19 10:25:05 -07:00
Tim Wojtulewicz
0e47fa10c6
Remove unnecessary #includes in telemetry and supervisor
2025-05-19 10:25:05 -07:00
Tim Wojtulewicz
8b992320cb
Remove unnecessary #includes in cluster/broker/iosource/probabilistic/session
2025-05-19 10:25:05 -07:00
Tim Wojtulewicz
17101da6b3
Remove unnecessary #includes in zeekygen and base plugin files
2025-05-19 10:25:05 -07:00
Tim Wojtulewicz
e3c4b1fd58
Remove unnecessary #includes in input/logging/threading
2025-05-19 10:25:05 -07:00
Tim Wojtulewicz
79301c4691
Remove unnecessary #includes in analyzer/packet analyzer/file analyzer source files
2025-05-19 10:25:05 -07:00
Tim Wojtulewicz
456c1fa42c
Remove unnecessary #includes in analyzer/packet analyzer/file analyzer headers
2025-05-19 10:25:05 -07:00
Tim Wojtulewicz
896e41c794
Remove unnecessary #includes in base files in repo
2025-05-19 09:50:23 -07:00
Tim Wojtulewicz
224be5a951
Merge remote-tracking branch 'origin/topic/timw/rename-ci-github-labels'
...
* origin/topic/timw/rename-ci-github-labels:
Rename CI-related github labels for PRs
2025-05-19 09:44:10 -07:00
Tim Wojtulewicz
e72572bf32
Rename CI-related github labels for PRs
2025-05-19 09:41:27 -07:00
zeek-bot
bf30cf7997
Update doc submodule [nomail] [skip ci]
2025-05-17 00:27:23 +00:00
Tim Wojtulewicz
9683e88795
Merge remote-tracking branch 'origin/topic/timw/include-cleanup-part-1'
...
* origin/topic/timw/include-cleanup-part-1:
Remove including <cinttypes> from util.h
Remove telemetry #includes from OpaqueVal.h
Reduce includes in plugin/Component.h
Remove zeek/Stats.h include from NetVar.h
Include StmtBase/StmtEnums in Func.h instead of Stmt.h
Use modern names for standard headers
Remove fix for CentOS 7 from TCP_Flags.h
Fix usage of std::string in http analyzer
Reorder top section of net_util.h to batch includes together
Use quotes instead of <> for zeek includes
Fix Obj.h include in IntrusivePtr.h to have full path
2025-05-16 10:27:46 -07:00
Tim Wojtulewicz
e618d00326
Remove including <cinttypes> from util.h
2025-05-16 10:14:37 -07:00
Tim Wojtulewicz
174bf09d77
Remove telemetry #includes from OpaqueVal.h
2025-05-16 10:14:37 -07:00
Tim Wojtulewicz
c659592773
Reduce includes in plugin/Component.h
2025-05-16 10:14:37 -07:00
Tim Wojtulewicz
ff9f0f7a5c
Remove zeek/Stats.h include from NetVar.h
2025-05-16 10:14:37 -07:00
Tim Wojtulewicz
ca3002d745
Include StmtBase/StmtEnums in Func.h instead of Stmt.h
...
This requires changes in lots of other files that were depending on Func.h
to provide that include for them.
2025-05-16 10:14:36 -07:00
Tim Wojtulewicz
ad50443590
Use modern names for standard headers
2025-05-16 10:14:36 -07:00
Tim Wojtulewicz
4b2ed67eaf
Remove fix for CentOS 7 from TCP_Flags.h
2025-05-16 10:14:36 -07:00
Tim Wojtulewicz
3197bb7f59
Fix usage of std::string in http analyzer
2025-05-16 10:14:36 -07:00
Tim Wojtulewicz
661b230f23
Reorder top section of net_util.h to batch includes together
2025-05-16 10:14:36 -07:00
Tim Wojtulewicz
648f0f0623
Use quotes instead of <> for zeek includes
2025-05-16 10:14:36 -07:00
Tim Wojtulewicz
499db5dd70
Fix Obj.h include in IntrusivePtr.h to have full path
2025-05-16 10:14:36 -07:00
Arne Welzel
4691e2c51b
Merge remote-tracking branch 'origin/topic/vern/event-trace-on-exit'
...
* origin/topic/vern/event-trace-on-exit:
Generate --event-trace output explicitly rather than in EventTraceMgr destructor
2025-05-16 13:40:04 +02:00
Vern Paxson
f5c1a32d8d
Generate --event-trace output explicitly rather than in EventTraceMgr destructor
2025-05-15 13:00:17 -07:00
Tim Wojtulewicz
6833088cde
Merge remote-tracking branch 'origin/topic/timw/disallow-blind-searching-for-krb5-on-macos'
...
* origin/topic/timw/disallow-blind-searching-for-krb5-on-macos:
Require non-system version of libkrb5 on macOS
2025-05-15 12:15:57 -07:00
Tim Wojtulewicz
663281e05f
Require non-system version of libkrb5 on macOS
2025-05-15 11:24:51 -07:00
Arne Welzel
e40aac30f4
Merge remote-tracking branch 'origin/topic/awelzel/bump-ixwebsocket-11.4.6'
...
* origin/topic/awelzel/bump-ixwebsocket-11.4.6:
IXWebSocket: Point at upstream, bump to v11.4.6
2025-05-15 16:44:30 +02:00
Arne Welzel
4911d34a1d
IXWebSocket: Point at upstream, bump to v11.4.6
2025-05-15 16:37:09 +02:00
Johanna Amann
9d3e39581e
Merge branch 'topic/jgras/pop3-stls-dpd' of https://github.com/J-Gras/zeek
...
* 'topic/jgras/pop3-stls-dpd' of https://github.com/J-Gras/zeek :
Add STLS command to POP3 DPD signature
2025-05-15 10:23:43 +01:00
zeek-bot
adc0937bf5
Update doc submodule [nomail] [skip ci]
2025-05-15 00:14:11 +00:00
Jan Grashoefer
84cc4b890d
Add STLS command to POP3 DPD signature
2025-05-14 16:37:25 +02:00
zeek-bot
734fd62325
Update doc submodule [nomail] [skip ci]
2025-05-14 00:15:11 +00:00
Arne Welzel
2255fa23b8
Merge remote-tracking branch 'origin/topic/vern/zam-aggr-change-in-loop'
...
* origin/topic/vern/zam-aggr-change-in-loop:
fix for ZAM optimization when an aggregate is modified inside of a loop
2025-05-13 19:50:56 +02:00
Tim Wojtulewicz
5aa6734042
Merge remote-tracking branch 'origin/topic/timw/allow-macos-libkrb5'
...
* origin/topic/timw/allow-macos-libkrb5:
Allow macOS to search for libkrb5, but disallow system version of library
2025-05-13 10:03:55 -07:00
Tim Wojtulewicz
051c191f63
Allow macOS to search for libkrb5, but disallow system version of library
2025-05-13 10:03:26 -07:00
Arne Welzel
8f60d37ad0
Merge remote-tracking branch 'origin/topic/awelzel/4440-websocket-pong-timeout'
...
* origin/topic/awelzel/4440-websocket-pong-timeout:
btest/cluster/websocket: Update tests for new event signature
cluster/websocket: Propagate code and reason to websocket_client_lost()
cluster/websocket: Support configurable ping interval
IXWebSocket: Bump to improve O^2 rxbuf erase()
2025-05-13 18:58:54 +02:00
Arne Welzel
6d2bd93f1f
btest/cluster/websocket: Update tests for new event signature
2025-05-13 18:26:03 +02:00
Arne Welzel
a61aff010f
cluster/websocket: Propagate code and reason to websocket_client_lost()
...
This allows to get visibility into the reason why ixwebsocket or the
client decided to disconnect.
Closed #4440
2025-05-13 18:26:03 +02:00
Arne Welzel
aaddeb19ad
cluster/websocket: Support configurable ping interval
...
Primarily for testing purposes and maybe the hard-coded 5 seconds is too
aggressive for some deployments, so makes sense for it to be
configurable.
2025-05-13 18:26:03 +02:00
Tim Wojtulewicz
912356deac
Merge remote-tracking branch 'origin/topic/bbannier/fix-spicy-main'
...
* origin/topic/bbannier/fix-spicy-main:
Fix clang-tidy `bugprone-inc-dec-in-conditions` report in Spicy plugins glue compiler
Fix clang-tidy `performance-enum-size` reports in Spicy plugin's glue compiler
Remove unneeded copies in Spicy plugin glue compiler
Adjust for renamed function flavor in Spicy development version
2025-05-12 11:33:54 -07:00
Vern Paxson
da689f1835
fix for ZAM optimization when an aggregate is modified inside of a loop
2025-05-09 15:01:55 -07:00
Arne Welzel
6b6c3dbbb7
Merge remote-tracking branch 'origin/topic/justin/file_analysis_speedup'
...
* origin/topic/justin/file_analysis_speedup:
speed up file analysis, remove IncrementByteCount
2025-05-09 17:25:55 +02:00
Benjamin Bannier
24071118eb
Fix clang-tidy bugprone-inc-dec-in-conditions report in Spicy plugins glue compiler
2025-05-09 16:58:22 +02:00
Justin Azoff
7f350587b0
speed up file analysis, remove IncrementByteCount
...
Avoid creating and recreating count objects for each chunk of file
analyzed. This replaces counts inside of records with c++ uint64_ts.
On a pcap containing a 100GB file download this gives a 9% speedup
Benchmark 1 (3 runs): zeek-master/bin/zeek -Cr http_100g_zeroes.pcap tuning/json-logs frameworks/files/hash-all-files
measurement mean ± σ min … max outliers delta
wall_time 102s ± 1.23s 101s … 103s 0 ( 0%) 0%
peak_rss 108MB ± 632KB 107MB … 109MB 0 ( 0%) 0%
cpu_cycles 381G ± 862M 380G … 382G 0 ( 0%) 0%
instructions 663G ± 5.16M 663G … 663G 0 ( 0%) 0%
cache_references 1.03G ± 109M 927M … 1.15G 0 ( 0%) 0%
cache_misses 12.3M ± 587K 11.7M … 12.9M 0 ( 0%) 0%
branch_misses 1.23G ± 2.10M 1.22G … 1.23G 0 ( 0%) 0%
Benchmark 2 (3 runs): zeek-file_analysis_speedup/bin/zeek -Cr http_100g_zeroes.pcap tuning/json-logs frameworks/files/hash-all-files
measurement mean ± σ min … max outliers delta
wall_time 92.9s ± 1.85s 91.8s … 95.1s 0 ( 0%) ⚡ - 9.0% ± 3.5%
peak_rss 108MB ± 393KB 108MB … 109MB 0 ( 0%) + 0.1% ± 1.1%
cpu_cycles 341G ± 695M 341G … 342G 0 ( 0%) ⚡ - 10.4% ± 0.5%
instructions 605G ± 626M 605G … 606G 0 ( 0%) ⚡ - 8.7% ± 0.2%
cache_references 831M ± 16.9M 813M … 846M 0 ( 0%) ⚡ - 19.6% ± 17.2%
cache_misses 12.4M ± 1.48M 11.4M … 14.1M 0 ( 0%) + 0.3% ± 20.8%
branch_misses 1.02G ± 3.45M 1.02G … 1.02G 0 ( 0%) ⚡ - 16.8% ± 0.5%
2025-05-09 10:50:04 -04:00
Arne Welzel
2041306772
IXWebSocket: Bump to improve O^2 rxbuf erase()
...
Part of #4440
2025-05-09 16:38:36 +02:00
Benjamin Bannier
37b095f39b
Fix clang-tidy performance-enum-size reports in Spicy plugin's glue compiler
2025-05-09 16:08:14 +02:00
Benjamin Bannier
9355512adc
Remove unneeded copies in Spicy plugin glue compiler
2025-05-09 16:08:14 +02:00
Benjamin Bannier
fbe8dbce5e
Adjust for renamed function flavor in Spicy development version
...
With zeek/spicy#2048 the flavor for functions was renamed from
`Standard` to `Function`. This patch adapts the code for that while
still allowing using earlier Spicy versions.
2025-05-09 16:08:14 +02:00
