next/1187/20260122/v1 #14673
Merged
next/1187/20260122/v1 #14673
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
- cleaner YouTube link - fix weird sentence Follow-up of Task OISF#5612
Issue: 7146 Create an event when the IPv4 header contains an unknown IP protocol.
Use of t_pcapcnt is only relevant when compiled in debug mode only. This patch adds additional debug guard to also shield the declaration and assignment.
For an easier review process, this is a two-step change process, in which pcap_cnt is first accessed by functions-to-be, implemented as simple macros. In the follow-up commit, the actual refactor is implemented with the new function. The old macros are deleted. Ticket: 7835
Code refactor to gather all PCAP-related structure members under one structure. New pcap_v structure guards protect the union variables from other capture modes trying to access the packet number incorrectly. Ticket: 7835
This should make it possible to catch invalid combinations in the same signature early. This patch covers checking and erroring on the following invalid cmd combinations: - set + isset - unset + isnotset - set + toggle - set + unset - isset + isnotset - unset + toggle the same flowbit in the same signature which is basically an unnecessary operation at runtime. This also helps bring down the difficulty of handling of actual complex flowbit chains. Bug 7772 Bug 7773 Bug 7774 Bug 7817 Bug 7818 Bug 8166
victorjulien
requested review from
a team,
jasonish and
jufajardini
as code owners
Codecov Report❌ Patch coverage is Additional details and impacted files@@ Coverage Diff @@
## main #14673 +/- ##
==========================================
- Coverage 82.11% 82.11% -0.01%
==========================================
Files 1011 1011
Lines 262812 262924 +112
==========================================
+ Hits 215812 215896 +84
- Misses 47000 47028 +28
Flags with carried forward coverage won't be shown. Click here to find out more. 🚀 New features to boost your workflow:
|
catenacyber
approved these changes
Jan 22, 2026
Contributor
catenacyber
left a comment
catenacyber
left a comment
There was a problem hiding this comment.
Good staging
Good SV
Good CI
QA ?
|
reran trex_generic and ips in dev after a reboot and everything was fine. so i guess run again and if it goes off ill have to reboot prod and try yet again? |
|
Information: QA ran without warnings. Pipeline = 29250 |
This was referenced Jan 22, 2026
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
7 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Staging:
SV_BRANCH=OISF/suricata-verify#2883