diff --git a/windows_kext/driver/src/connection_cache.rs b/windows_kext/driver/src/connection_cache.rs index 6e149508..665e60f4 100644 --- a/windows_kext/driver/src/connection_cache.rs +++ b/windows_kext/driver/src/connection_cache.rs @@ -59,7 +59,7 @@ impl ConnectionCache { process_connection: fn(&ConnectionV4) -> Option, ) -> Option { let _guard = self.lock_v4.read_lock(); - self.connections_v4.read(&key, process_connection) + self.connections_v4.read(key, process_connection) } pub fn read_connection_v6( @@ -68,7 +68,7 @@ impl ConnectionCache { process_connection: fn(&ConnectionV6) -> Option, ) -> Option { let _guard = self.lock_v6.read_lock(); - self.connections_v6.read(&key, process_connection) + self.connections_v6.read(key, process_connection) } pub fn end_connection_v4(&mut self, key: Key) -> Option { diff --git a/windows_kext/driver/src/connection_map.rs b/windows_kext/driver/src/connection_map.rs index 282da153..bf2210f8 100644 --- a/windows_kext/driver/src/connection_map.rs +++ b/windows_kext/driver/src/connection_map.rs @@ -111,7 +111,7 @@ impl ConnectionMap { pub fn end(&mut self, key: Key) -> Option { if let Some(connections) = self.0.get_mut(&key.small()) { - for (_, conn) in connections.iter_mut().enumerate() { + for conn in connections.iter_mut() { if conn.remote_equals(&key) { conn.end(wdk::utils::get_system_timestamp_ms()); return Some(conn.clone()); @@ -124,7 +124,7 @@ impl ConnectionMap { pub fn end_all_on_port(&mut self, key: (IpProtocol, u16)) -> Option> { if let Some(connections) = self.0.get_mut(&key) { let mut vec = Vec::with_capacity(connections.len()); - for (_, conn) in connections.iter_mut().enumerate() { + for conn in connections.iter_mut() { if !conn.has_ended() { conn.end(wdk::utils::get_system_timestamp_ms()); vec.push(conn.clone()); diff --git a/windows_kext/driver/src/device.rs b/windows_kext/driver/src/device.rs index e5eeca7d..b7175207 100644 --- a/windows_kext/driver/src/device.rs +++ b/windows_kext/driver/src/device.rs @@ -46,9 +46,7 @@ impl Device { Err(err) => return Err(alloc::format!("filter engine error: {}", err)), }; - if let Err(err) = filter_engine.commit(callouts::get_callout_vec()) { - return Err(err); - } + filter_engine.commit(callouts::get_callout_vec())?; Ok(Self { filter_engine, diff --git a/windows_kext/driver/src/id_cache.rs b/windows_kext/driver/src/id_cache.rs index 3b791ff9..9a0c4b27 100644 --- a/windows_kext/driver/src/id_cache.rs +++ b/windows_kext/driver/src/id_cache.rs @@ -56,7 +56,7 @@ impl IdCache { } } -fn get_payload<'a>(packet: &'a Packet) -> Option<&'a [u8]> { +fn get_payload(packet: &Packet) -> Option<&[u8]> { match packet { Packet::PacketLayer(nbl, _) => nbl.get_data(), Packet::AleLayer(defer) => { diff --git a/windows_kext/driver/src/packet_callouts.rs b/windows_kext/driver/src/packet_callouts.rs index 9971d6af..6736a628 100644 --- a/windows_kext/driver/src/packet_callouts.rs +++ b/windows_kext/driver/src/packet_callouts.rs @@ -278,7 +278,7 @@ fn get_connection_info( ) -> Option { if ipv6 { let conn_info = connection_cache.read_connection_v6( - &key, + key, |conn: &ConnectionV6| -> Option { // Function is is behind spin lock. Just copy and return. Some(ConnectionInfo::from_connection(conn)) @@ -287,7 +287,7 @@ fn get_connection_info( return conn_info; } else { let conn_info = connection_cache.read_connection_v4( - &key, + key, |conn: &ConnectionV4| -> Option { // Function is is behind spin lock. Just copy and return. Some(ConnectionInfo::from_connection(conn))