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

Check conditions using NSAssert and use Empty categories to check arrays and sets for emptiness

Browse Source
This commit is contained in:
Sergey Abramchuk
2018-10-16 19:09:28 +03:00
parent 10f3985e57
commit fc4446fa7d
1 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Sources/OpenVPNAdapter/OpenVPNNetworkSettingsBuilder.m
+11 -4
View File
@@ -9,6 +9,9 @@
#import <NetworkExtension/NetworkExtension.h> #import <NetworkExtension/NetworkExtension.h>
#import "NSArray+Empty.h"
#import "NSSet+Empty.h"
@interface OpenVPNNetworkSettingsBuilder () @interface OpenVPNNetworkSettingsBuilder ()
// TODO: Use NSHashTable for routes to avoid duplicates // TODO: Use NSHashTable for routes to avoid duplicates
@@ -35,11 +38,13 @@
#pragma mark - NEPacketTunnelNetworkSettings Generation #pragma mark - NEPacketTunnelNetworkSettings Generation
- (NEPacketTunnelNetworkSettings *)networkSettings { - (NEPacketTunnelNetworkSettings *)networkSettings {
if (!self.remoteAddress.length) { return nil; } NSAssert(self.remoteAddress != nil && self.remoteAddress.length > 0, @"Remote address is nil or empty.");
NEPacketTunnelNetworkSettings *networkSettings = [[NEPacketTunnelNetworkSettings alloc] initWithTunnelRemoteAddress:self.remoteAddress]; NEPacketTunnelNetworkSettings *networkSettings = [[NEPacketTunnelNetworkSettings alloc] initWithTunnelRemoteAddress:self.remoteAddress];
if (self.ipv4LocalAddresses.count && (self.ipv4LocalAddresses.count == self.ipv4SubnetMasks.count)) { if (self.ipv4LocalAddresses.isNotEmpty) {
NSAssert(self.ipv4LocalAddresses.count == self.ipv4SubnetMasks.count, @"Number of IPv4 addresses is not equal to number of IPv4 subnet masks.");
NEIPv4Settings *ipv4Settings = [[NEIPv4Settings alloc] initWithAddresses:self.ipv4LocalAddresses NEIPv4Settings *ipv4Settings = [[NEIPv4Settings alloc] initWithAddresses:self.ipv4LocalAddresses
subnetMasks:self.ipv4SubnetMasks]; subnetMasks:self.ipv4SubnetMasks];
@@ -49,7 +54,9 @@
networkSettings.IPv4Settings = ipv4Settings; networkSettings.IPv4Settings = ipv4Settings;
} }
if (self.ipv6LocalAddresses.count && (self.ipv6LocalAddresses.count == self.ipv6NetworkPrefixLengths.count)) { if (self.ipv6LocalAddresses.isNotEmpty) {
NSAssert(self.ipv6LocalAddresses.count == self.ipv6NetworkPrefixLengths.count, @"Number of IPv6 addresses is not equal to number of IPv6 prefixes.");
NEIPv6Settings *ipv6Settings = [[NEIPv6Settings alloc] initWithAddresses:self.ipv6LocalAddresses NEIPv6Settings *ipv6Settings = [[NEIPv6Settings alloc] initWithAddresses:self.ipv6LocalAddresses
networkPrefixLengths:self.ipv6NetworkPrefixLengths]; networkPrefixLengths:self.ipv6NetworkPrefixLengths];
@@ -59,7 +66,7 @@
networkSettings.IPv6Settings = ipv6Settings; networkSettings.IPv6Settings = ipv6Settings;
} }
if (self.dnsServers.count) { if (self.dnsServers.isNotEmpty) {
NEDNSSettings *dnsSettings = [[NEDNSSettings alloc] initWithServers:self.dnsServers.allObjects]; NEDNSSettings *dnsSettings = [[NEDNSSettings alloc] initWithServers:self.dnsServers.allObjects];
dnsSettings.searchDomains = self.searchDomains.allObjects; dnsSettings.searchDomains = self.searchDomains.allObjects;
networkSettings.DNSSettings = dnsSettings; networkSettings.DNSSettings = dnsSettings;