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

Set username and password via properties instead of adapter method

Browse Source
This commit is contained in:
Sergey Abramchuk
2017-03-06 21:24:02 +03:00
parent 5ef43a447c
commit 57577377e1
2 changed files with 16 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
OpenVPN Tunnel Provider/OpenVPNAdapter.mm
+10 -6
View File
@@ -290,15 +290,19 @@ static void socketCallback(CFSocketRef socket, CFSocketCallBackType type, CFData
@implementation OpenVPNAdapter (Provider)
@dynamic username;
@dynamic password;
@dynamic delegate;
#pragma mark Client Configuration
- (BOOL)configureWithUsername:(NSString *)username password:(NSString *)password configuration:(NSData *)configuration error:(out NSError * __autoreleasing _Nullable *)error {
NSString *vpnConfiguration = [[NSString alloc] initWithData:configuration encoding:NSUTF8StringEncoding];
- (BOOL)configureUsing:(NSData *)settings error:(out NSError * __autoreleasing _Nullable *)error {
NSString *vpnConfiguration = [[NSString alloc] initWithData:settings encoding:NSUTF8StringEncoding];
if (vpnConfiguration == nil) {
if (error) *error = [NSError errorWithDomain:OpenVPNClientErrorDomain code:OpenVPNErrorConfigurationFailure userInfo:@{
// TODO: Write error message
NSLocalizedDescriptionKey: @"Failed to ..."
NSLocalizedDescriptionKey: @"Failed to read VPN configuration"
}];
return NO;
}
@@ -318,8 +322,8 @@ static void socketCallback(CFSocketRef socket, CFSocketCallBackType type, CFData
}
ClientAPI::ProvideCreds creds;
creds.username = [username UTF8String];
creds.password = [password UTF8String];
creds.username = [self.username UTF8String];
creds.password = [self.password UTF8String];
ClientAPI::Status creds_status = self.vpnClient->provide_creds(creds);
if (creds_status.error) {