fixup: some warnings

Author: dlon

mullvad-cli/src/cmds/split_tunnel/macos.rs

@@ -1,5 +1,3 @@
-// TODO: add by paths
-
 use anyhow::Result;
 use std::path::PathBuf;
 

talpid-core/src/split_tunnel/macos/bpf.rs

@@ -4,7 +4,7 @@ use libc::{
     BIOCSHDRCMPLT, BIOCSSEESENT, BPF_ALIGNMENT, EBUSY, F_GETFL, F_SETFL, O_NONBLOCK,
 };
 use std::{
-    ffi::{c_int, c_uint, CStr},
+    ffi::{c_int, c_uint},
     fs::File,
     io::{self, Read, Write},
     mem,
@@ -263,11 +263,6 @@ pub struct BpfStream {
 }
 
 impl BpfStream {
-    pub fn from_bpf(bpf: Bpf) -> Result<Self, Error> {
-        bpf.set_nonblocking(true)?;
-        Self::from_file(bpf.file)
-    }
-
     pub fn from_read_half(reader: ReadHalf) -> Result<Self, Error> {
         Self::from_file(reader.0)
     }

talpid-core/src/split_tunnel/macos/mod.rs

@@ -3,6 +3,7 @@ use talpid_routing::RouteManagerHandle;
 
 use self::process::ExclusionStatus;
 
+#[allow(non_camel_case_types)]
 mod bindings;
 mod bpf;
 mod process;

talpid-core/src/split_tunnel/macos/process.rs

@@ -32,9 +32,7 @@ pub enum Error {
     FindProcessPath(#[error(source)] io::Error, u32),
 }
 
-pub struct ProcessMonitor {
-    states: ProcessStates,
-}
+pub struct ProcessMonitor(());
 
 #[derive(Debug)]
 pub struct ProcessMonitorHandle {
@@ -45,9 +43,6 @@ pub struct ProcessMonitorHandle {
 
 impl ProcessMonitor {
     pub async fn spawn() -> Result<ProcessMonitorHandle, Error> {
-        // TODO: need handle that can add excluded procs, etc.
-        // TODO: probably do need mutex
-
         let states = ProcessStates::new()?;
 
         let excluded_paths = vec![];
@@ -82,8 +77,6 @@ impl ProcessMonitor {
                 let mut inner = states_clone.inner.lock().unwrap();
                 inner.handle_message(val);
             }
-
-            // TODO: signal complete shutdown here?
         });
 
         Ok(ProcessMonitorHandle {
@@ -173,7 +166,7 @@ impl ProcessStates {
     pub fn exclude_paths(&self, paths: Vec<PathBuf>) {
         let mut inner = self.inner.lock().unwrap();
 
-        for (pid, info) in &mut inner.processes {
+        for (_pid, info) in &mut inner.processes {
             // Remove no-longer excluded paths from exclusion list
             let mut new_exclude_paths: Vec<_> = info
                 .excluded_by_paths
@@ -391,7 +384,6 @@ struct ESAuditToken {
 
 #[derive(Debug, Deserialize)]
 struct ESProcess {
-    ppid: u32,
     audit_token: ESAuditToken,
     executable: ESExecutable,
 }

talpid-core/src/split_tunnel/macos/tun.rs

@@ -113,13 +113,13 @@ pub enum RoutingDecision {
 
 /// Interface name, addresses, and gateway
 #[derive(Debug, Clone)]
-pub struct DefaultInterface {
+struct DefaultInterface {
     /// Interface name
-    pub name: String,
+    name: String,
     /// MAC/Hardware address of the gateway
-    pub v4_addrs: Option<DefaultInterfaceAddrs<Ipv4Addr>>,
+    v4_addrs: Option<DefaultInterfaceAddrs<Ipv4Addr>>,
     /// MAC/Hardware address of the gateway
-    pub v6_addrs: Option<DefaultInterfaceAddrs<Ipv6Addr>>,
+    v6_addrs: Option<DefaultInterfaceAddrs<Ipv6Addr>>,
 }
 
 /// Interface name, addresses, and gateway
@@ -461,7 +461,6 @@ async fn redirect_packets_for_pktap_stream(
     };
 
     let vpn_v4 = vpn_interface.as_ref().and_then(|iface| iface.v4_address);
-    let def_v4 = default_interface.v4_addrs.as_ref().unwrap().source_ip;
 
     let ingress_task: tokio::task::JoinHandle<(
         tokio::io::ReadHalf<tun::AsyncDevice>,
@@ -598,17 +597,17 @@ async fn handle_incoming_data(
     vpn_v4: Option<Ipv4Addr>,
 ) {
     let Some(mut frame) = MutableEthernetPacket::new(payload) else {
-        log::debug!("default: Discarding non-Ethernet frame");
+        log::trace!("discarding non-Ethernet frame");
         return;
     };
 
     if frame.get_ethertype() != EtherTypes::Ipv4 {
-        log::debug!("discarding non-ipv4");
+        log::trace!("discarding non-IPv4 frame");
         return;
     }
 
     let Some(mut ip) = MutableIpv4Packet::new(frame.payload_mut()) else {
-        log::debug!("default: Discarding non-IPv4 packet");
+        log::trace!("discarding non-IPv4 packet");
         return;
     };