> [!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
114 lines
3.5 KiB
C#
114 lines
3.5 KiB
C#
using Server.Items;
|
|
using Server.Network;
|
|
using Xunit;
|
|
|
|
namespace Server.Tests.Network;
|
|
|
|
[Collection("Sequential Server Tests")]
|
|
public class SecureTradePacketTests
|
|
{
|
|
[Theory]
|
|
[InlineData("short-name")]
|
|
[InlineData("this is a really long name that is more than 30 characters, probably")]
|
|
public void TestDisplaySecureTrade(string name)
|
|
{
|
|
var m = new Mobile((Serial)0x1);
|
|
m.DefaultMobileInit();
|
|
|
|
var firstCont = new Container(World.NewItem);
|
|
var secondCont = new Container(World.NewItem);
|
|
|
|
var expected = new DisplaySecureTrade(m, firstCont, secondCont, name).Compile();
|
|
|
|
using var ns = PacketTestUtilities.CreateTestNetState();
|
|
ns.SendDisplaySecureTrade(m, firstCont, secondCont, name);
|
|
|
|
var result = ns.SendBuffer.GetReadSpan();
|
|
AssertThat.Equal(result, expected);
|
|
}
|
|
|
|
[Fact]
|
|
public void TestCloseSecureTrade()
|
|
{
|
|
var cont = new Container(World.NewItem);
|
|
|
|
var expected = new CloseSecureTrade(cont).Compile();
|
|
|
|
using var ns = PacketTestUtilities.CreateTestNetState();
|
|
ns.SendCloseSecureTrade(cont);
|
|
|
|
var result = ns.SendBuffer.GetReadSpan();
|
|
AssertThat.Equal(result, expected);
|
|
}
|
|
|
|
[Theory, InlineData(true, false), InlineData(false, true)]
|
|
// Update first
|
|
// Update second
|
|
public void TestUpdateSecureTrade(bool first, bool second)
|
|
{
|
|
var firstCont = new Container(World.NewItem);
|
|
var secondCont = new Container(World.NewItem);
|
|
|
|
var cont = first ? firstCont : secondCont;
|
|
var expected = new UpdateSecureTrade(cont, first, second).Compile();
|
|
|
|
using var ns = PacketTestUtilities.CreateTestNetState();
|
|
ns.SendUpdateSecureTrade(cont, first, second);
|
|
|
|
var result = ns.SendBuffer.GetReadSpan();
|
|
AssertThat.Equal(result, expected);
|
|
}
|
|
|
|
[Theory]
|
|
[InlineData(100000, 30, TradeFlag.UpdateGold)]
|
|
[InlineData(250000, 50000, TradeFlag.UpdateLedger)]
|
|
public void TestUpdateGoldSecureTrade(int gold, int plat, TradeFlag flag)
|
|
{
|
|
var cont = new Container(World.NewItem);
|
|
var expected = new UpdateSecureTrade(cont, flag, gold, plat).Compile();
|
|
|
|
using var ns = PacketTestUtilities.CreateTestNetState();
|
|
ns.SendUpdateSecureTrade(cont, flag, gold, plat);
|
|
|
|
var result = ns.SendBuffer.GetReadSpan();
|
|
AssertThat.Equal(result, expected);
|
|
}
|
|
|
|
[Fact]
|
|
public void TestSecureTradeEquip()
|
|
{
|
|
var m = new Mobile((Serial)0x1);
|
|
m.DefaultMobileInit();
|
|
|
|
var cont = new Container(World.NewItem);
|
|
var itemInCont = new Item(World.NewItem) { Parent = cont };
|
|
|
|
var expected = new SecureTradeEquip(itemInCont, m).Compile();
|
|
|
|
using var ns = PacketTestUtilities.CreateTestNetState();
|
|
ns.SendSecureTradeEquip(itemInCont, m);
|
|
|
|
var result = ns.SendBuffer.GetReadSpan();
|
|
AssertThat.Equal(result, expected);
|
|
}
|
|
|
|
[Fact]
|
|
public void TestSecureTradeEquip6017()
|
|
{
|
|
var m = new Mobile((Serial)0x1);
|
|
m.DefaultMobileInit();
|
|
|
|
var cont = new Container(World.NewItem);
|
|
var itemInCont = new Item(World.NewItem) { Parent = cont };
|
|
|
|
var expected = new SecureTradeEquip6017(itemInCont, m).Compile();
|
|
|
|
using var ns = PacketTestUtilities.CreateTestNetState();
|
|
ns.ProtocolChanges |= ProtocolChanges.ContainerGridLines;
|
|
|
|
ns.SendSecureTradeEquip(itemInCont, m);
|
|
|
|
var result = ns.SendBuffer.GetReadSpan();
|
|
AssertThat.Equal(result, expected);
|
|
}
|
|
}
|