tribufu/ServerManagers
1
0
Fork 0
mirror of https://github.com/tribufu/ServerManagers synced 2026-06-01 09:42:39 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Updated QueryMaster to comply with new windows client standards

Browse source
This commit is contained in:
Floe Hetling 2021-06-08 13:03:59 +03:00
parent e00abe611d
commit aa77d9310d
1 changed files with 43 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

47
src/QueryMaster/Server.cs
View file

@ -59,11 +59,23 @@ namespace QueryMaster
/// Retrieves information about the server /// Retrieves information about the server
/// </summary> /// </summary>
/// <returns>Instance of ServerInfo class</returns> /// <returns>Instance of ServerInfo class</returns>
public virtual ServerInfo GetInfo() public virtual ServerInfo GetInfo(byte[] data=null)
{ {
byte[] Query = QueryMsg.InfoQuery; // If we already have pre-formed request in data var
if (IsObsolete) // we will populate Query with it
Query = QueryMsg.ObsoleteInfoQuery; // also let's declare Query earlier
byte[] Query;
if (data != null && data.Length > 0)
{
Query = data;
}
else
{
Query = QueryMsg.InfoQuery;
if (IsObsolete)
Query = QueryMsg.ObsoleteInfoQuery;
}
byte[] recvData = new byte[socket.BufferSize]; byte[] recvData = new byte[socket.BufferSize];
Stopwatch sw = Stopwatch.StartNew(); Stopwatch sw = Stopwatch.StartNew();
@ -72,6 +84,28 @@ namespace QueryMaster
Latency = sw.ElapsedMilliseconds; Latency = sw.ElapsedMilliseconds;
try try
{ {
// first, let's check if we have a challenge received instead of S2A_INFO_SRC
// according to https://steamcommunity.com/discussions/forum/14/2974028351344359625/
// server can reply with S2C_CHALLENGE in form of 0x41(4 byte) if it suspects client
// in IP spoofing
if (recvData[0] == 0x41)
{
// we will get current Query and append recvData to its end. Skipping 0x41 and
// honoring the trailing 0x00 at the Query end
byte[] signedQuery = new byte[Query.Length + (recvData.Length - 1)];
Query.CopyTo(signedQuery, 0);
for (int bId = (recvData.Length - 1); bId > 0; bId--)
{
signedQuery[signedQuery.Length - bId] = recvData[recvData.Length - bId];
}
// finally, we are calling GetInfo() recursively with our new signed query
// to get pass the S2C_CHALLENGE
return GetInfo(signedQuery);
}
switch (recvData[0]) switch (recvData[0])
{ {
case 0x49: return Current(recvData); case 0x49: return Current(recvData);
@ -79,6 +113,11 @@ namespace QueryMaster
default: throw new InvalidHeaderException("packet header is not valid"); default: throw new InvalidHeaderException("packet header is not valid");
} }
} }
// this patch must not have any impact in cases S2C_CHALLENGE never arrives
// hope, it will help those who are experiencing "stuck at initializing/waiting for publication"
// problem. ~FH
catch (Exception e) catch (Exception e)
{ {
e.Data.Add("ReceivedData", recvData); e.Data.Add("ReceivedData", recvData);