Transform rust 7229 v9 #12068
Closed
Transform rust 7229 v9 #12068
Conversation
This file contains 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
Ticket: 7229
Ticket: 7229
Ticket: 7229
md5, sha1 and sha256 Ticket: 7229
Ticket: 7229
Ticket: 7229
Ticket: 7229
Ticket: 7229
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## master #12068 +/- ##
==========================================
- Coverage 83.42% 79.80% -3.63%
==========================================
Files 910 906 -4
Lines 257642 257512 -130
==========================================
- Hits 214949 205513 -9436
- Misses 42693 51999 +9306
Flags with carried forward coverage won't be shown. Click here to find out more. |
|
WARNING:
Pipeline 23225 |
|
Passed my QA. Ran this PR with SV master. Local pipeline 5130, run 626. |
jasonish
reviewed
Nov 5, 2024
Comment on lines
+31
to
+56
| #[repr(C)] | ||
| #[allow(non_snake_case)] | ||
| pub struct SCTransformTableElmt { | ||
| pub name: *const c_char, | ||
| pub desc: *const c_char, | ||
| pub url: *const c_char, | ||
| pub flags: u16, | ||
| pub Setup: unsafe extern "C" fn(de: *mut c_void, s: *mut c_void, raw: *const c_char) -> c_int, | ||
| pub Free: Option<unsafe extern "C" fn(de: *mut c_void, ptr: *mut c_void)>, | ||
| pub Transform: unsafe extern "C" fn(inspect_buf: *mut c_void, options: *mut c_void), | ||
| pub TransformValidate: | ||
| Option<unsafe extern "C" fn(content: *const u8, len: u16, context: *mut c_void) -> bool>, | ||
| } | ||
|
|
||
| /// cbindgen:ignore | ||
| extern "C" { | ||
| pub fn DetectSignatureAddTransform( | ||
| s: *mut c_void, transform_id: c_int, ctx: *mut c_void, | ||
| ) -> c_int; | ||
| pub fn InspectionBufferPtr(buf: *const c_void) -> *const u8; | ||
| pub fn InspectionBufferLength(buf: *const c_void) -> u32; | ||
| pub fn InspectionBufferCopy(ibuf: *const c_void, buf: *const u8, buf_len: u32); | ||
| pub fn DetectHelperTransformRegister(kw: *const SCTransformTableElmt) -> c_int; | ||
| pub fn InspectionBufferCheckAndExpand(ibuf: *const c_void, buf_len: u32) -> *mut u8; | ||
| pub fn InspectionBufferTruncate(ibuf: *const c_void, buf_len: u32); | ||
| } |
There was a problem hiding this comment.
Unrelated to this PR, but with respect to bindgen (#12062) these are the type of structs we'd move back to C, and let bind gen generate them to avoid to the circular dependency issue.
jasonish
reviewed
Nov 5, 2024
| pub fn InspectionBufferLength(buf: *const c_void) -> u32; | ||
| pub fn InspectionBufferCopy(ibuf: *const c_void, buf: *const u8, buf_len: u32); | ||
| pub fn DetectHelperTransformRegister(kw: *const SCTransformTableElmt) -> c_int; | ||
| pub fn InspectionBufferCheckAndExpand(ibuf: *const c_void, buf_len: u32) -> *mut u8; |
There was a problem hiding this comment.
Shouldn't matter, but on the C side this returns void *. But they're the same size so FFI should be OK.
victorjulien
approved these changes
Nov 6, 2024
Merged
|
Merged in #12094, thanks! |
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/7229
Describe changes:
#12065 with rust fixes and clean history
Only base64 and pcrexform left in C
Benchmark
./src/suricata -r bigf.pcapng -S bigf.rules -c bigf.yaml -k none -l log --runmode singlewith big.rules being
alert tcp any any -> any any (file.data; strip_whitespace; content:"hasxspace"; sid:1;)and bigf.pcapng being a capture of http1 download of 28 Mbyte file SV datasets-1m-StringSets/datasets.csv and bigf.yaml having all kinds of options for profilingwith PR
With master
So 77389980 vs 81533120 does not seem significant for a difference