diff --git a/.github/workflows/builds.yml b/.github/workflows/builds.yml index 8be0cb327b..4bc26bb1a0 100644 --- a/.github/workflows/builds.yml +++ b/.github/workflows/builds.yml @@ -393,7 +393,7 @@ jobs: rust/src/ldap/*.rs rust/src/mime/*.rs rust/src/ntp/*.rs rust/src/quic/*.rs rust/src/rfb/*.rs rust/src/ssh/*.rs rust/src/utils/*.rs rust/src/websocket/*.rs rust/src/dhcp/*.rs rust/src/krb/*.rs rust/src/mdns/*.rs rust/src/pop3/*.rs - rust/src/http2/*.rs rust/src/ike/*.rs + rust/src/http2/*.rs rust/src/ike/*.rs rust/src/modbus/*.rs - name: Check if Cargo.lock.in is up to date run: | cp rust/Cargo.lock rust/Cargo.lock.in diff --git a/rust/src/modbus/detect.rs b/rust/src/modbus/detect.rs index d5833cf10f..ec07a57529 100644 --- a/rust/src/modbus/detect.rs +++ b/rust/src/modbus/detect.rs @@ -1014,7 +1014,8 @@ mod test { // Encapsulated Interface Transport (MEI) assert_eq!( - modbus.parse(std::ptr::null_mut(), + modbus.parse( + std::ptr::null_mut(), &[ 0x00, 0x10, // Transaction ID 0x00, 0x00, // Protocol ID @@ -1043,7 +1044,8 @@ mod test { // Unassigned/Unknown function assert_eq!( - modbus.parse(std::ptr::null_mut(), + modbus.parse( + std::ptr::null_mut(), &[ 0x00, 0x0A, // Transaction ID 0x00, 0x00, // Protocol ID @@ -1070,7 +1072,8 @@ mod test { // Read Coils request assert_eq!( - modbus.parse(std::ptr::null_mut(), + modbus.parse( + std::ptr::null_mut(), &[ 0x00, 0x00, // Transaction ID 0x00, 0x00, // Protocol ID @@ -1175,7 +1178,8 @@ mod test { // Read Inputs Register request assert_eq!( - modbus.parse(std::ptr::null_mut(), + modbus.parse( + std::ptr::null_mut(), &[ 0x00, 0x0A, // Transaction ID 0x00, 0x00, // Protocol ID @@ -1325,7 +1329,8 @@ mod test { // Origin: https://github.com/bro/bro/blob/master/testing/btest/Traces/modbus/modbus.trace // Read Coils Response assert_eq!( - modbus.parse(std::ptr::null_mut(), + modbus.parse( + std::ptr::null_mut(), &[ 0x00, 0x01, // Transaction ID 0x00, 0x00, // Protocol ID @@ -1369,7 +1374,8 @@ mod test { // Origin: https://github.com/bro/bro/blob/master/testing/btest/Traces/modbus/modbus.trace // Write Single Register Response assert_eq!( - modbus.parse(std::ptr::null_mut(), + modbus.parse( + std::ptr::null_mut(), &[ 0x00, 0x01, // Transaction ID 0x00, 0x00, // Protocol ID @@ -1411,7 +1417,8 @@ mod test { // Origin: https://github.com/bro/bro/blob/master/testing/btest/Traces/modbus/modbus.trace // Write Single Register Response assert_eq!( - modbus.parse(std::ptr::null_mut(), + modbus.parse( + std::ptr::null_mut(), &[ 0x00, 0x00, // Transaction ID 0x00, 0x00, // Protocol ID diff --git a/rust/src/modbus/modbus.rs b/rust/src/modbus/modbus.rs index 98b6da2058..c073abb051 100644 --- a/rust/src/modbus/modbus.rs +++ b/rust/src/modbus/modbus.rs @@ -184,9 +184,7 @@ impl ModbusState { } } - pub fn parse( - &mut self, flow: *mut Flow, input: &[u8], direction: Direction, - ) -> AppLayerResult { + pub fn parse(&mut self, flow: *mut Flow, input: &[u8], direction: Direction) -> AppLayerResult { let mut rest = input; while !rest.is_empty() { match MODBUS_PARSER.parse(rest, direction.clone()) { @@ -1067,7 +1065,11 @@ mod tests { let mut state = ModbusState::new(); assert_eq!( AppLayerResult::ok(), - state.parse(std::ptr::null_mut(), RD_WR_MULT_REG_REQ, Direction::ToServer) + state.parse( + std::ptr::null_mut(), + RD_WR_MULT_REG_REQ, + Direction::ToServer + ) ); assert_eq!(state.transactions.len(), 1); @@ -1091,7 +1093,11 @@ mod tests { assert_eq!( AppLayerResult::ok(), - state.parse(std::ptr::null_mut(), RD_WR_MULT_REG_RESP, Direction::ToClient) + state.parse( + std::ptr::null_mut(), + RD_WR_MULT_REG_RESP, + Direction::ToClient + ) ); assert_eq!(state.transactions.len(), 1); @@ -1417,7 +1423,11 @@ mod tests { assert_eq!( AppLayerResult::ok(), - state.parse(std::ptr::null_mut(), WR_SINGLE_REG_RESP, Direction::ToClient) + state.parse( + std::ptr::null_mut(), + WR_SINGLE_REG_RESP, + Direction::ToClient + ) ); assert_eq!(state.transactions.len(), 1); @@ -1492,7 +1502,11 @@ mod tests { assert_eq!( AppLayerResult::ok(), - state.parse(std::ptr::null_mut(), WR_SINGLE_REG_RESP, Direction::ToClient) + state.parse( + std::ptr::null_mut(), + WR_SINGLE_REG_RESP, + Direction::ToClient + ) ); assert_eq!(state.transactions.len(), 1);