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

catch all exceptions around minidns :(

Browse source
This commit is contained in:
Daniel Gultsch 2017-07-10 12:33:04 +02:00
parent a1f9f5e774
commit c5824a3b2a
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/main/java/eu/siacs/conversations/utils/Resolver.java
View file

@ -57,7 +57,7 @@ public class Resolver {
Log.d(Config.LOGTAG,Resolver.class.getSimpleName()+": "+e.getMessage()); Log.d(Config.LOGTAG,Resolver.class.getSimpleName()+": "+e.getMessage());
} }
if (results.size() == 0) { if (results.size() == 0) {
results.addAll(resolveFallback(DNSName.from(domain),true)); results.addAll(resolveNoSrvRecords(DNSName.from(domain),true));
} }
Collections.sort(results); Collections.sort(results);
Log.d(Config.LOGTAG,Resolver.class.getSimpleName()+": "+results.toString()); Log.d(Config.LOGTAG,Resolver.class.getSimpleName()+": "+results.toString());
@ -102,7 +102,7 @@ public class Resolver {
return list; return list;
} }
private static List<Result> resolveFallback(DNSName dnsName, boolean withCnames) { private static List<Result> resolveNoSrvRecords(DNSName dnsName, boolean withCnames) {
List<Result> results = new ArrayList<>(); List<Result> results = new ArrayList<>();
try { try {
for(A a : resolveWithFallback(dnsName,A.class,false).getAnswersOrEmptySet()) { for(A a : resolveWithFallback(dnsName,A.class,false).getAnswersOrEmptySet()) {
@ -111,13 +111,13 @@ public class Resolver {
for(AAAA aaaa : resolveWithFallback(dnsName,AAAA.class,false).getAnswersOrEmptySet()) { for(AAAA aaaa : resolveWithFallback(dnsName,AAAA.class,false).getAnswersOrEmptySet()) {
results.add(Result.createDefault(dnsName,aaaa.getInetAddress())); results.add(Result.createDefault(dnsName,aaaa.getInetAddress()));
} }
if (results.size() == 0) { if (results.size() == 0 && withCnames) {
for (CNAME cname : resolveWithFallback(dnsName, CNAME.class, false).getAnswersOrEmptySet()) { for (CNAME cname : resolveWithFallback(dnsName, CNAME.class, false).getAnswersOrEmptySet()) {
results.addAll(resolveFallback(cname.name, false)); results.addAll(resolveNoSrvRecords(cname.name, false));
} }
} }
} catch (IOException e) { } catch (Throwable throwable) {
Log.d(Config.LOGTAG,"error resolving fallback records "+e); Log.d(Config.LOGTAG, Resolver.class.getSimpleName() + "error resolving fallback records",throwable);
} }
if (results.size() == 0) { if (results.size() == 0) {
results.add(Result.createDefault(dnsName)); results.add(Result.createDefault(dnsName));