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

Get error and send it to the delegate

Browse Source
This commit is contained in:
Sergey Abramchuk
2017-02-11 21:07:11 +03:00
parent 5867367320
commit 4b81e400fc
1 changed files with 19 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
OpenVPN Tunnel Provider/OpenVPNAdapter.mm
View File

@@ -14,6 +14,7 @@
#import <NetworkExtension/NetworkExtension.h> #import <NetworkExtension/NetworkExtension.h>
#import "OpenVPNError.h"
#import "OpenVPNEvent.h" #import "OpenVPNEvent.h"
#import "OpenVPNClient.h" #import "OpenVPNClient.h"
@@ -21,6 +22,9 @@
#import "OpenVPNAdapter+Client.h" #import "OpenVPNAdapter+Client.h"
#import "OpenVPNAdapter+Provider.h" #import "OpenVPNAdapter+Provider.h"
NSString *const OpenVPNClientErrorDomain = @"OpenVPNClientErrorDomain";
NSString *const OpenVPNClientErrorFatalKey = @"OpenVPNClientErrorFatalKey";
@interface OpenVPNAdapter () @interface OpenVPNAdapter ()
@@ -82,15 +86,25 @@ static void socketCallback(CFSocketRef socket, CFSocketCallBackType type, CFData
NSAssert(self.delegate != nil, @"delegate property should not be nil"); NSAssert(self.delegate != nil, @"delegate property should not be nil");
NSString *eventName = [NSString stringWithUTF8String:event->name.c_str()]; NSString *eventName = [NSString stringWithUTF8String:event->name.c_str()];
OpenVPNEvent eventIdentifier = [self getOpenVPNEventFromName:eventName]; OpenVPNEvent eventIdentifier = [self getOpenVPNEventByName:eventName];
NSString *eventMessage = [NSString stringWithUTF8String:event->info.c_str()]; NSString *eventMessage = [NSString stringWithUTF8String:event->info.c_str()];
if (event->error) { if (event->error) {
NSMutableDictionary *userInfo = [NSMutableDictionary new]; NSMutableDictionary *userInfo = [NSMutableDictionary new];
// TODO: Generate error and handle it by delegate [userInfo setObject:[NSNumber numberWithBool:event->fatal] forKey:OpenVPNClientErrorFatalKey];
if (eventMessage != nil && ![eventMessage isEqualToString:@""]) {
[userInfo setObject:eventMessage forKey:NSLocalizedDescriptionKey];
}
NSError *error = [NSError errorWithDomain:OpenVPNClientErrorDomain
code:eventIdentifier
userInfo:[userInfo copy]];
[self.delegate handleError:error];
} else { } else {
[self.delegate handleEvent:eventIdentifier message:![eventMessage isEqualToString:@""] ? eventMessage : nil]; [self.delegate handleEvent:eventIdentifier message:eventMessage == nil || [eventMessage isEqualToString:@""] ? nil : eventMessage];
} }
} }
@@ -99,7 +113,7 @@ static void socketCallback(CFSocketRef socket, CFSocketCallBackType type, CFData
NSLog(@"%@", message); NSLog(@"%@", message);
} }
- (OpenVPNEvent)getOpenVPNEventFromName:(NSString *)name { - (OpenVPNEvent)getOpenVPNEventByName:(NSString *)eventName {
NSDictionary *events = @{ NSDictionary *events = @{
@"DISCONNECTED": @(OpenVPNEventDisconnected), @"DISCONNECTED": @(OpenVPNEventDisconnected),
@"CONNECTED": @(OpenVPNEventConnected), @"CONNECTED": @(OpenVPNEventConnected),
@@ -134,7 +148,7 @@ static void socketCallback(CFSocketRef socket, CFSocketCallBackType type, CFData
@"EPKI_INVALID_ALIAS": @(OpenVPNEventEPKIInvalidAlias), @"EPKI_INVALID_ALIAS": @(OpenVPNEventEPKIInvalidAlias),
}; };
OpenVPNEvent event = events[name] != nil ? (OpenVPNEvent)[(NSNumber *)events[name] unsignedIntegerValue] : OpenVPNEventUnknown; OpenVPNEvent event = events[eventName] != nil ? (OpenVPNEvent)[(NSNumber *)events[eventName] unsignedIntegerValue] : OpenVPNEventUnknown;
return event; return event;
} }