Skip to content

Drop UDP packets with no client instead of killing the server #347

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Zaldaryon merged 1 commit into from
Oct 1, 2026
Merged

Drop UDP packets with no client instead of killing the server #347

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 29 additions & 3 deletions patches/VintagestoryLib/Vintagestory.Server.Systems/ServerUdpQueue.cs.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,35 @@ diff --git a/VintagestoryLib/Vintagestory.Server.Systems/ServerUdpQueue.cs b/Vin
index 2f84679..42b944a 100644
--- a/VintagestoryLib/Vintagestory.Server.Systems/ServerUdpQueue.cs
+++ b/VintagestoryLib/Vintagestory.Server.Systems/ServerUdpQueue.cs
@@ -66,10 +66,27 @@ public class ServerUdpQueue
@@ -26,5 +26,11 @@ public class ServerUdpQueue
internal void QueuePacket(ConnectedClient client, Packet_UdpPacket packet)
{
+ // Stratum: disconnects can hand this queue a packet with no client. Enqueueing
+ // that kills the UDP thread when the send path dereferences the client.
+ if (client == null || packet == null)
+ {
+ return;
+ }
queue.Enqueue(new QueuedUDPPacket(client, packet));
if (idle)
{
@@ -57,17 +63,40 @@ public class ServerUdpQueue
long num = Environment.TickCount - 750;
QueuedUDPPacket result;
while (queue.TryDequeue(out result))
{
- if (result.creationTime > num)
+ // Stratum: a null client here is what took the process down under an 800-bot join.
+ if (result?.client == null || result.packet == null)
+ {
+ network.physicsManager.StratumReturnBulkPositionPacket(result?.packet, false);
+ continue;
+ }
+ if (result.creationTime > num)
{
try
{
server.SendPacketBlocking(result.client, result.packet);
}
catch (Exception e)
{
Expand All @@ -28,5 +56,3 @@ index 2f84679..42b944a 100644
}
}
}
}
}
Loading