SteamWar/Velocity
13
0
Fork 0
geforkt von Mirrors/Velocity
Code Issues Pull-Requests Aktivität

Fix some spirous "connection closed" errors.

Quellcode durchsuchen
Dieser Commit ist enthalten in:
Andrew Steinborn 2018-08-07 07:18:54 -04:00
Ursprung a2b4291b36
Commit b983cdb7b3
1 geänderte Dateien mit 12 neuen und 17 gelöschten Zeilen
Statistiken anzeigen Patch-Datei herunterladen Vergleichs-Datei herunterladen Alle Dateien ausklappen Alle Dateien einklappen

29
proxy/src/main/java/com/velocitypowered/proxy/connection/MinecraftConnection.java
Datei anzeigen

@ -41,7 +41,6 @@ public class MinecraftConnection extends ChannelInboundHandlerAdapter {
private static final Logger logger = LogManager.getLogger(MinecraftConnection.class); private static final Logger logger = LogManager.getLogger(MinecraftConnection.class);
private final Channel channel; private final Channel channel;
private boolean closed;
private StateRegistry state; private StateRegistry state;
private MinecraftSessionHandler sessionHandler; private MinecraftSessionHandler sessionHandler;
private int protocolVersion; private int protocolVersion;
@ -49,7 +48,6 @@ public class MinecraftConnection extends ChannelInboundHandlerAdapter {
public MinecraftConnection(Channel channel) { public MinecraftConnection(Channel channel) {
this.channel = channel; this.channel = channel;
this.closed = false;
this.state = StateRegistry.HANDSHAKE; this.state = StateRegistry.HANDSHAKE;
} }
@ -73,8 +71,6 @@ public class MinecraftConnection extends ChannelInboundHandlerAdapter {
if (association != null) { if (association != null) {
logger.info("{} has disconnected", association); logger.info("{} has disconnected", association);
} }
teardown();
} }
@Override @Override
@ -103,7 +99,6 @@ public class MinecraftConnection extends ChannelInboundHandlerAdapter {
logger.error("{} encountered an exception", ctx.channel().remoteAddress(), cause); logger.error("{} encountered an exception", ctx.channel().remoteAddress(), cause);
} }
closed = true;
ctx.close(); ctx.close();
} }
} }
@ -124,19 +119,15 @@ public class MinecraftConnection extends ChannelInboundHandlerAdapter {
} }
public void closeWith(Object msg) { public void closeWith(Object msg) {
ensureOpen(); if (channel.isActive()) {
teardown(); channel.writeAndFlush(msg).addListener(ChannelFutureListener.CLOSE);
channel.writeAndFlush(msg).addListener(ChannelFutureListener.CLOSE); }
} }
public void close() { public void close() {
ensureOpen(); if (channel.isActive()) {
teardown(); channel.close();
channel.close(); }
}
public void teardown() {
closed = true;
} }
public Channel getChannel() { public Channel getChannel() {
@ -144,7 +135,7 @@ public class MinecraftConnection extends ChannelInboundHandlerAdapter {
} }
public boolean isClosed() { public boolean isClosed() {
return closed; return !channel.isActive();
} }
public StateRegistry getState() { public StateRegistry getState() {
@ -186,10 +177,12 @@ public class MinecraftConnection extends ChannelInboundHandlerAdapter {
} }
private void ensureOpen() { private void ensureOpen() {
Preconditions.checkState(!closed, "Connection is closed."); Preconditions.checkState(!isClosed(), "Connection is closed.");
} }
public void setCompressionThreshold(int threshold) { public void setCompressionThreshold(int threshold) {
ensureOpen();
if (threshold == -1) { if (threshold == -1) {
channel.pipeline().remove(COMPRESSION_DECODER); channel.pipeline().remove(COMPRESSION_DECODER);
channel.pipeline().remove(COMPRESSION_ENCODER); channel.pipeline().remove(COMPRESSION_ENCODER);
@ -206,6 +199,8 @@ public class MinecraftConnection extends ChannelInboundHandlerAdapter {
} }
public void enableEncryption(byte[] secret) throws GeneralSecurityException { public void enableEncryption(byte[] secret) throws GeneralSecurityException {
ensureOpen();
SecretKey key = new SecretKeySpec(secret, "AES"); SecretKey key = new SecretKeySpec(secret, "AES");
VelocityCipherFactory factory = Natives.cipher.get(); VelocityCipherFactory factory = Natives.cipher.get();