ShockVPN/wireguard-apple
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ConfTextStorage: Let's keep the AllowedIPs and DNS servers as strings

Browse Source 
Signed-off-by: Roopesh Chander <roop@roopc.net>
This commit is contained in:
Roopesh Chander
2019-02-16 00:31:28 +05:30
parent 2fb9d6af71
commit 4c88f477a2
1 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
WireGuard/WireGuard/UI/macOS/View/ConfTextStorage.swift
+4 -8
View File
@@ -17,8 +17,8 @@ class ConfTextStorage: NSTextStorage {
private(set) var privateKeyString: String? private(set) var privateKeyString: String?
private(set) var hasOnePeer: Bool = false private(set) var hasOnePeer: Bool = false
private(set) var lastOnePeerAllowedIPs: [IPAddressRange] = [] private(set) var lastOnePeerAllowedIPs = [String]()
private(set) var lastOnePeerDNSServers: [DNSServer] = [] private(set) var lastOnePeerDNSServers = [String]()
override init() { override init() {
backingStore = NSMutableAttributedString(string: "") backingStore = NSMutableAttributedString(string: "")
@@ -117,9 +117,7 @@ class ConfTextStorage: NSTextStorage {
} else if span.type == HighlightField { } else if span.type == HighlightField {
fieldType = FieldType(rawValue: substring.lowercased()) fieldType = FieldType(rawValue: substring.lowercased())
} else if span.type == HighlightIP && fieldType == .dns { } else if span.type == HighlightIP && fieldType == .dns {
if let parsed = DNSServer(from: substring) { lastOnePeerDNSServers.append(substring)
lastOnePeerDNSServers.append(parsed)
}
} else if span.type == HighlightIP && fieldType == .allowedips { } else if span.type == HighlightIP && fieldType == .allowedips {
let next = spans.successor() let next = spans.successor()
let nextnext = next.successor() let nextnext = next.successor()
@@ -127,9 +125,7 @@ class ConfTextStorage: NSTextStorage {
substring += backingStore.attributedSubstring(from: NSRange(location: next.pointee.start, length: next.pointee.len)).string + substring += backingStore.attributedSubstring(from: NSRange(location: next.pointee.start, length: next.pointee.len)).string +
backingStore.attributedSubstring(from: NSRange(location: nextnext.pointee.start, length: nextnext.pointee.len)).string backingStore.attributedSubstring(from: NSRange(location: nextnext.pointee.start, length: nextnext.pointee.len)).string
} }
if let parsed = IPAddressRange(from: substring) { lastOnePeerAllowedIPs.append(substring)
lastOnePeerAllowedIPs.append(parsed)
}
} }
spans = spans.successor() spans = spans.successor()
} }