> [!IMPORTANT] > **Breaking Changes** > - DecodePacket and EncodePacket delegates replaced with IClientEncryption interface > - NetState.Connection (Socket) replaced with internal RingSocket management > - NetState.RecvPipe and NetState.SendPipe removed (buffers managed internally) ## Summary Upgrades the networking stack from PollGroup-based I/O to io_uring, significantly improving I/O performance on Linux. This also adds native client encryption support for encrypted UO clients. ## Major Changes io_uring Networking Architecture - Replaced PollGroup with IORingGroup for async socket I/O operations - Removed Pipe.cs (mirrored ring buffer) and TcpServer.cs in favor of RingSocketManager - Added NetState.Network.cs - centralized network infrastructure handling accept, recv, send, and disconnect completions - Added SocketHelper.cs - platform-specific socket utilities for raw socket handle operations (getpeername, getsockname) - Buffer management now handled by RingSocketManager with configurable slab allocation ### Client Encryption Support - Added full encryption stack in Network/Encryption/: - EncryptionConfig.cs - configurable encryption modes (None, Unencrypted, Encrypted, Both) - EncryptionManager.cs - encryption detection and initialization for login/game packets - LoginEncryption.cs - handles login packet encryption with version-derived keys - GameEncryption.cs - handles game server encryption using Twofish - TwofishEngine.cs - optimized Twofish block cipher implementation - LoginKeys.cs - encryption key table for client versions - IClientEncryption.cs - interface for client encryption implementations ### NetState Improvements - Replaced Socket Connection with RingSocket _socket for managed socket lifecycle - Changed from GCHandle polling to event-based completion processing - Disconnect handling now properly waits for pending sends to flush - Simplified connecting socket management using lazy queue removal ### Configuration - New settings: network.encryptionMode and network.encryptionDebug - Encryption mode flags: Unencrypted, Encrypted, or Both ### Dependencies - Replaced PollGroup NuGet package with IORingGroup - Linux requires liburing-dev / liburing-devel package ### Test plan - Verify server starts and accepts connections on Linux with io_uring - Verify server starts and accepts connections on Windows (fallback to IOCP) - Test unencrypted client connections (ClassicUO with encryption disabled) - Test encrypted client connections if available - Verify graceful disconnect flushes pending data - Confirm CI builds pass on all target platforms
90 lines
2.2 KiB
C#
90 lines
2.2 KiB
C#
using Server.Network;
|
|
using Server.Targeting;
|
|
using Xunit;
|
|
|
|
namespace Server.Tests.Network;
|
|
|
|
public class TestMultiTarget : MultiTarget
|
|
{
|
|
public TestMultiTarget(
|
|
int multiID,
|
|
Point3D offset,
|
|
int range = 10,
|
|
bool allowGround = true,
|
|
TargetFlags flags = TargetFlags.None
|
|
) : base(multiID, offset, range, allowGround, flags)
|
|
{
|
|
}
|
|
}
|
|
|
|
public class TestTarget : Target
|
|
{
|
|
public TestTarget(
|
|
int range,
|
|
bool allowGround,
|
|
TargetFlags flags
|
|
) : base(range, allowGround, flags)
|
|
{
|
|
}
|
|
}
|
|
|
|
[Collection("Sequential Server Tests")]
|
|
public class TargetPacketsTests
|
|
{
|
|
[Fact]
|
|
public void TestMultiTargetReqHS()
|
|
{
|
|
var multiID = 0x1024;
|
|
var p = new Point3D(1000, 100, 10);
|
|
MultiTarget t = new TestMultiTarget(multiID, p);
|
|
|
|
var expected = new MultiTargetReqHS(t).Compile();
|
|
|
|
using var ns = PacketTestUtilities.CreateTestNetState();
|
|
ns.ProtocolChanges |= ProtocolChanges.HighSeas;
|
|
ns.SendMultiTargetReq(t);
|
|
|
|
var result = ns.SendBuffer.GetReadSpan();
|
|
AssertThat.Equal(result, expected);
|
|
}
|
|
|
|
[Fact]
|
|
public void TestMultiTargetReq()
|
|
{
|
|
var multiID = 0x1024;
|
|
var p = new Point3D(1000, 100, 10);
|
|
MultiTarget t = new TestMultiTarget(multiID, p);
|
|
|
|
var expected = new MultiTargetReq(t).Compile();
|
|
|
|
using var ns = PacketTestUtilities.CreateTestNetState();
|
|
ns.SendMultiTargetReq(t);
|
|
|
|
var result = ns.SendBuffer.GetReadSpan();
|
|
AssertThat.Equal(result, expected);
|
|
}
|
|
|
|
[Fact]
|
|
public void TestCancelTarget()
|
|
{
|
|
var expected = new CancelTarget().Compile();
|
|
using var ns = PacketTestUtilities.CreateTestNetState();
|
|
ns.SendCancelTarget();
|
|
|
|
var result = ns.SendBuffer.GetReadSpan();
|
|
AssertThat.Equal(result, expected);
|
|
}
|
|
|
|
[Fact]
|
|
public void TestTargetReq()
|
|
{
|
|
var t = new TestTarget(10, true, TargetFlags.Beneficial);
|
|
var expected = new TargetReq(t).Compile();
|
|
|
|
using var ns = PacketTestUtilities.CreateTestNetState();
|
|
ns.SendTargetReq(t);
|
|
|
|
var result = ns.SendBuffer.GetReadSpan();
|
|
AssertThat.Equal(result, expected);
|
|
}
|
|
}
|