From 486f96225239592fc47ca036e96121050dbef166 Mon Sep 17 00:00:00 2001 From: Norman Maurer Date: Mon, 24 Jul 2017 13:12:53 +0200 Subject: [PATCH] Respect DNS port that is specified via JNDI Motivation: JNDI allows to specify an port so we should respect it. Modifications: Use the specified port and if none is specifed use 53. Result: Correct handling of JNDI configured DNS. --- .../resolver/dns/DefaultDnsServerAddressStreamProvider.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/resolver-dns/src/main/java/io/netty/resolver/dns/DefaultDnsServerAddressStreamProvider.java b/resolver-dns/src/main/java/io/netty/resolver/dns/DefaultDnsServerAddressStreamProvider.java index b7c5bd719f..8c45f7e71e 100644 --- a/resolver-dns/src/main/java/io/netty/resolver/dns/DefaultDnsServerAddressStreamProvider.java +++ b/resolver-dns/src/main/java/io/netty/resolver/dns/DefaultDnsServerAddressStreamProvider.java @@ -69,7 +69,9 @@ public final class DefaultDnsServerAddressStreamProvider implements DnsServerAdd String[] servers = dnsUrls.split(" "); for (String server : servers) { try { - defaultNameServers.add(SocketUtils.socketAddress(new URI(server).getHost(), DNS_PORT)); + URI uri = new URI(server); + int port = uri.getPort(); + defaultNameServers.add(SocketUtils.socketAddress(uri.getHost(), port == -1 ? DNS_PORT : port)); } catch (URISyntaxException e) { logger.debug("Skipping a malformed nameserver URI: {}", server, e); }