54f102feb9
Motivation:
At the moment we basically drop all non prefered addresses when calling DnsNameResolver.resolveAll(...). This is just incorrect and was introduced by 4cd39cc4b3. More correct is to still retain these but sort the returned List to have the prefered addresses on the beginning of the List. This also ensures resolve(...) will return the correct return type.
Modifications:
- Introduce PreferredAddressTypeComperator which we use to sort the List so it will contain the preferred address type first.
- Add unit test to verify behaviour
Result:
Include not only preferred addresses in the List that is returned by resolveAll(...)
92 lines
3.7 KiB
Java
92 lines
3.7 KiB
Java
/*
|
|
* Copyright 2018 The Netty Project
|
|
*
|
|
* The Netty Project licenses this file to you under the Apache License,
|
|
* version 2.0 (the "License"); you may not use this file except in compliance
|
|
* with the License. You may obtain a copy of the License at:
|
|
*
|
|
* http://www.apache.org/licenses/LICENSE-2.0
|
|
*
|
|
* Unless required by applicable law or agreed to in writing, software
|
|
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
|
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
|
* License for the specific language governing permissions and limitations
|
|
* under the License.
|
|
*/
|
|
package io.netty.resolver.dns;
|
|
|
|
import static io.netty.resolver.dns.DnsAddressDecoder.decodeAddress;
|
|
|
|
import java.net.InetAddress;
|
|
import java.net.UnknownHostException;
|
|
import java.util.List;
|
|
|
|
import io.netty.channel.EventLoop;
|
|
import io.netty.handler.codec.dns.DnsRecord;
|
|
import io.netty.handler.codec.dns.DnsRecordType;
|
|
import io.netty.util.concurrent.Promise;
|
|
|
|
final class DnsAddressResolveContext extends DnsResolveContext<InetAddress> {
|
|
|
|
private final DnsCache resolveCache;
|
|
private final AuthoritativeDnsServerCache authoritativeDnsServerCache;
|
|
|
|
DnsAddressResolveContext(DnsNameResolver parent, String hostname, DnsRecord[] additionals,
|
|
DnsServerAddressStream nameServerAddrs, DnsCache resolveCache,
|
|
AuthoritativeDnsServerCache authoritativeDnsServerCache) {
|
|
super(parent, hostname, DnsRecord.CLASS_IN, parent.resolveRecordTypes(), additionals, nameServerAddrs);
|
|
this.resolveCache = resolveCache;
|
|
this.authoritativeDnsServerCache = authoritativeDnsServerCache;
|
|
}
|
|
|
|
@Override
|
|
DnsResolveContext<InetAddress> newResolverContext(DnsNameResolver parent, String hostname,
|
|
int dnsClass, DnsRecordType[] expectedTypes,
|
|
DnsRecord[] additionals,
|
|
DnsServerAddressStream nameServerAddrs) {
|
|
return new DnsAddressResolveContext(parent, hostname, additionals, nameServerAddrs, resolveCache,
|
|
authoritativeDnsServerCache);
|
|
}
|
|
|
|
@Override
|
|
InetAddress convertRecord(DnsRecord record, String hostname, DnsRecord[] additionals, EventLoop eventLoop) {
|
|
return decodeAddress(record, hostname, parent.isDecodeIdn());
|
|
}
|
|
|
|
@Override
|
|
List<InetAddress> filterResults(List<InetAddress> unfiltered) {
|
|
unfiltered.sort(PreferredAddressTypeComparator.comparator(parent.preferredAddressType()));
|
|
return unfiltered;
|
|
}
|
|
|
|
@Override
|
|
void cache(String hostname, DnsRecord[] additionals,
|
|
DnsRecord result, InetAddress convertedResult) {
|
|
resolveCache.cache(hostname, additionals, convertedResult, result.timeToLive(), parent.ch.eventLoop());
|
|
}
|
|
|
|
@Override
|
|
void cache(String hostname, DnsRecord[] additionals, UnknownHostException cause) {
|
|
resolveCache.cache(hostname, additionals, cause, parent.ch.eventLoop());
|
|
}
|
|
|
|
@Override
|
|
void doSearchDomainQuery(String hostname, Promise<List<InetAddress>> nextPromise) {
|
|
// Query the cache for the hostname first and only do a query if we could not find it in the cache.
|
|
if (!DnsNameResolver.doResolveAllCached(
|
|
hostname, additionals, nextPromise, resolveCache, parent.resolvedInternetProtocolFamiliesUnsafe())) {
|
|
super.doSearchDomainQuery(hostname, nextPromise);
|
|
}
|
|
}
|
|
|
|
@Override
|
|
DnsCache resolveCache() {
|
|
return resolveCache;
|
|
}
|
|
|
|
@Override
|
|
AuthoritativeDnsServerCache authoritativeDnsServerCache() {
|
|
return authoritativeDnsServerCache;
|
|
}
|
|
}
|