> [!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.8 KiB
C#
93 lines
2.8 KiB
C#
using System.Collections.Generic;
|
|
using Server.Items;
|
|
using Server.Network;
|
|
using Xunit;
|
|
|
|
namespace Server.Tests.Network;
|
|
|
|
[Collection("Sequential Server Tests")]
|
|
public class VendorBuyPacketTests
|
|
{
|
|
[Theory]
|
|
[InlineData(ProtocolChanges.None)]
|
|
[InlineData(ProtocolChanges.ContainerGridLines)]
|
|
public void TestVendorBuyContent(ProtocolChanges protocolChanges)
|
|
{
|
|
var cont = new Container(World.NewItem);
|
|
|
|
var buyStates = new List<BuyItemState>
|
|
{
|
|
new("First Item", cont.Serial, World.NewItem, 10, 1, 0x01, 0),
|
|
new("Second Item", cont.Serial, World.NewItem, 20, 2, 0x0A, 0),
|
|
new("Third Item", cont.Serial, World.NewItem, 30, 10, 0x0F, 0)
|
|
};
|
|
|
|
using var ns = PacketTestUtilities.CreateTestNetState();
|
|
ns.ProtocolChanges = protocolChanges;
|
|
|
|
var expected = new VendorBuyContent(buyStates, ns.ContainerGridLines).Compile();
|
|
|
|
ns.SendVendorBuyContent(buyStates);
|
|
|
|
var result = ns.SendBuffer.GetReadSpan();
|
|
AssertThat.Equal(result, expected);
|
|
}
|
|
|
|
[Theory]
|
|
[InlineData(ProtocolChanges.None)]
|
|
[InlineData(ProtocolChanges.HighSeas)]
|
|
public void TestDisplayBuyList(ProtocolChanges protocolChanges)
|
|
{
|
|
var vendor = new Mobile((Serial)0x1);
|
|
vendor.DefaultMobileInit();
|
|
|
|
using var ns = PacketTestUtilities.CreateTestNetState();
|
|
ns.ProtocolChanges = protocolChanges;
|
|
|
|
var expected = new DisplayBuyList(vendor.Serial, ns.HighSeas).Compile();
|
|
|
|
ns.SendDisplayBuyList(vendor.Serial);
|
|
|
|
var result = ns.SendBuffer.GetReadSpan();
|
|
AssertThat.Equal(result, expected);
|
|
}
|
|
|
|
[Fact]
|
|
public void TestVendorBuyList()
|
|
{
|
|
var vendor = new Mobile((Serial)0x1);
|
|
vendor.DefaultMobileInit();
|
|
|
|
var cont = new Container(World.NewItem);
|
|
|
|
var buyStates = new List<BuyItemState>
|
|
{
|
|
new("First Item", cont.Serial, World.NewItem, 10, 1, 0x01, 0),
|
|
new("Second Item", cont.Serial, World.NewItem, 20, 2, 0x0A, 0),
|
|
new("Third Item", cont.Serial, World.NewItem, 30, 10, 0x0F, 0)
|
|
};
|
|
|
|
var expected = new VendorBuyList(vendor, buyStates).Compile();
|
|
|
|
using var ns = PacketTestUtilities.CreateTestNetState();
|
|
ns.SendVendorBuyList(vendor, buyStates);
|
|
|
|
var result = ns.SendBuffer.GetReadSpan();
|
|
AssertThat.Equal(result, expected);
|
|
}
|
|
|
|
[Fact]
|
|
public void TestEndVendorBuy()
|
|
{
|
|
var vendor = new Mobile((Serial)0x1);
|
|
vendor.DefaultMobileInit();
|
|
|
|
var expected = new EndVendorBuy(vendor.Serial).Compile();
|
|
|
|
using var ns = PacketTestUtilities.CreateTestNetState();
|
|
ns.SendEndVendorBuy(vendor.Serial);
|
|
|
|
var result = ns.SendBuffer.GetReadSpan();
|
|
AssertThat.Equal(result, expected);
|
|
}
|
|
}
|