mirror/Velocity
2
0
Fork 0
mirror of https://github.com/PaperMC/Velocity.git synced 2025-01-30 14:59:39 +08:00
Code Issues Packages Projects Releases Wiki Activity

Don't resolve IP addresses in the config except for the bind one.

Browse Source
This commit is contained in:
Andrew Steinborn 2019-04-29 01:59:55 -04:00
parent de51ea18cc
commit 472f45df08
3 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
proxy/src/main/java/com/velocitypowered/proxy/config/VelocityConfiguration.java
View File

@ -242,7 +242,7 @@ public class VelocityConfiguration extends AnnotatedConfig implements ProxyConfi
}
public InetSocketAddress getBind() {
return AddressUtil.parseAddress(bind);
return AddressUtil.parseAndResolveAddress(bind);
}
@Override

1
proxy/src/main/java/com/velocitypowered/proxy/network/ConnectionManager.java
View File

@ -51,7 +51,6 @@ public final class ConnectionManager {
this.resolverGroup = new DnsAddressResolverGroup(
new DnsNameResolverBuilder()
.channelType(this.transportType.datagramChannelClass)
.ttl(300, 86400)
.negativeTtl(15)
.ndots(1)
);

16
proxy/src/main/java/com/velocitypowered/proxy/util/AddressUtil.java
View File

@ -10,12 +10,26 @@ public class AddressUtil {
}
/**
* Attempts to parse an IP address of the form <code>127.0.0.1:25565</code>.
* Attempts to parse an IP address of the form <code>127.0.0.1:25565</code>. The returned
* {@link InetSocketAddress} is not resolved.
*
* @param ip the IP to parse
* @return the parsed address
*/
public static InetSocketAddress parseAddress(String ip) {
Preconditions.checkNotNull(ip, "ip");
URI uri = URI.create("tcp://" + ip);
return InetSocketAddress.createUnresolved(uri.getHost(), uri.getPort());
}
/**
* Attempts to parse an IP address of the form <code>127.0.0.1:25565</code>. The returned
* {@link InetSocketAddress} is resolved.
*
* @param ip the IP to parse
* @return the parsed address
*/
public static InetSocketAddress parseAndResolveAddress(String ip) {
Preconditions.checkNotNull(ip, "ip");
URI uri = URI.create("tcp://" + ip);
return new InetSocketAddress(uri.getHost(), uri.getPort());