vlad.os/LuaCsForBarotraumaEP
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed incorrect debug info when receiving a message with an invalid object header. The method wrote the bytes/bits read SINCE the previous object (= just one byte, the invalid object header) instead of what was read in the previous object. The error message also ignored empty entity events.

Browse Source
This commit is contained in:
Joonas Rikkonen
2018-07-25 17:00:31 +03:00
parent d3d842eecd
commit 40f4e94613
2 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Barotrauma/BarotraumaClient/Source/Networking/GameClient.cs
+9 -2
View File
@@ -986,6 +986,9 @@ namespace Barotrauma.Networking
long prevBitPos = 0; long prevBitPos = 0;
long prevBytePos = 0; long prevBytePos = 0;
long prevBitLength = 0;
long prevByteLength = 0;
ServerNetObject objHeader; ServerNetObject objHeader;
while ((objHeader = (ServerNetObject)inc.ReadByte()) != ServerNetObject.END_OF_MESSAGE) while ((objHeader = (ServerNetObject)inc.ReadByte()) != ServerNetObject.END_OF_MESSAGE)
{ {
@@ -1023,8 +1026,9 @@ namespace Barotrauma.Networking
List<string> errorLines = new List<string> List<string> errorLines = new List<string>
{ {
"Error while reading update from server (unknown object header \"" + objHeader + "\"!)", "Error while reading update from server (unknown object header \"" + objHeader + "\"!)",
"Message length: " + inc.LengthBits + " (" + inc.LengthBytes + " bytes)",
prevObjHeader != null ? "Previous object type: " + prevObjHeader.ToString() : "Error occurred on the very first object!", prevObjHeader != null ? "Previous object type: " + prevObjHeader.ToString() : "Error occurred on the very first object!",
"Previous object was " + (inc.Position - prevBitPos) + " bits long (" + (inc.PositionInBytes - prevBytePos) + " bytes)" "Previous object was " + (prevBitLength) + " bits long (" + (prevByteLength) + " bytes)"
}; };
if (prevObjHeader == ServerNetObject.ENTITY_EVENT || prevObjHeader == ServerNetObject.ENTITY_EVENT_INITIAL) if (prevObjHeader == ServerNetObject.ENTITY_EVENT || prevObjHeader == ServerNetObject.ENTITY_EVENT_INITIAL)
{ {
@@ -1051,13 +1055,16 @@ namespace Barotrauma.Networking
FileStream fl = File.Open("crashreport_object.bin", FileMode.Create); FileStream fl = File.Open("crashreport_object.bin", FileMode.Create);
BinaryWriter sw = new BinaryWriter(fl); BinaryWriter sw = new BinaryWriter(fl);
sw.Write(inc.Data, (int)prevBytePos, (int)(inc.LengthBytes - prevBytePos)); sw.Write(inc.Data, (int)(prevBytePos - prevByteLength), (int)(prevByteLength));
sw.Close(); sw.Close();
fl.Close(); fl.Close();
throw new Exception("Error while reading update from server: please send us \"crashreport_object.bin\"!"); throw new Exception("Error while reading update from server: please send us \"crashreport_object.bin\"!");
} }
prevBitLength = inc.Position - prevBitPos;
prevByteLength = inc.PositionInBytes - prevByteLength;
prevObjHeader = objHeader; prevObjHeader = objHeader;
prevBitPos = inc.Position; prevBitPos = inc.Position;
prevBytePos = inc.PositionInBytes; prevBytePos = inc.PositionInBytes;
Barotrauma/BarotraumaClient/Source/Networking/NetEntityEvent/ClientEntityEventManager.cs
+6
View File
@@ -140,7 +140,13 @@ namespace Barotrauma.Networking
if (entityID == 0) if (entityID == 0)
{ {
if (GameSettings.VerboseLogging)
{
DebugConsole.NewMessage("received msg " + thisEventID + " (null entity)",
Microsoft.Xna.Framework.Color.Orange);
}
msg.ReadPadBits(); msg.ReadPadBits();
entities.Add(null);
if (thisEventID == (UInt16)(lastReceivedID + 1)) lastReceivedID++; if (thisEventID == (UInt16)(lastReceivedID + 1)) lastReceivedID++;
continue; continue;
} }