vikarti.anatra/safing-portmaster
1
0
Fork 0
mirror of https://github.com/safing/portmaster synced 2025-09-04 19:49:15 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

[windows_kext] Fix clippy warnings

Browse source
This commit is contained in:
Vladimir Stoilov 2024-06-04 14:55:29 +03:00
parent b72cf2577a
commit 9fe140bd02
No known key found for this signature in database
GPG key ID: 2F190B67A43A81AF
5 changed files with 8 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
windows_kext/driver/src/connection_cache.rs
View file

@ -59,7 +59,7 @@ impl ConnectionCache {
process_connection: fn(&ConnectionV4) -> Option<T>, process_connection: fn(&ConnectionV4) -> Option<T>,
) -> Option<T> { ) -> Option<T> {
let _guard = self.lock_v4.read_lock(); 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<T>( pub fn read_connection_v6<T>(
@ -68,7 +68,7 @@ impl ConnectionCache {
process_connection: fn(&ConnectionV6) -> Option<T>, process_connection: fn(&ConnectionV6) -> Option<T>,
) -> Option<T> { ) -> Option<T> {
let _guard = self.lock_v6.read_lock(); 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<ConnectionV4> { pub fn end_connection_v4(&mut self, key: Key) -> Option<ConnectionV4> {

4
windows_kext/driver/src/connection_map.rs
View file

@ -111,7 +111,7 @@ impl<T: Connection + Clone> ConnectionMap<T> {
pub fn end(&mut self, key: Key) -> Option<T> { pub fn end(&mut self, key: Key) -> Option<T> {
if let Some(connections) = self.0.get_mut(&key.small()) { 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) { if conn.remote_equals(&key) {
conn.end(wdk::utils::get_system_timestamp_ms()); conn.end(wdk::utils::get_system_timestamp_ms());
return Some(conn.clone()); return Some(conn.clone());
@ -124,7 +124,7 @@ impl<T: Connection + Clone> ConnectionMap<T> {
pub fn end_all_on_port(&mut self, key: (IpProtocol, u16)) -> Option<Vec<T>> { pub fn end_all_on_port(&mut self, key: (IpProtocol, u16)) -> Option<Vec<T>> {
if let Some(connections) = self.0.get_mut(&key) { if let Some(connections) = self.0.get_mut(&key) {
let mut vec = Vec::with_capacity(connections.len()); 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() { if !conn.has_ended() {
conn.end(wdk::utils::get_system_timestamp_ms()); conn.end(wdk::utils::get_system_timestamp_ms());
vec.push(conn.clone()); vec.push(conn.clone());

4
windows_kext/driver/src/device.rs
View file

@ -46,9 +46,7 @@ impl Device {
Err(err) => return Err(alloc::format!("filter engine error: {}", err)), Err(err) => return Err(alloc::format!("filter engine error: {}", err)),
}; };
if let Err(err) = filter_engine.commit(callouts::get_callout_vec()) { filter_engine.commit(callouts::get_callout_vec())?;
return Err(err);
}
Ok(Self { Ok(Self {
filter_engine, filter_engine,

2
windows_kext/driver/src/id_cache.rs
View file

@ -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 { match packet {
Packet::PacketLayer(nbl, _) => nbl.get_data(), Packet::PacketLayer(nbl, _) => nbl.get_data(),
Packet::AleLayer(defer) => { Packet::AleLayer(defer) => {

4
windows_kext/driver/src/packet_callouts.rs
View file

@ -278,7 +278,7 @@ fn get_connection_info(
) -> Option<ConnectionInfo> { ) -> Option<ConnectionInfo> {
if ipv6 { if ipv6 {
let conn_info = connection_cache.read_connection_v6( let conn_info = connection_cache.read_connection_v6(
&key, key,
|conn: &ConnectionV6| -> Option<ConnectionInfo> { |conn: &ConnectionV6| -> Option<ConnectionInfo> {
// Function is is behind spin lock. Just copy and return. // Function is is behind spin lock. Just copy and return.
Some(ConnectionInfo::from_connection(conn)) Some(ConnectionInfo::from_connection(conn))
@ -287,7 +287,7 @@ fn get_connection_info(
return conn_info; return conn_info;
} else { } else {
let conn_info = connection_cache.read_connection_v4( let conn_info = connection_cache.read_connection_v4(
&key, key,
|conn: &ConnectionV4| -> Option<ConnectionInfo> { |conn: &ConnectionV4| -> Option<ConnectionInfo> {
// Function is is behind spin lock. Just copy and return. // Function is is behind spin lock. Just copy and return.
Some(ConnectionInfo::from_connection(conn)) Some(ConnectionInfo::from_connection(conn))