github/OpenVPNAdapter
4
0
Fork 0
mirror of https://github.com/deneraraujo/OpenVPNAdapter.git synced 2026-04-24 00:00:05 +08:00
Code Issues Packages Projects Releases Wiki Activity

Change argument type of the completion handler and add packetFlow parameter to initializer

Browse Source
This commit is contained in:
Sergey Abramchuk
2020-06-09 21:02:40 +03:00
parent 0326b93bea
commit bdf829e80a
2 changed files with 51 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Sources/OpenVPNAdapter/library/OpenVPNAdapter.h
+6 -1
View File
@@ -39,7 +39,7 @@ typedef NS_ENUM(NSInteger, OpenVPNAdapterEvent);
*/
- (void)openVPNAdapter:(OpenVPNAdapter *)openVPNAdapter
configureTunnelWithNetworkSettings:(nullable NEPacketTunnelNetworkSettings *)networkSettings
completionHandler:(void (^)(id<OpenVPNAdapterPacketFlow> _Nullable packetFlow))completionHandler
completionHandler:(void (^)(NSError *error))completionHandler
NS_SWIFT_NAME(openVPNAdapter(_:configureTunnelWithNetworkSettings:completionHandler:));
/**
@@ -126,6 +126,11 @@ NS_SWIFT_NAME(openVPNAdapter(_:handleEvent:message:));
*/
@property (nonatomic, readonly) OpenVPNTransportStats *transportStatistics;
/**
*/
- (instancetype)initWithPacketFlow:(id<OpenVPNAdapterPacketFlow>)packetFlow;
/**
Applies the given configuration object.
Call this method prior to connecting, this method has no effect after calling connect.
Sources/OpenVPNAdapter/library/OpenVPNAdapter.mm
+45 -16
View File
@@ -40,9 +40,10 @@
@implementation OpenVPNAdapter
- (instancetype)init {
- (instancetype)initWithPacketFlow:(id<OpenVPNAdapterPacketFlow>)packetFlow {
if (self = [super init]) {
_vpnClient = new OpenVPNClient(self);
_packetFlowBridge = [[OpenVPNPacketFlowBridge alloc] initWithPacketFlow:packetFlow];
}
return self;
}
@@ -56,7 +57,7 @@
if (error) {
NSString *message = [NSString stringWithUTF8String:eval.message.c_str()];
*error = [NSError ovpn_errorObjectForAdapterError:OpenVPNAdapterErrorConfigurationFailure
description:@"Failed to apply OpenVPN configuration"
description:@"Failed to apply OpenVPN configuration."
message:message
fatal:YES];
}
@@ -74,7 +75,7 @@
if (error) {
NSString *message = [NSString stringWithUTF8String:status.message.c_str()];
*error = [NSError ovpn_errorObjectForAdapterError:OpenVPNAdapterErrorCredentialsFailure
description:@"Failed to provide OpenVPN credentials"
description:@"Failed to provide OpenVPN credentials."
message:message
fatal:YES];
}
@@ -87,7 +88,7 @@
- (void)connect {
dispatch_queue_attr_t attributes = dispatch_queue_attr_make_with_qos_class(DISPATCH_QUEUE_SERIAL, QOS_CLASS_UTILITY, 0);
dispatch_queue_t connectQueue = dispatch_queue_create("me.ss-abramchuk.openvpn-adapter.connection", attributes);
dispatch_queue_t connectQueue = dispatch_queue_create("me.ss-abramchuk.openvpn-adapter.connection.", attributes);
dispatch_async(connectQueue, ^{
OpenVPNClient::init_process();
@@ -123,7 +124,7 @@
NSString *message = [NSString stringWithUTF8String:status.message.c_str()];
NSError *error = [NSError ovpn_errorObjectForAdapterError:adapterError
description:@"Failed to establish connection with OpenVPN server"
description:@"Failed to establish connection with OpenVPN server."
message:message
fatal:YES];
@@ -315,23 +316,35 @@
dispatch_semaphore_t semaphore = dispatch_semaphore_create(0);
__weak typeof(self) weakSelf = self;
void (^completionHandler)(id<OpenVPNAdapterPacketFlow> _Nullable) = ^(id<OpenVPNAdapterPacketFlow> flow) {
__strong typeof(self) self = weakSelf;
if (flow && (self.packetFlowBridge == nil || self.packetFlowBridge != flow)) {
self.packetFlowBridge = [[OpenVPNPacketFlowBridge alloc] initWithPacketFlow:flow];
}
__block NSError *configurationError;
void (^completionHandler)(NSError *error) = ^(NSError *error) {
configurationError = error;
dispatch_semaphore_signal(semaphore);
};
[self.delegate openVPNAdapter:self configureTunnelWithNetworkSettings:networkSettings completionHandler:completionHandler];
dispatch_semaphore_wait(semaphore, dispatch_time(DISPATCH_TIME_NOW, TUNNEL_CONFIGURATION_TIMEOUT * NSEC_PER_SEC));
long timeout = dispatch_semaphore_wait(semaphore, dispatch_time(DISPATCH_TIME_NOW, TUNNEL_CONFIGURATION_TIMEOUT * NSEC_PER_SEC));
if (timeout) { return NO; }
if (configurationError) {
NSDictionary *userInfo = @{
NSLocalizedDescriptionKey: @"Failed to configure tunnel using provided settings. Check underlying error for more details.",
NSUnderlyingErrorKey: configurationError,
OpenVPNAdapterErrorFatalKey: @(YES)
};
NSError *error = [NSError errorWithDomain:OpenVPNAdapterErrorDomain
code:OpenVPNAdapterErrorTUNSetupFailed
userInfo:userInfo];
[self.delegate openVPNAdapter:self handleError:error];
return NO;
}
NSError *socketError;
if (self.packetFlowBridge && [self.packetFlowBridge configureSocketsWithError:&socketError]) {
if ([self.packetFlowBridge configureSocketsWithError:&socketError]) {
[self.packetFlowBridge startReading];
return YES;
} else {
@@ -407,13 +420,29 @@
dispatch_semaphore_t semaphore = dispatch_semaphore_create(0);
void (^completionHandler)(id<OpenVPNAdapterPacketFlow> _Nullable) = ^(id<OpenVPNAdapterPacketFlow> flow) {
__block NSError *configurationError;
void (^completionHandler)(NSError *error) = ^(NSError *error) {
configurationError = error;
dispatch_semaphore_signal(semaphore);
};
[self.delegate openVPNAdapter:self configureTunnelWithNetworkSettings:nil completionHandler:completionHandler];
dispatch_semaphore_wait(semaphore, dispatch_time(DISPATCH_TIME_NOW, TUNNEL_CONFIGURATION_TIMEOUT * NSEC_PER_SEC));
if (configurationError) {
NSDictionary *userInfo = @{
NSLocalizedDescriptionKey: @"Failed to reset tunnel. Check underlying error for more details.",
NSUnderlyingErrorKey: configurationError,
OpenVPNAdapterErrorFatalKey: @(YES)
};
NSError *error = [NSError errorWithDomain:OpenVPNAdapterErrorDomain
code:OpenVPNAdapterErrorTUNSetupFailed
userInfo:userInfo];
[self.delegate openVPNAdapter:self handleError:error];
}
}
#pragma mark -