Rename OpenVPNProperties to OpenVPNPConfigurationEvaluation

This commit is contained in:
Sergey Abramchuk
2020-08-18 10:07:00 +03:00
parent f95da0256a
commit ec1477b8a3
9 changed files with 32 additions and 32 deletions
+1 -1
View File
@@ -26,7 +26,7 @@ FOUNDATION_EXPORT const unsigned char OpenVPNAdapterVersionString[];
#import <OpenVPNAdapter/OpenVPNConfiguration.h>
#import <OpenVPNAdapter/OpenVPNCredentials.h>
#import <OpenVPNAdapter/OpenVPNServerEntry.h>
#import <OpenVPNAdapter/OpenVPNProperties.h>
#import <OpenVPNAdapter/OpenVPNConfigurationEvaluation.h>
#import <OpenVPNAdapter/OpenVPNConnectionInfo.h>
#import <OpenVPNAdapter/OpenVPNSessionToken.h>
#import <OpenVPNAdapter/OpenVPNTransportStats.h>
@@ -0,0 +1 @@
../library/OpenVPNConfigurationEvaluation.h
@@ -1 +0,0 @@
../library/OpenVPNProperties.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:));
@@ -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 {
@@ -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 <ovpnapi.hpp>
using namespace openvpn;
@interface OpenVPNProperties (Internal)
@interface OpenVPNConfigurationEvaluation (Internal)
- (instancetype)initWithEvalConfig:(ClientAPI::EvalConfig)eval;
@@ -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
@@ -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 <openvpn/common/number.hpp>
@@ -16,7 +16,7 @@
using namespace openvpn;
@implementation OpenVPNProperties
@implementation OpenVPNConfigurationEvaluation
- (instancetype)initWithEvalConfig:(ClientAPI::EvalConfig)eval {
if (self = [super init]) {