> [!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
101 lines
2.9 KiB
C#
101 lines
2.9 KiB
C#
using Server.Collections;
|
|
using Server.ContextMenus;
|
|
using Server.Menus.ItemLists;
|
|
using Server.Menus.Questions;
|
|
using Server.Network;
|
|
using Xunit;
|
|
|
|
namespace Server.Tests.Network;
|
|
|
|
internal class ContextMenuItem : Item
|
|
{
|
|
private readonly bool _requiresNewPacket;
|
|
public ContextMenuItem(Serial serial, bool requiresNewPacket) : base(serial) =>
|
|
_requiresNewPacket = requiresNewPacket;
|
|
|
|
public override void GetContextMenuEntries(Mobile from, ref PooledRefList<ContextMenuEntry> list)
|
|
{
|
|
base.GetContextMenuEntries(from, ref list);
|
|
|
|
list.Add(new ContextMenuEntry(3000001));
|
|
list.Add(new ContextMenuEntry(3000002));
|
|
list.Add(new ContextMenuEntry(3000003));
|
|
if (_requiresNewPacket)
|
|
{
|
|
list.Add(new ContextMenuEntry(500000));
|
|
}
|
|
}
|
|
}
|
|
|
|
[Collection("Sequential Server Tests")]
|
|
public class MenuPacketTests
|
|
{
|
|
[Fact]
|
|
public void TestDisplayItemListMenu()
|
|
{
|
|
var menu = new ItemListMenu(
|
|
"Which item would you choose?",
|
|
[
|
|
new ItemListEntry("Item 1", 0x01),
|
|
new ItemListEntry("Item 2", 0x100),
|
|
new ItemListEntry("Item 3", 0x1000, 250)
|
|
]
|
|
);
|
|
|
|
var expected = new DisplayItemListMenu(menu).Compile();
|
|
|
|
using var ns = PacketTestUtilities.CreateTestNetState();
|
|
ns.SendDisplayItemListMenu(menu);
|
|
|
|
var result = ns.SendBuffer.GetReadSpan();
|
|
AssertThat.Equal(result, expected);
|
|
}
|
|
|
|
[Fact]
|
|
public void TestDisplayQuestionMenu()
|
|
{
|
|
var menu = new QuestionMenu(
|
|
"Which option would you choose?",
|
|
[
|
|
"Option 1",
|
|
"Option 2",
|
|
"Option 3"
|
|
]
|
|
);
|
|
|
|
var expected = new DisplayQuestionMenu(menu).Compile();
|
|
using var ns = PacketTestUtilities.CreateTestNetState();
|
|
ns.SendDisplayQuestionMenu(menu);
|
|
|
|
var result = ns.SendBuffer.GetReadSpan();
|
|
AssertThat.Equal(result, expected);
|
|
}
|
|
|
|
[Theory]
|
|
[InlineData(false, false)]
|
|
[InlineData(false, true)]
|
|
[InlineData(true, false)]
|
|
[InlineData(true, true)]
|
|
public void TestDisplayContextMenu(bool newHaven, bool newPacket)
|
|
{
|
|
var m = new Mobile((Serial)0x1);
|
|
m.DefaultMobileInit();
|
|
|
|
var item = new ContextMenuItem(World.NewItem, newPacket);
|
|
var menu = ContextMenuSystem.CreateContextMenu(m, item);
|
|
|
|
var packet = newHaven && newPacket ? (Packet)new DisplayContextMenu(menu) : new DisplayContextMenuOld(menu);
|
|
var expected = packet.Compile();
|
|
|
|
using var ns = PacketTestUtilities.CreateTestNetState();
|
|
if (newHaven)
|
|
{
|
|
ns.ProtocolChanges |= ProtocolChanges.NewHaven;
|
|
}
|
|
|
|
ns.SendDisplayContextMenu(menu);
|
|
|
|
var result = ns.SendBuffer.GetReadSpan();
|
|
AssertThat.Equal(result, expected);
|
|
}
|
|
}
|