narayana/conversations-classic
3
2
Fork 0
Code Issues 3 Pull requests 2 Actions Packages Projects Releases 4 Wiki Activity

use build in method on >= lolipop devices to discover dns servers

Browse source
This commit is contained in:
Daniel Gultsch 2015-08-28 12:16:28 +02:00
parent 9a56e1620b
commit 3db7087658
2 changed files with 41 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
src/main/java/eu/siacs/conversations/utils/DNSHelper.java
View file

@ -1,13 +1,21 @@
package eu.siacs.conversations.utils; package eu.siacs.conversations.utils;
import android.annotation.TargetApi;
import android.content.Context;
import android.net.ConnectivityManager;
import android.net.LinkProperties;
import android.net.Network;
import android.os.Build;
import android.os.Bundle; import android.os.Bundle;
import android.util.Log; import android.util.Log;
import java.io.IOException; import java.io.IOException;
import java.net.InetAddress; import java.net.InetAddress;
import java.net.SocketTimeoutException; import java.net.SocketTimeoutException;
import java.net.UnknownHostException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
import java.util.List;
import java.util.Random; import java.util.Random;
import java.util.TreeMap; import java.util.TreeMap;
import java.util.regex.Pattern; import java.util.regex.Pattern;
@ -35,17 +43,42 @@ public class DNSHelper {
protected static Client client = new Client(); protected static Client client = new Client();
public static Bundle getSRVRecord(final Jid jid) throws IOException { public static Bundle getSRVRecord(final Jid jid, Context context) throws IOException {
final String host = jid.getDomainpart(); final String host = jid.getDomainpart();
String dns[] = client.findDNS(); final List<InetAddress> servers = Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP ? getDnsServers(context) : getDnsServersPreLolipop();
for (int i = 0; i < dns.length; ++i) { Bundle b = null;
InetAddress ip = InetAddress.getByName(dns[i]); for(InetAddress server : servers) {
Bundle b = queryDNS(host, ip); b = queryDNS(host, server);
if (b.containsKey("values") || i == dns.length - 1) { if (b.containsKey("values")) {
return b; return b;
} }
} }
return null; return b;
}
@TargetApi(21)
private static List<InetAddress> getDnsServers(Context context) {
List<InetAddress> servers = new ArrayList<>();
ConnectivityManager connectivityManager = (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE);
Network[] networks = connectivityManager.getAllNetworks();
for(int i = 0; i < networks.length; ++i) {
LinkProperties linkProperties = connectivityManager.getLinkProperties(networks[i]);
servers.addAll(linkProperties.getDnsServers());
}
return servers.size() > 0 ? servers : getDnsServersPreLolipop();
}
private static List<InetAddress> getDnsServersPreLolipop() {
List<InetAddress> servers = new ArrayList<>();
String[] dns = client.findDNS();
for(int i = 0; i < dns.length; ++i) {
try {
servers.add(InetAddress.getByName(dns[i]));
} catch (UnknownHostException e) {
//ignore
}
}
return servers;
} }
public static Bundle queryDNS(String host, InetAddress dnsServer) { public static Bundle queryDNS(String host, InetAddress dnsServer) {

2
src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java
View file

@ -159,7 +159,7 @@ public class XmppConnection implements Runnable {
throw new UnknownHostException(); throw new UnknownHostException();
} }
} else { } else {
final Bundle result = DNSHelper.getSRVRecord(account.getServer()); final Bundle result = DNSHelper.getSRVRecord(account.getServer(),mXmppConnectionService);
if (result == null) { if (result == null) {
throw new IOException("unhandled exception in DNS resolver"); throw new IOException("unhandled exception in DNS resolver");
} }