diff --git a/OpenVPNAdapter.xcodeproj/project.pbxproj b/OpenVPNAdapter.xcodeproj/project.pbxproj index a32be30..3ba2eff 100644 --- a/OpenVPNAdapter.xcodeproj/project.pbxproj +++ b/OpenVPNAdapter.xcodeproj/project.pbxproj @@ -8,6 +8,7 @@ /* Begin PBXBuildFile section */ C910EAE524EBB1DA0081AF13 /* OpenVPNReachabilityTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = C97E5FD624123F48005C2EBC /* OpenVPNReachabilityTests.swift */; }; + C910EAE724EBB5210081AF13 /* OpenVPNConfigurationEvaluation.h in Headers */ = {isa = PBXBuildFile; fileRef = C910EAE624EBB5210081AF13 /* OpenVPNConfigurationEvaluation.h */; settings = {ATTRIBUTES = (Public, ); }; }; C97E5F6E24122F12005C2EBC /* NSArray+OpenVPNAdditions.h in Headers */ = {isa = PBXBuildFile; fileRef = C97E5F6D24122F12005C2EBC /* NSArray+OpenVPNAdditions.h */; }; C97E5F7024122F22005C2EBC /* NSError+OpenVPNError.h in Headers */ = {isa = PBXBuildFile; fileRef = C97E5F6F24122F22005C2EBC /* NSError+OpenVPNError.h */; }; C97E5F7224122F5C005C2EBC /* OpenVPNClient.h in Headers */ = {isa = PBXBuildFile; fileRef = C97E5F7124122F5C005C2EBC /* OpenVPNClient.h */; }; @@ -32,8 +33,8 @@ C97E5F98241230F7005C2EBC /* OpenVPNPacket.h in Headers */ = {isa = PBXBuildFile; fileRef = C97E5F97241230F7005C2EBC /* OpenVPNPacket.h */; }; C97E5F9A24123135005C2EBC /* OpenVPNPacketFlowBridge.h in Headers */ = {isa = PBXBuildFile; fileRef = C97E5F9924123135005C2EBC /* OpenVPNPacketFlowBridge.h */; }; C97E5F9C2412313F005C2EBC /* OpenVPNPrivateKey.h in Headers */ = {isa = PBXBuildFile; fileRef = C97E5F9B2412313F005C2EBC /* OpenVPNPrivateKey.h */; }; - C97E5F9E2412314A005C2EBC /* OpenVPNProperties.h in Headers */ = {isa = PBXBuildFile; fileRef = C97E5F9D24123149005C2EBC /* OpenVPNProperties.h */; }; - C97E5FA024123152005C2EBC /* OpenVPNProperties+Internal.h in Headers */ = {isa = PBXBuildFile; fileRef = C97E5F9F24123151005C2EBC /* OpenVPNProperties+Internal.h */; }; + C97E5F9E2412314A005C2EBC /* OpenVPNConfigurationEvaluation.h in Headers */ = {isa = PBXBuildFile; fileRef = C97E5F9D24123149005C2EBC /* OpenVPNConfigurationEvaluation.h */; }; + C97E5FA024123152005C2EBC /* OpenVPNConfigurationEvaluation+Internal.h in Headers */ = {isa = PBXBuildFile; fileRef = C97E5F9F24123151005C2EBC /* OpenVPNConfigurationEvaluation+Internal.h */; }; C97E5FA22412315D005C2EBC /* OpenVPNReachability.h in Headers */ = {isa = PBXBuildFile; fileRef = C97E5FA12412315C005C2EBC /* OpenVPNReachability.h */; }; C97E5FA424123168005C2EBC /* OpenVPNReachability+Internal.h in Headers */ = {isa = PBXBuildFile; fileRef = C97E5FA324123168005C2EBC /* OpenVPNReachability+Internal.h */; }; C97E5FA62412317B005C2EBC /* OpenVPNReachabilityStatus.h in Headers */ = {isa = PBXBuildFile; fileRef = C97E5FA52412317B005C2EBC /* OpenVPNReachabilityStatus.h */; }; @@ -74,7 +75,7 @@ OBJ_271 /* OpenVPNPacket.mm in Sources */ = {isa = PBXBuildFile; fileRef = OBJ_39 /* OpenVPNPacket.mm */; }; OBJ_272 /* OpenVPNPacketFlowBridge.mm in Sources */ = {isa = PBXBuildFile; fileRef = OBJ_40 /* OpenVPNPacketFlowBridge.mm */; }; OBJ_273 /* OpenVPNPrivateKey.m in Sources */ = {isa = PBXBuildFile; fileRef = OBJ_41 /* OpenVPNPrivateKey.m */; }; - OBJ_274 /* OpenVPNProperties.mm in Sources */ = {isa = PBXBuildFile; fileRef = OBJ_42 /* OpenVPNProperties.mm */; }; + OBJ_274 /* OpenVPNConfigurationEvaluation.mm in Sources */ = {isa = PBXBuildFile; fileRef = OBJ_42 /* OpenVPNConfigurationEvaluation.mm */; }; OBJ_275 /* OpenVPNReachability.mm in Sources */ = {isa = PBXBuildFile; fileRef = OBJ_43 /* OpenVPNReachability.mm */; }; OBJ_276 /* OpenVPNReachabilityTracker.mm in Sources */ = {isa = PBXBuildFile; fileRef = OBJ_44 /* OpenVPNReachabilityTracker.mm */; }; OBJ_277 /* OpenVPNServerEntry.mm in Sources */ = {isa = PBXBuildFile; fileRef = OBJ_45 /* OpenVPNServerEntry.mm */; }; @@ -88,7 +89,6 @@ OBJ_286 /* OpenVPNTLSCertProfile.h in Headers */ = {isa = PBXBuildFile; fileRef = OBJ_54 /* OpenVPNTLSCertProfile.h */; settings = {ATTRIBUTES = (Public, ); }; }; OBJ_287 /* OpenVPNPrivateKey.h in Headers */ = {isa = PBXBuildFile; fileRef = OBJ_55 /* OpenVPNPrivateKey.h */; settings = {ATTRIBUTES = (Public, ); }; }; OBJ_288 /* OpenVPNInterfaceStats.h in Headers */ = {isa = PBXBuildFile; fileRef = OBJ_56 /* OpenVPNInterfaceStats.h */; settings = {ATTRIBUTES = (Public, ); }; }; - OBJ_289 /* OpenVPNProperties.h in Headers */ = {isa = PBXBuildFile; fileRef = OBJ_57 /* OpenVPNProperties.h */; settings = {ATTRIBUTES = (Public, ); }; }; OBJ_290 /* OpenVPNReachability.h in Headers */ = {isa = PBXBuildFile; fileRef = OBJ_58 /* OpenVPNReachability.h */; settings = {ATTRIBUTES = (Public, ); }; }; OBJ_291 /* OpenVPNIPv6Preference.h in Headers */ = {isa = PBXBuildFile; fileRef = OBJ_59 /* OpenVPNIPv6Preference.h */; settings = {ATTRIBUTES = (Public, ); }; }; OBJ_292 /* OpenVPNAdapterPacketFlow.h in Headers */ = {isa = PBXBuildFile; fileRef = OBJ_60 /* OpenVPNAdapterPacketFlow.h */; settings = {ATTRIBUTES = (Public, ); }; }; @@ -226,6 +226,7 @@ /* End PBXContainerItemProxy section */ /* Begin PBXFileReference section */ + C910EAE624EBB5210081AF13 /* OpenVPNConfigurationEvaluation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OpenVPNConfigurationEvaluation.h; sourceTree = ""; }; C97E5F6D24122F12005C2EBC /* NSArray+OpenVPNAdditions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSArray+OpenVPNAdditions.h"; sourceTree = ""; }; C97E5F6F24122F22005C2EBC /* NSError+OpenVPNError.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSError+OpenVPNError.h"; sourceTree = ""; }; C97E5F7124122F5C005C2EBC /* OpenVPNClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OpenVPNClient.h; sourceTree = ""; }; @@ -250,8 +251,8 @@ C97E5F97241230F7005C2EBC /* OpenVPNPacket.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OpenVPNPacket.h; sourceTree = ""; }; C97E5F9924123135005C2EBC /* OpenVPNPacketFlowBridge.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OpenVPNPacketFlowBridge.h; sourceTree = ""; }; C97E5F9B2412313F005C2EBC /* OpenVPNPrivateKey.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OpenVPNPrivateKey.h; sourceTree = ""; }; - C97E5F9D24123149005C2EBC /* OpenVPNProperties.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OpenVPNProperties.h; sourceTree = ""; }; - C97E5F9F24123151005C2EBC /* OpenVPNProperties+Internal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "OpenVPNProperties+Internal.h"; sourceTree = ""; }; + C97E5F9D24123149005C2EBC /* OpenVPNConfigurationEvaluation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OpenVPNConfigurationEvaluation.h; sourceTree = ""; }; + C97E5F9F24123151005C2EBC /* OpenVPNConfigurationEvaluation+Internal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "OpenVPNConfigurationEvaluation+Internal.h"; sourceTree = ""; }; C97E5FA12412315C005C2EBC /* OpenVPNReachability.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OpenVPNReachability.h; sourceTree = ""; }; C97E5FA324123168005C2EBC /* OpenVPNReachability+Internal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "OpenVPNReachability+Internal.h"; sourceTree = ""; }; C97E5FA52412317B005C2EBC /* OpenVPNReachabilityStatus.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OpenVPNReachabilityStatus.h; sourceTree = ""; }; @@ -432,7 +433,7 @@ OBJ_39 /* OpenVPNPacket.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = OpenVPNPacket.mm; sourceTree = ""; }; OBJ_40 /* OpenVPNPacketFlowBridge.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = OpenVPNPacketFlowBridge.mm; sourceTree = ""; }; OBJ_41 /* OpenVPNPrivateKey.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = OpenVPNPrivateKey.m; sourceTree = ""; }; - OBJ_42 /* OpenVPNProperties.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = OpenVPNProperties.mm; sourceTree = ""; }; + OBJ_42 /* OpenVPNConfigurationEvaluation.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = OpenVPNConfigurationEvaluation.mm; sourceTree = ""; }; OBJ_43 /* OpenVPNReachability.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = OpenVPNReachability.mm; sourceTree = ""; }; OBJ_44 /* OpenVPNReachabilityTracker.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = OpenVPNReachabilityTracker.mm; sourceTree = ""; }; OBJ_45 /* OpenVPNServerEntry.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = OpenVPNServerEntry.mm; sourceTree = ""; }; @@ -446,7 +447,6 @@ OBJ_54 /* OpenVPNTLSCertProfile.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = OpenVPNTLSCertProfile.h; sourceTree = ""; }; OBJ_55 /* OpenVPNPrivateKey.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = OpenVPNPrivateKey.h; sourceTree = ""; }; OBJ_56 /* OpenVPNInterfaceStats.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = OpenVPNInterfaceStats.h; sourceTree = ""; }; - OBJ_57 /* OpenVPNProperties.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = OpenVPNProperties.h; sourceTree = ""; }; OBJ_58 /* OpenVPNReachability.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = OpenVPNReachability.h; sourceTree = ""; }; OBJ_59 /* OpenVPNIPv6Preference.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = OpenVPNIPv6Preference.h; sourceTree = ""; }; OBJ_60 /* OpenVPNAdapterPacketFlow.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = OpenVPNAdapterPacketFlow.h; sourceTree = ""; }; @@ -747,9 +747,9 @@ OBJ_40 /* OpenVPNPacketFlowBridge.mm */, C97E5F9B2412313F005C2EBC /* OpenVPNPrivateKey.h */, OBJ_41 /* OpenVPNPrivateKey.m */, - C97E5F9D24123149005C2EBC /* OpenVPNProperties.h */, - C97E5F9F24123151005C2EBC /* OpenVPNProperties+Internal.h */, - OBJ_42 /* OpenVPNProperties.mm */, + C97E5F9D24123149005C2EBC /* OpenVPNConfigurationEvaluation.h */, + C97E5F9F24123151005C2EBC /* OpenVPNConfigurationEvaluation+Internal.h */, + OBJ_42 /* OpenVPNConfigurationEvaluation.mm */, C97E5FA12412315C005C2EBC /* OpenVPNReachability.h */, C97E5FA324123168005C2EBC /* OpenVPNReachability+Internal.h */, OBJ_43 /* OpenVPNReachability.mm */, @@ -779,7 +779,7 @@ OBJ_54 /* OpenVPNTLSCertProfile.h */, OBJ_55 /* OpenVPNPrivateKey.h */, OBJ_56 /* OpenVPNInterfaceStats.h */, - OBJ_57 /* OpenVPNProperties.h */, + C910EAE624EBB5210081AF13 /* OpenVPNConfigurationEvaluation.h */, OBJ_58 /* OpenVPNReachability.h */, OBJ_59 /* OpenVPNIPv6Preference.h */, OBJ_60 /* OpenVPNAdapterPacketFlow.h */, @@ -975,12 +975,11 @@ C97E5F6E24122F12005C2EBC /* NSArray+OpenVPNAdditions.h in Headers */, OBJ_286 /* OpenVPNTLSCertProfile.h in Headers */, C97E5FAE241231B3005C2EBC /* OpenVPNSessionToken.h in Headers */, - C97E5F9E2412314A005C2EBC /* OpenVPNProperties.h in Headers */, + C97E5F9E2412314A005C2EBC /* OpenVPNConfigurationEvaluation.h in Headers */, C97E5FA62412317B005C2EBC /* OpenVPNReachabilityStatus.h in Headers */, OBJ_287 /* OpenVPNPrivateKey.h in Headers */, C97E5F7424122FE6005C2EBC /* OpenVPNAdapter.h in Headers */, OBJ_288 /* OpenVPNInterfaceStats.h in Headers */, - OBJ_289 /* OpenVPNProperties.h in Headers */, OBJ_290 /* OpenVPNReachability.h in Headers */, OBJ_291 /* OpenVPNIPv6Preference.h in Headers */, C97E5F8C24123091005C2EBC /* OpenVPNInterfaceStats.h in Headers */, @@ -988,7 +987,7 @@ C97E5F92241230C6005C2EBC /* OpenVPNKeyType.h in Headers */, C97E5F94241230D9005C2EBC /* OpenVPNMinTLSVersion.h in Headers */, C97E5F7E24123046005C2EBC /* OpenVPNConfiguration.h in Headers */, - C97E5FA024123152005C2EBC /* OpenVPNProperties+Internal.h in Headers */, + C97E5FA024123152005C2EBC /* OpenVPNConfigurationEvaluation+Internal.h in Headers */, C97E5FB2241231DA005C2EBC /* OpenVPNTLSCertProfile.h in Headers */, OBJ_292 /* OpenVPNAdapterPacketFlow.h in Headers */, C97E5FA824123186005C2EBC /* OpenVPNReachabilityTracker.h in Headers */, @@ -1010,6 +1009,7 @@ OBJ_301 /* OpenVPNSessionToken.h in Headers */, C97E5FA424123168005C2EBC /* OpenVPNReachability+Internal.h in Headers */, OBJ_302 /* OpenVPNCertificate.h in Headers */, + C910EAE724EBB5210081AF13 /* OpenVPNConfigurationEvaluation.h in Headers */, C97E5FAC241231AA005C2EBC /* OpenVPNServerEntry+Internal.h in Headers */, C97E5F90241230B3005C2EBC /* OpenVPNIPv6Preference.h in Headers */, C97E5FE624124B0E005C2EBC /* Umbrella-Header.h in Headers */, @@ -1196,7 +1196,7 @@ OBJ_271 /* OpenVPNPacket.mm in Sources */, OBJ_272 /* OpenVPNPacketFlowBridge.mm in Sources */, OBJ_273 /* OpenVPNPrivateKey.m in Sources */, - OBJ_274 /* OpenVPNProperties.mm in Sources */, + OBJ_274 /* OpenVPNConfigurationEvaluation.mm in Sources */, OBJ_275 /* OpenVPNReachability.mm in Sources */, OBJ_276 /* OpenVPNReachabilityTracker.mm in Sources */, OBJ_277 /* OpenVPNServerEntry.mm in Sources */, diff --git a/Sources/OpenVPNAdapter/Umbrella-Header.h b/Sources/OpenVPNAdapter/Umbrella-Header.h index f195964..e30ed5a 100644 --- a/Sources/OpenVPNAdapter/Umbrella-Header.h +++ b/Sources/OpenVPNAdapter/Umbrella-Header.h @@ -26,7 +26,7 @@ FOUNDATION_EXPORT const unsigned char OpenVPNAdapterVersionString[]; #import #import #import -#import +#import #import #import #import diff --git a/Sources/OpenVPNAdapter/include/OpenVPNConfigurationEvaluation.h b/Sources/OpenVPNAdapter/include/OpenVPNConfigurationEvaluation.h new file mode 120000 index 0000000..e026ba8 --- /dev/null +++ b/Sources/OpenVPNAdapter/include/OpenVPNConfigurationEvaluation.h @@ -0,0 +1 @@ +../library/OpenVPNConfigurationEvaluation.h \ No newline at end of file diff --git a/Sources/OpenVPNAdapter/include/OpenVPNProperties.h b/Sources/OpenVPNAdapter/include/OpenVPNProperties.h deleted file mode 120000 index 6bc19ad..0000000 --- a/Sources/OpenVPNAdapter/include/OpenVPNProperties.h +++ /dev/null @@ -1 +0,0 @@ -../library/OpenVPNProperties.h \ No newline at end of file diff --git a/Sources/OpenVPNAdapter/library/OpenVPNAdapter.h b/Sources/OpenVPNAdapter/library/OpenVPNAdapter.h index 70b007b..e99f1dd 100644 --- a/Sources/OpenVPNAdapter/library/OpenVPNAdapter.h +++ b/Sources/OpenVPNAdapter/library/OpenVPNAdapter.h @@ -22,7 +22,7 @@ typedef NS_ENUM(NSInteger, OpenVPNAdapterEvent); @class OpenVPNConnectionInfo; @class OpenVPNCredentials; @class OpenVPNInterfaceStats; -@class OpenVPNProperties; +@class OpenVPNConfigurationEvaluation; @class OpenVPNTransportStats; @class OpenVPNSessionToken; @@ -134,7 +134,7 @@ NS_SWIFT_NAME(openVPNAdapter(_:handleEvent:message:)); @param error If there is an error applying the configuration, upon return contains an error object that describes the problem. @return A properties object describing the configuration which has been applied. */ -- (nullable OpenVPNProperties *)applyConfiguration:(OpenVPNConfiguration *)configuration +- (nullable OpenVPNConfigurationEvaluation *)applyConfiguration:(OpenVPNConfiguration *)configuration error:(NSError **)error NS_SWIFT_NAME(apply(configuration:)); diff --git a/Sources/OpenVPNAdapter/library/OpenVPNAdapter.mm b/Sources/OpenVPNAdapter/library/OpenVPNAdapter.mm index 44bc498..9925d11 100644 --- a/Sources/OpenVPNAdapter/library/OpenVPNAdapter.mm +++ b/Sources/OpenVPNAdapter/library/OpenVPNAdapter.mm @@ -24,7 +24,7 @@ #import "OpenVPNConfiguration+Internal.h" #import "OpenVPNConnectionInfo+Internal.h" #import "OpenVPNInterfaceStats+Internal.h" -#import "OpenVPNProperties+Internal.h" +#import "OpenVPNConfigurationEvaluation+Internal.h" #import "OpenVPNSessionToken+Internal.h" #import "OpenVPNTransportStats+Internal.h" #import "NSError+OpenVPNError.h" @@ -50,7 +50,7 @@ #pragma mark - OpenVPNClient Lifecycle -- (OpenVPNProperties *)applyConfiguration:(OpenVPNConfiguration *)configuration error:(NSError * __autoreleasing *)error { +- (OpenVPNConfigurationEvaluation *)applyConfiguration:(OpenVPNConfiguration *)configuration error:(NSError * __autoreleasing *)error { ClientAPI::EvalConfig eval = self.vpnClient->apply_config(configuration.config); if (eval.error) { @@ -65,7 +65,7 @@ return nil; } - return [[OpenVPNProperties alloc] initWithEvalConfig:eval]; + return [[OpenVPNConfigurationEvaluation alloc] initWithEvalConfig:eval]; } - (BOOL)provideCredentials:(OpenVPNCredentials *)credentials error:(NSError * __autoreleasing *)error { diff --git a/Sources/OpenVPNAdapter/library/OpenVPNProperties+Internal.h b/Sources/OpenVPNAdapter/library/OpenVPNConfigurationEvaluation+Internal.h similarity index 58% rename from Sources/OpenVPNAdapter/library/OpenVPNProperties+Internal.h rename to Sources/OpenVPNAdapter/library/OpenVPNConfigurationEvaluation+Internal.h index 6757da9..f2496a4 100644 --- a/Sources/OpenVPNAdapter/library/OpenVPNProperties+Internal.h +++ b/Sources/OpenVPNAdapter/library/OpenVPNConfigurationEvaluation+Internal.h @@ -1,18 +1,18 @@ // -// OpenVPNProperties+Internal.h +// OpenVPNConfigurationEvaluation+Internal.h // OpenVPN Adapter // // Created by Sergey Abramchuk on 26.04.17. // // -#import "OpenVPNProperties.h" +#import "OpenVPNConfigurationEvaluation.h" #include using namespace openvpn; -@interface OpenVPNProperties (Internal) +@interface OpenVPNConfigurationEvaluation (Internal) - (instancetype)initWithEvalConfig:(ClientAPI::EvalConfig)eval; diff --git a/Sources/OpenVPNAdapter/library/OpenVPNProperties.h b/Sources/OpenVPNAdapter/library/OpenVPNConfigurationEvaluation.h similarity index 95% rename from Sources/OpenVPNAdapter/library/OpenVPNProperties.h rename to Sources/OpenVPNAdapter/library/OpenVPNConfigurationEvaluation.h index 8a63975..26a8c92 100644 --- a/Sources/OpenVPNAdapter/library/OpenVPNProperties.h +++ b/Sources/OpenVPNAdapter/library/OpenVPNConfigurationEvaluation.h @@ -1,5 +1,5 @@ // -// OpenVPNProperties.h +// OpenVPNConfigurationEvaluation.h // OpenVPN Adapter // // Created by Sergey Abramchuk on 26.04.17. @@ -11,7 +11,7 @@ typedef NS_ENUM(NSInteger, OpenVPNTransportProtocol); @class OpenVPNServerEntry; -@interface OpenVPNProperties : NSObject +@interface OpenVPNConfigurationEvaluation : NSObject /** This username must be used with profile diff --git a/Sources/OpenVPNAdapter/library/OpenVPNProperties.mm b/Sources/OpenVPNAdapter/library/OpenVPNConfigurationEvaluation.mm similarity index 91% rename from Sources/OpenVPNAdapter/library/OpenVPNProperties.mm rename to Sources/OpenVPNAdapter/library/OpenVPNConfigurationEvaluation.mm index 8a6cdf9..9a89167 100644 --- a/Sources/OpenVPNAdapter/library/OpenVPNProperties.mm +++ b/Sources/OpenVPNAdapter/library/OpenVPNConfigurationEvaluation.mm @@ -1,13 +1,13 @@ // -// OpenVPNProperties.m +// OpenVPNConfigurationEvaluation.m // OpenVPN Adapter // // Created by Sergey Abramchuk on 26.04.17. // // -#import "OpenVPNProperties.h" -#import "OpenVPNProperties+Internal.h" +#import "OpenVPNConfigurationEvaluation.h" +#import "OpenVPNConfigurationEvaluation+Internal.h" #include @@ -16,7 +16,7 @@ using namespace openvpn; -@implementation OpenVPNProperties +@implementation OpenVPNConfigurationEvaluation - (instancetype)initWithEvalConfig:(ClientAPI::EvalConfig)eval { if (self = [super init]) {