From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Andrew Steinborn Date: Sun, 5 Jul 2020 22:38:18 -0400 Subject: [PATCH] Optimize NetworkManager Exception Handling diff --git a/src/main/java/net/minecraft/network/ConnectionProtocol.java b/src/main/java/net/minecraft/network/ConnectionProtocol.java index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 --- a/src/main/java/net/minecraft/network/ConnectionProtocol.java +++ b/src/main/java/net/minecraft/network/ConnectionProtocol.java @@ -0,0 +0,0 @@ public enum ConnectionProtocol { @Nullable public Packet createPacket(int id) { + if (id < 0 || id >= this.idToConstructor.size()) return null; // Paper Supplier> supplier = (Supplier) this.idToConstructor.get(id); return supplier != null ? (Packet) supplier.get() : null; diff --git a/src/main/java/net/minecraft/network/Varint21FrameDecoder.java b/src/main/java/net/minecraft/network/Varint21FrameDecoder.java index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 --- a/src/main/java/net/minecraft/network/Varint21FrameDecoder.java +++ b/src/main/java/net/minecraft/network/Varint21FrameDecoder.java @@ -0,0 +0,0 @@ import java.util.List; public class Varint21FrameDecoder extends ByteToMessageDecoder { + private final byte[] lenBuf = new byte[3]; // Paper public Varint21FrameDecoder() {} protected void decode(ChannelHandlerContext channelhandlercontext, ByteBuf bytebuf, List list) throws Exception { + // Paper start - if channel is not active just discard the packet + if (!channelhandlercontext.channel().isActive()) { + bytebuf.skipBytes(bytebuf.readableBytes()); + return; + } + // Paper end bytebuf.markReaderIndex(); - byte[] abyte = new byte[3]; + // Paper start - reuse temporary length buffer + byte[] abyte = lenBuf; + java.util.Arrays.fill(abyte, (byte) 0); + // Paper end for (int i = 0; i < abyte.length; ++i) { if (!bytebuf.isReadable()) { diff --git a/src/main/java/net/minecraft/network/protocol/Packet.java b/src/main/java/net/minecraft/network/protocol/Packet.java index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 --- a/src/main/java/net/minecraft/network/protocol/Packet.java +++ b/src/main/java/net/minecraft/network/protocol/Packet.java @@ -0,0 +0,0 @@ package net.minecraft.network.protocol; import io.netty.channel.ChannelFuture; // Paper import java.io.IOException; +import net.minecraft.network.Connection; import net.minecraft.network.FriendlyByteBuf; import net.minecraft.network.PacketListener; +import net.minecraft.server.level.ServerPlayer; public interface Packet { @@ -0,0 +0,0 @@ public interface Packet { /** * @param player Null if not at PLAY stage yet */ - default void onPacketDispatch(@javax.annotation.Nullable EntityPlayer player) {} + default void onPacketDispatch(@javax.annotation.Nullable ServerPlayer player) {} /** * @param player Null if not at PLAY stage yet * @param future Can be null if packet was cancelled */ - default void onPacketDispatchFinish(@javax.annotation.Nullable EntityPlayer player, @javax.annotation.Nullable ChannelFuture future) {} + default void onPacketDispatchFinish(@javax.annotation.Nullable ServerPlayer player, @javax.annotation.Nullable ChannelFuture future) {} default boolean hasFinishListener() { return false; } default boolean isReady() { return true; } default java.util.List getExtraPackets() { return null; } - default boolean packetTooLarge(NetworkManager manager) { + default boolean packetTooLarge(Connection manager) { return false; } // Paper end diff --git a/src/main/java/net/minecraft/network/protocol/PacketUtils.java b/src/main/java/net/minecraft/network/protocol/PacketUtils.java index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 --- a/src/main/java/net/minecraft/network/protocol/PacketUtils.java +++ b/src/main/java/net/minecraft/network/protocol/PacketUtils.java @@ -0,0 +0,0 @@ package net.minecraft.network.protocol; +import net.minecraft.network.Connection; import net.minecraft.network.PacketListener; +import net.minecraft.network.chat.TextComponent; +import net.minecraft.network.protocol.game.ClientboundDisconnectPacket; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import co.aikar.timings.MinecraftTimings; // Paper @@ -0,0 +0,0 @@ public class PacketUtils { try (Timing ignored = timing.startTiming()) { // Paper - timings packet.handle(listener); } // Paper - timings + // Paper start + catch (Exception e) { + Connection networkmanager = listener.a(); + if (networkmanager.getPlayer() != null) { + LOGGER.error("Error whilst processing packet {} for {}[{}]", packet, networkmanager.getPlayer().getScoreboardName(), networkmanager.getRemoteAddress(), e); + } else { + LOGGER.error("Error whilst processing packet {} for connection from {}", packet, networkmanager.getRemoteAddress(), e); + } + TextComponent error = new TextComponent("Packet processing error"); + networkmanager.send(new ClientboundDisconnectPacket(error), (future) -> { + networkmanager.disconnect(error); + }); + networkmanager.setReadOnly(); + } + // Paper end } else { PacketUtils.LOGGER.debug("Ignoring packet due to disconnection: " + packet); }