summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorEmīls <emils@mullvad.net>2023-11-22 11:05:17 +0100
committerEmīls <emils@mullvad.net>2023-11-22 11:05:17 +0100
commit285cf6fbfbfeadbfba01f3735edcd7710e713b9d (patch)
tree81bfb0733b4165fdbf0e488b3df68d0e09178e66
parent6dc527e0d7aa50202730d829f1774a299dd7f704 (diff)
parent6cd825bf9369670711ac612599b23809f22e3acc (diff)
downloadmullvadvpn-285cf6fbfbfeadbfba01f3735edcd7710e713b9d.tar.xz
mullvadvpn-285cf6fbfbfeadbfba01f3735edcd7710e713b9d.zip
Merge branch 'fix-blocked-state-leaks'
-rw-r--r--ios/PacketTunnelCore/Actor/PacketTunnelActor+ErrorState.swift12
1 files changed, 11 insertions, 1 deletions
diff --git a/ios/PacketTunnelCore/Actor/PacketTunnelActor+ErrorState.swift b/ios/PacketTunnelCore/Actor/PacketTunnelActor+ErrorState.swift
index 71afd7cdfd..077bfdbb25 100644
--- a/ios/PacketTunnelCore/Actor/PacketTunnelActor+ErrorState.swift
+++ b/ios/PacketTunnelCore/Actor/PacketTunnelActor+ErrorState.swift
@@ -7,6 +7,8 @@
//
import Foundation
+import MullvadTypes
+import Network
import WireGuardKitTypes
extension PacketTunnelActor {
@@ -114,7 +116,15 @@ extension PacketTunnelActor {
privateKey: PrivateKey(),
interfaceAddresses: []
)
- try await tunnelAdapter.start(configuration: configurationBuilder.makeConfiguration())
+ var config = try configurationBuilder.makeConfiguration()
+ config.dns = [IPv4Address.loopback]
+ config.interfaceAddresses = [IPAddressRange(from: "10.64.0.1/8")!]
+ config.peer = TunnelPeer(
+ endpoint: .ipv4(IPv4Endpoint(string: "127.0.0.1:9090")!),
+ publicKey: PrivateKey().publicKey
+ )
+ try? await tunnelAdapter.stop()
+ try await tunnelAdapter.start(configuration: config)
} catch {
logger.error(error: error, message: "Unable to configure the tunnel for error state.")
}