Skip to content

Fix server hanging after a packet error from a disconnected client #285

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

Open
magaflaca wants to merge 1 commit into
base: general-devel
Choose a base branch
from
Open

Fix server hanging after a packet error from a disconnected client #285

Show file tree
Hide file tree
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
1 change: 1 addition & 0 deletions TerrariaServerAPI/Program.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,7 @@ static void StartServer(string[] args)
}

Terraria.WindowsLaunch.Main(args);
Terraria.Netplay.Disconnect = true;
}

/// <summary>
Expand Down
11 changes: 11 additions & 0 deletions TerrariaServerAPI/TerrariaApi.Server/Hooking/NetHooks.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
using OTAPI;
using System;
using Terraria;
using Terraria.Localization;
using Terraria.Net;
using Terraria.Testing;

namespace TerrariaApi.Server.Hooking;

Expand All @@ -24,13 +26,22 @@ public static void AttachTo(HookManager hookManager)
HookEvents.Terraria.Chat.ChatHelper.BroadcastChatMessage += OnBroadcastChatMessage;
HookEvents.Terraria.Net.NetManager.SendData += OnSendNetData;
HookEvents.Terraria.Netplay.UpdateConnectedClients += OnUpdateConnectedClients;
HookEvents.Terraria.NetMessage.LogMessageError += OnLogMessageError;

Hooks.NetMessage.SendData += OnSendData;
Hooks.NetMessage.SendBytes += OnSendBytes;
Hooks.MessageBuffer.GetData += OnReceiveData;
Hooks.MessageBuffer.NameCollision += OnNameCollision;
}

static void OnLogMessageError(object? sender, HookEvents.Terraria.NetMessage.LogMessageErrorEventArgs args)
{
if (!args.ContinueExecution) return;
args.ContinueExecution = false;
RemoteClient client = Netplay.Clients[args.bufferIndex];
Invariant.Assert(false, $"{Language.GetTextValue("Error.NetMessageError", args.id)} @{client.Socket?.GetRemoteAddress()}({client.Name}). {args.exception}");
}

static void OnUpdateConnectedClients(object? sender, HookEvents.Terraria.Netplay.UpdateConnectedClientsEventArgs args)
{
if (!args.ContinueExecution) return;
Expand Down