diff options
| author | iNPUTmice <daniel@gultsch.de> | 2014-12-14 18:31:52 +0100 |
|---|---|---|
| committer | iNPUTmice <daniel@gultsch.de> | 2014-12-14 18:31:52 +0100 |
| commit | 50410dad334643945e4978117d81dc3cbf4c3157 (patch) | |
| tree | e02b56b7b93a377e888c296aafc3b13eec1679e2 /src/main/java/eu/siacs/conversations/utils/DNSHelper.java | |
| parent | de06cb38d190e9853e8557e07eaff1c8ba881e2a (diff) | |
possible dns fixes
Diffstat (limited to 'src/main/java/eu/siacs/conversations/utils/DNSHelper.java')
| -rw-r--r-- | src/main/java/eu/siacs/conversations/utils/DNSHelper.java | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/src/main/java/eu/siacs/conversations/utils/DNSHelper.java b/src/main/java/eu/siacs/conversations/utils/DNSHelper.java index 8c1a8dea..2aa6f573 100644 --- a/src/main/java/eu/siacs/conversations/utils/DNSHelper.java +++ b/src/main/java/eu/siacs/conversations/utils/DNSHelper.java @@ -143,12 +143,21 @@ public class DNSHelper { Bundle namePort = new Bundle(); namePort.putString("name", srv.getName()); namePort.putInt("port", srv.getPort()); + if (ips6.containsKey(srv.getName())) { + ArrayList<String> ip = ips6.get(srv.getName()); + Collections.shuffle(ip, rnd); + namePort.putString("ip", ip.get(0)); + values.add(namePort); + } if (ips4.containsKey(srv.getName())) { ArrayList<String> ip = ips4.get(srv.getName()); Collections.shuffle(ip, rnd); - namePort.putString("ipv4", ip.get(0)); + namePort.putString("ip", ip.get(0)); + values.add(namePort); + } + if (!ips6.containsKey(srv.getName()) && !ips4.containsKey(srv.getName())) { + values.add(namePort); } - values.add(namePort); } bundle.putParcelableArrayList("values", values); } catch (SocketTimeoutException e) { |