From e00a7f60ce2b875a2e0cb6b293b4c171169696a2 Mon Sep 17 00:00:00 2001 From: Davide De Rosa Date: Mon, 25 Mar 2019 10:34:57 +0100 Subject: [PATCH] Update TunnelKit for --remote-random --- .../Sources/Services/InfrastructurePreset.swift | 4 ++++ Podfile | 4 ++-- Podfile.lock | 10 +++++----- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/Passepartout/Sources/Services/InfrastructurePreset.swift b/Passepartout/Sources/Services/InfrastructurePreset.swift index 7848a7cc..4c8b44d3 100644 --- a/Passepartout/Sources/Services/InfrastructurePreset.swift +++ b/Passepartout/Sources/Services/InfrastructurePreset.swift @@ -60,6 +60,8 @@ public struct InfrastructurePreset: Codable { case renegotiatesAfterSeconds = "reneg" case usesPIAPatches = "pia" + + case randomizeEndpoint = "random" } public let id: String @@ -96,6 +98,7 @@ public struct InfrastructurePreset: Codable { sessionBuilder.keepAliveInterval = try cfgContainer.decodeIfPresent(TimeInterval.self, forKey: .keepAliveSeconds) sessionBuilder.renegotiatesAfter = try cfgContainer.decodeIfPresent(TimeInterval.self, forKey: .renegotiatesAfterSeconds) sessionBuilder.usesPIAPatches = try cfgContainer.decodeIfPresent(Bool.self, forKey: .usesPIAPatches) ?? false + sessionBuilder.randomizeEndpoint = try cfgContainer.decodeIfPresent(Bool.self, forKey: .randomizeEndpoint) ?? false var builder = TunnelKitProvider.ConfigurationBuilder(sessionConfiguration: sessionBuilder.build()) builder.endpointProtocols = try cfgContainer.decode([EndpointProtocol].self, forKey: .endpointProtocols) @@ -120,5 +123,6 @@ public struct InfrastructurePreset: Codable { try cfgContainer.encodeIfPresent(configuration.sessionConfiguration.keepAliveInterval, forKey: .keepAliveSeconds) try cfgContainer.encodeIfPresent(configuration.sessionConfiguration.renegotiatesAfter, forKey: .renegotiatesAfterSeconds) try cfgContainer.encodeIfPresent(configuration.sessionConfiguration.usesPIAPatches, forKey: .usesPIAPatches) + try cfgContainer.encodeIfPresent(configuration.sessionConfiguration.randomizeEndpoint, forKey: .randomizeEndpoint) } } diff --git a/Podfile b/Podfile index 86f931ba..162bd1ba 100644 --- a/Podfile +++ b/Podfile @@ -5,8 +5,8 @@ use_frameworks! def shared_pods #pod 'TunnelKit', '~> 1.5.0' #pod 'TunnelKit/LZO', '~> 1.5.0' - pod 'TunnelKit', :git => 'https://github.com/keeshux/tunnelkit', :commit => '04fbbb1' - pod 'TunnelKit/LZO', :git => 'https://github.com/keeshux/tunnelkit', :commit => '04fbbb1' + pod 'TunnelKit', :git => 'https://github.com/keeshux/tunnelkit', :commit => '17b7aee' + pod 'TunnelKit/LZO', :git => 'https://github.com/keeshux/tunnelkit', :commit => '17b7aee' #pod 'TunnelKit', :path => '../../personal/tunnelkit' #pod 'TunnelKit/LZO', :path => '../../personal/tunnelkit' end diff --git a/Podfile.lock b/Podfile.lock index aed9a0a7..36752ce9 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -15,8 +15,8 @@ PODS: DEPENDENCIES: - MBProgressHUD - - TunnelKit (from `https://github.com/keeshux/tunnelkit`, commit `04fbbb1`) - - TunnelKit/LZO (from `https://github.com/keeshux/tunnelkit`, commit `04fbbb1`) + - TunnelKit (from `https://github.com/keeshux/tunnelkit`, commit `17b7aee`) + - TunnelKit/LZO (from `https://github.com/keeshux/tunnelkit`, commit `17b7aee`) SPEC REPOS: https://github.com/cocoapods/specs.git: @@ -26,12 +26,12 @@ SPEC REPOS: EXTERNAL SOURCES: TunnelKit: - :commit: 04fbbb1 + :commit: 17b7aee :git: https://github.com/keeshux/tunnelkit CHECKOUT OPTIONS: TunnelKit: - :commit: 04fbbb1 + :commit: 17b7aee :git: https://github.com/keeshux/tunnelkit SPEC CHECKSUMS: @@ -40,6 +40,6 @@ SPEC CHECKSUMS: SwiftyBeaver: 8e67ab3cd94389cbbb7a9c7cc02748d98bfee68e TunnelKit: fb4db4d4c4b36af0ca8e973e3345a1c3ef5ac85c -PODFILE CHECKSUM: 1b84c62ece95cae765c64491d65dab9333db2381 +PODFILE CHECKSUM: 082d690f87529388ee247f4f651b2fd1b69659bd COCOAPODS: 1.6.1