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

fix: Fixes packet length checks (#953)

Browse source 
Fixes an issue with DropReq where an old client was sending in 14 bytes, but the server was expecting 15 bytes.

To fix this we introduced a new packet handler, `ContainerGridPacketHandler` and changed the code to determine the length of the packet dynamically using `GetLength(NetState)`.

Also fixed throttling so dropped packets are properly skipped.
This commit is contained in:
Kamron Batman 2022-03-04 12:32:25 -08:00 • committed by GitHub
parent 1f4162288e
commit 58b907d39e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
30 changed files with 1077 additions and 1126 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Projects/UOContent/Network/ConnectUO.cs
View file

@ -70,7 +70,7 @@ namespace Server.Network
}
}
public static void PollInfo(NetState ns, CircularBufferReader reader, ref int packetLength)
public static void PollInfo(NetState state, CircularBufferReader reader, int packetLength)
{
var version = reader.ReadByte();
@ -83,21 +83,21 @@ namespace Server.Network
if (!span.SequenceEqual(_token))
{
ns.Disconnect("Invalid token sent for ConnectUO");
state.Disconnect("Invalid token sent for ConnectUO");
return;
}
}
}
ns.LogInfo($"ConnectUO (v{version}) is requesting stats.");
state.LogInfo($"ConnectUO (v{version}) is requesting stats.");
if (version > ConnectUOProtocolVersion)
{
Utility.PushColor(ConsoleColor.Yellow);
ns.LogInfo("Warning! ConnectUO (v{version}) is newer than what is supported.");
state.LogInfo("Warning! ConnectUO (v{version}) is newer than what is supported.");
Utility.PopColor();
}
ns.SendServerPollInfo();
state.SendServerPollInfo();
}
public static void SendServerPollInfo(this NetState ns)

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

@ -36,14 +36,14 @@ namespace Server.Network
public static void Register(int cmd, bool ingame, OnPacketReceive onReceive) =>
_handlers[cmd] = new PacketHandler(cmd, 0, ingame, onReceive);
public static void QueryGuildMemberLocations(NetState state, CircularBufferReader reader, ref int packetLength)
public static void QueryGuildMemberLocations(NetState state, CircularBufferReader reader, int packetLength)
{
Mobile from = state.Mobile;
state.SendGuildMemberLocations(from, from.Guild as Guild, reader.ReadBoolean());
}
public static void QueryPartyMemberLocations(NetState state, CircularBufferReader reader, ref int packetLength)
public static void QueryPartyMemberLocations(NetState state, CircularBufferReader reader, int packetLength)
{
Mobile from = state.Mobile;
var party = Party.Get(from);

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

@ -21,11 +21,11 @@ namespace Server.Network
{
var packetHandlers = new PacketHandler[0x100];
void DecodeBundledPacket(NetState state, CircularBufferReader reader, ref int packetLength)
void DecodeBundledPacket(NetState state, CircularBufferReader reader, int packetLength)
{
int cmd = reader.ReadByte();
PacketHandler ph = cmd >= 0 && cmd < packetHandlers.Length ? packetHandlers[cmd] : null;
PacketHandler ph = packetHandlers[cmd];
if (ph == null)
{
@ -43,7 +43,7 @@ namespace Server.Network
}
else
{
ph.OnReceive(state, reader, ref packetLength);
ph.OnReceive(state, reader, packetLength);
}
}

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

@ -33,9 +33,9 @@ namespace Server.Network
}
}
public static void QueryCompactShardStats(NetState ns, CircularBufferReader reader, ref int packetLength)
public static void QueryCompactShardStats(NetState state, CircularBufferReader reader, int packetLength)
{
ns.SendCompactShardStats(
state.SendCompactShardStats(
(uint)(Core.TickCount / 1000),
TcpServer.Instances.Count - 1, // Shame if you modify this!
World.Items.Count,
@ -44,10 +44,10 @@ namespace Server.Network
);
}
public static void QueryExtendedShardStats(NetState ns, CircularBufferReader reader, ref int packetLength)
public static void QueryExtendedShardStats(NetState state, CircularBufferReader reader, int packetLength)
{
const long ticksInHour = 1000 * 60 * 60;
ns.SendExtendedShardStats(
state.SendExtendedShardStats(
ServerList.ServerName,
(int)(Core.TickCount / ticksInHour),
TcpServer.Instances.Count - 1, // Shame if you modify this!