passepartoutvpn
/
tunnelkit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Handle IPv4/IPv6 variants in SocketType

This commit is contained in:
Davide De Rosa 2020-02-29 22:47:51 +01:00
parent c7595ed295
commit 6f235e9ea2
3 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
TunnelKit/Sources/Core/SocketType.swift
View File

@ -33,4 +33,16 @@ public enum SocketType: String {
/// TCP socket type. /// TCP socket type.
case tcp = "TCP" case tcp = "TCP"
/// UDP socket type (IPv4).
case udp4 = "UDP4"
/// TCP socket type (IPv4).
case tcp4 = "TCP4"
/// UDP socket type (IPv6).
case udp6 = "UDP6"
/// TCP socket type (IPv6).
case tcp6 = "TCP6"
} }

4
TunnelKit/Sources/Protocols/OpenVPN/AppExtension/ConnectionStrategy.swift
View File

@ -156,11 +156,11 @@ private extension NEProvider {
func createSocket(to address: String, protocol endpointProtocol: EndpointProtocol) -> GenericSocket { func createSocket(to address: String, protocol endpointProtocol: EndpointProtocol) -> GenericSocket {
let endpoint = NWHostEndpoint(hostname: address, port: "\(endpointProtocol.port)") let endpoint = NWHostEndpoint(hostname: address, port: "\(endpointProtocol.port)")
switch endpointProtocol.socketType { switch endpointProtocol.socketType {
case .udp: case .udp, .udp4, .udp6:
let impl = createUDPSession(to: endpoint, from: nil) let impl = createUDPSession(to: endpoint, from: nil)
return NEUDPSocket(impl: impl) return NEUDPSocket(impl: impl)
case .tcp: case .tcp, .tcp4, .tcp6:
let impl = createTCPConnection(to: endpoint, enableTLS: false, tlsParameters: nil, delegate: nil) let impl = createTCPConnection(to: endpoint, enableTLS: false, tlsParameters: nil, delegate: nil)
return NETCPSocket(impl: impl) return NETCPSocket(impl: impl)
} }

10
TunnelKit/Sources/Protocols/OpenVPN/ConfigurationParser.swift
View File

@ -62,11 +62,11 @@ extension OpenVPN {
// MARK: Client // MARK: Client
static let proto = NSRegularExpression("^proto +(udp6?|tcp6?)") static let proto = NSRegularExpression("^proto +(udp[46]?|tcp[46]?)")
static let port = NSRegularExpression("^port +\\d+") static let port = NSRegularExpression("^port +\\d+")
static let remote = NSRegularExpression("^remote +[^ ]+( +\\d+)?( +(udp6?|tcp6?))?") static let remote = NSRegularExpression("^remote +[^ ]+( +\\d+)?( +(udp[46]?|tcp[46]?))?")
static let eku = NSRegularExpression("^remote-cert-tls +server") static let eku = NSRegularExpression("^remote-cert-tls +server")
@ -817,10 +817,6 @@ private extension String {
private extension SocketType { private extension SocketType {
init?(protoString: String) { init?(protoString: String) {
var str = protoString self.init(rawValue: protoString.uppercased())
if str.hasSuffix("6") {
str.removeLast()
}
self.init(rawValue: str.uppercased())
} }
} }