PaperMC/patches/server/0462-Optimize-NetworkManager-Exception-Handling.patch

70 lines
4.1 KiB
Diff
Raw Normal View History

2021-06-11 14:02:28 +02:00
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Andrew Steinborn <git@steinborn.me>
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
2022-06-08 07:46:52 +02:00
index d15ef330db69e0c948824d9bf112a26680c90b1b..25c98fa91260c5fe3bd42c0861e3834b4ec5dc5c 100644
2021-06-11 14:02:28 +02:00
--- a/src/main/java/net/minecraft/network/ConnectionProtocol.java
+++ b/src/main/java/net/minecraft/network/ConnectionProtocol.java
2022-06-08 07:46:52 +02:00
@@ -299,6 +299,7 @@ public enum ConnectionProtocol {
2021-06-11 14:02:28 +02:00
@Nullable
2021-06-14 11:46:59 +02:00
public Packet<?> createPacket(int id, FriendlyByteBuf buf) {
+ if (id < 0 || id >= this.idToDeserializer.size()) return null; // Paper
Function<FriendlyByteBuf, ? extends Packet<T>> function = this.idToDeserializer.get(id);
return function != null ? function.apply(buf) : null;
}
2021-06-11 14:02:28 +02:00
diff --git a/src/main/java/net/minecraft/network/Varint21FrameDecoder.java b/src/main/java/net/minecraft/network/Varint21FrameDecoder.java
index 99b581052f937b0f2d6b5d73de699008c1d51774..ed54479b14dcfc736ac90749106557f0ff537550 100644
2021-06-11 14:02:28 +02:00
--- a/src/main/java/net/minecraft/network/Varint21FrameDecoder.java
+++ b/src/main/java/net/minecraft/network/Varint21FrameDecoder.java
@@ -8,8 +8,20 @@ import io.netty.handler.codec.CorruptedFrameException;
2021-06-14 11:46:59 +02:00
import java.util.List;
2021-06-11 14:02:28 +02:00
public class Varint21FrameDecoder extends ByteToMessageDecoder {
+ private final byte[] lenBuf = new byte[3]; // Paper
+ @Override
2021-06-14 11:46:59 +02:00
protected void decode(ChannelHandlerContext channelHandlerContext, ByteBuf byteBuf, List<Object> list) {
2021-06-11 14:02:28 +02:00
+ // Paper start - if channel is not active just discard the packet
2021-06-14 11:46:59 +02:00
+ if (!channelHandlerContext.channel().isActive()) {
+ byteBuf.skipBytes(byteBuf.readableBytes());
2021-06-11 14:02:28 +02:00
+ return;
+ }
+ // Paper end
2021-06-14 11:46:59 +02:00
byteBuf.markReaderIndex();
2021-06-11 14:02:28 +02:00
+ // Paper start - reuse temporary length buffer
+ byte[] abyte = lenBuf;
+ java.util.Arrays.fill(abyte, (byte) 0);
+ // Paper end
2021-06-14 11:46:59 +02:00
byte[] bs = new byte[3];
2021-06-11 14:02:28 +02:00
2021-06-14 11:46:59 +02:00
for(int i = 0; i < bs.length; ++i) {
2021-06-11 14:02:28 +02:00
diff --git a/src/main/java/net/minecraft/network/protocol/PacketUtils.java b/src/main/java/net/minecraft/network/protocol/PacketUtils.java
2022-06-08 10:45:59 +02:00
index 049e64c355d5f064009b1107ad15d28c44f999dd..a34f22cadc09e53ea4de787b04d050b99dddbcac 100644
2021-06-11 14:02:28 +02:00
--- a/src/main/java/net/minecraft/network/protocol/PacketUtils.java
+++ b/src/main/java/net/minecraft/network/protocol/PacketUtils.java
2022-03-01 06:43:03 +01:00
@@ -30,11 +30,17 @@ public class PacketUtils {
try (co.aikar.timings.Timing ignored = timing.startTiming()) { // Paper - timings
packet.handle(listener);
} catch (Exception exception) {
- if (listener.shouldPropagateHandlingExceptions()) {
- throw exception;
+ net.minecraft.network.Connection networkmanager = listener.getConnection();
2021-06-11 14:02:28 +02:00
+ if (networkmanager.getPlayer() != null) {
2022-03-01 06:43:03 +01:00
+ LOGGER.error("Error whilst processing packet {} for {}[{}]", packet, networkmanager.getPlayer().getScoreboardName(), networkmanager.getRemoteAddress(), exception);
2021-06-11 14:02:28 +02:00
+ } else {
2022-03-01 06:43:03 +01:00
+ LOGGER.error("Error whilst processing packet {} for connection from {}", packet, networkmanager.getRemoteAddress(), exception);
}
-
- PacketUtils.LOGGER.error("Failed to handle packet {}, suppressing error", packet, exception);
2022-06-08 10:45:59 +02:00
+ net.minecraft.network.chat.Component error = net.minecraft.network.chat.Component.literal("Packet processing error");
2022-03-01 06:43:03 +01:00
+ networkmanager.send(new net.minecraft.network.protocol.game.ClientboundDisconnectPacket(error), (future) -> {
2021-06-11 14:02:28 +02:00
+ networkmanager.disconnect(error);
+ });
+ networkmanager.setReadOnly();
2022-03-01 06:43:03 +01:00
}
2021-06-11 14:02:28 +02:00
} else {
2021-06-14 11:46:59 +02:00
PacketUtils.LOGGER.debug("Ignoring packet due to disconnection: {}", packet);