diff options
| author | Emīls <emils@mullvad.net> | 2023-05-25 18:44:18 +0200 |
|---|---|---|
| committer | Emīls <emils@mullvad.net> | 2023-05-25 18:44:18 +0200 |
| commit | ddcbfe5bda6fc9a8ad62428c36d2185bad4004e2 (patch) | |
| tree | 5323b0e144e713337950da512e908ed830b1cbad /ios/PacketTunnel | |
| parent | 0fdb7df2dd774256380b468e634a9166fcab10a6 (diff) | |
| parent | 314a88b56eef1ee847bf25ebe2beab828eae16b0 (diff) | |
| download | mullvadvpn-ddcbfe5bda6fc9a8ad62428c36d2185bad4004e2.tar.xz mullvadvpn-ddcbfe5bda6fc9a8ad62428c36d2185bad4004e2.zip | |
Merge branch 'specify-api-endpoint-to-the-proxy-ios-138'
Diffstat (limited to 'ios/PacketTunnel')
| -rw-r--r-- | ios/PacketTunnel/PacketTunnelProvider.swift | 3 | ||||
| -rw-r--r-- | ios/PacketTunnel/TunnelTransportProvider.swift | 7 |
2 files changed, 7 insertions, 3 deletions
diff --git a/ios/PacketTunnel/PacketTunnelProvider.swift b/ios/PacketTunnel/PacketTunnelProvider.swift index bca20bfed9..d58b4e0e51 100644 --- a/ios/PacketTunnel/PacketTunnelProvider.swift +++ b/ios/PacketTunnel/PacketTunnelProvider.swift @@ -154,7 +154,8 @@ class PacketTunnelProvider: NEPacketTunnelProvider, TunnelMonitorDelegate { let urlSessionTransport = REST.URLSessionTransport(urlSession: urlSession) let transportProvider = TunnelTransportProvider( urlSessionTransport: urlSessionTransport, - relayCache: relayCache + relayCache: relayCache, + addressCache: addressCache ) let proxyFactory = REST.ProxyFactory.makeProxyFactory( diff --git a/ios/PacketTunnel/TunnelTransportProvider.swift b/ios/PacketTunnel/TunnelTransportProvider.swift index a0f7e275ff..417f6904ff 100644 --- a/ios/PacketTunnel/TunnelTransportProvider.swift +++ b/ios/PacketTunnel/TunnelTransportProvider.swift @@ -16,10 +16,12 @@ final class TunnelTransportProvider: RESTTransportProvider { private let urlSessionTransport: REST.URLSessionTransport private let relayCache: RelayCache private let logger = Logger(label: "TunnelTransportProvider") + private let addressCache: REST.AddressCache - init(urlSessionTransport: REST.URLSessionTransport, relayCache: RelayCache) { + init(urlSessionTransport: REST.URLSessionTransport, relayCache: RelayCache, addressCache: REST.AddressCache) { self.urlSessionTransport = urlSessionTransport self.relayCache = relayCache + self.addressCache = addressCache } func transport() -> MullvadREST.RESTTransport? { @@ -43,7 +45,8 @@ final class TunnelTransportProvider: RESTTransportProvider { let shadowSocksTransport = REST.URLSessionShadowSocksTransport( urlSession: shadowSocksURLSession, shadowSocksConfiguration: shadowSocksConfiguration, - shadowSocksBridgeRelay: shadowSocksBridgeRelay + shadowSocksBridgeRelay: shadowSocksBridgeRelay, + addressCache: addressCache ) return shadowSocksTransport |