passepartoutvpn
/
passepartout-apple
mirror of https://github.com/passepartoutvpn/passepartout-apple.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update TunnelKit to fix IPv4 endianness 

Hopefully once and for all!
This commit is contained in:
Davide De Rosa 2018-11-05 20:30:06 +01:00
parent 66cfab678b
commit aa6af8acb3
3 changed files with 22 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Passepartout/Sources/Services/Pool.swift
View File

@ -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: UInt32(bigEndian: $0)) return DNSResolver.string(fromIPv4: $0)
} }
addrs.insert(hostname, at: 0) addrs.insert(hostname, at: 0)
return addrs return addrs

6
Podfile
View File

@ -2,9 +2,9 @@ source 'https://github.com/cocoapods/specs.git'
use_frameworks! use_frameworks!
def shared_pods def shared_pods
pod 'TunnelKit', '~> 1.3.0' #pod 'TunnelKit', '~> 1.3.0'
#pod 'TunnelKit', :git => 'https://github.com/keeshux/tunnelkit', :commit => '9c989da' pod 'TunnelKit', :git => 'https://github.com/keeshux/tunnelkit', :commit => 'caea662'
#pod 'TunnelKit', :path => '../tunnelkit' #pod 'TunnelKit', :path => '../../personal/tunnelkit'
end end
target 'Passepartout-iOS' do target 'Passepartout-iOS' do

27
Podfile.lock
View File

@ -2,33 +2,42 @@ PODS:
- MBProgressHUD (1.1.0) - MBProgressHUD (1.1.0)
- OpenSSL-Apple (1.1.0i-v2) - OpenSSL-Apple (1.1.0i-v2)
- SwiftyBeaver (1.6.1) - SwiftyBeaver (1.6.1)
- TunnelKit (1.3.0): - TunnelKit (1.3.1):
- TunnelKit/AppExtension (= 1.3.0) - TunnelKit/AppExtension (= 1.3.1)
- TunnelKit/Core (= 1.3.0) - TunnelKit/Core (= 1.3.1)
- TunnelKit/AppExtension (1.3.0): - TunnelKit/AppExtension (1.3.1):
- SwiftyBeaver - SwiftyBeaver
- TunnelKit/Core - TunnelKit/Core
- TunnelKit/Core (1.3.0): - TunnelKit/Core (1.3.1):
- OpenSSL-Apple (~> 1.1.0h) - OpenSSL-Apple (~> 1.1.0h)
- SwiftyBeaver - SwiftyBeaver
DEPENDENCIES: DEPENDENCIES:
- MBProgressHUD - MBProgressHUD
- TunnelKit (~> 1.3.0) - TunnelKit (from `https://github.com/keeshux/tunnelkit`, commit `caea662`)
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: caea662
:git: https://github.com/keeshux/tunnelkit
CHECKOUT OPTIONS:
TunnelKit:
:commit: caea662
:git: https://github.com/keeshux/tunnelkit
SPEC CHECKSUMS: SPEC CHECKSUMS:
MBProgressHUD: e7baa36a220447d8aeb12769bf0585582f3866d9 MBProgressHUD: e7baa36a220447d8aeb12769bf0585582f3866d9
OpenSSL-Apple: a93b8f2eec8783ff40d9a9304de180ab68bb647c OpenSSL-Apple: a93b8f2eec8783ff40d9a9304de180ab68bb647c
SwiftyBeaver: ccfcdf85a04d429f1633f668650b0ce8020bda3a SwiftyBeaver: ccfcdf85a04d429f1633f668650b0ce8020bda3a
TunnelKit: 8e747cac28959ebfdfa4eeab589c933f1856c0fb TunnelKit: f98fb7d88642eda94c42007dbc501903c469a891
PODFILE CHECKSUM: 6e8d763f62d6de73b2704ad87c725d3116d051df PODFILE CHECKSUM: a86923e57746e09e04296a49bdc0ad3520fd700f
COCOAPODS: 1.6.0.beta.2 COCOAPODS: 1.6.0.beta.2