Leahnaya/pkmn-classic-framework
1
0
Fork 0
mirror of https://github.com/mm201/pkmn-classic-framework.git synced 2026-09-11 19:55:17 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed issue with .NET NetworkStreams not reading all the data.

Browse Source
This commit is contained in:
Greg Edwards
2014-06-14 23:21:03 -04:00
parent 89196dba60
commit a0cc86c949
1 changed files with 18 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
GlobalTerminalService/GTServerBase.cs
View File

@@ -106,11 +106,11 @@ namespace PkmnFoundations.GlobalTerminalService
}
byte[] data = new byte[4];
s.Read(data, 0, 4);
ReadAll(s, data, 0, 4);
int length = BitConverter.ToInt32(data, 0);
data = new byte[length];
BitConverter.GetBytes(length).CopyTo(data, 0);
s.Read(data, 4, length - 4); // todo: stop DoS by timing out blocking requests
ReadAll(s, data, 4, length - 4); // todo: stop DoS by timing out blocking requests
// todo after that: ban IPs that make lots of blocking requests
byte[] response = ProcessRequest(data);
@@ -137,5 +137,21 @@ namespace PkmnFoundations.GlobalTerminalService
protected abstract byte[] ProcessRequest(byte[] data);
public abstract String Title { get; }
/// <summary>
/// Reads bytes from a stream and waits until it can read them all.
/// </summary>
/// <param name="s"></param>
/// <param name="buffer"></param>
/// <param name="offset"></param>
/// <param name="count"></param>
public static void ReadAll(Stream s, byte[] buffer, int offset, int count)
{
int readBytes = 0;
while (readBytes < count)
{
readBytes += s.Read(buffer, offset + readBytes, count - readBytes);
}
}
}
}