diff options
author | cyberta <cyberta@riseup.net> | 2020-01-23 00:56:50 -0600 |
---|---|---|
committer | cyberta <cyberta@riseup.net> | 2020-01-23 00:56:50 -0600 |
commit | 0375f0eccdf2b22a47e0089b4a1868c3a54a527a (patch) | |
tree | a6b568d54b4cf3c7b53c0c5af30f8e5da15298f5 /app/src/main/java/se/leap/bitmaskclient/DnsResolver.java | |
parent | 42b794a24f7b47910d595e713f29db85e3d0da3d (diff) |
add api ip to provider class, implement ip lookup based on given provider host name
Diffstat (limited to 'app/src/main/java/se/leap/bitmaskclient/DnsResolver.java')
-rw-r--r-- | app/src/main/java/se/leap/bitmaskclient/DnsResolver.java | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/app/src/main/java/se/leap/bitmaskclient/DnsResolver.java b/app/src/main/java/se/leap/bitmaskclient/DnsResolver.java index 069318a4..92f70492 100644 --- a/app/src/main/java/se/leap/bitmaskclient/DnsResolver.java +++ b/app/src/main/java/se/leap/bitmaskclient/DnsResolver.java @@ -1,29 +1,33 @@ package se.leap.bitmaskclient; +import org.jetbrains.annotations.NotNull; + import java.net.InetAddress; import java.net.UnknownHostException; import java.util.ArrayList; import java.util.List; import okhttp3.Dns; +import se.leap.bitmaskclient.utils.IPAddress; class DnsResolver implements Dns { @Override - public List<InetAddress> lookup(String hostname) throws UnknownHostException { + public List<InetAddress> lookup(@NotNull String hostname) throws UnknownHostException { try { return Dns.SYSTEM.lookup(hostname); } catch (UnknownHostException e) { ProviderObservable observable = ProviderObservable.getInstance(); Provider currentProvider; - if (observable.getProviderToSetup() != null) { - currentProvider = observable.getProviderToSetup(); + if (observable.getProviderForDns() != null) { + currentProvider = observable.getProviderForDns(); } else { currentProvider = observable.getCurrentProvider(); } - if (currentProvider.hasProviderIp()) { + String ip = currentProvider.getIpForHostname(hostname); + if (!ip.isEmpty()) { ArrayList<InetAddress> addresses = new ArrayList<>(); - addresses.add(InetAddress.getByAddress(hostname, currentProvider.getProviderIpAsBytes())); + addresses.add(InetAddress.getByAddress(hostname, IPAddress.asBytes(ip))); return addresses; } else { throw new UnknownHostException("Hostname " + hostname + " not found"); |