sum7/Conversations
sum7
/
Conversations
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

rewrote dns fallback

This commit is contained in:
Daniel Gultsch 2015-07-24 19:06:47 +02:00
parent e5fae429fa
commit 9c94c9ad8f
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/main/java/eu/siacs/conversations/utils/DNSHelper.java
View File

@ -38,17 +38,14 @@ public class DNSHelper {
public static Bundle getSRVRecord(final Jid jid) throws IOException { public static Bundle getSRVRecord(final Jid jid) throws IOException {
final String host = jid.getDomainpart(); final String host = jid.getDomainpart();
String dns[] = client.findDNS(); String dns[] = client.findDNS();
for (int i = 0; i < dns.length; ++i) {
if (dns != null) { InetAddress ip = InetAddress.getByName(dns[i]);
for (String dnsserver : dns) {
InetAddress ip = InetAddress.getByName(dnsserver);
Bundle b = queryDNS(host, ip); Bundle b = queryDNS(host, ip);
if (b.containsKey("values")) { if (b.containsKey("values") || i == dns.length - 1) {
return b; return b;
} }
} }
} return null;
return queryDNS(host, InetAddress.getByName("8.8.8.8"));
} }
public static Bundle queryDNS(String host, InetAddress dnsServer) { public static Bundle queryDNS(String host, InetAddress dnsServer) {

3
src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java
View File

@ -164,6 +164,9 @@ public class XmppConnection implements Runnable {
} }
} else { } else {
final Bundle result = DNSHelper.getSRVRecord(account.getServer()); final Bundle result = DNSHelper.getSRVRecord(account.getServer());
if (result == null) {
throw new IOException("unhandled exception in DNS resolver");
}
final ArrayList<Parcelable> values = result.getParcelableArrayList("values"); final ArrayList<Parcelable> values = result.getParcelableArrayList("values");
if ("timeout".equals(result.getString("error"))) { if ("timeout".equals(result.getString("error"))) {
throw new IOException("timeout in dns"); throw new IOException("timeout in dns");