From c5824a3b2a62d928c25e90af2c621cf5981bd330 Mon Sep 17 00:00:00 2001 From: Daniel Gultsch Date: Mon, 10 Jul 2017 12:33:04 +0200 Subject: [PATCH] catch all exceptions around minidns :( --- .../java/eu/siacs/conversations/utils/Resolver.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/java/eu/siacs/conversations/utils/Resolver.java b/src/main/java/eu/siacs/conversations/utils/Resolver.java index 8b160fa44..9716fa882 100644 --- a/src/main/java/eu/siacs/conversations/utils/Resolver.java +++ b/src/main/java/eu/siacs/conversations/utils/Resolver.java @@ -57,7 +57,7 @@ public class Resolver { Log.d(Config.LOGTAG,Resolver.class.getSimpleName()+": "+e.getMessage()); } if (results.size() == 0) { - results.addAll(resolveFallback(DNSName.from(domain),true)); + results.addAll(resolveNoSrvRecords(DNSName.from(domain),true)); } Collections.sort(results); Log.d(Config.LOGTAG,Resolver.class.getSimpleName()+": "+results.toString()); @@ -102,7 +102,7 @@ public class Resolver { return list; } - private static List resolveFallback(DNSName dnsName, boolean withCnames) { + private static List resolveNoSrvRecords(DNSName dnsName, boolean withCnames) { List results = new ArrayList<>(); try { 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()) { 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()) { - results.addAll(resolveFallback(cname.name, false)); + results.addAll(resolveNoSrvRecords(cname.name, false)); } } - } catch (IOException e) { - Log.d(Config.LOGTAG,"error resolving fallback records "+e); + } catch (Throwable throwable) { + Log.d(Config.LOGTAG, Resolver.class.getSimpleName() + "error resolving fallback records",throwable); } if (results.size() == 0) { results.add(Result.createDefault(dnsName));