diff options
| author | Christian S <christian@pix-art.de> | 2015-09-12 10:27:56 +0200 |
|---|---|---|
| committer | Christian S <christian@pix-art.de> | 2015-09-12 10:27:56 +0200 |
| commit | 58a07c4ca2652a4fb92fe7da7c3861b4ffbccab4 (patch) | |
| tree | 657fba8eebcc988c833a317834cdb30dddfd4b02 /src/main/java/eu/siacs/conversations/utils/DNSHelper.java | |
| parent | c90ca66c58c37836c13075c794b1e7cad3813984 (diff) | |
| parent | 07c1571e1eb32c1c36fe80bdb96caf17c3824dc4 (diff) | |
Merge branch 'siacs-master' into development
Diffstat (limited to 'src/main/java/eu/siacs/conversations/utils/DNSHelper.java')
| -rw-r--r-- | src/main/java/eu/siacs/conversations/utils/DNSHelper.java | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/main/java/eu/siacs/conversations/utils/DNSHelper.java b/src/main/java/eu/siacs/conversations/utils/DNSHelper.java index 2cde19ae3..70bc73606 100644 --- a/src/main/java/eu/siacs/conversations/utils/DNSHelper.java +++ b/src/main/java/eu/siacs/conversations/utils/DNSHelper.java @@ -84,6 +84,7 @@ public class DNSHelper { public static Bundle queryDNS(String host, InetAddress dnsServer) { Bundle bundle = new Bundle(); try { + client.setTimeout(Config.PING_TIMEOUT * 1000); String qname = "_xmpp-client._tcp." + host; Log.d(Config.LOGTAG, "using dns server: " + dnsServer.getHostAddress() + " to look up " + host); DNSMessage message = client.query(qname, TYPE.SRV, CLASS.IN, dnsServer.getHostAddress()); |