feat(net): support domain names in peer configuration #6727
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,171 @@ | ||
| package org.tron.core.config.args; | ||
|
|
||
| import java.net.InetAddress; | ||
| import java.net.InetSocketAddress; | ||
| import java.net.UnknownHostException; | ||
| import java.util.ArrayList; | ||
| import java.util.HashMap; | ||
| import java.util.LinkedHashMap; | ||
| import java.util.List; | ||
| import java.util.Map; | ||
| import java.util.concurrent.ExecutionException; | ||
| import java.util.concurrent.ExecutorService; | ||
| import java.util.concurrent.Future; | ||
| import java.util.concurrent.TimeUnit; | ||
| import java.util.concurrent.TimeoutException; | ||
| import java.util.function.BiFunction; | ||
| import lombok.extern.slf4j.Slf4j; | ||
| import org.tron.common.es.ExecutorServiceManager; | ||
| import org.tron.p2p.dns.lookup.LookUpTxt; | ||
| import org.tron.p2p.utils.NetUtil; | ||
|
|
||
| @Slf4j(topic = "app") | ||
| public class InetUtil { | ||
|
|
||
| private static final String DNS_POOL_NAME = "args-dns-lookup"; | ||
| private static final int DNS_POOL_MAX_SIZE = 10; | ||
| // Per-lookup wall-clock budget. After this, the entry is treated as unresolvable. | ||
| private static final long DNS_LOOKUP_TIMEOUT_SECONDS = 10; | ||
|
|
||
| // Overridable in tests so worker threads (parallel path) can use a non-network lookup. | ||
| // Reset to LookUpTxt::lookUpIp after each test that overrides it. | ||
| public static volatile BiFunction<String, Boolean, InetAddress> dnsLookup = | ||
| LookUpTxt::lookUpIp; | ||
|
|
||
| /** | ||
| * Converts a list of {@code ipOrDomain:port} config strings into resolved {@link | ||
| * InetSocketAddress} objects, preserving the original order. | ||
| * | ||
| * <p>IP literals (IPv4 and IPv6) are used as-is. Domain names are resolved via DNS: when there | ||
| * are multiple domains, they are resolved in parallel using a dedicated thread pool; a single | ||
| * domain is resolved inline. Entries that fail DNS resolution are silently dropped. | ||
| * | ||
| * <p>Supported formats: | ||
| * <ul> | ||
| * <li>{@code 192.168.100.0:18888} | ||
| * <li>{@code [fe80::48ff:fe00:1122]:18888} | ||
| * <li>{@code example.com:18888} | ||
| * <li>{@code hostname:18888} | ||
| * </ul> | ||
| * | ||
| * @param ipOrDomainWithPortList list of address strings in {@code ipOrDomain:port} format, | ||
| * may mix IP literals and domain names | ||
| * @return resolved addresses in the same order as the input, omitting unresolvable entries | ||
| */ | ||
| public static List<InetSocketAddress> resolveInetSocketAddressList( | ||
|
Sunny6889 marked this conversation as resolved.
|
||
| List<String> ipOrDomainWithPortList) { | ||
| List<InetSocketAddress> result = new ArrayList<>(); | ||
| if (ipOrDomainWithPortList.isEmpty()) { | ||
| return result; | ||
| } | ||
|
|
||
| // Single pass: parse every entry once; collect domain entries for DNS resolution. | ||
| LinkedHashMap<String, InetSocketAddress> parsedMap = new LinkedHashMap<>(); | ||
| List<String> domainEntries = new ArrayList<>(); | ||
| for (String item : ipOrDomainWithPortList) { | ||
| InetSocketAddress parsed = NetUtil.parseInetSocketAddress(item); | ||
| parsedMap.put(item, parsed); | ||
| if (!isIpLiteral(parsed.getHostString())) { | ||
| domainEntries.add(item); | ||
| } | ||
| } | ||
|
|
||
| // Resolve domain names: spin up a thread pool only when there are multiple domains. | ||
| Map<String, InetSocketAddress> resolvedDomains = new HashMap<>(); | ||
| if (domainEntries.size() > 1) { | ||
|
317787106 marked this conversation as resolved.
Outdated
|
||
| int poolSize = StrictMath.min(domainEntries.size(), DNS_POOL_MAX_SIZE); | ||
| ExecutorService dnsPool = ExecutorServiceManager | ||
| .newFixedThreadPool(DNS_POOL_NAME, poolSize, true); | ||
| List<Future<InetSocketAddress>> futures = new ArrayList<>(domainEntries.size()); | ||
| for (String entry : domainEntries) { | ||
| futures.add(dnsPool.submit(() -> resolveInetSocketAddress(entry))); | ||
| } | ||
| for (int i = 0; i < domainEntries.size(); i++) { | ||
| String entry = domainEntries.get(i); | ||
| try { | ||
| resolvedDomains.put(entry, | ||
| futures.get(i).get(DNS_LOOKUP_TIMEOUT_SECONDS, TimeUnit.SECONDS)); | ||
| } catch (InterruptedException e) { | ||
| Thread.currentThread().interrupt(); | ||
| logger.warn("DNS lookup interrupted for: {}", entry); | ||
| break; | ||
| } catch (ExecutionException e) { | ||
| logger.warn("Failed to resolve address, skip: {}", entry); | ||
| } catch (TimeoutException e) { | ||
| logger.warn("DNS lookup timed out after {}s, skip: {}", DNS_LOOKUP_TIMEOUT_SECONDS, | ||
| entry); | ||
| } | ||
| } | ||
| ExecutorServiceManager.shutdownAndAwaitTermination(dnsPool, DNS_POOL_NAME); | ||
| } else if (domainEntries.size() == 1) { | ||
| String entry = domainEntries.get(0); | ||
| resolvedDomains.put(entry, resolveInetSocketAddress(entry)); | ||
|
317787106 marked this conversation as resolved.
Outdated
|
||
| } | ||
|
|
||
| // Build the result list preserving the original config order. | ||
| for (Map.Entry<String, InetSocketAddress> entry : parsedMap.entrySet()) { | ||
| String item = entry.getKey(); | ||
| InetSocketAddress parsed = entry.getValue(); | ||
| InetSocketAddress resolved = isIpLiteral(parsed.getHostString()) | ||
| ? parsed | ||
| : resolvedDomains.get(item); | ||
| if (resolved != null) { | ||
| result.add(resolved); | ||
| } | ||
| } | ||
| return result; | ||
| } | ||
|
|
||
| /** | ||
| * Resolves a {@code ipOrDomain:port} config string to an {@link InetSocketAddress} via DNS. | ||
| * | ||
| * <p>The host is looked up first over IPv4, then over IPv6 as a fallback. Returns {@code null} | ||
| * if DNS resolution fails for both address families. | ||
| * | ||
| * @param ipOrDomainWithPort address string in {@code ipOrDomain:port} format | ||
| * @return resolved {@link InetSocketAddress}, or {@code null} if the host cannot be resolved | ||
| */ | ||
| private static InetSocketAddress resolveInetSocketAddress(String ipOrDomainWithPort) { | ||
|
Contributor
There was a problem hiding this comment. Could you rename
Collaborator
Author
There was a problem hiding this comment. Class |
||
| InetSocketAddress parsed = NetUtil.parseInetSocketAddress(ipOrDomainWithPort); | ||
| String host = parsed.getHostString(); | ||
| int port = parsed.getPort(); | ||
| InetAddress address = dnsLookup.apply(host, true); | ||
| if (address == null) { | ||
| address = dnsLookup.apply(host, false); | ||
| } | ||
| if (address == null) { | ||
| return null; | ||
| } | ||
| logger.info("Resolve {} to {}", host, address.getHostAddress()); | ||
| return new InetSocketAddress(address, port); | ||
| } | ||
|
|
||
| /** | ||
| * Resolves {@code ipOrDomain} to an {@link InetAddress}. | ||
| * | ||
| * <p>IP literals are converted directly without a DNS lookup. Domain names are first resolved | ||
| * over IPv4, then retried over IPv6 if the first attempt fails. | ||
| * | ||
| * @param ipOrDomain IPv4/IPv6 literal or a domain name to resolve | ||
| * @return the resolved {@link InetAddress}, or {@code null} if resolution fails | ||
| */ | ||
| public static InetAddress resolveInetAddress(String ipOrDomain) { | ||
| // Fast path: already a numeric address — no lookup needed. | ||
| if (isIpLiteral(ipOrDomain)) { | ||
| try { | ||
| return InetAddress.getByName(ipOrDomain); | ||
| } catch (UnknownHostException e) { | ||
| return null; | ||
| } | ||
| } | ||
| InetAddress address = dnsLookup.apply(ipOrDomain, true); | ||
| if (address == null) { | ||
| address = dnsLookup.apply(ipOrDomain, false); | ||
| } | ||
| return address; | ||
| } | ||
|
|
||
| private static boolean isIpLiteral(String host) { | ||
| return NetUtil.validIpV4(host) || NetUtil.validIpV6(host); | ||
| } | ||
| } | ||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Is this
release-v2.2.8-SNAPSHOTa correct usage?Why change from
io.github.tronprotocoltocom.github.tronprotocolThere was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It's a gitpack temporary dependency now. After the libp2p v2.2.8 releases, it will be updated as