From 64cbb9b4b2df300727af832f8cb394efde8388bb Mon Sep 17 00:00:00 2001 From: Davide De Rosa Date: Sun, 28 Oct 2018 00:36:46 +0200 Subject: [PATCH] Use versioned TunnelKit Also fixes issues with IPv4/UInt32 endianness. --- Passepartout/Sources/Services/Pool.swift | 2 +- Podfile | 4 ++-- Podfile.lock | 15 +++------------ 3 files changed, 6 insertions(+), 15 deletions(-) diff --git a/Passepartout/Sources/Services/Pool.swift b/Passepartout/Sources/Services/Pool.swift index 004b3778..d7d42ad3 100644 --- a/Passepartout/Sources/Services/Pool.swift +++ b/Passepartout/Sources/Services/Pool.swift @@ -63,7 +63,7 @@ struct Pool: Codable, Comparable, CustomStringConvertible { // XXX: inefficient, can't easily use lazy on struct func addresses(sorted: Bool) -> [String] { var addrs = (sorted ? numericAddresses.sorted() : numericAddresses).map { - return DNSResolver.string(fromIPv4: $0.bigEndian) + return DNSResolver.string(fromIPv4: $0) } addrs.insert(hostname, at: 0) return addrs diff --git a/Podfile b/Podfile index 2a13ad2c..53e221e0 100644 --- a/Podfile +++ b/Podfile @@ -2,8 +2,8 @@ source 'https://github.com/cocoapods/specs.git' use_frameworks! def shared_pods - #pod 'TunnelKit', '~> 1.1.2' - pod 'TunnelKit', :git => 'https://github.com/keeshux/tunnelkit', :commit => '3447128' + pod 'TunnelKit', '~> 1.3.0' + #pod 'TunnelKit', :git => 'https://github.com/keeshux/tunnelkit', :commit => '9c989da' #pod 'TunnelKit', :path => '../tunnelkit' end diff --git a/Podfile.lock b/Podfile.lock index 2ec00efb..2cbaf279 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -14,23 +14,14 @@ PODS: DEPENDENCIES: - MBProgressHUD - - TunnelKit (from `https://github.com/keeshux/tunnelkit`, commit `3447128`) + - TunnelKit (~> 1.3.0) SPEC REPOS: https://github.com/cocoapods/specs.git: - MBProgressHUD - OpenSSL-Apple - SwiftyBeaver - -EXTERNAL SOURCES: - TunnelKit: - :commit: '3447128' - :git: https://github.com/keeshux/tunnelkit - -CHECKOUT OPTIONS: - TunnelKit: - :commit: '3447128' - :git: https://github.com/keeshux/tunnelkit + - TunnelKit SPEC CHECKSUMS: MBProgressHUD: e7baa36a220447d8aeb12769bf0585582f3866d9 @@ -38,6 +29,6 @@ SPEC CHECKSUMS: SwiftyBeaver: ccfcdf85a04d429f1633f668650b0ce8020bda3a TunnelKit: 8e747cac28959ebfdfa4eeab589c933f1856c0fb -PODFILE CHECKSUM: 2e3ddf964a7da5d6afc6d39c26218d9af992c770 +PODFILE CHECKSUM: 6e8d763f62d6de73b2704ad87c725d3116d051df COCOAPODS: 1.6.0.beta.2