From 6d25fc0022aaba943372a89b609897f974b9f12d Mon Sep 17 00:00:00 2001 From: cxxpxr <60411087+cxxpxr@users.noreply.github.com> Date: Thu, 19 Aug 2021 15:51:35 -0400 Subject: [PATCH] Update RelayHandler.cs --- .../LRM/RelayHandler/RelayHandler.cs | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/ServerProject-DONT-IMPORT-INTO-UNITY/LRM/RelayHandler/RelayHandler.cs b/ServerProject-DONT-IMPORT-INTO-UNITY/LRM/RelayHandler/RelayHandler.cs index 2839a1b..dd91658 100644 --- a/ServerProject-DONT-IMPORT-INTO-UNITY/LRM/RelayHandler/RelayHandler.cs +++ b/ServerProject-DONT-IMPORT-INTO-UNITY/LRM/RelayHandler/RelayHandler.cs @@ -85,11 +85,7 @@ namespace LightReflectiveMirror private void SendData(byte[] clientData, int channel, int sendTo, int senderId) { - // 1 byte for opcode - var headerLength = 1; - var payloadLength = headerLength + clientData.Length; - - if (payloadLength > _maxPacketSize) + if (clientData.Length > _maxPacketSize) { Program.transport.ServerDisconnect(senderId); Program.WriteLogMessage($"Client {senderId} tried to send more than max packet size! Disconnecting..."); @@ -97,7 +93,7 @@ namespace LightReflectiveMirror } int pos = 0; - byte[] sendBuffer = _sendBuffers.Rent(payloadLength); + byte[] sendBuffer = _sendBuffers.Rent(_maxPacketSize); sendBuffer.WriteByte(ref pos, (byte)OpCodes.GetData); sendBuffer.WriteBytes(ref pos, clientData); @@ -108,11 +104,7 @@ namespace LightReflectiveMirror private void SendDataToRoomHost(int senderId, byte[] clientData, int channel, Room room) { - // 1 byte - opcode, 4 bytes for sizeof(int) client id - var headerLength = 5; - var payloadLength = headerLength + clientData.Length; - - if(payloadLength > _maxPacketSize) + if(clientData.Length > _maxPacketSize) { Program.transport.ServerDisconnect(senderId); Program.WriteLogMessage($"Client {senderId} tried to send more than max packet size! Disconnecting..."); @@ -121,7 +113,7 @@ namespace LightReflectiveMirror // We are not the host, so send the data to the host. int pos = 0; - byte[] sendBuffer = _sendBuffers.Rent(payloadLength); + byte[] sendBuffer = _sendBuffers.Rent(_maxPacketSize); sendBuffer.WriteByte(ref pos, (byte)OpCodes.GetData); sendBuffer.WriteBytes(ref pos, clientData);