ims-volte-vowifi
/
strongswan
9
0
Fork 0
Code Pull Requests Releases Activity

android: Use helper to parse IP addresses where appropriate

This commit is contained in:
Tobias Brunner 2019-03-05 19:02:05 +01:00
parent 7028e9d31e
commit 2ef473be15
4 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/frontends/android/app/src/main/java/org/strongswan/android/logic/CharonVpnService.java
View File

@ -58,6 +58,7 @@ import org.strongswan.android.utils.Constants;
import org.strongswan.android.utils.IPRange; import org.strongswan.android.utils.IPRange;
import org.strongswan.android.utils.IPRangeSet; import org.strongswan.android.utils.IPRangeSet;
import org.strongswan.android.utils.SettingsWriter; import org.strongswan.android.utils.SettingsWriter;
import org.strongswan.android.utils.Utils;
import java.io.File; import java.io.File;
import java.io.FileInputStream; import java.io.FileInputStream;
@ -1117,7 +1118,7 @@ public class CharonVpnService extends VpnService implements Runnable, VpnStateSe
{ {
try try
{ {
mDnsServers.add(InetAddress.getByName(server)); mDnsServers.add(Utils.parseInetAddress(server));
recordAddressFamily(server); recordAddressFamily(server);
mDnsServersConfigured = true; mDnsServersConfigured = true;
} }
@ -1156,7 +1157,7 @@ public class CharonVpnService extends VpnService implements Runnable, VpnStateSe
try try
{ {
mDnsServers.add(InetAddress.getByName(address)); mDnsServers.add(Utils.parseInetAddress(address));
recordAddressFamily(address); recordAddressFamily(address);
} }
catch (UnknownHostException e) catch (UnknownHostException e)
@ -1341,7 +1342,7 @@ public class CharonVpnService extends VpnService implements Runnable, VpnStateSe
private boolean isIPv6(String address) throws UnknownHostException private boolean isIPv6(String address) throws UnknownHostException
{ {
InetAddress addr = InetAddress.getByName(address); InetAddress addr = Utils.parseInetAddress(address);
if (addr instanceof Inet4Address) if (addr instanceof Inet4Address)
{ {
return false; return false;

3
src/frontends/android/app/src/main/java/org/strongswan/android/ui/VpnProfileDetailActivity.java
View File

@ -72,7 +72,6 @@ import org.strongswan.android.utils.Constants;
import org.strongswan.android.utils.IPRangeSet; import org.strongswan.android.utils.IPRangeSet;
import org.strongswan.android.utils.Utils; import org.strongswan.android.utils.Utils;
import java.net.InetAddress;
import java.net.UnknownHostException; import java.net.UnknownHostException;
import java.security.cert.X509Certificate; import java.security.cert.X509Certificate;
import java.util.ArrayList; import java.util.ArrayList;
@ -915,7 +914,7 @@ public class VpnProfileDetailActivity extends AppCompatActivity
{ {
try try
{ {
InetAddress.getByName(addr); Utils.parseInetAddress(addr);
} }
catch (UnknownHostException e) catch (UnknownHostException e)
{ {

3
src/frontends/android/app/src/main/java/org/strongswan/android/ui/VpnProfileImportActivity.java
View File

@ -65,7 +65,6 @@ import java.io.ByteArrayOutputStream;
import java.io.FileNotFoundException; import java.io.FileNotFoundException;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.net.InetAddress;
import java.net.URL; import java.net.URL;
import java.net.UnknownHostException; import java.net.UnknownHostException;
import java.security.KeyStore; import java.security.KeyStore;
@ -634,7 +633,7 @@ public class VpnProfileImportActivity extends AppCompatActivity
{ {
try try
{ {
InetAddress.getByName(addr); Utils.parseInetAddress(addr);
} }
catch (UnknownHostException e) catch (UnknownHostException e)
{ {

4
src/frontends/android/app/src/main/java/org/strongswan/android/utils/IPRange.java
View File

@ -76,7 +76,7 @@ public class IPRange implements Comparable<IPRange>
public IPRange(String from, String to) throws UnknownHostException 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) public IPRange(InetAddress from, InetAddress to)
@ -106,7 +106,7 @@ public class IPRange implements Comparable<IPRange>
public IPRange(String base, int prefix) throws UnknownHostException public IPRange(String base, int prefix) throws UnknownHostException
{ {
this(InetAddress.getByName(base), prefix); this(Utils.parseInetAddress(base), prefix);
} }
public IPRange(InetAddress base, int prefix) public IPRange(InetAddress base, int prefix)