Add explicit clear mtu

mullvad · May 15, 2024 · 72dcfc8 · 72dcfc8
1 parent 197f501
commit 72dcfc8
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/repository/SettingsRepository.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/repository/SettingsRepository.kt
@@ -54,7 +54,7 @@ class SettingsRepository(
 
     suspend fun setWireguardMtu(mtu: Mtu) = managementService.setWireguardMtu(mtu.value)
 
-    suspend fun clearWireguardMtu() = managementService.setWireguardMtu(null)
+    suspend fun clearWireguardMtu() = managementService.clearWireguardMtu()
 
     suspend fun setWireguardQuantumResistant(value: QuantumResistantState) =
         managementService.setWireguardQuantumResistant(value)

diff --git a/...b/daemon-grpc/src/main/kotlin/net/mullvad/mullvadvpn/lib/daemon/grpc/ManagementService.kt b/...b/daemon-grpc/src/main/kotlin/net/mullvad/mullvadvpn/lib/daemon/grpc/ManagementService.kt
@@ -9,6 +9,7 @@ import arrow.optics.typeclasses.Index
 import com.google.protobuf.BoolValue
 import com.google.protobuf.Empty
 import com.google.protobuf.StringValue
+import com.google.protobuf.UInt32Value
 import io.grpc.ConnectivityState
 import io.grpc.Status
 import io.grpc.StatusException
@@ -353,8 +354,13 @@ class ManagementService(
             .mapLeft(SetDnsOptionsError::Unknown)
             .mapEmpty()
 
-    suspend fun setWireguardMtu(value: Int?): Either<SetWireguardMtuError, Unit> =
-        Either.catch { grpc.setWireguardMtu(value.fromDomain()) }
+    suspend fun setWireguardMtu(value: Int): Either<SetWireguardMtuError, Unit> =
+        Either.catch { grpc.setWireguardMtu(UInt32Value.of(value)) }
+            .mapLeft(SetWireguardMtuError::Unknown)
+            .mapEmpty()
+
+    suspend fun clearWireguardMtu(): Either<SetWireguardMtuError, Unit> =
+        Either.catch { grpc.setWireguardMtu(UInt32Value.newBuilder().clearValue().build()) }
             .mapLeft(SetWireguardMtuError::Unknown)
             .mapEmpty()