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

More server-side EntityEvent error logging, Item.ServerWrite does some error checks and writes NetEntityEvent.Type.Invalid as the type of the event instead of attempting to write a potentially unreadable message.

Browse Source
This commit is contained in:
Joonas Rikkonen
2018-07-29 22:28:56 +03:00
parent b7b033dac1
commit 458c972580
4 changed files with 60 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Barotrauma/BarotraumaClient/Source/Items/Item.cs
View File

@@ -406,6 +406,8 @@ namespace Barotrauma
case NetEntityEvent.Type.ChangeProperty:
ReadPropertyChange(msg);
break;
case NetEntityEvent.Type.Invalid:
break;
}
}

56
Barotrauma/BarotraumaShared/Source/Items/Item.cs
View File

@@ -1284,18 +1284,58 @@ namespace Barotrauma
{
if (extraData == null || extraData.Length == 0 || !(extraData[0] is NetEntityEvent.Type))
{
string errorMsg = "";
if (extraData == null)
{
errorMsg = "Failed to write a network event for the item \"" + Name + "\" - event data was null.";
}
else if (extraData.Length == 0)
{
errorMsg = "Failed to write a network event for the item \"" + Name + "\" - event data was empty.";
}
else
{
errorMsg = "Failed to write a network event for the item \"" + Name + "\" - event type not set.";
}
msg.WriteRangedInteger(0, Enum.GetValues(typeof(NetEntityEvent.Type)).Length - 1, (int)NetEntityEvent.Type.Invalid);
DebugConsole.Log(errorMsg);
GameAnalyticsManager.AddErrorEventOnce("Item.ServerWrite:InvalidData" + Name, GameAnalyticsSDK.Net.EGAErrorSeverity.Error, errorMsg);
return;
}
long initialWritePos = msg.Position;
NetEntityEvent.Type eventType = (NetEntityEvent.Type)extraData[0];
msg.WriteRangedInteger(0, Enum.GetValues(typeof(NetEntityEvent.Type)).Length - 1, (int)eventType);
switch (eventType)
{
case NetEntityEvent.Type.ComponentState:
string componentErrorMsg = "";
if (extraData.Length < 2 || !(extraData[1] is int))
{
componentErrorMsg = "Failed to write a component state event for the item \"" + Name + "\" - component index not given.";
}
int componentIndex = (int)extraData[1];
msg.WriteRangedInteger(0, components.Count-1, componentIndex);
(components[componentIndex] as IServerSerializable).ServerWrite(msg, c, extraData);
if (componentIndex < 0 || componentIndex >= components.Count)
{
componentErrorMsg = "Failed to write a component state event for the item \"" + Name + "\" - component index out of range (" + componentIndex + ").";
}
else if (!(components[componentIndex] is IServerSerializable))
{
componentErrorMsg = "Failed to write a component state event for the item \"" + Name + "\" - component \"" + components[componentIndex] + "\" is not server serializable.";
}
if (string.IsNullOrEmpty(componentErrorMsg))
{
msg.WriteRangedInteger(0, components.Count - 1, componentIndex);
(components[componentIndex] as IServerSerializable).ServerWrite(msg, c, extraData);
}
else
{
msg.Position = initialWritePos;
msg.WriteRangedInteger(0, Enum.GetValues(typeof(NetEntityEvent.Type)).Length - 1, (int)NetEntityEvent.Type.Invalid);
DebugConsole.Log(componentErrorMsg);
GameAnalyticsManager.AddErrorEventOnce("Item.ServerWrite:InvalidComponentData" + Name, GameAnalyticsSDK.Net.EGAErrorSeverity.Error, componentErrorMsg);
}
break;
case NetEntityEvent.Type.InventoryState:
ownInventory.ServerWrite(msg, c, extraData);
@@ -1321,6 +1361,16 @@ namespace Barotrauma
case NetEntityEvent.Type.ChangeProperty:
WritePropertyChange(msg, extraData);
break;
default:
{
//event type not valid for items - rewind the write position and write invalid event type
msg.Position = initialWritePos;
msg.WriteRangedInteger(0, Enum.GetValues(typeof(NetEntityEvent.Type)).Length - 1, (int)NetEntityEvent.Type.Invalid);
string errorMsg = "Failed to write a network event for the item \"" + Name + "\" - \"" + eventType + "\" is not a valid entity event type for items.";
DebugConsole.Log(errorMsg);
GameAnalyticsManager.AddErrorEventOnce("Item.ServerWrite:InvalidData" + Name, GameAnalyticsSDK.Net.EGAErrorSeverity.Error, errorMsg);
}
break;
}
}

5
Barotrauma/BarotraumaShared/Source/Networking/GameServer.cs
View File

@@ -504,7 +504,10 @@ namespace Barotrauma.Networking
}
catch (Exception e)
{
DebugConsole.ThrowError("Failed to write a network message for the client \""+c.Name+"\"!", e);
DebugConsole.ThrowError("Failed to write a network message for the client \"" + c.Name + "\"!", e);
GameAnalyticsManager.AddErrorEventOnce("GameServer.Update:ClientWriteFailed" + e.StackTrace, GameAnalyticsSDK.Net.EGAErrorSeverity.Error,
"Failed to write a network message for the client \"" + c.Name + "\"! (MidRoundSyncing: " + c.NeedsMidRoundSync + ")\n"
+ e.Message + "\n" + e.StackTrace);
}
}

1
Barotrauma/BarotraumaShared/Source/Networking/NetEntityEvent/NetEntityEvent.cs
View File

@@ -7,6 +7,7 @@ namespace Barotrauma.Networking
{
public enum Type
{
Invalid,
ComponentState,
InventoryState,
Status,