Parker2991/MCProtocolLib
1
0
Fork 0
mirror of https://github.com/GeyserMC/MCProtocolLib.git synced 2024-12-12 08:41:00 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Replace dnsjava with netty DNS support.

Browse source
This commit is contained in:
Steveice10 2020-06-01 14:07:46 -07:00
parent 75f0f02d89
commit bfd0687b3c
2 changed files with 61 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
pom.xml
View file

@ -52,17 +52,6 @@
<version>4.1.45.Final</version> <version>4.1.45.Final</version>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<dependency>
<groupId>dnsjava</groupId>
<artifactId>dnsjava</artifactId>
<version>3.1.0</version>
</dependency>
<!-- Silence dnsjava slf4j warnings -->
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-nop</artifactId>
<version>1.7.30</version>
</dependency>
</dependencies> </dependencies>
<build> <build>

94
src/main/java/com/github/steveice10/packetlib/tcp/TcpClientSession.java
View file

@ -5,6 +5,7 @@ import com.github.steveice10.packetlib.Client;
import com.github.steveice10.packetlib.ProxyInfo; import com.github.steveice10.packetlib.ProxyInfo;
import com.github.steveice10.packetlib.packet.PacketProtocol; import com.github.steveice10.packetlib.packet.PacketProtocol;
import io.netty.bootstrap.Bootstrap; import io.netty.bootstrap.Bootstrap;
import io.netty.buffer.ByteBuf;
import io.netty.channel.Channel; import io.netty.channel.Channel;
import io.netty.channel.ChannelFuture; import io.netty.channel.ChannelFuture;
import io.netty.channel.ChannelInitializer; import io.netty.channel.ChannelInitializer;
@ -12,15 +13,22 @@ import io.netty.channel.ChannelOption;
import io.netty.channel.ChannelPipeline; import io.netty.channel.ChannelPipeline;
import io.netty.channel.EventLoopGroup; import io.netty.channel.EventLoopGroup;
import io.netty.channel.nio.NioEventLoopGroup; import io.netty.channel.nio.NioEventLoopGroup;
import io.netty.channel.socket.nio.NioDatagramChannel;
import io.netty.channel.socket.nio.NioSocketChannel; import io.netty.channel.socket.nio.NioSocketChannel;
import io.netty.handler.codec.dns.DefaultDnsQuestion;
import io.netty.handler.codec.dns.DefaultDnsRawRecord;
import io.netty.handler.codec.dns.DefaultDnsRecordDecoder;
import io.netty.handler.codec.dns.DnsMessage;
import io.netty.handler.codec.dns.DnsRecordType;
import io.netty.handler.codec.dns.DnsSection;
import io.netty.handler.proxy.HttpProxyHandler; import io.netty.handler.proxy.HttpProxyHandler;
import io.netty.handler.proxy.Socks4ProxyHandler; import io.netty.handler.proxy.Socks4ProxyHandler;
import io.netty.handler.proxy.Socks5ProxyHandler; import io.netty.handler.proxy.Socks5ProxyHandler;
import org.xbill.DNS.Lookup; import io.netty.resolver.dns.DnsNameResolver;
import org.xbill.DNS.Record; import io.netty.resolver.dns.DnsNameResolverBuilder;
import org.xbill.DNS.SRVRecord;
import org.xbill.DNS.TextParseException; import java.net.InetSocketAddress;
import org.xbill.DNS.Type; import java.net.SocketAddress;
public class TcpClientSession extends TcpSession { public class TcpClientSession extends TcpSession {
private Client client; private Client client;
@ -102,34 +110,7 @@ public class TcpClientSession extends TcpSession {
@Override @Override
public void run() { public void run() {
try { try {
boolean debug = getFlag(BuiltinFlags.PRINT_DEBUG, false); bootstrap.remoteAddress(resolveAddress());
String host = getHost();
int port = getPort();
try {
Lookup lookup = new Lookup(getPacketProtocol().getSRVRecordPrefix() + "._tcp." + host, Type.SRV);
Record[] records = lookup.run();
if(records != null && records.length > 0) {
SRVRecord srv = (SRVRecord) records[0];
host = srv.getTarget().toString().replaceFirst("\\.$", "");
port = srv.getPort();
if(debug) {
System.out.println("[PacketLib] Found SRV record for \"" + host + ":" + port + "\".");
}
} else if(debug) {
System.out.println("[PacketLib] No SRV records found; resolver returned \"" + lookup.getErrorString() + "\".");
}
} catch(TextParseException e) {
if(debug) {
System.out.println("[PacketLib] Failed to resolve SRV record.");
e.printStackTrace();
}
}
bootstrap.remoteAddress(host, port);
ChannelFuture future = bootstrap.connect().sync(); ChannelFuture future = bootstrap.connect().sync();
if(future.isSuccess()) { if(future.isSuccess()) {
@ -156,6 +137,53 @@ public class TcpClientSession extends TcpSession {
} }
} }
private SocketAddress resolveAddress() {
boolean debug = getFlag(BuiltinFlags.PRINT_DEBUG, false);
String name = this.getPacketProtocol().getSRVRecordPrefix() + "._tcp." + this.getHost();
if(debug) {
System.out.println("[PacketLib] Attempting SRV lookup for \"" + name + "\".");
}
try {
final DnsNameResolver resolver = new DnsNameResolverBuilder(this.group.next())
.channelType(NioDatagramChannel.class)
.build();
DnsMessage message = resolver.query(new DefaultDnsQuestion(name, DnsRecordType.SRV)).get().content();
if(message.count(DnsSection.ANSWER) > 0) {
DefaultDnsRawRecord record = message.recordAt(DnsSection.ANSWER, 0);
if(record.type() == DnsRecordType.SRV) {
ByteBuf buf = record.content();
buf.skipBytes(4); // Skip priority and weight.
int port = buf.readUnsignedShort();
String host = DefaultDnsRecordDecoder.decodeName(buf);
if(host.endsWith(".")) {
host = host.substring(0, host.length() - 1);
}
if(debug) {
System.out.println("[PacketLib] Found SRV record containing \"" + host + ":" + port + "\".");
}
return new InetSocketAddress(host, port);
} else if(debug) {
System.out.println("[PacketLib] Received non-SRV record in response.");
}
} else if(debug) {
System.out.println("[PacketLib] No SRV record found.");
}
} catch(Exception e) {
if(debug) {
System.out.println("[PacketLib] Failed to resolve SRV record.");
e.printStackTrace();
}
}
return new InetSocketAddress(this.getHost(), this.getPort());
}
@Override @Override
public void disconnect(String reason, Throwable cause) { public void disconnect(String reason, Throwable cause) {
super.disconnect(reason, cause); super.disconnect(reason, cause);