mirror of
https://github.com/deneraraujo/OpenVPNAdapter.git
synced 2024-10-06 17:22:07 +08:00
Add extra spaces and empty lines
This commit is contained in:
parent
d3a2d6ec0c
commit
c956d61597
@ -11,8 +11,8 @@ NS_ASSUME_NONNULL_BEGIN
|
||||
|
||||
@class NEIPv4Route;
|
||||
@class NEIPv6Route;
|
||||
@class NEPacketTunnelNetworkSettings;
|
||||
@class NEProxyServer;
|
||||
@class NEPacketTunnelNetworkSettings;
|
||||
|
||||
@interface OpenVPNNetworkSettingsBuilder : NSObject
|
||||
|
||||
|
@ -5,21 +5,27 @@
|
||||
// Created by Jonathan Downing on 12/10/2017.
|
||||
//
|
||||
|
||||
#import <NetworkExtension/NetworkExtension.h>
|
||||
#import "OpenVPNNetworkSettingsBuilder.h"
|
||||
|
||||
#import <NetworkExtension/NetworkExtension.h>
|
||||
|
||||
@interface OpenVPNNetworkSettingsBuilder ()
|
||||
|
||||
@property (nonatomic) NSMutableArray<NSString *> *ipv4LocalAddresses;
|
||||
@property (nonatomic) NSMutableArray<NSString *> *ipv4SubnetMasks;
|
||||
@property (nonatomic) NSMutableArray<NEIPv4Route *> *ipv4IncludedRoutes;
|
||||
@property (nonatomic) NSMutableArray<NEIPv4Route *> *ipv4ExcludedRoutes;
|
||||
|
||||
@property (nonatomic) NSMutableArray<NSString *> *ipv6LocalAddresses;
|
||||
@property (nonatomic) NSMutableArray<NSNumber *> *ipv6NetworkPrefixLengths;
|
||||
@property (nonatomic) NSMutableArray<NEIPv6Route *> *ipv6IncludedRoutes;
|
||||
@property (nonatomic) NSMutableArray<NEIPv6Route *> *ipv6ExcludedRoutes;
|
||||
|
||||
@property (nonatomic) NSMutableArray<NSString *> *dnsServers;
|
||||
@property (nonatomic) NSMutableArray<NSString *> *searchDomains;
|
||||
|
||||
@property (nonatomic) NSMutableArray<NSString *> *proxyExceptionList;
|
||||
|
||||
@end
|
||||
|
||||
@implementation OpenVPNNetworkSettingsBuilder
|
||||
@ -27,23 +33,27 @@
|
||||
#pragma mark - NEPacketTunnelNetworkSettings Generation
|
||||
|
||||
- (NEPacketTunnelNetworkSettings *)networkSettings {
|
||||
if (!self.remoteAddress.length) {
|
||||
return nil;
|
||||
}
|
||||
if (!self.remoteAddress.length) { return nil; }
|
||||
|
||||
NEPacketTunnelNetworkSettings *networkSettings = [[NEPacketTunnelNetworkSettings alloc] initWithTunnelRemoteAddress:self.remoteAddress];
|
||||
|
||||
if (self.ipv4LocalAddresses.count && (self.ipv4LocalAddresses.count == self.ipv4SubnetMasks.count)) {
|
||||
NEIPv4Settings *ipv4Settings = [[NEIPv4Settings alloc] initWithAddresses:self.ipv4LocalAddresses subnetMasks:self.ipv4SubnetMasks];
|
||||
NEIPv4Settings *ipv4Settings = [[NEIPv4Settings alloc] initWithAddresses:self.ipv4LocalAddresses
|
||||
subnetMasks:self.ipv4SubnetMasks];
|
||||
|
||||
ipv4Settings.includedRoutes = self.ipv4IncludedRoutes;
|
||||
ipv4Settings.excludedRoutes = self.ipv4ExcludedRoutes;
|
||||
|
||||
networkSettings.IPv4Settings = ipv4Settings;
|
||||
}
|
||||
|
||||
if (self.ipv6LocalAddresses.count && (self.ipv6LocalAddresses.count == self.ipv6NetworkPrefixLengths.count)) {
|
||||
NEIPv6Settings *ipv6Settings = [[NEIPv6Settings alloc] initWithAddresses:self.ipv6LocalAddresses networkPrefixLengths:self.ipv6NetworkPrefixLengths];
|
||||
NEIPv6Settings *ipv6Settings = [[NEIPv6Settings alloc] initWithAddresses:self.ipv6LocalAddresses
|
||||
networkPrefixLengths:self.ipv6NetworkPrefixLengths];
|
||||
|
||||
ipv6Settings.includedRoutes = self.ipv6IncludedRoutes;
|
||||
ipv6Settings.excludedRoutes = self.ipv6ExcludedRoutes;
|
||||
|
||||
networkSettings.IPv6Settings = ipv6Settings;
|
||||
}
|
||||
|
||||
@ -55,6 +65,7 @@
|
||||
|
||||
if (self.autoProxyConfigurationEnabled || self.httpProxyServerEnabled || self.httpsProxyServerEnabled) {
|
||||
NEProxySettings *proxySettings = [[NEProxySettings alloc] init];
|
||||
|
||||
proxySettings.autoProxyConfigurationEnabled = self.autoProxyConfigurationEnabled;
|
||||
proxySettings.proxyAutoConfigurationURL = self.proxyAutoConfigurationURL;
|
||||
proxySettings.exceptionList = self.proxyExceptionList;
|
||||
@ -62,6 +73,7 @@
|
||||
proxySettings.HTTPEnabled = self.httpProxyServerEnabled;
|
||||
proxySettings.HTTPSServer = self.httpsProxyServer;
|
||||
proxySettings.HTTPSEnabled = self.httpsProxyServerEnabled;
|
||||
|
||||
networkSettings.proxySettings = proxySettings;
|
||||
}
|
||||
|
||||
@ -73,79 +85,57 @@
|
||||
#pragma mark - Lazy Initializers
|
||||
|
||||
- (NSMutableArray<NSString *> *)ipv4LocalAddresses {
|
||||
if (!_ipv4LocalAddresses) {
|
||||
_ipv4LocalAddresses = [[NSMutableArray alloc] init];
|
||||
}
|
||||
if (!_ipv4LocalAddresses) { _ipv4LocalAddresses = [[NSMutableArray alloc] init]; }
|
||||
return _ipv4LocalAddresses;
|
||||
}
|
||||
|
||||
- (NSMutableArray<NSString *> *)ipv4SubnetMasks {
|
||||
if (!_ipv4SubnetMasks) {
|
||||
_ipv4SubnetMasks = [[NSMutableArray alloc] init];
|
||||
}
|
||||
if (!_ipv4SubnetMasks) { _ipv4SubnetMasks = [[NSMutableArray alloc] init]; }
|
||||
return _ipv4SubnetMasks;
|
||||
}
|
||||
|
||||
- (NSMutableArray<NEIPv4Route *> *)ipv4IncludedRoutes {
|
||||
if (!_ipv4IncludedRoutes) {
|
||||
_ipv4IncludedRoutes = [[NSMutableArray alloc] init];
|
||||
}
|
||||
if (!_ipv4IncludedRoutes) { _ipv4IncludedRoutes = [[NSMutableArray alloc] init]; }
|
||||
return _ipv4IncludedRoutes;
|
||||
}
|
||||
|
||||
- (NSMutableArray<NEIPv4Route *> *)ipv4ExcludedRoutes {
|
||||
if (!_ipv4ExcludedRoutes) {
|
||||
_ipv4ExcludedRoutes = [[NSMutableArray alloc] init];
|
||||
}
|
||||
if (!_ipv4ExcludedRoutes) { _ipv4ExcludedRoutes = [[NSMutableArray alloc] init]; }
|
||||
return _ipv4ExcludedRoutes;
|
||||
}
|
||||
|
||||
- (NSMutableArray<NSString *> *)ipv6LocalAddresses {
|
||||
if (!_ipv6LocalAddresses) {
|
||||
_ipv6LocalAddresses = [[NSMutableArray alloc] init];
|
||||
}
|
||||
if (!_ipv6LocalAddresses) { _ipv6LocalAddresses = [[NSMutableArray alloc] init]; }
|
||||
return _ipv6LocalAddresses;
|
||||
}
|
||||
|
||||
- (NSMutableArray<NSNumber *> *)ipv6NetworkPrefixLengths {
|
||||
if (!_ipv6NetworkPrefixLengths) {
|
||||
_ipv6NetworkPrefixLengths = [[NSMutableArray alloc] init];
|
||||
}
|
||||
if (!_ipv6NetworkPrefixLengths) { _ipv6NetworkPrefixLengths = [[NSMutableArray alloc] init]; }
|
||||
return _ipv6NetworkPrefixLengths;
|
||||
}
|
||||
|
||||
- (NSMutableArray<NEIPv6Route *> *)ipv6IncludedRoutes {
|
||||
if (!_ipv6IncludedRoutes) {
|
||||
_ipv6IncludedRoutes = [[NSMutableArray alloc] init];
|
||||
}
|
||||
if (!_ipv6IncludedRoutes) { _ipv6IncludedRoutes = [[NSMutableArray alloc] init]; }
|
||||
return _ipv6IncludedRoutes;
|
||||
}
|
||||
|
||||
- (NSMutableArray<NEIPv6Route *> *)ipv6ExcludedRoutes {
|
||||
if (!_ipv6ExcludedRoutes) {
|
||||
_ipv6ExcludedRoutes = [[NSMutableArray alloc] init];
|
||||
}
|
||||
if (!_ipv6ExcludedRoutes) { _ipv6ExcludedRoutes = [[NSMutableArray alloc] init]; }
|
||||
return _ipv6ExcludedRoutes;
|
||||
}
|
||||
|
||||
- (NSMutableArray<NSString *> *)dnsServers {
|
||||
if (!_dnsServers) {
|
||||
_dnsServers = [[NSMutableArray alloc] init];
|
||||
}
|
||||
if (!_dnsServers) { _dnsServers = [[NSMutableArray alloc] init]; }
|
||||
return _dnsServers;
|
||||
}
|
||||
|
||||
- (NSMutableArray<NSString *> *)searchDomains {
|
||||
if (!_searchDomains) {
|
||||
_searchDomains = [[NSMutableArray alloc] init];
|
||||
}
|
||||
if (!_searchDomains) { _searchDomains = [[NSMutableArray alloc] init]; }
|
||||
return _searchDomains;
|
||||
}
|
||||
|
||||
- (NSMutableArray<NSString *> *)proxyExceptionList {
|
||||
if (!_proxyExceptionList) {
|
||||
_proxyExceptionList = [[NSMutableArray alloc] init];
|
||||
}
|
||||
if (!_proxyExceptionList) { _proxyExceptionList = [[NSMutableArray alloc] init]; }
|
||||
return _proxyExceptionList;
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user