rust ffi ints/v1 #12009
Merged
rust ffi ints/v1 #12009
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
Member
jasonish
commented
Oct 22, 2024
jasonish
commented
- eve/schema: add missing field "code" anomaly events
- rust/applayer: use c_int as return type for get_info_by_id
Rust was using i8 as the return type, while C uses int. As of Rust 1.82, the return value is turned to garbage over the FFI boundary. Ticket: OISF#7338
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## master #12009 +/- ##
==========================================
- Coverage 83.22% 83.22% -0.01%
==========================================
Files 910 910
Lines 258136 258136
==========================================
- Hits 214831 214825 -6
- Misses 43305 43311 +6
Flags with carried forward coverage won't be shown. Click here to find out more. |
jasonish
commented
Oct 22, 2024
| @@ -445,7 +445,7 @@ pub type StateGetTxFn = unsafe extern "C" fn (*mut c_void, u64) -> *m | |||
| pub type StateGetTxCntFn = unsafe extern "C" fn (*mut c_void) -> u64; | |||
| pub type StateGetProgressFn = unsafe extern "C" fn (*mut c_void, u8) -> c_int; | |||
| pub type GetEventInfoFn = unsafe extern "C" fn (*const c_char, *mut c_int, *mut AppLayerEventType) -> c_int; | |||
| pub type GetEventInfoByIdFn = unsafe extern "C" fn (c_int, *mut *const c_char, *mut AppLayerEventType) -> i8; | |||
| pub type GetEventInfoByIdFn = unsafe extern "C" fn (c_int, *mut *const c_char, *mut AppLayerEventType) -> c_int; | |||
There was a problem hiding this comment.
That we also use uint8_t and int for the event_type (first argument) in C, while not breaking anything right now, could be a source for error.
|
Information: QA ran without warnings. Pipeline 23161 |
victorjulien
approved these changes
Oct 23, 2024
Merged
|
Merged in #12013, 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.