warrentyexpired/ModernUO
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: Replaces throttlers and packet callbacks with function pointers (#1063)

Browse source 
Replaces multi-cast delegates with function pointers to gain 25% in performance and lower allocations.
This commit is contained in:
Stefano Merotta 2022-06-15 21:48:43 +02:00 • committed by GitHub
parent b779d7737f
commit f24b98f8e2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
31 changed files with 189 additions and 172 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Projects/Server/Network/ContainerGridPacketHandler.cs
View file

@ -15,9 +15,10 @@
namespace Server.Network;
public class ContainerGridPacketHandler : PacketHandler
public unsafe class ContainerGridPacketHandler : PacketHandler
{
public ContainerGridPacketHandler(int packetID, int length, bool ingame, OnPacketReceive onReceive)
public ContainerGridPacketHandler(int packetID, int length, bool ingame,
delegate*<NetState, CircularBufferReader, int, void> onReceive)
: base(packetID, length, ingame, onReceive)
{
}

4
Projects/Server/Network/NetState/NetState.cs
View file

@ -745,7 +745,7 @@ public partial class NetState : IComparable<NetState>
* length is the total buffer length. We might be able to use packetReader.Capacity() instead.
* packetLength is the length of the packet that this function actually found.
*/
private ParserState HandlePacket(CircularBufferReader packetReader, byte packetId, out int packetLength)
private unsafe ParserState HandlePacket(CircularBufferReader packetReader, byte packetId, out int packetLength)
{
PacketHandler handler = IncomingPackets.GetHandler(packetId);
int length = packetReader.Length;
@ -793,7 +793,7 @@ public partial class NetState : IComparable<NetState>
}
}
ThrottlePacketCallback throttler = handler.ThrottleCallback;
var throttler = handler.ThrottleCallback;
if (throttler != null)
{
if (!throttler(packetId, this, out bool drop))

14
Projects/Server/Network/PacketHandler.cs
View file

@ -15,15 +15,11 @@
namespace Server.Network;
public delegate void OnPacketReceive(NetState state, CircularBufferReader reader, int packetLength);
public delegate bool ThrottlePacketCallback(int packetId, NetState state, out bool drop);
public class PacketHandler
public unsafe class PacketHandler
{
private int _length;
private readonly int _length;
public PacketHandler(int packetID, int length, bool ingame, OnPacketReceive onReceive)
public PacketHandler(int packetID, int length, bool ingame, delegate*<NetState, CircularBufferReader, int, void> onReceive)
{
_length = length;
PacketID = packetID;
@ -35,9 +31,9 @@ public class PacketHandler
public virtual int GetLength(NetState ns) => _length;
public OnPacketReceive OnReceive { get; }
public delegate*<NetState, CircularBufferReader, int, void> OnReceive { get; }
public ThrottlePacketCallback ThrottleCallback { get; set; }
public delegate*<int, NetState, out bool, bool> ThrottleCallback { get; set; }
public bool Ingame { get; }
}

28
Projects/Server/Network/Packets/IncomingAccountPackets.cs
View file

@ -38,21 +38,21 @@ public static class IncomingAccountPackets
}
}
public static void Configure()
public static unsafe void Configure()
{
IncomingPackets.Register(0x00, 104, false, CreateCharacter);
IncomingPackets.Register(0x5D, 73, false, PlayCharacter);
IncomingPackets.Register(0x80, 62, false, AccountLogin);
IncomingPackets.Register(0x83, 39, false, DeleteCharacter);
IncomingPackets.Register(0x91, 65, false, GameLogin);
IncomingPackets.Register(0xA0, 3, false, PlayServer);
IncomingPackets.Register(0xBB, 9, false, AccountID);
IncomingPackets.Register(0xBD, 0, false, ClientVersion);
IncomingPackets.Register(0xBE, 0, true, AssistVersion);
IncomingPackets.Register(0xCF, 0, false, AccountLogin);
IncomingPackets.Register(0xE1, 0, false, ClientType);
IncomingPackets.Register(0xEF, 21, false, LoginServerSeed);
IncomingPackets.Register(0xF8, 106, false, CreateCharacter);
IncomingPackets.Register(0x00, 104, false, &CreateCharacter);
IncomingPackets.Register(0x5D, 73, false, &PlayCharacter);
IncomingPackets.Register(0x80, 62, false, &AccountLogin);
IncomingPackets.Register(0x83, 39, false, &DeleteCharacter);
IncomingPackets.Register(0x91, 65, false, &GameLogin);
IncomingPackets.Register(0xA0, 3, false, &PlayServer);
IncomingPackets.Register(0xBB, 9, false, &AccountID);
IncomingPackets.Register(0xBD, 0, false, &ClientVersion);
IncomingPackets.Register(0xBE, 0, true, &AssistVersion);
IncomingPackets.Register(0xCF, 0, false, &AccountLogin);
IncomingPackets.Register(0xE1, 0, false, &ClientType);
IncomingPackets.Register(0xEF, 21, false, &LoginServerSeed);
IncomingPackets.Register(0xF8, 106, false, &CreateCharacter);
}
public static void CreateCharacter(NetState state, CircularBufferReader reader, int packetLength)

10
Projects/Server/Network/Packets/IncomingEntityPackets.cs
View file

@ -19,12 +19,12 @@ public static class IncomingEntityPackets
{
public static bool SingleClickProps { get; set; }
public static void Configure()
public static unsafe void Configure()
{
IncomingPackets.Register(0x06, 5, true, UseReq);
IncomingPackets.Register(0x09, 5, true, LookReq);
IncomingPackets.Register(0xB6, 9, true, ObjectHelpRequest);
IncomingPackets.Register(0xD6, 0, true, BatchQueryProperties);
IncomingPackets.Register(0x06, 5, true, &UseReq);
IncomingPackets.Register(0x09, 5, true, &LookReq);
IncomingPackets.Register(0xB6, 9, true, &ObjectHelpRequest);
IncomingPackets.Register(0xD6, 0, true, &BatchQueryProperties);
}
public static void ObjectHelpRequest(NetState state, CircularBufferReader reader, int packetLength)

47
Projects/Server/Network/Packets/IncomingExtendedCommandPackets.cs
View file

@ -34,29 +34,29 @@ public static class IncomingExtendedCommandPackets
125, 126, 127, 128
};
public static void Configure()
public static unsafe void Configure()
{
IncomingPackets.Register(0xBF, 0, true, ExtendedCommand);
IncomingPackets.Register(0xBF, 0, true, &ExtendedCommand);
RegisterExtended(0x05, false, ScreenSize);
RegisterExtended(0x06, true, PartyMessage);
RegisterExtended(0x09, true, DisarmRequest);
RegisterExtended(0x0A, true, StunRequest);
RegisterExtended(0x0B, false, Language);
RegisterExtended(0x0C, true, CloseStatus);
RegisterExtended(0x0E, true, Animate);
RegisterExtended(0x0F, false, Empty); // What's this?
RegisterExtended(0x10, true, QueryProperties);
RegisterExtended(0x13, true, ContextMenuRequest);
RegisterExtended(0x15, true, ContextMenuResponse);
RegisterExtended(0x1A, true, StatLockChange);
RegisterExtended(0x1C, true, CastSpell);
RegisterExtended(0x24, false, UnhandledBF);
RegisterExtended(0x2C, true, BandageTarget);
RegisterExtended(0x2D, true, TargetedSpell);
RegisterExtended(0x2E, true, TargetedSkillUse);
RegisterExtended(0x30, true, TargetByResourceMacro);
RegisterExtended(0x32, true, ToggleFlying);
RegisterExtended(0x05, false, &ScreenSize);
RegisterExtended(0x06, true, &PartyMessage);
RegisterExtended(0x09, true, &DisarmRequest);
RegisterExtended(0x0A, true, &StunRequest);
RegisterExtended(0x0B, false, &Language);
RegisterExtended(0x0C, true, &CloseStatus);
RegisterExtended(0x0E, true, &Animate);
RegisterExtended(0x0F, false, &Empty); // What's this?
RegisterExtended(0x10, true, &QueryProperties);
RegisterExtended(0x13, true, &ContextMenuRequest);
RegisterExtended(0x15, true, &ContextMenuResponse);
RegisterExtended(0x1A, true, &StatLockChange);
RegisterExtended(0x1C, true, &CastSpell);
RegisterExtended(0x24, false, &UnhandledBF);
RegisterExtended(0x2C, true, &BandageTarget);
RegisterExtended(0x2D, true, &TargetedSpell);
RegisterExtended(0x2E, true, &TargetedSkillUse);
RegisterExtended(0x30, true, &TargetByResourceMacro);
RegisterExtended(0x32, true, &ToggleFlying);
}
private static void UnhandledBF(NetState state, CircularBufferReader reader, int packetLength)
@ -67,7 +67,8 @@ public static class IncomingExtendedCommandPackets
{
}
public static void RegisterExtended(int packetID, bool ingame, OnPacketReceive onReceive)
public static unsafe void RegisterExtended(int packetID, bool ingame,
delegate*<NetState, CircularBufferReader, int, void> onReceive)
{
if (packetID is >= 0 and < 0x100)
{
@ -86,7 +87,7 @@ public static class IncomingExtendedCommandPackets
}
}
public static void ExtendedCommand(NetState state, CircularBufferReader reader, int packetLength)
public static unsafe void ExtendedCommand(NetState state, CircularBufferReader reader, int packetLength)
{
int packetId = reader.ReadUInt16();

4
Projects/Server/Network/Packets/IncomingHousePackets.cs
View file

@ -17,9 +17,9 @@ namespace Server.Network;
public static class IncomingHousePackets
{
public static void Configure()
public static unsafe void Configure()
{
IncomingPackets.Register(0xFB, 2, false, ShowPublicHouseContent);
IncomingPackets.Register(0xFB, 2, false, &ShowPublicHouseContent);
}
public static void ShowPublicHouseContent(NetState state, CircularBufferReader reader, int packetLength)

12
Projects/Server/Network/Packets/IncomingItemPackets.cs
View file

@ -21,13 +21,13 @@ namespace Server.Network;
public static class IncomingItemPackets
{
public static void Configure()
public static unsafe void Configure()
{
IncomingPackets.Register(0x07, 7, true, LiftReq);
IncomingPackets.Register(new ContainerGridPacketHandler(0x08, 14, true, DropReq));
IncomingPackets.Register(0x13, 10, true, EquipReq);
IncomingPackets.Register(0xEC, 0, false, EquipMacro);
IncomingPackets.Register(0xED, 0, false, UnequipMacro);
IncomingPackets.Register(0x07, 7, true, &LiftReq);
IncomingPackets.Register(new ContainerGridPacketHandler(0x08, 14, true, &DropReq));
IncomingPackets.Register(0x13, 10, true, &EquipReq);
IncomingPackets.Register(0xEC, 0, false, &EquipMacro);
IncomingPackets.Register(0xED, 0, false, &UnequipMacro);
}
public static void LiftReq(NetState state, CircularBufferReader reader, int packetLength)

6
Projects/Server/Network/Packets/IncomingMessagePackets.cs
View file

@ -40,10 +40,10 @@ public static class IncomingMessagePackets
{
private static readonly KeywordList m_KeywordList = new();
public static void Configure()
public static unsafe void Configure()
{
IncomingPackets.Register(0x03, 0, true, AsciiSpeech);
IncomingPackets.Register(0xAD, 0, true, UnicodeSpeech);
IncomingPackets.Register(0x03, 0, true, &AsciiSpeech);
IncomingPackets.Register(0xAD, 0, true, &UnicodeSpeech);
}
public static void AsciiSpeech(NetState state, CircularBufferReader reader, int packetLength)

10
Projects/Server/Network/Packets/IncomingMobilePackets.cs
View file

@ -19,12 +19,12 @@ namespace Server.Network;
public static class IncomingMobilePackets
{
public static void Configure()
public static unsafe void Configure()
{
IncomingPackets.Register(0x75, 35, true, RenameRequest);
IncomingPackets.Register(0x98, 0, true, MobileNameRequest);
IncomingPackets.Register(0xB8, 0, true, ProfileReq);
IncomingPackets.Register(0x6F, 0, true, SecureTrade);
IncomingPackets.Register(0x75, 35, true, &RenameRequest);
IncomingPackets.Register(0x98, 0, true, &MobileNameRequest);
IncomingPackets.Register(0xB8, 0, true, &ProfileReq);
IncomingPackets.Register(0x6F, 0, true, &SecureTrade);
}
public static void RenameRequest(NetState state, CircularBufferReader reader, int packetLength)

4
Projects/Server/Network/Packets/IncomingMovementPackets.cs
View file

@ -17,9 +17,9 @@ namespace Server.Network;
public static class IncomingMovementPackets
{
public static void Configure()
public static unsafe void Configure()
{
IncomingPackets.Register(0x02, 7, true, MovementReq);
IncomingPackets.Register(0x02, 7, true, &MovementReq);
// Not used by OSI, and interferes with ClassicUO/Razor protocol extensions
// IncomingPackets.Register(0xF0, 0, true, NewMovementReq);
// IncomingPackets.Register(0xF1, 9, true, TimeSyncReq);

5
Projects/Server/Network/Packets/IncomingPackets.cs
View file

@ -24,7 +24,8 @@ public static class IncomingPackets
public static PacketHandler[] Handlers { get; } = new PacketHandler[0x100];
[MethodImpl(MethodImplOptions.AggressiveInlining)]
public static void Register(int packetID, int length, bool ingame, OnPacketReceive onReceive) =>
public static unsafe void Register(int packetID, int length, bool ingame,
delegate*<NetState, CircularBufferReader, int, void> onReceive) =>
Register(new PacketHandler(packetID, length, ingame, onReceive));
public static void Register(PacketHandler packetHandler)
@ -53,7 +54,7 @@ public static class IncomingPackets
}
}
public static void RegisterThrottler(int packetID, ThrottlePacketCallback t)
public static unsafe void RegisterThrottler(int packetID, delegate*<int, NetState, out bool, bool> t)
{
var ph = GetHandler(packetID);

46
Projects/Server/Network/Packets/IncomingPlayerPackets.cs
View file

@ -23,30 +23,30 @@ namespace Server.Network;
public static class IncomingPlayerPackets
{
public static void Configure()
public static unsafe void Configure()
{
IncomingPackets.Register(0x01, 5, false, Disconnect);
IncomingPackets.Register(0x05, 5, true, AttackReq);
IncomingPackets.Register(0x12, 0, true, TextCommand);
IncomingPackets.Register(0x22, 3, true, Resynchronize);
IncomingPackets.Register(0x2C, 2, true, DeathStatusResponse);
IncomingPackets.Register(0x34, 10, true, MobileQuery);
IncomingPackets.Register(0x3A, 0, true, ChangeSkillLock);
IncomingPackets.Register(0x72, 5, true, SetWarMode);
IncomingPackets.Register(0x73, 2, false, PingReq);
IncomingPackets.Register(0x7D, 13, true, MenuResponse);
IncomingPackets.Register(0x95, 9, true, HuePickerResponse);
IncomingPackets.Register(0x9A, 0, true, AsciiPromptResponse);
IncomingPackets.Register(0x9B, 258, true, HelpRequest);
IncomingPackets.Register(0xA4, 149, false, SystemInfo);
IncomingPackets.Register(0xA7, 4, true, RequestScrollWindow);
IncomingPackets.Register(0xB1, 0, true, DisplayGumpResponse);
IncomingPackets.Register(0xC2, 0, true, UnicodePromptResponse);
IncomingPackets.Register(0xC8, 2, true, SetUpdateRange);
IncomingPackets.Register(0xD0, 0, true, ConfigurationFile);
IncomingPackets.Register(0xD1, 2, true, LogoutReq);
IncomingPackets.Register(0xD7, 0, true, EncodedCommand);
IncomingPackets.Register(0xF4, 0, false, CrashReport);
IncomingPackets.Register(0x01, 5, false, &Disconnect);
IncomingPackets.Register(0x05, 5, true, &AttackReq);
IncomingPackets.Register(0x12, 0, true, &TextCommand);
IncomingPackets.Register(0x22, 3, true, &Resynchronize);
IncomingPackets.Register(0x2C, 2, true, &DeathStatusResponse);
IncomingPackets.Register(0x34, 10, true, &MobileQuery);
IncomingPackets.Register(0x3A, 0, true, &ChangeSkillLock);
IncomingPackets.Register(0x72, 5, true, &SetWarMode);
IncomingPackets.Register(0x73, 2, false, &PingReq);
IncomingPackets.Register(0x7D, 13, true, &MenuResponse);
IncomingPackets.Register(0x95, 9, true, &HuePickerResponse);
IncomingPackets.Register(0x9A, 0, true, &AsciiPromptResponse);
IncomingPackets.Register(0x9B, 258, true, &HelpRequest);
IncomingPackets.Register(0xA4, 149, false, &SystemInfo);
IncomingPackets.Register(0xA7, 4, true, &RequestScrollWindow);
IncomingPackets.Register(0xB1, 0, true, &DisplayGumpResponse);
IncomingPackets.Register(0xC2, 0, true, &UnicodePromptResponse);
IncomingPackets.Register(0xC8, 2, true, &SetUpdateRange);
IncomingPackets.Register(0xD0, 0, true, &ConfigurationFile);
IncomingPackets.Register(0xD1, 2, true, &LogoutReq);
IncomingPackets.Register(0xD7, 0, true, &EncodedCommand);
IncomingPackets.Register(0xF4, 0, false, &CrashReport);
IncomingPackets.RegisterEncoded(0x28, true, GuildGumpRequest);
IncomingPackets.RegisterEncoded(0x32, true, QuestGumpRequest);

4
Projects/Server/Network/Packets/IncomingTargetingPackets.cs
View file

@ -20,9 +20,9 @@ namespace Server.Network;
public static class IncomingTargetingPackets
{
public static void Configure()
public static unsafe void Configure()
{
IncomingPackets.Register(0x6C, 19, true, TargetResponse);
IncomingPackets.Register(0x6C, 19, true, &TargetResponse);
}
public static void TargetResponse(NetState state, CircularBufferReader reader, int packetLength)

6
Projects/Server/Network/Packets/IncomingVendorPackets.cs
View file

@ -19,10 +19,10 @@ namespace Server.Network;
public static class IncomingVendorPackets
{
public static void Configure()
public static unsafe void Configure()
{
IncomingPackets.Register(0x3B, 0, true, VendorBuyReply);
IncomingPackets.Register(0x9F, 0, true, VendorSellReply);
IncomingPackets.Register(0x3B, 0, true, &VendorBuyReply);
IncomingPackets.Register(0x9F, 0, true, &VendorSellReply);
}
public static void VendorBuyReply(NetState state, CircularBufferReader reader, int packetLength)

8
Projects/UOContent/Accounting/AccountAttackLimiter.cs
View file

@ -17,16 +17,16 @@ namespace Server.Accounting
Enabled = ServerConfiguration.GetOrUpdateSetting("accountAttackLimiter.enable", true);
}
public static void Initialize()
public static unsafe void Initialize()
{
if (!Enabled)
{
return;
}
IncomingPackets.RegisterThrottler(0x80, Throttle);
IncomingPackets.RegisterThrottler(0x91, Throttle);
IncomingPackets.RegisterThrottler(0xCF, Throttle);
IncomingPackets.RegisterThrottler(0x80, &Throttle);
IncomingPackets.RegisterThrottler(0x91, &Throttle);
IncomingPackets.RegisterThrottler(0xCF, &Throttle);
}
public static bool Throttle(int packetId, NetState ns, out bool drop)

6
Projects/UOContent/Engines/Chat/ChatPackets.cs
View file

@ -21,10 +21,10 @@ namespace Server.Engines.Chat
{
public static class ChatPackets
{
public static void Configure()
public static unsafe void Configure()
{
IncomingPackets.Register(0xB5, 0x40, true, OpenChatWindowRequest);
IncomingPackets.Register(0xB3, 0, true, ChatAction);
IncomingPackets.Register(0xB5, 0x40, true, &OpenChatWindowRequest);
IncomingPackets.Register(0xB3, 0, true, &ChatAction);
}
public static void OpenChatWindowRequest(NetState state, CircularBufferReader reader, int packetLength)

4
Projects/UOContent/Engines/ML Quests/Gumps/RaceChangeGump.cs
View file

@ -76,11 +76,11 @@ namespace Server.Engines.MLQuests.Gumps
}
}
public static void Initialize()
public static unsafe void Initialize()
{
m_Pending = new Dictionary<NetState, RaceChangeState>();
IncomingExtendedCommandPackets.RegisterExtended(0x2A, true, RaceChangeReply);
IncomingExtendedCommandPackets.RegisterExtended(0x2A, true, &RaceChangeReply);
}
public static bool IsPending(NetState state) => state != null && m_Pending.ContainsKey(state);

4
Projects/UOContent/Engines/UltimaStore/UltimaStorePackets.cs
View file

@ -4,9 +4,9 @@ namespace Server.Engines.UltimaStore
{
public static class UltimaStorePackets
{
public static void Configure()
public static unsafe void Configure()
{
IncomingPackets.Register(0xFA, 1, true, UltimaStoreOpenRequest);
IncomingPackets.Register(0xFA, 1, true, &UltimaStoreOpenRequest);
}
public static void UltimaStoreOpenRequest(NetState state, CircularBufferReader reader, int packetLength)

8
Projects/UOContent/Items/Books/BookPackets.cs
View file

@ -22,11 +22,11 @@ namespace Server.Items
{
public static class BookPackets
{
public static void Configure()
public static unsafe void Configure()
{
IncomingPackets.Register(0xD4, 0, true, HeaderChange);
IncomingPackets.Register(0x66, 0, true, ContentChange);
IncomingPackets.Register(0x93, 99, true, OldHeaderChange);
IncomingPackets.Register(0xD4, 0, true, &HeaderChange);
IncomingPackets.Register(0x66, 0, true, &ContentChange);
IncomingPackets.Register(0x93, 99, true, &OldHeaderChange);
}
public static void OldHeaderChange(NetState state, CircularBufferReader reader, int packetLength)

4
Projects/UOContent/Items/Bulletin Boards/BulletinBoardPackets.cs
View file

@ -24,9 +24,9 @@ namespace Server.Network
{
public static class BulletinBoardPackets
{
public static void Configure()
public static unsafe void Configure()
{
IncomingPackets.Register(0x71, 0, true, BBClientRequest);
IncomingPackets.Register(0x71, 0, true, &BBClientRequest);
}
public static string FormatTS(TimeSpan ts)

4
Projects/UOContent/Items/Games/Mahjong/MahjongPackets.cs
View file

@ -43,9 +43,9 @@ namespace Server.Engines.Mahjong
return null;
}
public static void Configure()
public static unsafe void Configure()
{
IncomingPackets.Register(0xDA, 0, true, OnPacket);
IncomingPackets.Register(0xDA, 0, true, &OnPacket);
RegisterSubCommand(0x6, ExitGame);
RegisterSubCommand(0xA, GivePoints);

4
Projects/UOContent/Items/Maps/MapItemPackets.cs
View file

@ -20,9 +20,9 @@ namespace Server.Network
{
public static class MapItemPackets
{
public static void Configure()
public static unsafe void Configure()
{
IncomingPackets.Register(0x56, 11, true, OnMapCommand);
IncomingPackets.Register(0x56, 11, true, &OnMapCommand);
}
private static void OnMapCommand(NetState state, CircularBufferReader reader, int packetLength)

4
Projects/UOContent/Misc/HardwareInfo.cs
View file

@ -87,9 +87,9 @@ namespace Server
[CommandProperty(AccessLevel.GameMaster)]
public DateTime TimeReceived { get; private set; }
public static void Configure()
public static unsafe void Configure()
{
IncomingPackets.Register(0xD9, 0x10C, false, OnReceive);
IncomingPackets.Register(0xD9, 0x10C, false, &OnReceive);
CommandSystem.Register("HWInfo", AccessLevel.GameMaster, HWInfo_OnCommand);
}

8
Projects/UOContent/Misc/PacketThrottles.cs
View file

@ -12,7 +12,7 @@ namespace Server.Network
private static readonly int[] Delays = new int[0x100];
private const string ThrottlesConfiguration = "Configuration/throttles.json";
public static void Initialize()
public static unsafe void Initialize()
{
CommandSystem.Register("GetThrottle", AccessLevel.Administrator, GetThrottle);
CommandSystem.Register("SetThrottle", AccessLevel.Administrator, SetThrottle);
@ -47,7 +47,7 @@ namespace Server.Network
{
if (Delays[i] > 0)
{
IncomingPackets.RegisterThrottler(i, Throttle);
IncomingPackets.RegisterThrottler(i, &Throttle);
}
}
@ -77,7 +77,7 @@ namespace Server.Network
[Usage("SetThrottle <packetID> <timeInMilliseconds>")]
[Description("Sets a throttle for the given packet.")]
public static void SetThrottle(CommandEventArgs e)
public static unsafe void SetThrottle(CommandEventArgs e)
{
if (e.Length != 2)
{
@ -104,7 +104,7 @@ namespace Server.Network
if (oldDelay == 0 && delay > 0)
{
IncomingPackets.RegisterThrottler(packetID, Throttle);
IncomingPackets.RegisterThrottler(packetID, &Throttle);
}
else if (oldDelay > 0 && delay == 0)
{

4
Projects/UOContent/Multis/Houses/HouseFoundation.cs
View file

@ -972,9 +972,9 @@ namespace Server.Multis
public bool IsHiddenToCustomizer(Item item) =>
item == Signpost || item == SignHanger || item == Sign || IsFixture(item);
public static void Initialize()
public static unsafe void Initialize()
{
IncomingExtendedCommandPackets.RegisterExtended(0x1E, true, QueryDesignDetails);
IncomingExtendedCommandPackets.RegisterExtended(0x1E, true, &QueryDesignDetails);
IncomingPackets.RegisterEncoded(0x02, true, Designer_Backup);
IncomingPackets.RegisterEncoded(0x03, true, Designer_Restore);

9
Projects/UOContent/Network/FreeshardProtocol.cs
View file

@ -22,10 +22,15 @@ namespace Server.Network
[CallPriority(10)]
public static void Configure()
{
_handlers = ProtocolExtensions.Register(0xF1);
_handlers = ProtocolExtensions<FreeshardProtocolInfo>.Register(new FreeshardProtocolInfo());
}
public static void Register(int cmd, bool ingame, OnPacketReceive onReceive) =>
public static unsafe void Register(int cmd, bool ingame, delegate*<NetState, CircularBufferReader, int, void> onReceive) =>
_handlers[cmd] = new PacketHandler(cmd, 0, ingame, onReceive);
private struct FreeshardProtocolInfo : IProtocolExtensionsInfo
{
public int PacketId => 0xF1;
}
}
}

15
Projects/UOContent/Network/MapUO.cs
View file

@ -25,15 +25,15 @@ namespace Server.Network
{
private static PacketHandler[] _handlers;
public static void Configure()
public static unsafe void Configure()
{
_handlers = ProtocolExtensions.Register(0xF0);
_handlers = ProtocolExtensions<MapUOProtocolInfo>.Register(new MapUOProtocolInfo());
Register(0x00, true, QueryPartyMemberLocations);
Register(0x01, true, QueryGuildMemberLocations);
Register(0x00, true, &QueryPartyMemberLocations);
Register(0x01, true, &QueryGuildMemberLocations);
}
public static void Register(int cmd, bool ingame, OnPacketReceive onReceive) =>
public static unsafe void Register(int cmd, bool ingame, delegate*<NetState, CircularBufferReader, int, void> onReceive) =>
_handlers[cmd] = new PacketHandler(cmd, 0, ingame, onReceive);
public static void QueryGuildMemberLocations(NetState state, CircularBufferReader reader, int packetLength)
@ -160,5 +160,10 @@ namespace Server.Network
writer.WritePacketLength();
ns.Send(writer.Span);
}
private struct MapUOProtocolInfo : IProtocolExtensionsInfo
{
public int PacketId => 0xF0;
}
}
}

64
Projects/UOContent/Network/ProtocolExtensions.cs
View file

@ -15,40 +15,48 @@
namespace Server.Network
{
public static class ProtocolExtensions
public interface IProtocolExtensionsInfo
{
public static PacketHandler[] Register(byte packetId)
public int PacketId { get; }
}
public static class ProtocolExtensions<T> where T : struct, IProtocolExtensionsInfo
{
private static readonly PacketHandler[] packetHandlers = new PacketHandler[0x100];
private static int packetId;
public static unsafe PacketHandler[] Register(T info)
{
var packetHandlers = new PacketHandler[0x100];
packetId = info.PacketId;
IncomingPackets.Register(packetId, 0, false, &DecodeBundledPacket);
void DecodeBundledPacket(NetState state, CircularBufferReader reader, int packetLength)
return packetHandlers;
}
private static unsafe void DecodeBundledPacket(NetState state, CircularBufferReader reader, int packetLength)
{
int cmd = reader.ReadByte();
PacketHandler ph = packetHandlers[cmd];
if (ph == null)
{
int cmd = reader.ReadByte();
PacketHandler ph = packetHandlers[cmd];
if (ph == null)
{
return;
}
if (ph.Ingame && state.Mobile == null)
{
state.LogInfo($"Sent in-game packet (0x{packetId:X2}x{cmd:X2}) before having been attached to a mobile");
state.Disconnect("Sent in-game packet before being attached to a mobile.");
}
else if (ph.Ingame && state.Mobile.Deleted)
{
state.Disconnect(string.Empty);
}
else
{
ph.OnReceive(state, reader, packetLength);
}
return;
}
IncomingPackets.Register(packetId, 0, false, DecodeBundledPacket);
return packetHandlers;
if (ph.Ingame && state.Mobile == null)
{
state.LogInfo($"Sent in-game packet (0x{packetId:X2}x{cmd:X2}) before having been attached to a mobile");
state.Disconnect("Sent in-game packet before being attached to a mobile.");
}
else if (ph.Ingame && state.Mobile.Deleted)
{
state.Disconnect(string.Empty);
}
else
{
ph.OnReceive(state, reader, packetLength);
}
}
}
}

6
Projects/UOContent/Network/UOGateway.cs
View file

@ -22,14 +22,14 @@ namespace Server.Network
{
public static class UOGateway
{
public static void Configure()
public static unsafe void Configure()
{
var enabled = ServerConfiguration.GetOrUpdateSetting("uogateway.enabled", true);
if (enabled)
{
FreeshardProtocol.Register(0xFE, false, QueryCompactShardStats);
FreeshardProtocol.Register(0xFF, false, QueryExtendedShardStats);
FreeshardProtocol.Register(0xFE, false, &QueryCompactShardStats);
FreeshardProtocol.Register(0xFF, false, &QueryExtendedShardStats);
}
}

4
Projects/UOContent/Skills/Tracking/Tracking.cs
View file

@ -12,9 +12,9 @@ namespace Server.SkillHandlers
{
private static readonly Dictionary<Mobile, TrackingInfo> m_Table = new();
public static void Configure()
public static unsafe void Configure()
{
IncomingExtendedCommandPackets.RegisterExtended(0x07, true, QuestArrow);
IncomingExtendedCommandPackets.RegisterExtended(0x07, true, &QuestArrow);
SkillInfo.Table[(int)SkillName.Tracking].Callback = OnUse;
}