Skip to content

next/1280/20260323/v1#15091

Merged
victorjulien merged 6 commits intoOISF:mainfrom
victorjulien:next/1280/20260323/v1
Mar 24, 2026
Merged

next/1280/20260323/v1#15091
victorjulien merged 6 commits intoOISF:mainfrom
victorjulien:next/1280/20260323/v1

Conversation

@victorjulien
Copy link
Copy Markdown
Member

catenacyber and others added 6 commits March 23, 2026 21:10
Ticket: 8333

Allows to pass on pseudo packets

So, that a ruleset like
pass ssh any any -> any any (geoip:any,US,IN; sid: 1;)
drop ip any any -> any any (flow:established, to_server; sid:2;)

Does not lead to a drop on the pseudo-packet when we flush
because ssh traffic gets encrypted
Add flushing logic driven off of the file contexts. This is a simpler
solution that removes the need for logger registration changes.

Overview:
Use the heartbeat-driven thread to periodically flush all registered EVE
contexts via a global flush list.

The global flush list is a mutex-protected TAILQ of LogFileFlushEntry
nodes; each node points to a LogFileCtx. Mutex = log_file_flush_mutex

Periodic flushing performed by a thread according to the
heartbeat.output-flush-interval [1,60]. LogFileFlushAll() is invoked to
initiate flushing of registered LogFileCtx structs; each struct's
fp_mutex is obtained while the flush occurs to synchronize with
LogFileWrite activity.

Interacts with file-rotation via the fp_mutex.

Deadlock prevention: the log_file_flush_mutex must be obtained before
the fp_mutex.

Issue: 8286
Remove packet-based flush logic in favor of simpler solution

Issue: 8286
Remove log flush functions and update registration logic as
context-based flushing doesn't require it.

Issue: 8286
Update output flushing description to reflect EVE based approach in
documentation and config template.

Issue: 8286
Apply zero-padding to Napatech worker threads so alphanumeric sorting
displays workers in proper order.

Set padding for thread names according to stream count:

1-9 streams: no padding, e.g, nt1, nt9
10-99 streams: use padding, e.g, nt01, nt99
100-999 streams: use padding, e.g, nt001, nt099, nt999

This will insure that thread names, when sorted alphanumerically,
maintain thread worker id order.

Issue: 8337
@victorjulien victorjulien requested review from a team and jufajardini as code owners March 23, 2026 23:50
@codecov
Copy link
Copy Markdown

codecov Bot commented Mar 24, 2026

Codecov Report

❌ Patch coverage is 22.72727% with 34 lines in your changes missing coverage. Please review.
✅ Project coverage is 82.61%. Comparing base (bc4a055) to head (448915f).
⚠️ Report is 6 commits behind head on main.

Additional details and impacted files
@@           Coverage Diff           @@
##             main   #15091   +/-   ##
=======================================
  Coverage   82.61%   82.61%           
=======================================
  Files         990      990           
  Lines      271655   271581   -74     
=======================================
- Hits       224415   224375   -40     
+ Misses      47240    47206   -34     
Flag Coverage Δ
fuzzcorpus 61.06% <13.63%> (+0.02%) ⬆️
livemode 18.36% <22.72%> (-0.04%) ⬇️
netns 18.36% <22.72%> (-0.05%) ⬇️
pcap 45.30% <22.72%> (+0.02%) ⬆️
suricata-verify 66.17% <22.72%> (+0.03%) ⬆️
unittests 58.85% <13.63%> (+0.01%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

Copy link
Copy Markdown
Contributor

@jufajardini jufajardini left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Consistent with original, approved PRs
CI checks pass missing ClusterFuzzLite, to be precise)

@suricata-qa
Copy link
Copy Markdown

Information: QA ran without warnings.

Pipeline = 30506

@victorjulien victorjulien merged commit 448915f into OISF:main Mar 24, 2026
61 checks passed
@victorjulien victorjulien deleted the next/1280/20260323/v1 branch March 24, 2026 08:12
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Development

Successfully merging this pull request may close these issues.

6 participants