Replace `println` with `log` in mullvad-masque-proxy

8 files changed, 33 insertions, 19 deletions

diff --git a/Cargo.lock b/Cargo.lock
index 77b4af0d33..8359d58614 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2874,10 +2874,12 @@ dependencies = [
  "anyhow",
  "bytes",
  "clap",
+ "env_logger 0.11.7",
  "h3",
  "h3-datagram",
  "h3-quinn",
  "http 1.1.0",
+ "log",
  "quinn",
  "rand 0.8.5",
  "rustls 0.23.18",
diff --git a/mullvad-masque-proxy/Cargo.toml b/mullvad-masque-proxy/Cargo.toml
index 232a83ca6d..2911991296 100644
--- a/mullvad-masque-proxy/Cargo.toml
+++ b/mullvad-masque-proxy/Cargo.toml
@@ -20,8 +20,10 @@ rustls = { version = "0.23", default-features = false }
 rustls-pemfile = "2.1.3"
 bytes = "1"
 anyhow = { workspace = true }
+log = { workspace = true }
 
 [dev-dependencies]
+env_logger = { workspace = true }
 tokio = { workspace = true, features = ["fs", "macros", "io-util", "rt-multi-thread"] }
 clap = { workspace = true }
 rand = "0.8.5"
diff --git a/mullvad-masque-proxy/examples/masque-client.rs b/mullvad-masque-proxy/examples/masque-client.rs
index 3a6b591640..73f7402381 100644
--- a/mullvad-masque-proxy/examples/masque-client.rs
+++ b/mullvad-masque-proxy/examples/masque-client.rs
@@ -36,6 +36,11 @@ pub struct ClientArgs {
 
 #[tokio::main]
 async fn main() {
+    env_logger::builder()
+        .filter_level(log::LevelFilter::Info)
+        .parse_default_env()
+        .init();
+
     let ClientArgs {
         server_addr,
         target_addr,
@@ -58,7 +63,8 @@ async fn main() {
         .await
         .expect("Failed to bind address");
     let local_addr = local_socket.local_addr().unwrap();
-    println!("Listening on {local_addr}");
+
+    log::info!("Listening on {local_addr}");
 
     let client = mullvad_masque_proxy::client::Client::connect_with_tls_config(
         local_socket,
@@ -71,9 +77,9 @@ async fn main() {
     )
     .await;
     if let Err(err) = &client {
-        println!("ERROR: {:?}", err);
+        log::error!("ERROR: {:?}", err);
         if let Error::Connection(err) = err {
-            println!("ERROR: {}", err);
+            log::error!("ERROR: {}", err);
         }
     }
     client
diff --git a/mullvad-masque-proxy/examples/masque-server.rs b/mullvad-masque-proxy/examples/masque-server.rs
index fe216070ef..560a750e0a 100644
--- a/mullvad-masque-proxy/examples/masque-server.rs
+++ b/mullvad-masque-proxy/examples/masque-server.rs
@@ -33,6 +33,11 @@ pub struct ServerArgs {
 
 #[tokio::main]
 async fn main() {
+    env_logger::builder()
+        .filter_level(log::LevelFilter::Info)
+        .parse_default_env()
+        .init();
+
     let args = ServerArgs::parse();
     let _keylog = rustls::KeyLogFile::new();
 
@@ -45,7 +50,7 @@ async fn main() {
         args.mtu,
     )
     .expect("Failed to initialize server");
-    println!("Listening on {}", args.bind_addr);
+    log::info!("Listening on {}", args.bind_addr);
     server.run().await.expect("Server failed.")
 }
 
diff --git a/mullvad-masque-proxy/src/client/mod.rs b/mullvad-masque-proxy/src/client/mod.rs
index a0041c17d2..5716d3b700 100644
--- a/mullvad-masque-proxy/src/client/mod.rs
+++ b/mullvad-masque-proxy/src/client/mod.rs
@@ -429,7 +429,7 @@ async fn client_socket_tx_task(
         }
 
         if response.stream_id() != stream_id {
-            // log::trace!("Received datagram with an unexpected stream ID");
+            log::debug!("Received datagram with an unexpected stream ID");
             continue;
         }
         let payload = response.into_payload();
diff --git a/mullvad-masque-proxy/src/fragment.rs b/mullvad-masque-proxy/src/fragment.rs
index 94aafad574..f6e648af9e 100644
--- a/mullvad-masque-proxy/src/fragment.rs
+++ b/mullvad-masque-proxy/src/fragment.rs
@@ -30,7 +30,6 @@ pub struct Fragments {
 #[derive(Debug, thiserror::Error)]
 pub enum DefragError {
     #[error("Bad context id: {:?}", .0)]
-    #[allow(dead_code)] // TODO: use this error or remove it.
     BadContextId(Result<VarInt, h3::proto::coding::UnexpectedEnd>),
 
     #[error("Payload is too small")]
@@ -82,7 +81,7 @@ impl Fragments {
         if self.fragment_index_fifo.len() >= FRAGMENT_BUFFER_CAP {
             let id = self.fragment_index_fifo.pop_front().expect("fifo is full");
             if self.fragment_map.remove(&id).is_some() && cfg!(debug_assertions) {
-                println!("Fragment was discarded before reassembly");
+                log::debug!("Fragment was discarded before reassembly");
             };
         }
         self.fragment_index_fifo.push_back(id);
@@ -119,7 +118,7 @@ impl Fragments {
             .any(|(expected_index, fragment)| fragment.index != expected_index);
         if fragments_missing {
             if cfg!(debug_assertions) {
-                println!("Discarding unordered fragment set");
+                log::debug!("Discarding unordered fragment set");
             }
             return None;
         }
diff --git a/mullvad-masque-proxy/src/server/mod.rs b/mullvad-masque-proxy/src/server/mod.rs
index 4644ff5215..7e73ad9bfa 100644
--- a/mullvad-masque-proxy/src/server/mod.rs
+++ b/mullvad-masque-proxy/src/server/mod.rs
@@ -111,7 +111,7 @@ impl Server {
     async fn handle_incoming_connection(connection: Incoming, allowed_hosts: AllowedIps, mtu: u16) {
         match connection.await {
             Ok(conn) => {
-                println!("new connection established");
+                log::debug!("new connection established");
 
                 let quinn_conn = conn.clone();
 
@@ -120,7 +120,7 @@ impl Server {
                     .build(h3_quinn::Connection::new(conn))
                     .await
                 else {
-                    println!("Failed to construct a new H3 server connection");
+                    log::error!("Failed to construct a new H3 server connection");
                     return;
                 };
 
@@ -140,12 +140,12 @@ impl Server {
                     Ok(None) => {}
 
                     Err(err) => {
-                        println!("error on accept {}", err);
+                        log::error!("error on accept {}", err);
                     }
                 }
             }
             Err(err) => {
-                println!("accepting connection failed: {:?}", err);
+                log::error!("accepting connection failed: {:?}", err);
             }
         }
     }
@@ -170,7 +170,7 @@ impl Server {
             return handle_failed_socket(stream).await;
         };
         if let Err(err) = udp_socket.connect(target_addr).await {
-            println!("Failed to set destination for UDP socket: {err}");
+            log::error!("Failed to set destination for UDP socket: {err}");
             return handle_failed_socket(stream).await;
         };
 
@@ -263,14 +263,14 @@ async fn proxy_tx_task(udp_socket: impl AsRef<UdpSocket>, mut client_rx: mpsc::R
         let packet = match fragments.handle_incoming_packet(quic_payload) {
             Ok(Some(packet)) => packet,
             Ok(None) => continue,
-            Err(_defrag_err) => {
-                // TODO: log::trace!()
+            Err(err) => {
+                log::trace!("Failed to reassemble incoming packet: {err}");
                 continue;
             }
         };
 
-        if let Err(_err) = udp_socket.send(&packet).await {
-            // TODO: log::trace!()
+        if let Err(err) = udp_socket.send(&packet).await {
+            log::trace!("Failed to forward packet to UDP socket {err}");
         }
     }
 }
@@ -297,7 +297,7 @@ async fn proxy_rx_task(
         let (_n, sender_addr) = match udp_socket.recv_buf_from(&mut proxy_recv_buf).await {
             Ok(recv) => recv,
             Err(err) => {
-                println!("Failed to receive packet from proxy socket: {err}");
+                log::error!("Failed to receive packet from proxy socket: {err}");
                 continue;
             }
         };
diff --git a/mullvad-masque-proxy/src/stats.rs b/mullvad-masque-proxy/src/stats.rs
index 412ddcc9bd..1e3bc6e20c 100644
--- a/mullvad-masque-proxy/src/stats.rs
+++ b/mullvad-masque-proxy/src/stats.rs
@@ -19,7 +19,7 @@ const ORD: Ordering = Ordering::Relaxed;
 
 impl Drop for Stats {
     fn drop(&mut self) {
-        println!("stats: {:?}", self);
+        log::debug!("stats: {:?}", self);
     }
 }