diff options
| author | Andrej Mihajlov <and@mullvad.net> | 2020-07-09 11:23:06 +0200 |
|---|---|---|
| committer | Andrej Mihajlov <and@mullvad.net> | 2020-07-15 14:33:00 +0200 |
| commit | 4d58b52832a127c9bdf6fae7124e7f67abaa0bc2 (patch) | |
| tree | 541990a53b6b8f6cba7b7831bc05dda09d546849 | |
| parent | e5fe5e4bcac9904fcaa21892cdb5d243295a4295 (diff) | |
| download | mullvadvpn-4d58b52832a127c9bdf6fae7124e7f67abaa0bc2.tar.xz mullvadvpn-4d58b52832a127c9bdf6fae7124e7f67abaa0bc2.zip | |
Rename tunnelConfiguration -> tunnelSettings
| -rw-r--r-- | ios/PacketTunnel/PacketTunnelProvider.swift | 2 | ||||
| -rw-r--r-- | ios/PacketTunnel/PacketTunnelSettingsGenerator.swift | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/ios/PacketTunnel/PacketTunnelProvider.swift b/ios/PacketTunnel/PacketTunnelProvider.swift index ecd0d7c32c..c30171e999 100644 --- a/ios/PacketTunnel/PacketTunnelProvider.swift +++ b/ios/PacketTunnel/PacketTunnelProvider.swift @@ -382,7 +382,7 @@ class PacketTunnelProvider: NEPacketTunnelProvider { private func updateNetworkSettings(packetTunnelConfig: PacketTunnelConfiguration, completionHandler: @escaping (Result<(), PacketTunnelProviderError>) -> Void) { let settingsGenerator = PacketTunnelSettingsGenerator( mullvadEndpoint: packetTunnelConfig.selectorResult.endpoint, - tunnelConfiguration: packetTunnelConfig.tunnelSettings + tunnelSettings: packetTunnelConfig.tunnelSettings ) setTunnelNetworkSettings(settingsGenerator.networkSettings()) { (error) in diff --git a/ios/PacketTunnel/PacketTunnelSettingsGenerator.swift b/ios/PacketTunnel/PacketTunnelSettingsGenerator.swift index 2bcc3b2518..b91c7bc326 100644 --- a/ios/PacketTunnel/PacketTunnelSettingsGenerator.swift +++ b/ios/PacketTunnel/PacketTunnelSettingsGenerator.swift @@ -13,7 +13,7 @@ import os struct PacketTunnelSettingsGenerator { let mullvadEndpoint: MullvadEndpoint - let tunnelConfiguration: TunnelSettings + let tunnelSettings: TunnelSettings func networkSettings() -> NEPacketTunnelNetworkSettings { let tunnelRemoteAddress = "\(mullvadEndpoint.ipv4Relay.ip)" @@ -40,7 +40,7 @@ struct PacketTunnelSettingsGenerator { } private func ipv4Settings() -> NEIPv4Settings { - let interfaceAddresses = tunnelConfiguration.interface.addresses + let interfaceAddresses = tunnelSettings.interface.addresses let ipv4AddressRanges = interfaceAddresses.filter { $0.address is IPv4Address } let ipv4Settings = NEIPv4Settings( @@ -55,7 +55,7 @@ struct PacketTunnelSettingsGenerator { } private func ipv6Settings() -> NEIPv6Settings { - let interfaceAddresses = tunnelConfiguration.interface.addresses + let interfaceAddresses = tunnelSettings.interface.addresses let ipv6AddressRanges = interfaceAddresses.filter { $0.address is IPv6Address } let addresses = ipv6AddressRanges.map { "\($0.address)" } |
