applayer/ftp: Post-merge fixups #12687
Conversation
Issue: 4082 Fixup the incorrect state values -- they should be the default enum values to match the pre-Rust implementation.
This commit moves the MPM fn declaration into core.rs making it available for other Rust modules. Issue: 4082
Issue: 4082 Small fixups.
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## master #12687 +/- ##
==========================================
- Coverage 80.71% 80.71% -0.01%
==========================================
Files 936 936
Lines 259425 259425
==========================================
- Hits 209399 209382 -17
- Misses 50026 50043 +17
Flags with carried forward coverage won't be shown. Click here to find out more. |
| @@ -161,7 +160,7 @@ impl Default for FtpTransferCmd { | |||
| file_name: std::ptr::null_mut(), | |||
| file_len: 0, | |||
| direction: 0, | |||
| cmd: FtpStateValues::FTP_STATE_NONE as u8, | |||
There was a problem hiding this comment.
why is this changed? It seems a named value is clearer
There was a problem hiding this comment.
It's an incorrect value -- it's expected to be a command enum ... not a state value
There was a problem hiding this comment.
should it be FTP_COMMAND_UNKNOWN then?
There was a problem hiding this comment.
Maybe? It's always initialized before use -- the current code calloc's the memory for this struct which is why I used 0
|
WARNING:
Pipeline 24929 |
|
Merged in #12693, thanks! |
Post merge fixups of FTP to Rust conversion
Link to ticket: https://redmine.openinfosecfoundation.org/issues/4082
Describe changes:
Provide values to any of the below to override the defaults.
link to the pull request in the respective
_BRANCHvariable.SV_REPO=
SV_BRANCH=
SU_REPO=
SU_BRANCH=
LIBHTP_REPO=
LIBHTP_BRANCH=