Parker2991/ViaProxy
1
0
Fork 0
mirror of https://github.com/ViaVersion/ViaProxy.git synced 2024-11-26 17:36:21 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed packets being sent too early after connecting

Browse source
This commit is contained in:
RaphiMC 2023-10-03 20:20:49 +02:00
parent 58b4819677
commit 25b341a545
No known key found for this signature in database
GPG key ID: 0F6BB0657A03AC94
2 changed files with 18 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/main/java/net/raphimc/viaproxy/proxy/client2proxy/Client2ProxyHandler.java
View file

@ -229,18 +229,20 @@ public class Client2ProxyHandler extends SimpleChannelInboundHandler<IPacket> {
this.proxyConnection.connectToServer(serverAddress, serverVersion).addListeners((ThrowingChannelFutureListener) f -> { this.proxyConnection.connectToServer(serverAddress, serverVersion).addListeners((ThrowingChannelFutureListener) f -> {
if (f.isSuccess()) { if (f.isSuccess()) {
if (Options.SERVER_HAPROXY_PROTOCOL) { f.channel().eventLoop().submit(() -> { // Reschedule so the packets get sent after the channel is fully initialized and active
this.proxyConnection.getChannel().writeAndFlush(HAProxyUtil.createMessage(this.proxyConnection.getC2P(), this.proxyConnection.getChannel(), clientVersion)).addListener(ChannelFutureListener.FIRE_EXCEPTION_ON_FAILURE); if (Options.SERVER_HAPROXY_PROTOCOL) {
} this.proxyConnection.getChannel().writeAndFlush(HAProxyUtil.createMessage(this.proxyConnection.getC2P(), this.proxyConnection.getChannel(), clientVersion)).addListener(ChannelFutureListener.FIRE_EXCEPTION_ON_FAILURE);
handshakeParts[0] = serverAddress.getAddress();
this.proxyConnection.getChannel().writeAndFlush(new C2SHandshakePacket(clientVersion.getOriginalVersion(), String.join("\0", handshakeParts), serverAddress.getPort(), packet.intendedState)).addListeners(ChannelFutureListener.FIRE_EXCEPTION_ON_FAILURE, (ChannelFutureListener) f2 -> {
if (f2.isSuccess()) {
this.proxyConnection.setP2sConnectionState(packet.intendedState);
} }
});
ChannelUtil.restoreAutoRead(this.proxyConnection.getC2P()); handshakeParts[0] = serverAddress.getAddress();
this.proxyConnection.getChannel().writeAndFlush(new C2SHandshakePacket(clientVersion.getOriginalVersion(), String.join("\0", handshakeParts), serverAddress.getPort(), packet.intendedState)).addListeners(ChannelFutureListener.FIRE_EXCEPTION_ON_FAILURE, (ChannelFutureListener) f2 -> {
if (f2.isSuccess()) {
this.proxyConnection.setP2sConnectionState(packet.intendedState);
}
});
ChannelUtil.restoreAutoRead(this.proxyConnection.getC2P());
});
} }
}, (ThrowingChannelFutureListener) f -> { }, (ThrowingChannelFutureListener) f -> {
if (!f.isSuccess()) { if (!f.isSuccess()) {

10
src/main/java/net/raphimc/viaproxy/proxy/client2proxy/passthrough/PassthroughClient2ProxyHandler.java
View file

@ -82,11 +82,13 @@ public class PassthroughClient2ProxyHandler extends SimpleChannelInboundHandler<
this.proxyConnection.connect(serverAddress).addListeners((ThrowingChannelFutureListener) f -> { this.proxyConnection.connect(serverAddress).addListeners((ThrowingChannelFutureListener) f -> {
if (f.isSuccess()) { if (f.isSuccess()) {
if (Options.SERVER_HAPROXY_PROTOCOL) { f.channel().eventLoop().submit(() -> { // Reschedule so the packets get sent after the channel is fully initialized and active
this.proxyConnection.getChannel().writeAndFlush(HAProxyUtil.createMessage(this.proxyConnection.getC2P(), this.proxyConnection.getChannel(), null)).addListener(ChannelFutureListener.FIRE_EXCEPTION_ON_FAILURE); if (Options.SERVER_HAPROXY_PROTOCOL) {
} this.proxyConnection.getChannel().writeAndFlush(HAProxyUtil.createMessage(this.proxyConnection.getC2P(), this.proxyConnection.getChannel(), null)).addListener(ChannelFutureListener.FIRE_EXCEPTION_ON_FAILURE);
}
ChannelUtil.restoreAutoRead(this.proxyConnection.getC2P()); ChannelUtil.restoreAutoRead(this.proxyConnection.getC2P());
});
} }
}, (ThrowingChannelFutureListener) f -> { }, (ThrowingChannelFutureListener) f -> {
if (!f.isSuccess()) { if (!f.isSuccess()) {