From 7be13ff44d2d862bb31956c5214b547efde22abe Mon Sep 17 00:00:00 2001 From: Martin/Geno Date: Sat, 25 May 2019 01:19:58 +0200 Subject: [PATCH] Networkstack - switch IPv4 and IPv6 --- .../java/eu/siacs/conversations/utils/Resolver.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/java/eu/siacs/conversations/utils/Resolver.java b/src/main/java/eu/siacs/conversations/utils/Resolver.java index 96ce63c90..6a252f26a 100644 --- a/src/main/java/eu/siacs/conversations/utils/Resolver.java +++ b/src/main/java/eu/siacs/conversations/utils/Resolver.java @@ -219,12 +219,12 @@ public class Resolver { private static List resolveNoSrvRecords(DNSName dnsName, boolean withCnames) { List results = new ArrayList<>(); try { - for (A a : resolveWithFallback(dnsName, A.class, false).getAnswersOrEmptySet()) { - results.add(Result.createDefault(dnsName, a.getInetAddress())); - } for (AAAA aaaa : resolveWithFallback(dnsName, AAAA.class, false).getAnswersOrEmptySet()) { results.add(Result.createDefault(dnsName, aaaa.getInetAddress())); } + for (A a : resolveWithFallback(dnsName, A.class, false).getAnswersOrEmptySet()) { + results.add(Result.createDefault(dnsName, a.getInetAddress())); + } if (results.size() == 0 && withCnames) { for (CNAME cname : resolveWithFallback(dnsName, CNAME.class, false).getAnswersOrEmptySet()) { results.addAll(resolveNoSrvRecords(cname.name, false)); @@ -379,10 +379,10 @@ public class Resolver { if (ip == null && result.ip == null) { return 0; } else if (ip != null && result.ip != null) { - if (ip instanceof Inet4Address && result.ip instanceof Inet4Address) { + if (ip instanceof Inet6Address && result.ip instanceof Inet6Address) { return 0; } else { - return ip instanceof Inet4Address ? -1 : 1; + return ip instanceof Inet6Address ? -1 : 1; } } else { return ip != null ? -1 : 1;