diff options
author | Parménides GV <parmegv@sdf.org> | 2015-01-12 19:18:54 +0100 |
---|---|---|
committer | Parménides GV <parmegv@sdf.org> | 2015-01-12 19:18:54 +0100 |
commit | 32998b046977da5d272a948ad0668bf653d598f4 (patch) | |
tree | a8f68d5b09d7293ceb35211d2f26f48d4312fcf3 /app/src/main/java/de/blinkt/openvpn/core/NetworkSpace.java | |
parent | 1d37f94a7980d1181a49863cb3880bc7938cc6d1 (diff) | |
parent | 6ed3fde3ea171700390552dd1040e10e8cc1ca32 (diff) |
Merge branch 'bug/Release-ConfigurationWizard-differs-from-debug's-#6633' into bug/ButterKnife-doesn't-find-provider_list_view-#6581
Diffstat (limited to 'app/src/main/java/de/blinkt/openvpn/core/NetworkSpace.java')
-rw-r--r-- | app/src/main/java/de/blinkt/openvpn/core/NetworkSpace.java | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/app/src/main/java/de/blinkt/openvpn/core/NetworkSpace.java b/app/src/main/java/de/blinkt/openvpn/core/NetworkSpace.java index 35f46513..26354689 100644 --- a/app/src/main/java/de/blinkt/openvpn/core/NetworkSpace.java +++ b/app/src/main/java/de/blinkt/openvpn/core/NetworkSpace.java @@ -1,6 +1,6 @@ /* * Copyright (c) 2012-2014 Arne Schwabe - * Distributed under the GNU GPL v2. For full terms see the file doc/LICENSE.txt + * Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt */ package de.blinkt.openvpn.core; @@ -21,6 +21,8 @@ import se.leap.bitmaskclient.BuildConfig; public class NetworkSpace { + + static class ipAddress implements Comparable<ipAddress> { private BigInteger netAddress; public int networkMask; @@ -198,6 +200,13 @@ public class NetworkSpace { mIpAddresses.add(new ipAddress(cidrIp, include)); } + public void addIPSplit(CIDRIP cidrIp, boolean include) { + ipAddress newIP = new ipAddress(cidrIp, include); + ipAddress[] splitIps = newIP.split(); + for (ipAddress split: splitIps) + mIpAddresses.add(split); + } + void addIPv6(Inet6Address address, int mask, boolean included) { mIpAddresses.add(new ipAddress(address, mask, included)); } |