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

Model: listenPort and persistentKeepAlive should be 16-bit integers

This commit is contained in:
Roopesh Chander 2018-10-23 15:51:19 +05:30
parent 0fa97c38ed
commit c8fa6850c2
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
WireGuard/WireGuard/Model/Configuration.swift
View File

@ -22,7 +22,7 @@ struct InterfaceConfiguration: Codable {
var name: String
var privateKey: Data
var addresses: [IPAddressRange] = []
var listenPort: UInt64? = nil
var listenPort: UInt16? = nil
var mtu: UInt64? = nil
var dns: String? = nil
@ -46,7 +46,7 @@ struct PeerConfiguration: Codable {
}
var allowedIPs: [IPAddressRange] = []
var endpoint: Endpoint?
var persistentKeepAlive: UInt64?
var persistentKeepAlive: UInt16?
init(publicKey: Data) {
self.publicKey = publicKey

8
WireGuard/WireGuard/UI/TunnelViewModel.swift
View File

@ -109,11 +109,11 @@ class TunnelViewModel {
config.addresses = addresses
}
if let listenPortString = scratchpad[.listenPort] {
if let listenPort = UInt64(listenPortString) {
if let listenPort = UInt16(listenPortString) {
config.listenPort = listenPort
} else {
fieldsWithError.insert(.listenPort)
errorMessages.append("Interface's listen port should be a number")
errorMessages.append("Interface's listen port should be a 16-bit integer (0 to 65535)")
}
}
if let mtuString = scratchpad[.mtu] {
@ -231,11 +231,11 @@ class TunnelViewModel {
}
}
if let persistentKeepAliveString = scratchpad[.persistentKeepAlive] {
if let persistentKeepAlive = UInt64(persistentKeepAliveString) {
if let persistentKeepAlive = UInt16(persistentKeepAliveString) {
config.persistentKeepAlive = persistentKeepAlive
} else {
fieldsWithError.insert(.persistentKeepAlive)
errorMessages.append("Peer's persistent keepalive should be a number")
errorMessages.append("Peer's persistent keepalive should be a 16-bit integer (0 to 65535)")
}
}