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

Move malformed error out of unrelated SessionError 

Also give more detail about the reason.
This commit is contained in:
Davide De Rosa 2019-04-03 12:10:58 +02:00
parent 42232804ca
commit f9ae3412a5
3 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
TunnelKit/Sources/Core/OptionsBundle.swift
View File

@ -190,7 +190,6 @@ public struct OptionsBundle {
var optIfconfig4Arguments: [String]? var optIfconfig4Arguments: [String]?
var optIfconfig6Arguments: [String]? var optIfconfig6Arguments: [String]?
var optGateway4Arguments: [String]? var optGateway4Arguments: [String]?
var optGateway6Arguments: [String]?
var optRoutes4: [(String, String, String?)] = [] // address, netmask, gateway var optRoutes4: [(String, String, String?)] = [] // address, netmask, gateway
var optRoutes6: [(String, UInt8, String?)] = [] // destination, prefix, gateway var optRoutes6: [(String, UInt8, String?)] = [] // destination, prefix, gateway
var optDNSServers: [String] = [] var optDNSServers: [String] = []
@ -560,7 +559,7 @@ public struct OptionsBundle {
// //
if let ifconfig4Arguments = optIfconfig4Arguments { if let ifconfig4Arguments = optIfconfig4Arguments {
guard ifconfig4Arguments.count == 2 else { guard ifconfig4Arguments.count == 2 else {
throw SessionError.malformedPushReply throw OptionsError.malformed(option: "ifconfig takes 2 arguments")
} }
let address4: String let address4: String
@ -573,7 +572,7 @@ public struct OptionsBundle {
// default gateway required when topology is subnet // default gateway required when topology is subnet
guard let gateway4Arguments = optGateway4Arguments, gateway4Arguments.count == 1 else { guard let gateway4Arguments = optGateway4Arguments, gateway4Arguments.count == 1 else {
throw SessionError.malformedPushReply throw OptionsError.malformed(option: "route-gateway takes 1 argument")
} }
address4 = ifconfig4Arguments[0] address4 = ifconfig4Arguments[0]
addressMask4 = ifconfig4Arguments[1] addressMask4 = ifconfig4Arguments[1]
@ -598,14 +597,14 @@ public struct OptionsBundle {
if let ifconfig6Arguments = optIfconfig6Arguments { if let ifconfig6Arguments = optIfconfig6Arguments {
guard ifconfig6Arguments.count == 2 else { guard ifconfig6Arguments.count == 2 else {
throw SessionError.malformedPushReply throw OptionsError.malformed(option: "ifconfig-ipv6 takes 2 arguments")
} }
let address6Components = ifconfig6Arguments[0].components(separatedBy: "/") let address6Components = ifconfig6Arguments[0].components(separatedBy: "/")
guard address6Components.count == 2 else { guard address6Components.count == 2 else {
throw SessionError.malformedPushReply throw OptionsError.malformed(option: "ifconfig-ipv6 address must have a /prefix")
} }
guard let addressPrefix6 = UInt8(address6Components[1]) else { guard let addressPrefix6 = UInt8(address6Components[1]) else {
throw SessionError.malformedPushReply throw OptionsError.malformed(option: "ifconfig-ipv6 address prefix must be a 8-bit number")
} }
let address6 = address6Components[0] let address6 = address6Components[0]

3
TunnelKit/Sources/Core/OptionsError.swift
View File

@ -28,6 +28,9 @@ import Foundation
/// Error raised by the options parser, with details about the line that triggered it. /// Error raised by the options parser, with details about the line that triggered it.
public enum OptionsError: Error { public enum OptionsError: Error {
/// Option syntax is incorrect.
case malformed(option: String)
/// The file misses a required option. /// The file misses a required option.
case missingConfiguration(option: String) case missingConfiguration(option: String)

3
TunnelKit/Sources/Core/SessionError.swift
View File

@ -59,9 +59,6 @@ public enum SessionError: String, Error {
/// The provided credentials failed authentication. /// The provided credentials failed authentication.
case badCredentials case badCredentials
/// The reply to PUSH_REQUEST is malformed.
case malformedPushReply
/// A write operation failed at the link layer (e.g. network unreachable). /// A write operation failed at the link layer (e.g. network unreachable).
case failedLinkWrite case failedLinkWrite