diff options
| author | David Lönnhager <david.l@mullvad.net> | 2025-09-18 17:22:18 +0200 |
|---|---|---|
| committer | David Lönnhager <david.l@mullvad.net> | 2025-09-18 17:22:18 +0200 |
| commit | c072667ffed6b4b698cec5a4a8adff00be88c3e5 (patch) | |
| tree | c1fe4b5354c23e939f97577ef7aadaf6eab5731e /android/lib | |
| parent | 923414f3f00b033dde8ed538ad05c18da4da6b27 (diff) | |
| parent | a074cb8e3625d5378c0be7954b1f5423479d071c (diff) | |
| download | mullvadvpn-c072667ffed6b4b698cec5a4a8adff00be88c3e5.tar.xz mullvadvpn-c072667ffed6b4b698cec5a4a8adff00be88c3e5.zip | |
Merge branch 'add-staggered-obfuscator'
Diffstat (limited to 'android/lib')
| -rw-r--r-- | android/lib/daemon-grpc/src/main/kotlin/net/mullvad/mullvadvpn/lib/daemon/grpc/mapper/ToDomain.kt | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/android/lib/daemon-grpc/src/main/kotlin/net/mullvad/mullvadvpn/lib/daemon/grpc/mapper/ToDomain.kt b/android/lib/daemon-grpc/src/main/kotlin/net/mullvad/mullvadvpn/lib/daemon/grpc/mapper/ToDomain.kt index 7889d1ea2d..4601995d78 100644 --- a/android/lib/daemon-grpc/src/main/kotlin/net/mullvad/mullvadvpn/lib/daemon/grpc/mapper/ToDomain.kt +++ b/android/lib/daemon-grpc/src/main/kotlin/net/mullvad/mullvadvpn/lib/daemon/grpc/mapper/ToDomain.kt @@ -193,8 +193,8 @@ internal fun ManagementInterface.TunnelEndpoint.toDomain(): TunnelEndpoint = }, quantumResistant = quantumResistant, obfuscation = - if (hasObfuscation()) { - obfuscation.toDomain() + if (hasObfuscation() && obfuscation.hasSingle()) { + obfuscation.single.toDomain() } else { null }, @@ -204,7 +204,10 @@ internal fun ManagementInterface.TunnelEndpoint.toDomain(): TunnelEndpoint = internal fun ManagementInterface.ObfuscationEndpoint.toDomain(): ObfuscationEndpoint = ObfuscationEndpoint( endpoint = - Endpoint(address = InetSocketAddress(address, port), protocol = protocol.toDomain()), + Endpoint( + address = endpoint.address.toInetSocketAddress(), + protocol = endpoint.protocol.toDomain(), + ), obfuscationType = obfuscationType.toDomain(), ) |