Use versioned TunnelKit
Also fixes issues with IPv4/UInt32 endianness.
This commit is contained in:
parent
bcd8032978
commit
64cbb9b4b2
|
@ -63,7 +63,7 @@ struct Pool: Codable, Comparable, CustomStringConvertible {
|
||||||
// XXX: inefficient, can't easily use lazy on struct
|
// XXX: inefficient, can't easily use lazy on struct
|
||||||
func addresses(sorted: Bool) -> [String] {
|
func addresses(sorted: Bool) -> [String] {
|
||||||
var addrs = (sorted ? numericAddresses.sorted() : numericAddresses).map {
|
var addrs = (sorted ? numericAddresses.sorted() : numericAddresses).map {
|
||||||
return DNSResolver.string(fromIPv4: $0.bigEndian)
|
return DNSResolver.string(fromIPv4: $0)
|
||||||
}
|
}
|
||||||
addrs.insert(hostname, at: 0)
|
addrs.insert(hostname, at: 0)
|
||||||
return addrs
|
return addrs
|
||||||
|
|
4
Podfile
4
Podfile
|
@ -2,8 +2,8 @@ source 'https://github.com/cocoapods/specs.git'
|
||||||
use_frameworks!
|
use_frameworks!
|
||||||
|
|
||||||
def shared_pods
|
def shared_pods
|
||||||
#pod 'TunnelKit', '~> 1.1.2'
|
pod 'TunnelKit', '~> 1.3.0'
|
||||||
pod 'TunnelKit', :git => 'https://github.com/keeshux/tunnelkit', :commit => '3447128'
|
#pod 'TunnelKit', :git => 'https://github.com/keeshux/tunnelkit', :commit => '9c989da'
|
||||||
#pod 'TunnelKit', :path => '../tunnelkit'
|
#pod 'TunnelKit', :path => '../tunnelkit'
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
15
Podfile.lock
15
Podfile.lock
|
@ -14,23 +14,14 @@ PODS:
|
||||||
|
|
||||||
DEPENDENCIES:
|
DEPENDENCIES:
|
||||||
- MBProgressHUD
|
- MBProgressHUD
|
||||||
- TunnelKit (from `https://github.com/keeshux/tunnelkit`, commit `3447128`)
|
- TunnelKit (~> 1.3.0)
|
||||||
|
|
||||||
SPEC REPOS:
|
SPEC REPOS:
|
||||||
https://github.com/cocoapods/specs.git:
|
https://github.com/cocoapods/specs.git:
|
||||||
- MBProgressHUD
|
- MBProgressHUD
|
||||||
- OpenSSL-Apple
|
- OpenSSL-Apple
|
||||||
- SwiftyBeaver
|
- SwiftyBeaver
|
||||||
|
- TunnelKit
|
||||||
EXTERNAL SOURCES:
|
|
||||||
TunnelKit:
|
|
||||||
:commit: '3447128'
|
|
||||||
:git: https://github.com/keeshux/tunnelkit
|
|
||||||
|
|
||||||
CHECKOUT OPTIONS:
|
|
||||||
TunnelKit:
|
|
||||||
:commit: '3447128'
|
|
||||||
:git: https://github.com/keeshux/tunnelkit
|
|
||||||
|
|
||||||
SPEC CHECKSUMS:
|
SPEC CHECKSUMS:
|
||||||
MBProgressHUD: e7baa36a220447d8aeb12769bf0585582f3866d9
|
MBProgressHUD: e7baa36a220447d8aeb12769bf0585582f3866d9
|
||||||
|
@ -38,6 +29,6 @@ SPEC CHECKSUMS:
|
||||||
SwiftyBeaver: ccfcdf85a04d429f1633f668650b0ce8020bda3a
|
SwiftyBeaver: ccfcdf85a04d429f1633f668650b0ce8020bda3a
|
||||||
TunnelKit: 8e747cac28959ebfdfa4eeab589c933f1856c0fb
|
TunnelKit: 8e747cac28959ebfdfa4eeab589c933f1856c0fb
|
||||||
|
|
||||||
PODFILE CHECKSUM: 2e3ddf964a7da5d6afc6d39c26218d9af992c770
|
PODFILE CHECKSUM: 6e8d763f62d6de73b2704ad87c725d3116d051df
|
||||||
|
|
||||||
COCOAPODS: 1.6.0.beta.2
|
COCOAPODS: 1.6.0.beta.2
|
||||||
|
|
Loading…
Reference in New Issue