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

Properly release DNS query resources.

Browse source
This commit is contained in:
Steveice10 2020-06-03 12:15:47 -07:00
parent bfd0687b3c
commit d8bfc98d05
1 changed files with 14 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -6,6 +6,7 @@ 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.buffer.ByteBuf;
import io.netty.channel.AddressedEnvelope;
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;
@ -18,8 +19,8 @@ import io.netty.channel.socket.nio.NioSocketChannel;
import io.netty.handler.codec.dns.DefaultDnsQuestion; import io.netty.handler.codec.dns.DefaultDnsQuestion;
import io.netty.handler.codec.dns.DefaultDnsRawRecord; import io.netty.handler.codec.dns.DefaultDnsRawRecord;
import io.netty.handler.codec.dns.DefaultDnsRecordDecoder; 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.DnsRecordType;
import io.netty.handler.codec.dns.DnsResponse;
import io.netty.handler.codec.dns.DnsSection; 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;
@ -145,14 +146,14 @@ public class TcpClientSession extends TcpSession {
System.out.println("[PacketLib] Attempting SRV lookup for \"" + name + "\"."); System.out.println("[PacketLib] Attempting SRV lookup for \"" + name + "\".");
} }
try { AddressedEnvelope<DnsResponse, InetSocketAddress> envelope = null;
final DnsNameResolver resolver = new DnsNameResolverBuilder(this.group.next()) try(DnsNameResolver resolver = new DnsNameResolverBuilder(this.group.next())
.channelType(NioDatagramChannel.class) .channelType(NioDatagramChannel.class)
.build(); .build()) {
envelope = resolver.query(new DefaultDnsQuestion(name, DnsRecordType.SRV)).get();
DnsMessage message = resolver.query(new DefaultDnsQuestion(name, DnsRecordType.SRV)).get().content(); DnsResponse response = envelope.content();
if(message.count(DnsSection.ANSWER) > 0) { if(response.count(DnsSection.ANSWER) > 0) {
DefaultDnsRawRecord record = message.recordAt(DnsSection.ANSWER, 0); DefaultDnsRawRecord record = response.recordAt(DnsSection.ANSWER, 0);
if(record.type() == DnsRecordType.SRV) { if(record.type() == DnsRecordType.SRV) {
ByteBuf buf = record.content(); ByteBuf buf = record.content();
buf.skipBytes(4); // Skip priority and weight. buf.skipBytes(4); // Skip priority and weight.
@ -179,6 +180,10 @@ public class TcpClientSession extends TcpSession {
System.out.println("[PacketLib] Failed to resolve SRV record."); System.out.println("[PacketLib] Failed to resolve SRV record.");
e.printStackTrace(); e.printStackTrace();
} }
} finally {
if(envelope != null) {
envelope.release();
}
} }
return new InetSocketAddress(this.getHost(), this.getPort()); return new InetSocketAddress(this.getHost(), this.getPort());