macOS: set MTU on config sync (#715)

Author: moubctez

src-tauri/src/app_config.rs

@@ -72,7 +72,7 @@ pub struct AppConfig {
     /// In seconds. How much time after last network activity the connection is automatically dropped.
     pub peer_alive_period: u32,
     /// Maximal transmission unit. 0 means default value.
-    pub mtu: u32,
+    mtu: u32,
 }
 
 // Important: keep in sync with client store default in frontend
@@ -138,7 +138,7 @@ impl AppConfig {
     /// ambiguity when applying updates coming from the frontend. An incoming MTU value of 0 is
     /// interpreted as a request to fall back to the default.
     #[must_use]
-    pub fn get_mtu(&self) -> Option<u32> {
+    pub fn mtu(&self) -> Option<u32> {
         match self.mtu {
             0 => None,
             v => Some(v),

src-tauri/src/apple.rs

@@ -925,12 +925,12 @@ pub(crate) fn tunnel_stats(id: Id, connection_type: &ConnectionType) -> Option<S
 }
 
 /// Synchronize locations and tunnels with system settings.
-pub async fn sync_locations_and_tunnels() -> Result<(), sqlx::Error> {
+pub async fn sync_locations_and_tunnels(mtu: Option<u32>) -> Result<(), sqlx::Error> {
     // Update location settings.
     let all_locations = Location::all(&*DB_POOL, false).await?;
     for location in &all_locations {
-        // For syncing, set `preshred_key` and `mtu` to `None`.
-        let Ok(tunnel_config) = location.tunnel_configurarion(&*DB_POOL, None, None).await else {
+        // For syncing, set `preshred_key` to `None`.
+        let Ok(tunnel_config) = location.tunnel_configurarion(&*DB_POOL, None, mtu).await else {
             error!(
                 "Failed to convert location {} to tunnel configuration.",
                 location.name
@@ -943,8 +943,7 @@ pub async fn sync_locations_and_tunnels() -> Result<(), sqlx::Error> {
     // Update tunnel settings.
     let all_tunnels = Tunnel::all(&*DB_POOL).await?;
     for tunnel in &all_tunnels {
-        // For syncing, set `mtu` to `None`.
-        let Ok(tunnel_config) = tunnel.tunnel_configurarion(None) else {
+        let Ok(tunnel_config) = tunnel.tunnel_configurarion(mtu) else {
             error!(
                 "Failed to convert tunnel {} to tunnel configuration.",
                 tunnel.name

src-tauri/src/bin/defguard-client.rs

@@ -90,8 +90,15 @@ async fn startup(app_handle: &AppHandle) {
         let semaphore = Arc::new(AtomicBool::new(false));
         let semaphore_clone = Arc::clone(&semaphore);
 
+        // Retrieve MTU from `AppConfig`.
+        let app_state = app_handle.state::<AppState>();
+        let mtu = app_state
+            .app_config
+            .lock()
+            .expect("failed to lock app state")
+            .mtu();
         let handle = tauri::async_runtime::spawn(async move {
-            if let Err(err) = defguard_client::apple::sync_locations_and_tunnels().await {
+            if let Err(err) = defguard_client::apple::sync_locations_and_tunnels(mtu).await {
                 error!("Failed to sync locations and tunnels: {err}");
             }
             semaphore_clone.store(true, Ordering::Release);

src-tauri/src/utils.rs

@@ -676,7 +676,11 @@ pub(crate) async fn handle_connection_for_location(
 ) -> Result<(), Error> {
     debug!("Setting up the connection for location {}", location.name);
     let state = handle.state::<AppState>();
-    let mtu = state.app_config.lock().unwrap().get_mtu();
+    let mtu = state
+        .app_config
+        .lock()
+        .expect("failed to lock app state")
+        .mtu();
     let interface_name =
         setup_interface(location, &location.name, preshared_key, mtu, &DB_POOL).await?;
     state
@@ -709,7 +713,11 @@ pub(crate) async fn handle_connection_for_tunnel(
 ) -> Result<(), Error> {
     debug!("Setting up the connection for tunnel: {}", tunnel.name);
     let state = handle.state::<AppState>();
-    let mtu = state.app_config.lock().unwrap().get_mtu();
+    let mtu = state
+        .app_config
+        .lock()
+        .expect("failed to lock app state")
+        .mtu();
     let interface_name = setup_interface_tunnel(tunnel, &tunnel.name, mtu).await?;
     state
         .add_connection(tunnel.id, &interface_name, ConnectionType::Tunnel)