From 2ef473be15320a6bed23702f1481ba6b2020eb4a Mon Sep 17 00:00:00 2001 From: Tobias Brunner Date: Tue, 5 Mar 2019 19:02:05 +0100 Subject: [PATCH] android: Use helper to parse IP addresses where appropriate --- .../org/strongswan/android/logic/CharonVpnService.java | 7 ++++--- .../strongswan/android/ui/VpnProfileDetailActivity.java | 3 +-- .../strongswan/android/ui/VpnProfileImportActivity.java | 3 +-- .../main/java/org/strongswan/android/utils/IPRange.java | 4 ++-- 4 files changed, 8 insertions(+), 9 deletions(-) diff --git a/src/frontends/android/app/src/main/java/org/strongswan/android/logic/CharonVpnService.java b/src/frontends/android/app/src/main/java/org/strongswan/android/logic/CharonVpnService.java index a43095fe0..367248039 100644 --- a/src/frontends/android/app/src/main/java/org/strongswan/android/logic/CharonVpnService.java +++ b/src/frontends/android/app/src/main/java/org/strongswan/android/logic/CharonVpnService.java @@ -58,6 +58,7 @@ import org.strongswan.android.utils.Constants; import org.strongswan.android.utils.IPRange; import org.strongswan.android.utils.IPRangeSet; import org.strongswan.android.utils.SettingsWriter; +import org.strongswan.android.utils.Utils; import java.io.File; import java.io.FileInputStream; @@ -1117,7 +1118,7 @@ public class CharonVpnService extends VpnService implements Runnable, VpnStateSe { try { - mDnsServers.add(InetAddress.getByName(server)); + mDnsServers.add(Utils.parseInetAddress(server)); recordAddressFamily(server); mDnsServersConfigured = true; } @@ -1156,7 +1157,7 @@ public class CharonVpnService extends VpnService implements Runnable, VpnStateSe try { - mDnsServers.add(InetAddress.getByName(address)); + mDnsServers.add(Utils.parseInetAddress(address)); recordAddressFamily(address); } catch (UnknownHostException e) @@ -1341,7 +1342,7 @@ public class CharonVpnService extends VpnService implements Runnable, VpnStateSe private boolean isIPv6(String address) throws UnknownHostException { - InetAddress addr = InetAddress.getByName(address); + InetAddress addr = Utils.parseInetAddress(address); if (addr instanceof Inet4Address) { return false; diff --git a/src/frontends/android/app/src/main/java/org/strongswan/android/ui/VpnProfileDetailActivity.java b/src/frontends/android/app/src/main/java/org/strongswan/android/ui/VpnProfileDetailActivity.java index ce7877e5a..e0965873c 100644 --- a/src/frontends/android/app/src/main/java/org/strongswan/android/ui/VpnProfileDetailActivity.java +++ b/src/frontends/android/app/src/main/java/org/strongswan/android/ui/VpnProfileDetailActivity.java @@ -72,7 +72,6 @@ import org.strongswan.android.utils.Constants; import org.strongswan.android.utils.IPRangeSet; import org.strongswan.android.utils.Utils; -import java.net.InetAddress; import java.net.UnknownHostException; import java.security.cert.X509Certificate; import java.util.ArrayList; @@ -915,7 +914,7 @@ public class VpnProfileDetailActivity extends AppCompatActivity { try { - InetAddress.getByName(addr); + Utils.parseInetAddress(addr); } catch (UnknownHostException e) { diff --git a/src/frontends/android/app/src/main/java/org/strongswan/android/ui/VpnProfileImportActivity.java b/src/frontends/android/app/src/main/java/org/strongswan/android/ui/VpnProfileImportActivity.java index f1c5746f5..221840be8 100644 --- a/src/frontends/android/app/src/main/java/org/strongswan/android/ui/VpnProfileImportActivity.java +++ b/src/frontends/android/app/src/main/java/org/strongswan/android/ui/VpnProfileImportActivity.java @@ -65,7 +65,6 @@ import java.io.ByteArrayOutputStream; import java.io.FileNotFoundException; import java.io.IOException; import java.io.InputStream; -import java.net.InetAddress; import java.net.URL; import java.net.UnknownHostException; import java.security.KeyStore; @@ -634,7 +633,7 @@ public class VpnProfileImportActivity extends AppCompatActivity { try { - InetAddress.getByName(addr); + Utils.parseInetAddress(addr); } catch (UnknownHostException e) { diff --git a/src/frontends/android/app/src/main/java/org/strongswan/android/utils/IPRange.java b/src/frontends/android/app/src/main/java/org/strongswan/android/utils/IPRange.java index 6c0aa659b..e8397707a 100644 --- a/src/frontends/android/app/src/main/java/org/strongswan/android/utils/IPRange.java +++ b/src/frontends/android/app/src/main/java/org/strongswan/android/utils/IPRange.java @@ -76,7 +76,7 @@ public class IPRange implements Comparable public IPRange(String from, String to) throws UnknownHostException { - this(InetAddress.getByName(from), InetAddress.getByName(to)); + this(Utils.parseInetAddress(from), Utils.parseInetAddress(to)); } public IPRange(InetAddress from, InetAddress to) @@ -106,7 +106,7 @@ public class IPRange implements Comparable public IPRange(String base, int prefix) throws UnknownHostException { - this(InetAddress.getByName(base), prefix); + this(Utils.parseInetAddress(base), prefix); } public IPRange(InetAddress base, int prefix)