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

Rename tunnel settings class

Browse Source
This commit is contained in:
Sergey Abramchuk
2017-05-05 19:02:51 +03:00
parent bf97b12bc1
commit adb995579e
4 changed files with 53 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files
OpenVPN Adapter.xcodeproj/project.pbxproj
+12 -12
View File
@@ -85,10 +85,10 @@
C9BCE25B1EB3C0D9009D6AC1 /* OpenVPNSessionToken.mm in Sources */ = {isa = PBXBuildFile; fileRef = C9BCE2571EB3C0D9009D6AC1 /* OpenVPNSessionToken.mm */; }; C9BCE25B1EB3C0D9009D6AC1 /* OpenVPNSessionToken.mm in Sources */ = {isa = PBXBuildFile; fileRef = C9BCE2571EB3C0D9009D6AC1 /* OpenVPNSessionToken.mm */; };
C9BCE25E1EB3C201009D6AC1 /* OpenVPNSessionToken+Internal.h in Headers */ = {isa = PBXBuildFile; fileRef = C9BCE25C1EB3C201009D6AC1 /* OpenVPNSessionToken+Internal.h */; }; C9BCE25E1EB3C201009D6AC1 /* OpenVPNSessionToken+Internal.h in Headers */ = {isa = PBXBuildFile; fileRef = C9BCE25C1EB3C201009D6AC1 /* OpenVPNSessionToken+Internal.h */; };
C9BCE25F1EB3C201009D6AC1 /* OpenVPNSessionToken+Internal.h in Headers */ = {isa = PBXBuildFile; fileRef = C9BCE25C1EB3C201009D6AC1 /* OpenVPNSessionToken+Internal.h */; }; C9BCE25F1EB3C201009D6AC1 /* OpenVPNSessionToken+Internal.h in Headers */ = {isa = PBXBuildFile; fileRef = C9BCE25C1EB3C201009D6AC1 /* OpenVPNSessionToken+Internal.h */; };
C9BDB1351EBCC3B900C204FF /* TUNConfiguration.h in Headers */ = {isa = PBXBuildFile; fileRef = C9BDB1331EBCC3B900C204FF /* TUNConfiguration.h */; }; C9BDB1351EBCC3B900C204FF /* OpenVPNTunnelSettings.h in Headers */ = {isa = PBXBuildFile; fileRef = C9BDB1331EBCC3B900C204FF /* OpenVPNTunnelSettings.h */; };
C9BDB1361EBCC3B900C204FF /* TUNConfiguration.h in Headers */ = {isa = PBXBuildFile; fileRef = C9BDB1331EBCC3B900C204FF /* TUNConfiguration.h */; }; C9BDB1361EBCC3B900C204FF /* OpenVPNTunnelSettings.h in Headers */ = {isa = PBXBuildFile; fileRef = C9BDB1331EBCC3B900C204FF /* OpenVPNTunnelSettings.h */; };
C9BDB1371EBCC3B900C204FF /* TUNConfiguration.m in Sources */ = {isa = PBXBuildFile; fileRef = C9BDB1341EBCC3B900C204FF /* TUNConfiguration.m */; }; C9BDB1371EBCC3B900C204FF /* OpenVPNTunnelSettings.m in Sources */ = {isa = PBXBuildFile; fileRef = C9BDB1341EBCC3B900C204FF /* OpenVPNTunnelSettings.m */; };
C9BDB1381EBCC3B900C204FF /* TUNConfiguration.m in Sources */ = {isa = PBXBuildFile; fileRef = C9BDB1341EBCC3B900C204FF /* TUNConfiguration.m */; }; C9BDB1381EBCC3B900C204FF /* OpenVPNTunnelSettings.m in Sources */ = {isa = PBXBuildFile; fileRef = C9BDB1341EBCC3B900C204FF /* OpenVPNTunnelSettings.m */; };
C9D2ABDB1EA20F99007EDF9D /* OpenVPNAdapter.mm in Sources */ = {isa = PBXBuildFile; fileRef = C9BB477E1E7173C700F3F98C /* OpenVPNAdapter.mm */; }; C9D2ABDB1EA20F99007EDF9D /* OpenVPNAdapter.mm in Sources */ = {isa = PBXBuildFile; fileRef = C9BB477E1E7173C700F3F98C /* OpenVPNAdapter.mm */; };
C9D2ABDC1EA20F99007EDF9D /* OpenVPNClient.mm in Sources */ = {isa = PBXBuildFile; fileRef = C9BB47781E7171ED00F3F98C /* OpenVPNClient.mm */; }; C9D2ABDC1EA20F99007EDF9D /* OpenVPNClient.mm in Sources */ = {isa = PBXBuildFile; fileRef = C9BB47781E7171ED00F3F98C /* OpenVPNClient.mm */; };
C9D2ABDE1EA20F99007EDF9D /* ovpncli.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C9FD92191E9A667600374FC4 /* ovpncli.cpp */; }; C9D2ABDE1EA20F99007EDF9D /* ovpncli.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C9FD92191E9A667600374FC4 /* ovpncli.cpp */; };
@@ -181,8 +181,8 @@
C9BCE2561EB3C0D9009D6AC1 /* OpenVPNSessionToken.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OpenVPNSessionToken.h; sourceTree = "<group>"; }; C9BCE2561EB3C0D9009D6AC1 /* OpenVPNSessionToken.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OpenVPNSessionToken.h; sourceTree = "<group>"; };
C9BCE2571EB3C0D9009D6AC1 /* OpenVPNSessionToken.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = OpenVPNSessionToken.mm; sourceTree = "<group>"; }; C9BCE2571EB3C0D9009D6AC1 /* OpenVPNSessionToken.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = OpenVPNSessionToken.mm; sourceTree = "<group>"; };
C9BCE25C1EB3C201009D6AC1 /* OpenVPNSessionToken+Internal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "OpenVPNSessionToken+Internal.h"; sourceTree = "<group>"; }; C9BCE25C1EB3C201009D6AC1 /* OpenVPNSessionToken+Internal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "OpenVPNSessionToken+Internal.h"; sourceTree = "<group>"; };
C9BDB1331EBCC3B900C204FF /* TUNConfiguration.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TUNConfiguration.h; sourceTree = "<group>"; }; C9BDB1331EBCC3B900C204FF /* OpenVPNTunnelSettings.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OpenVPNTunnelSettings.h; sourceTree = "<group>"; };
C9BDB1341EBCC3B900C204FF /* TUNConfiguration.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TUNConfiguration.m; sourceTree = "<group>"; }; C9BDB1341EBCC3B900C204FF /* OpenVPNTunnelSettings.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OpenVPNTunnelSettings.m; sourceTree = "<group>"; };
C9D2ABF01EA20F99007EDF9D /* OpenVPNAdapter.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = OpenVPNAdapter.framework; sourceTree = BUILT_PRODUCTS_DIR; }; C9D2ABF01EA20F99007EDF9D /* OpenVPNAdapter.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = OpenVPNAdapter.framework; sourceTree = BUILT_PRODUCTS_DIR; };
C9D2ABFF1EA212A3007EDF9D /* OpenVPN Adapter macOS Tests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "OpenVPN Adapter macOS Tests.xctest"; sourceTree = BUILT_PRODUCTS_DIR; }; C9D2ABFF1EA212A3007EDF9D /* OpenVPN Adapter macOS Tests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "OpenVPN Adapter macOS Tests.xctest"; sourceTree = BUILT_PRODUCTS_DIR; };
C9FD92181E9A667600374FC4 /* ovpncli.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = ovpncli.hpp; path = Vendors/openvpn/client/ovpncli.hpp; sourceTree = "<group>"; }; C9FD92181E9A667600374FC4 /* ovpncli.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = ovpncli.hpp; path = Vendors/openvpn/client/ovpncli.hpp; sourceTree = "<group>"; };
@@ -275,8 +275,8 @@
C9235AC41EB24F0100C7D303 /* Configuration */ = { C9235AC41EB24F0100C7D303 /* Configuration */ = {
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
C9BDB1331EBCC3B900C204FF /* TUNConfiguration.h */, C9BDB1331EBCC3B900C204FF /* OpenVPNTunnelSettings.h */,
C9BDB1341EBCC3B900C204FF /* TUNConfiguration.m */, C9BDB1341EBCC3B900C204FF /* OpenVPNTunnelSettings.m */,
C98467A41EAA5B7700272A9A /* OpenVPNConfiguration.h */, C98467A41EAA5B7700272A9A /* OpenVPNConfiguration.h */,
C98467AA1EAA5BB500272A9A /* OpenVPNConfiguration+Internal.h */, C98467AA1EAA5BB500272A9A /* OpenVPNConfiguration+Internal.h */,
C98467A51EAA5B7700272A9A /* OpenVPNConfiguration.mm */, C98467A51EAA5B7700272A9A /* OpenVPNConfiguration.mm */,
@@ -469,7 +469,7 @@
C9657A571EB0CDFB00EFF210 /* OpenVPNProperties+Internal.h in Headers */, C9657A571EB0CDFB00EFF210 /* OpenVPNProperties+Internal.h in Headers */,
C9BCE2581EB3C0D9009D6AC1 /* OpenVPNSessionToken.h in Headers */, C9BCE2581EB3C0D9009D6AC1 /* OpenVPNSessionToken.h in Headers */,
C9657A341EB0BA3900EFF210 /* OpenVPNInterfaceStats.h in Headers */, C9657A341EB0BA3900EFF210 /* OpenVPNInterfaceStats.h in Headers */,
C9BDB1351EBCC3B900C204FF /* TUNConfiguration.h in Headers */, C9BDB1351EBCC3B900C204FF /* OpenVPNTunnelSettings.h in Headers */,
C9657A401EB0CAC200EFF210 /* OpenVPNServerEntry.h in Headers */, C9657A401EB0CAC200EFF210 /* OpenVPNServerEntry.h in Headers */,
C98467AB1EAA5BE100272A9A /* OpenVPNConfiguration+Internal.h in Headers */, C98467AB1EAA5BE100272A9A /* OpenVPNConfiguration+Internal.h in Headers */,
C98467A61EAA5B7700272A9A /* OpenVPNConfiguration.h in Headers */, C98467A61EAA5B7700272A9A /* OpenVPNConfiguration.h in Headers */,
@@ -506,7 +506,7 @@
C9657A561EB0CDFA00EFF210 /* OpenVPNProperties+Internal.h in Headers */, C9657A561EB0CDFA00EFF210 /* OpenVPNProperties+Internal.h in Headers */,
C9BCE2591EB3C0D9009D6AC1 /* OpenVPNSessionToken.h in Headers */, C9BCE2591EB3C0D9009D6AC1 /* OpenVPNSessionToken.h in Headers */,
C9657A351EB0BA3900EFF210 /* OpenVPNInterfaceStats.h in Headers */, C9657A351EB0BA3900EFF210 /* OpenVPNInterfaceStats.h in Headers */,
C9BDB1361EBCC3B900C204FF /* TUNConfiguration.h in Headers */, C9BDB1361EBCC3B900C204FF /* OpenVPNTunnelSettings.h in Headers */,
C9657A411EB0CAC200EFF210 /* OpenVPNServerEntry.h in Headers */, C9657A411EB0CAC200EFF210 /* OpenVPNServerEntry.h in Headers */,
C98467AC1EAA5BE200272A9A /* OpenVPNConfiguration+Internal.h in Headers */, C98467AC1EAA5BE200272A9A /* OpenVPNConfiguration+Internal.h in Headers */,
C98467A71EAA5B7700272A9A /* OpenVPNConfiguration.h in Headers */, C98467A71EAA5B7700272A9A /* OpenVPNConfiguration.h in Headers */,
@@ -728,7 +728,7 @@
C9BCE25A1EB3C0D9009D6AC1 /* OpenVPNSessionToken.mm in Sources */, C9BCE25A1EB3C0D9009D6AC1 /* OpenVPNSessionToken.mm in Sources */,
C9BB47821E7173C700F3F98C /* OpenVPNAdapter.mm in Sources */, C9BB47821E7173C700F3F98C /* OpenVPNAdapter.mm in Sources */,
C98467A81EAA5B7700272A9A /* OpenVPNConfiguration.mm in Sources */, C98467A81EAA5B7700272A9A /* OpenVPNConfiguration.mm in Sources */,
C9BDB1371EBCC3B900C204FF /* TUNConfiguration.m in Sources */, C9BDB1371EBCC3B900C204FF /* OpenVPNTunnelSettings.m in Sources */,
C9657A311EB0B7A900EFF210 /* OpenVPNTransportStats.mm in Sources */, C9657A311EB0B7A900EFF210 /* OpenVPNTransportStats.mm in Sources */,
C9657A581EB0CE1300EFF210 /* OpenVPNProperties.mm in Sources */, C9657A581EB0CE1300EFF210 /* OpenVPNProperties.mm in Sources */,
C9BB477A1E7171ED00F3F98C /* OpenVPNClient.mm in Sources */, C9BB477A1E7171ED00F3F98C /* OpenVPNClient.mm in Sources */,
@@ -758,7 +758,7 @@
C9BCE25B1EB3C0D9009D6AC1 /* OpenVPNSessionToken.mm in Sources */, C9BCE25B1EB3C0D9009D6AC1 /* OpenVPNSessionToken.mm in Sources */,
C9D2ABDB1EA20F99007EDF9D /* OpenVPNAdapter.mm in Sources */, C9D2ABDB1EA20F99007EDF9D /* OpenVPNAdapter.mm in Sources */,
C98467A91EAA5B7700272A9A /* OpenVPNConfiguration.mm in Sources */, C98467A91EAA5B7700272A9A /* OpenVPNConfiguration.mm in Sources */,
C9BDB1381EBCC3B900C204FF /* TUNConfiguration.m in Sources */, C9BDB1381EBCC3B900C204FF /* OpenVPNTunnelSettings.m in Sources */,
C9657A301EB0B7A600EFF210 /* OpenVPNTransportStats.mm in Sources */, C9657A301EB0B7A600EFF210 /* OpenVPNTransportStats.mm in Sources */,
C9657A591EB0CE1400EFF210 /* OpenVPNProperties.mm in Sources */, C9657A591EB0CE1400EFF210 /* OpenVPNProperties.mm in Sources */,
C9D2ABDC1EA20F99007EDF9D /* OpenVPNClient.mm in Sources */, C9D2ABDC1EA20F99007EDF9D /* OpenVPNClient.mm in Sources */,
OpenVPN Adapter/OpenVPNAdapter.mm
+36 -36
View File
@@ -14,7 +14,7 @@
#import <NetworkExtension/NetworkExtension.h> #import <NetworkExtension/NetworkExtension.h>
#import "TUNConfiguration.h" #import "OpenVPNTunnelSettings.h"
#import "OpenVPNClient.h" #import "OpenVPNClient.h"
#import "OpenVPNError.h" #import "OpenVPNError.h"
#import "OpenVPNEvent.h" #import "OpenVPNEvent.h"
@@ -48,8 +48,8 @@ NSString * const OpenVPNAdapterErrorEventKey = @"me.ss-abramchuk.openvpn-adapter
@property (strong, nonatomic) NSString *defaultGatewayIPv6; @property (strong, nonatomic) NSString *defaultGatewayIPv6;
@property (strong, nonatomic) NSString *defaultGatewayIPv4; @property (strong, nonatomic) NSString *defaultGatewayIPv4;
@property (strong, nonatomic) TUNConfiguration *tunConfigurationIPv6; @property (strong, nonatomic) OpenVPNTunnelSettings *tunnelSettingsIPv6;
@property (strong, nonatomic) TUNConfiguration *tunConfigurationIPv4; @property (strong, nonatomic) OpenVPNTunnelSettings *tunnelSettingsIPv4;
@property (strong, nonatomic) NSMutableArray *searchDomains; @property (strong, nonatomic) NSMutableArray *searchDomains;
@@ -124,23 +124,23 @@ static void socketCallback(CFSocketRef socket, CFSocketCallBackType type, CFData
} }
if (isIPv6) { if (isIPv6) {
if (!self.tunConfigurationIPv6.initialized) { if (!self.tunnelSettingsIPv6.initialized) {
self.tunConfigurationIPv6.initialized = YES; self.tunnelSettingsIPv6.initialized = YES;
} }
self.defaultGatewayIPv6 = gateway; self.defaultGatewayIPv6 = gateway;
[self.tunConfigurationIPv6.localAddresses addObject:address]; [self.tunnelSettingsIPv6.localAddresses addObject:address];
[self.tunConfigurationIPv6.prefixLengths addObject:prefixLength]; [self.tunnelSettingsIPv6.prefixLengths addObject:prefixLength];
} else { } else {
if (!self.tunConfigurationIPv4.initialized) { if (!self.tunnelSettingsIPv4.initialized) {
self.tunConfigurationIPv4.initialized = YES; self.tunnelSettingsIPv4.initialized = YES;
} }
self.defaultGatewayIPv4 = gateway; self.defaultGatewayIPv4 = gateway;
[self.tunConfigurationIPv4.localAddresses addObject:address]; [self.tunnelSettingsIPv4.localAddresses addObject:address];
[self.tunConfigurationIPv4.prefixLengths addObject:prefixLength]; [self.tunnelSettingsIPv4.prefixLengths addObject:prefixLength];
} }
return YES; return YES;
@@ -151,14 +151,14 @@ static void socketCallback(CFSocketRef socket, CFSocketCallBackType type, CFData
NEIPv6Route *includedRoute = [NEIPv6Route defaultRoute]; NEIPv6Route *includedRoute = [NEIPv6Route defaultRoute];
includedRoute.gatewayAddress = self.defaultGatewayIPv6; includedRoute.gatewayAddress = self.defaultGatewayIPv6;
[self.tunConfigurationIPv6.includedRoutes addObject:includedRoute]; [self.tunnelSettingsIPv6.includedRoutes addObject:includedRoute];
} }
if (rerouteIPv4) { if (rerouteIPv4) {
NEIPv4Route *includedRoute = [NEIPv4Route defaultRoute]; NEIPv4Route *includedRoute = [NEIPv4Route defaultRoute];
includedRoute.gatewayAddress = self.defaultGatewayIPv4; includedRoute.gatewayAddress = self.defaultGatewayIPv4;
[self.tunConfigurationIPv4.includedRoutes addObject:includedRoute]; [self.tunnelSettingsIPv4.includedRoutes addObject:includedRoute];
} }
return YES; return YES;
@@ -173,14 +173,14 @@ static void socketCallback(CFSocketRef socket, CFSocketCallBackType type, CFData
NEIPv6Route *includedRoute = [[NEIPv6Route alloc] initWithDestinationAddress:route networkPrefixLength:prefixLength]; NEIPv6Route *includedRoute = [[NEIPv6Route alloc] initWithDestinationAddress:route networkPrefixLength:prefixLength];
includedRoute.gatewayAddress = self.defaultGatewayIPv6; includedRoute.gatewayAddress = self.defaultGatewayIPv6;
[self.tunConfigurationIPv6.includedRoutes addObject:includedRoute]; [self.tunnelSettingsIPv6.includedRoutes addObject:includedRoute];
} else { } else {
NSString *subnet = [self getSubnetFromPrefixLength:prefixLength]; NSString *subnet = [self getSubnetFromPrefixLength:prefixLength];
NEIPv4Route *includedRoute = [[NEIPv4Route alloc] initWithDestinationAddress:route subnetMask:subnet]; NEIPv4Route *includedRoute = [[NEIPv4Route alloc] initWithDestinationAddress:route subnetMask:subnet];
includedRoute.gatewayAddress = self.defaultGatewayIPv4; includedRoute.gatewayAddress = self.defaultGatewayIPv4;
[self.tunConfigurationIPv4.includedRoutes addObject:includedRoute]; [self.tunnelSettingsIPv4.includedRoutes addObject:includedRoute];
} }
return YES; return YES;
@@ -193,11 +193,11 @@ static void socketCallback(CFSocketRef socket, CFSocketCallBackType type, CFData
if (isIPv6) { if (isIPv6) {
NEIPv6Route *excludedRoute = [[NEIPv6Route alloc] initWithDestinationAddress:route networkPrefixLength:prefixLength]; NEIPv6Route *excludedRoute = [[NEIPv6Route alloc] initWithDestinationAddress:route networkPrefixLength:prefixLength];
[self.tunConfigurationIPv6.excludedRoutes addObject:excludedRoute]; [self.tunnelSettingsIPv6.excludedRoutes addObject:excludedRoute];
} else { } else {
NSString *subnet = [self getSubnetFromPrefixLength:prefixLength]; NSString *subnet = [self getSubnetFromPrefixLength:prefixLength];
NEIPv4Route *excludedRoute = [[NEIPv4Route alloc] initWithDestinationAddress:route subnetMask:subnet]; NEIPv4Route *excludedRoute = [[NEIPv4Route alloc] initWithDestinationAddress:route subnetMask:subnet];
[self.tunConfigurationIPv4.excludedRoutes addObject:excludedRoute]; [self.tunnelSettingsIPv4.excludedRoutes addObject:excludedRoute];
} }
return YES; return YES;
@@ -209,9 +209,9 @@ static void socketCallback(CFSocketRef socket, CFSocketCallBackType type, CFData
} }
if (isIPv6) { if (isIPv6) {
[self.tunConfigurationIPv6.dnsAddresses addObject:address]; [self.tunnelSettingsIPv6.dnsAddresses addObject:address];
} else { } else {
[self.tunConfigurationIPv4.dnsAddresses addObject:address]; [self.tunnelSettingsIPv4.dnsAddresses addObject:address];
} }
return YES; return YES;
@@ -238,25 +238,25 @@ static void socketCallback(CFSocketRef socket, CFSocketCallBackType type, CFData
NEPacketTunnelNetworkSettings *networkSettings = [[NEPacketTunnelNetworkSettings alloc] initWithTunnelRemoteAddress:self.remoteAddress]; NEPacketTunnelNetworkSettings *networkSettings = [[NEPacketTunnelNetworkSettings alloc] initWithTunnelRemoteAddress:self.remoteAddress];
// Configure IPv6 addresses and routes // Configure IPv6 addresses and routes
if (self.tunConfigurationIPv6.initialized) { if (self.tunnelSettingsIPv6.initialized) {
NEIPv6Settings *settingsIPv6 = [[NEIPv6Settings alloc] initWithAddresses:self.tunConfigurationIPv6.localAddresses networkPrefixLengths:self.tunConfigurationIPv6.prefixLengths]; NEIPv6Settings *settingsIPv6 = [[NEIPv6Settings alloc] initWithAddresses:self.tunnelSettingsIPv6.localAddresses networkPrefixLengths:self.tunnelSettingsIPv6.prefixLengths];
settingsIPv6.includedRoutes = self.tunConfigurationIPv6.includedRoutes; settingsIPv6.includedRoutes = self.tunnelSettingsIPv6.includedRoutes;
settingsIPv6.excludedRoutes = self.tunConfigurationIPv6.excludedRoutes; settingsIPv6.excludedRoutes = self.tunnelSettingsIPv6.excludedRoutes;
networkSettings.IPv6Settings = settingsIPv6; networkSettings.IPv6Settings = settingsIPv6;
} }
// Configure IPv4 addresses and routes // Configure IPv4 addresses and routes
if (self.tunConfigurationIPv4.initialized) { if (self.tunnelSettingsIPv4.initialized) {
NSMutableArray *subnets = [NSMutableArray new]; NSMutableArray *subnets = [NSMutableArray new];
[self.tunConfigurationIPv4.prefixLengths enumerateObjectsUsingBlock:^(id _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) { [self.tunnelSettingsIPv4.prefixLengths enumerateObjectsUsingBlock:^(id _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) {
NSString *subnet = [self getSubnetFromPrefixLength:obj]; NSString *subnet = [self getSubnetFromPrefixLength:obj];
[subnets addObject:subnet]; [subnets addObject:subnet];
}]; }];
NEIPv4Settings *ipSettings = [[NEIPv4Settings alloc] initWithAddresses:self.tunConfigurationIPv4.localAddresses subnetMasks:subnets]; NEIPv4Settings *ipSettings = [[NEIPv4Settings alloc] initWithAddresses:self.tunnelSettingsIPv4.localAddresses subnetMasks:subnets];
ipSettings.includedRoutes = self.tunConfigurationIPv4.includedRoutes; ipSettings.includedRoutes = self.tunnelSettingsIPv4.includedRoutes;
ipSettings.excludedRoutes = self.tunConfigurationIPv4.excludedRoutes; ipSettings.excludedRoutes = self.tunnelSettingsIPv4.excludedRoutes;
networkSettings.IPv4Settings = ipSettings; networkSettings.IPv4Settings = ipSettings;
} }
@@ -264,12 +264,12 @@ static void socketCallback(CFSocketRef socket, CFSocketCallBackType type, CFData
// Configure DNS addresses and search domains // Configure DNS addresses and search domains
NSMutableArray *dnsAddresses = [NSMutableArray new]; NSMutableArray *dnsAddresses = [NSMutableArray new];
if (self.tunConfigurationIPv6.dnsAddresses.count > 0) { if (self.tunnelSettingsIPv6.dnsAddresses.count > 0) {
[dnsAddresses addObjectsFromArray:self.tunConfigurationIPv6.dnsAddresses]; [dnsAddresses addObjectsFromArray:self.tunnelSettingsIPv6.dnsAddresses];
} }
if (self.tunConfigurationIPv4.dnsAddresses.count > 0) { if (self.tunnelSettingsIPv4.dnsAddresses.count > 0) {
[dnsAddresses addObjectsFromArray:self.tunConfigurationIPv4.dnsAddresses]; [dnsAddresses addObjectsFromArray:self.tunnelSettingsIPv4.dnsAddresses];
} }
if (dnsAddresses.count > 0) { if (dnsAddresses.count > 0) {
@@ -433,8 +433,8 @@ static void socketCallback(CFSocketRef socket, CFSocketCallBackType type, CFData
dispatch_async(connectQueue, ^{ dispatch_async(connectQueue, ^{
OpenVPNClient::init_process(); OpenVPNClient::init_process();
self.tunConfigurationIPv6 = [TUNConfiguration new]; self.tunnelSettingsIPv6 = [OpenVPNTunnelSettings new];
self.tunConfigurationIPv4 = [TUNConfiguration new]; self.tunnelSettingsIPv4 = [OpenVPNTunnelSettings new];
self.searchDomains = [NSMutableArray new]; self.searchDomains = [NSMutableArray new];
@@ -459,8 +459,8 @@ static void socketCallback(CFSocketRef socket, CFSocketCallBackType type, CFData
self.remoteAddress = nil; self.remoteAddress = nil;
self.tunConfigurationIPv6 = nil; self.tunnelSettingsIPv6 = nil;
self.tunConfigurationIPv4 = nil; self.tunnelSettingsIPv4 = nil;
self.searchDomains = nil; self.searchDomains = nil;
OpenVPN Adapter/TUNConfiguration.h → OpenVPN Adapter/OpenVPNTunnelSettings.h
+2 -2
View File
@@ -1,5 +1,5 @@
// //
// TUNConfiguration.h // OpenVPNTunnelSettings.h
// OpenVPN iOS Client // OpenVPN iOS Client
// //
// Created by Sergey Abramchuk on 26.02.17. // Created by Sergey Abramchuk on 26.02.17.
@@ -8,7 +8,7 @@
#import <Foundation/Foundation.h> #import <Foundation/Foundation.h>
@interface TUNConfiguration : NSObject @interface OpenVPNTunnelSettings : NSObject
@property (nonatomic) BOOL initialized; @property (nonatomic) BOOL initialized;
OpenVPN Adapter/TUNConfiguration.m → OpenVPN Adapter/OpenVPNTunnelSettings.m
+3 -3
View File
@@ -1,14 +1,14 @@
// //
// TUNConfiguration.m // OpenVPNTunnelSettings.m
// OpenVPN iOS Client // OpenVPN iOS Client
// //
// Created by Sergey Abramchuk on 26.02.17. // Created by Sergey Abramchuk on 26.02.17.
// //
// //
#import "TUNConfiguration.h" #import "OpenVPNTunnelSettings.h"
@implementation TUNConfiguration @implementation OpenVPNTunnelSettings
- (instancetype)init - (instancetype)init
{ {