> [!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
93 lines
2.5 KiB
C#
93 lines
2.5 KiB
C#
using Server;
|
|
using Server.Items;
|
|
using Server.Network;
|
|
using Server.Tests;
|
|
using Server.Tests.Network;
|
|
using Xunit;
|
|
|
|
namespace UOContent.Tests;
|
|
|
|
public class TestBook : BaseBook
|
|
{
|
|
public TestBook(int itemID, int pageCount = 20, bool writable = true) : base(itemID, pageCount, writable)
|
|
{
|
|
}
|
|
|
|
public TestBook(int itemID, string title, string author, int pageCount, bool writable) : base(itemID, title, author, pageCount, writable)
|
|
{
|
|
}
|
|
|
|
public TestBook(int itemID, bool writable) : base(itemID, writable)
|
|
{
|
|
}
|
|
|
|
public TestBook(Serial serial) : base(serial)
|
|
{
|
|
Pages = new BookPageInfo[20];
|
|
|
|
for (var i = 0; i < Pages.Length; ++i)
|
|
{
|
|
Pages[i] = new BookPageInfo();
|
|
}
|
|
}
|
|
}
|
|
|
|
[Collection("Sequential UOContent Tests")]
|
|
public class BookPacketTests
|
|
{
|
|
[Theory]
|
|
[InlineData("🅵🅰🅽🅲🆈 🆃🅴🆇🆃 Author", "🅵🅰🅽🅲🆈 🆃🅴🆇🆃 Title")]
|
|
public void TestBookCover(string author, string title)
|
|
{
|
|
var m = new Mobile((Serial)0x1);
|
|
m.DefaultMobileInit();
|
|
|
|
var serial = (Serial)0x1001;
|
|
var book = new TestBook(serial) { Author = author, Title = title };
|
|
|
|
var expected = new BookHeader(m, book).Compile();
|
|
|
|
using var ns = PacketTestUtilities.CreateTestNetState();
|
|
ns.SendBookCover(m, book);
|
|
|
|
var result = ns.SendBuffer.GetReadSpan();
|
|
AssertThat.Equal(result, expected);
|
|
}
|
|
|
|
[Fact]
|
|
public void TestBookContent()
|
|
{
|
|
var m = new Mobile((Serial)0x1);
|
|
m.DefaultMobileInit();
|
|
|
|
var serial = (Serial)0x1001;
|
|
var book = new TestBook(serial) { Author = "Some Author", Title = "Some Title" };
|
|
book.Pages[0].Lines = new[]
|
|
{
|
|
"Some books start with actual content",
|
|
"This book does not have any actual content",
|
|
"Instead it has several pages of useless text"
|
|
};
|
|
|
|
book.Pages[1].Lines = new[]
|
|
{
|
|
"Another page exists but this page:",
|
|
"Has lots of: 🅵🅰🅽🅲🆈 🆃🅴🆇🆃",
|
|
"And just more: 🅵🅰🅽🅲🆈 🆃🅴🆇🆃",
|
|
"So everyone can read: 🅵🅰🅽🅲🆈 🆃🅴🆇🆃"
|
|
};
|
|
|
|
book.Pages[2].Lines = new[]
|
|
{
|
|
"The end"
|
|
};
|
|
|
|
var expected = new BookPageDetails(book).Compile();
|
|
|
|
using var ns = PacketTestUtilities.CreateTestNetState();
|
|
ns.SendBookContent(book);
|
|
|
|
var result = ns.SendBuffer.GetReadSpan();
|
|
AssertThat.Equal(result, expected);
|
|
}
|
|
}
|