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

fix(core): Removes 6017 handler (#411)

Browse source 
- [X] Removes 6017 handler since it is only used in one place
- [X] Exposes a ref int to modify the packet length. This is acceptable since we technically have access to the entire reader/buffer.
This commit is contained in:
Kamron Batman 2021-01-16 13:43:16 -08:00 • committed by GitHub
parent dc44142d29
commit 97f311d7be
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
24 changed files with 126 additions and 129 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -37,13 +37,6 @@ namespace Server.Network
public static PacketHandler GetHandler(int packetID) => Handlers[packetID];
public static void Register6017(int packetID, int length, bool ingame, OnPacketReceive onReceive)
{
m_6017Handlers[packetID] = new PacketHandler(packetID, length, ingame, onReceive);
}
public static PacketHandler Get6017Handler(int packetID) => m_6017Handlers[packetID];
public static void RegisterEncoded(int packetID, bool ingame, OnEncodedPacketReceive onReceive)
{
if (packetID >= 0 && packetID < 0x100)
@ -87,13 +80,6 @@ namespace Server.Network
{
ph.ThrottleCallback = t;
}
ph = Get6017Handler(packetID);
if (ph != null)
{
ph.ThrottleCallback = t;
}
}
public static int ProcessPacket(this NetState ns, ArraySegment<byte>[] buffer)
@ -141,7 +127,9 @@ namespace Server.Network
return -1;
}
// We use this for failing fast where we already know the length, but may not read it entirely
var packetLength = handler.Length;
if (handler.Length <= 0 && reader.Length >= 3)
{
packetLength = reader.ReadUInt16();
@ -170,7 +158,9 @@ namespace Server.Network
ns.ThrottledUntil = DateTime.UtcNow + throttled;
}
handler.OnReceive(ns, reader);
// The packet length is sent in as a ref to support situations where a smaller/larger packet is read.
// Example is DropReq to support 6.0.1.7+ where the packet is 1 byte larger
handler.OnReceive(ns, reader, ref packetLength);
return packetLength;
}