From d2dd61cf0c18d2b55eb06367dbce566863fd1325 Mon Sep 17 00:00:00 2001 From: Jeroen Leenarts Date: Thu, 24 May 2018 06:21:46 +0200 Subject: [PATCH] Add wg-quick related model properties. Signed-off-by: Jason A. Donenfeld --- Wireguard.xcodeproj/project.pbxproj | 8 +++++ Wireguard/Models/Address+CoreDataClass.swift | 16 ++++++++++ .../Models/Address+CoreDataProperties.swift | 22 ++++++++++++++ .../Models/Interface+CoreDataProperties.swift | 30 ++++++++++++++++--- .../Models/Profile+CoreDataProperties.swift | 1 - .../Wireguard.xcdatamodel/contents | 13 ++++++-- 6 files changed, 83 insertions(+), 7 deletions(-) create mode 100644 Wireguard/Models/Address+CoreDataClass.swift create mode 100644 Wireguard/Models/Address+CoreDataProperties.swift diff --git a/Wireguard.xcodeproj/project.pbxproj b/Wireguard.xcodeproj/project.pbxproj index b93ea62..a60624c 100644 --- a/Wireguard.xcodeproj/project.pbxproj +++ b/Wireguard.xcodeproj/project.pbxproj @@ -25,6 +25,8 @@ 4A4BAD2120B6026900F12B28 /* Peer+CoreDataClass.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4A4BAD1D20B6026900F12B28 /* Peer+CoreDataClass.swift */; }; 4A4BAD2220B6026900F12B28 /* Interface+CoreDataProperties.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4A4BAD1E20B6026900F12B28 /* Interface+CoreDataProperties.swift */; }; 4A4BAD2320B6026900F12B28 /* Interface+CoreDataClass.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4A4BAD1F20B6026900F12B28 /* Interface+CoreDataClass.swift */; }; + 4A7F6EDD20B674CD00B260B7 /* Address+CoreDataClass.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4A7F6EDB20B674CD00B260B7 /* Address+CoreDataClass.swift */; }; + 4A7F6EDE20B674CD00B260B7 /* Address+CoreDataProperties.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4A7F6EDC20B674CD00B260B7 /* Address+CoreDataProperties.swift */; }; DA734B3636730B94E9C22F47 /* Pods_Wireguard.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8BF50C7EC60CD91BBA05E51F /* Pods_Wireguard.framework */; }; /* End PBXBuildFile section */ @@ -61,6 +63,8 @@ 4A4BAD1D20B6026900F12B28 /* Peer+CoreDataClass.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = "Peer+CoreDataClass.swift"; path = "/Users/jeroenleenarts/code/wireguard-ios/Wireguard/Models/Peer+CoreDataClass.swift"; sourceTree = ""; }; 4A4BAD1E20B6026900F12B28 /* Interface+CoreDataProperties.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = "Interface+CoreDataProperties.swift"; path = "/Users/jeroenleenarts/code/wireguard-ios/Wireguard/Models/Interface+CoreDataProperties.swift"; sourceTree = ""; }; 4A4BAD1F20B6026900F12B28 /* Interface+CoreDataClass.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = "Interface+CoreDataClass.swift"; path = "/Users/jeroenleenarts/code/wireguard-ios/Wireguard/Models/Interface+CoreDataClass.swift"; sourceTree = ""; }; + 4A7F6EDB20B674CD00B260B7 /* Address+CoreDataClass.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Address+CoreDataClass.swift"; sourceTree = ""; }; + 4A7F6EDC20B674CD00B260B7 /* Address+CoreDataProperties.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Address+CoreDataProperties.swift"; sourceTree = ""; }; 82069F3AE97A82448F990CFB /* Pods-Wireguard.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Wireguard.debug.xcconfig"; path = "Pods/Target Support Files/Pods-Wireguard/Pods-Wireguard.debug.xcconfig"; sourceTree = ""; }; 8BF50C7EC60CD91BBA05E51F /* Pods_Wireguard.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Wireguard.framework; sourceTree = BUILT_PRODUCTS_DIR; }; FB0ABC1036F5A16B24286D3C /* Pods-Wireguard.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Wireguard.release.xcconfig"; path = "Pods/Target Support Files/Pods-Wireguard/Pods-Wireguard.release.xcconfig"; sourceTree = ""; }; @@ -160,6 +164,8 @@ 4A4BAD1420B5F8C000F12B28 /* Models */ = { isa = PBXGroup; children = ( + 4A7F6EDB20B674CD00B260B7 /* Address+CoreDataClass.swift */, + 4A7F6EDC20B674CD00B260B7 /* Address+CoreDataProperties.swift */, 4A4BAD1D20B6026900F12B28 /* Peer+CoreDataClass.swift */, 4A4BAD1C20B6026900F12B28 /* Peer+CoreDataProperties.swift */, 4A4BAD1F20B6026900F12B28 /* Interface+CoreDataClass.swift */, @@ -379,6 +385,7 @@ files = ( 4A4BAD0C20B5F6AA00F12B28 /* AppCoordinator.swift in Sources */, 4A4BAD2220B6026900F12B28 /* Interface+CoreDataProperties.swift in Sources */, + 4A7F6EDE20B674CD00B260B7 /* Address+CoreDataProperties.swift in Sources */, 4A4BAD1320B5F82400F12B28 /* Identifyable.swift in Sources */, 4A4BAD1720B5F8DE00F12B28 /* Wireguard.xcdatamodeld in Sources */, 4A4BAD1A20B5F8FF00F12B28 /* Profile+CoreDataClass.swift in Sources */, @@ -387,6 +394,7 @@ 4A4BAD0E20B5F6C300F12B28 /* Coordinator.swift in Sources */, 4A4BAD2020B6026900F12B28 /* Peer+CoreDataProperties.swift in Sources */, 4A4BAD2320B6026900F12B28 /* Interface+CoreDataClass.swift in Sources */, + 4A7F6EDD20B674CD00B260B7 /* Address+CoreDataClass.swift in Sources */, 4A4BAD2120B6026900F12B28 /* Peer+CoreDataClass.swift in Sources */, 4A4BAD1B20B5F8FF00F12B28 /* Profile+CoreDataProperties.swift in Sources */, 4A4BACE620B5F1BF00F12B28 /* AppDelegate.swift in Sources */, diff --git a/Wireguard/Models/Address+CoreDataClass.swift b/Wireguard/Models/Address+CoreDataClass.swift new file mode 100644 index 0000000..15dfa47 --- /dev/null +++ b/Wireguard/Models/Address+CoreDataClass.swift @@ -0,0 +1,16 @@ +// +// Address+CoreDataClass.swift +// Wireguard +// +// Created by Jeroen Leenarts on 24-05-18. +// Copyright © 2018 Wireguard. All rights reserved. +// +// + +import Foundation +import CoreData + +@objc(Address) +public class Address: NSManagedObject { + +} diff --git a/Wireguard/Models/Address+CoreDataProperties.swift b/Wireguard/Models/Address+CoreDataProperties.swift new file mode 100644 index 0000000..35c09a9 --- /dev/null +++ b/Wireguard/Models/Address+CoreDataProperties.swift @@ -0,0 +1,22 @@ +// +// Address+CoreDataProperties.swift +// Wireguard +// +// Created by Jeroen Leenarts on 24-05-18. +// Copyright © 2018 Wireguard. All rights reserved. +// +// + +import Foundation +import CoreData + +extension Address { + + @nonobjc public class func fetchRequest() -> NSFetchRequest
{ + return NSFetchRequest
(entityName: "Address") + } + + @NSManaged public var address: String? + @NSManaged public var interface: Interface? + +} diff --git a/Wireguard/Models/Interface+CoreDataProperties.swift b/Wireguard/Models/Interface+CoreDataProperties.swift index 3372838..af1de0a 100644 --- a/Wireguard/Models/Interface+CoreDataProperties.swift +++ b/Wireguard/Models/Interface+CoreDataProperties.swift @@ -1,8 +1,9 @@ // // Interface+CoreDataProperties.swift -// +// Wireguard // -// Created by Jeroen Leenarts on 23-05-18. +// Created by Jeroen Leenarts on 24-05-18. +// Copyright © 2018 Wireguard. All rights reserved. // // @@ -15,9 +16,30 @@ extension Interface { return NSFetchRequest(entityName: "Interface") } - @NSManaged public var privateKey: String? - @NSManaged public var listenPort: Int16 @NSManaged public var fwMark: Int32 + @NSManaged public var listenPort: Int16 + @NSManaged public var privateKey: String? + @NSManaged public var mtu: Int32 + @NSManaged public var dns: String? + @NSManaged public var table: String? @NSManaged public var profile: Profile? + @NSManaged public var adresses: NSSet? + +} + +// MARK: Generated accessors for adresses +extension Interface { + + @objc(addAdressesObject:) + @NSManaged public func addToAdresses(_ value: Address) + + @objc(removeAdressesObject:) + @NSManaged public func removeFromAdresses(_ value: Address) + + @objc(addAdresses:) + @NSManaged public func addToAdresses(_ values: NSSet) + + @objc(removeAdresses:) + @NSManaged public func removeFromAdresses(_ values: NSSet) } diff --git a/Wireguard/Models/Profile+CoreDataProperties.swift b/Wireguard/Models/Profile+CoreDataProperties.swift index 8f8fb9a..91ed2b4 100644 --- a/Wireguard/Models/Profile+CoreDataProperties.swift +++ b/Wireguard/Models/Profile+CoreDataProperties.swift @@ -10,7 +10,6 @@ import Foundation import CoreData - extension Profile { @nonobjc public class func fetchRequest() -> NSFetchRequest { diff --git a/Wireguard/Models/Wireguard.xcdatamodeld/Wireguard.xcdatamodel/contents b/Wireguard/Models/Wireguard.xcdatamodeld/Wireguard.xcdatamodel/contents index 2aefa8d..ef81718 100644 --- a/Wireguard/Models/Wireguard.xcdatamodeld/Wireguard.xcdatamodel/contents +++ b/Wireguard/Models/Wireguard.xcdatamodeld/Wireguard.xcdatamodel/contents @@ -1,9 +1,17 @@ + + + + + + + + @@ -20,8 +28,9 @@ - - + + + \ No newline at end of file