Inna/CypherCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Some logs for testing a bug.

Browse Source
This commit is contained in:
hondacrx
2021-01-21 13:05:40 -05:00
parent 50b5385491
commit 099a2fa98f
1 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Game/Networking/WorldSocket.cs
+12 -1
View File
@@ -189,19 +189,24 @@ namespace Game.Networking
{ {
if (!IsOpen()) if (!IsOpen())
return; return;
Log.outError(LogFilter.Network, $"Raw socket data: {args.Buffer.ToHexString()}");
int currentReadIndex = 0; int currentReadIndex = 0;
while (currentReadIndex < args.BytesTransferred) while (currentReadIndex < args.BytesTransferred)
{ {
if (_headerBuffer.GetRemainingSpace() > 0) if (_headerBuffer.GetRemainingSpace() > 0)
{ {
// need to receive the header // need to receive the header
Log.outError(LogFilter.Network, $"_headerBuffer: {_headerBuffer.GetRemainingSpace()} bytesTransferred: {args.BytesTransferred} ReadIndex: {currentReadIndex}");
int readHeaderSize = Math.Min(args.BytesTransferred - currentReadIndex, _headerBuffer.GetRemainingSpace()); int readHeaderSize = Math.Min(args.BytesTransferred - currentReadIndex, _headerBuffer.GetRemainingSpace());
_headerBuffer.Write(args.Buffer, currentReadIndex, readHeaderSize); _headerBuffer.Write(args.Buffer, currentReadIndex, readHeaderSize);
Log.outError(LogFilter.Network, $"_headerBuffer Data: {_headerBuffer.GetData().ToHexString()}");
currentReadIndex += readHeaderSize; currentReadIndex += readHeaderSize;
if (_headerBuffer.GetRemainingSpace() > 0) if (_headerBuffer.GetRemainingSpace() > 0)
{
Log.outError(LogFilter.Network, $"Couldn't receive the whole header, _headerBuffer: {_headerBuffer.GetRemainingSpace()} bytesTransferred: {args.BytesTransferred}");
break; // Couldn't receive the whole header this time. break; // Couldn't receive the whole header this time.
}
// We just received nice new header // We just received nice new header
if (!ReadHeader()) if (!ReadHeader())
@@ -215,12 +220,17 @@ namespace Game.Networking
if (_packetBuffer.GetRemainingSpace() > 0) if (_packetBuffer.GetRemainingSpace() > 0)
{ {
// need more data in the payload // need more data in the payload
Log.outError(LogFilter.Network, $"_packetBuffer: {_packetBuffer.GetRemainingSpace()} bytesTransferred: {args.BytesTransferred} ReadIndex: {currentReadIndex}");
int readDataSize = Math.Min(args.BytesTransferred - currentReadIndex, _packetBuffer.GetRemainingSpace()); int readDataSize = Math.Min(args.BytesTransferred - currentReadIndex, _packetBuffer.GetRemainingSpace());
_packetBuffer.Write(args.Buffer, currentReadIndex, readDataSize); _packetBuffer.Write(args.Buffer, currentReadIndex, readDataSize);
Log.outError(LogFilter.Network, $"_packetBuffer Data: {_packetBuffer.GetData().ToHexString()}");
currentReadIndex += readDataSize; currentReadIndex += readDataSize;
if (_packetBuffer.GetRemainingSpace() > 0) if (_packetBuffer.GetRemainingSpace() > 0)
{
Log.outError(LogFilter.Network, $"Couldn't receive the whole data, _packetBuffer: {_headerBuffer.GetRemainingSpace()} bytesTransferred: {args.BytesTransferred}");
break; // Couldn't receive the whole data this time. break; // Couldn't receive the whole data this time.
}
} }
// just received fresh new payload // just received fresh new payload
@@ -270,6 +280,7 @@ namespace Game.Networking
if (packet.GetOpcode() >= (int)ClientOpcodes.Max) if (packet.GetOpcode() >= (int)ClientOpcodes.Max)
{ {
Log.outError(LogFilter.Network, $"WorldSocket.ReadData(): client {GetRemoteIpAddress()} sent wrong opcode (opcode: {packet.GetOpcode()})"); Log.outError(LogFilter.Network, $"WorldSocket.ReadData(): client {GetRemoteIpAddress()} sent wrong opcode (opcode: {packet.GetOpcode()})");
Log.outError(LogFilter.Network, $"Header: {_headerBuffer.GetData().ToHexString()} Data: {_packetBuffer.GetData().ToHexString()}");
return ReadDataHandlerResult.Error; return ReadDataHandlerResult.Error;
} }