detect/vlan: move vlan.id code to generic integer #13908
Draft
+176
−117
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
catenacyber
commented
Sep 26, 2025
| ) -> *mut DetectUintData<u32> { | ||
| let ft_name: &CStr = CStr::from_ptr(ustr); //unsafe | ||
| if let Ok(s) = ft_name.to_str() { | ||
| // TODO big composite type |
There was a problem hiding this comment.
just removed a TODO that was done on my way
catenacyber
commented
Sep 26, 2025
| v->u8[1] = a->layer; | ||
| v->u16[2] = a->du16.arg1; | ||
| v->u16[3] = a->du16.arg2; | ||
| const DetectVlanIdDataPrefilter a = SCDetectVlanIdPrefilter(smctx); |
There was a problem hiding this comment.
I wonder if I should move more prefilter code to rust :
- not export
DetectVlanIdDataPrefilterto C - pass
PrefilterPacketHeaderValue *vfrom C to rust as a slice of bytes that has at least 16 bytes
catenacyber
commented
Sep 26, 2025
| u8_layer | ||
| match a.index { | ||
| DetectUintIndex::All => { | ||
| // keep previous behavior that vlan.id: all matched only if there was vlan |
There was a problem hiding this comment.
How is this ?
Alternative could be to change the newly (Suri9) added all modes :
We could have all that behaves like for vlan.id, and all0 that would match if everything is a match or if the list is empty...
|
No new SV tests as, just exercising the existing Not sure if it makes sense to add a check like
|
|
Draft : waiting on feedback about the all vs all1-all0 |
|
WARNING:
Pipeline = 27714 |
|
WARNING:
Pipeline = 27727 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Link to ticket: https://redmine.openinfosecfoundation.org/issues/
https://redmine.openinfosecfoundation.org/issues/7929
Describe changes: