epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Send order queue length in ping responses.

Browse Source
This commit is contained in:
Paul Chote
2021-09-25 15:31:04 +01:00
committed by abcdefg30
parent 2d08f2bbfd
commit defaf92752
6 changed files with 30 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
OpenRA.Game/Server/Connection.cs
View File

@@ -128,13 +128,13 @@ namespace OpenRA.Server
{
// Ping packets are sent and processed internally within this thread to reduce
// server-introduced latencies from polling loops
if (expectLength == 9 && bytes[0] == (byte)OrderType.Ping)
if (expectLength == 10 && bytes[0] == (byte)OrderType.Ping)
{
if (pingHistory.Count == MaxPingSamples)
pingHistory.Dequeue();
pingHistory.Enqueue((int)(Game.RunTime - BitConverter.ToInt64(bytes, 1)));
server.OnConnectionPing(this, pingHistory.ToArray());
server.OnConnectionPing(this, pingHistory.ToArray(), bytes[9]);
}
else
server.OnConnectionPacket(this, frame, bytes);

1
OpenRA.Game/Server/ProtocolVersion.cs
View File

@@ -41,6 +41,7 @@ namespace OpenRA.Server
// - byte containing the number of sent order packets to apply
// - 0x20: Ping
// - Int64 containing the server timestamp when the ping was generated
// - [client -> server only] byte containing the number of frames ready to simulate
//
// A connection handshake begins when a client opens a connection to the server:
// - Server sends:

12
OpenRA.Game/Server/Server.cs
View File

@@ -323,9 +323,9 @@ namespace OpenRA.Server
events.Add(new ConnectionPacketEvent(conn, frame, data));
}
internal void OnConnectionPing(Connection conn, int[] pingHistory)
internal void OnConnectionPing(Connection conn, int[] pingHistory, byte queueLength)
{
events.Add(new ConnectionPingEvent(conn, pingHistory));
events.Add(new ConnectionPingEvent(conn, pingHistory, queueLength));
}
internal void OnConnectionDisconnect(Connection conn)
@@ -1021,7 +1021,7 @@ namespace OpenRA.Server
}
}
public void ReceivePing(Connection conn, int[] pingHistory)
public void ReceivePing(Connection conn, int[] pingHistory, byte queueLength)
{
// Levels set relative to the default order lag of 3 net ticks (360ms)
// TODO: Adjust this once dynamic lag is implemented
@@ -1367,16 +1367,18 @@ namespace OpenRA.Server
{
readonly Connection connection;
readonly int[] pingHistory;
readonly byte queueLength;
public ConnectionPingEvent(Connection connection, int[] pingHistory)
public ConnectionPingEvent(Connection connection, int[] pingHistory, byte queueLength)
{
this.connection = connection;
this.pingHistory = pingHistory;
this.queueLength = queueLength;
}
void IServerEvent.Invoke(Server server)
{
server.ReceivePing(connection, pingHistory);
server.ReceivePing(connection, pingHistory, queueLength);
}
}