fix RTO limit being exceeded

2021-05-14 18:48:47 -05:00
1 changed files with 7 additions and 5 deletions
@@ -860,19 +860,19 @@ enet_protocol_handle_acknowledge (ENetHost * host, ENetEvent * event, ENetPeer *
    {
       enet_peer_throttle (peer, roundTripTime);

-       peer -> roundTripTimeVariance -= (peer -> roundTripTimeVariance + 3) / 4;
+       peer -> roundTripTimeVariance -= peer -> roundTripTimeVariance / 4;

       if (roundTripTime >= peer -> roundTripTime)
       {
          enet_uint32 diff = roundTripTime - peer -> roundTripTime;
-          peer -> roundTripTimeVariance += (diff + 3) / 4;
-          peer -> roundTripTime += (diff + 7) / 8;
+          peer -> roundTripTimeVariance += diff / 4;
+          peer -> roundTripTime += diff / 8;
       }
       else
       {
          enet_uint32 diff = peer -> roundTripTime - roundTripTime;
-          peer -> roundTripTimeVariance += (diff + 3) / 4;
-          peer -> roundTripTime -= (diff + 7) / 8;
+          peer -> roundTripTimeVariance += diff / 4;
+          peer -> roundTripTime -= diff / 8;
       }
    }
    else
@@ -1368,6 +1368,8 @@ enet_protocol_check_timeouts (ENetHost * host, ENetPeer * peer, ENetEvent * even
       ++ peer -> packetsLost;

       outgoingCommand -> roundTripTimeout *= 2;
+       if (outgoingCommand -> roundTripTimeout > outgoingCommand -> roundTripTimeoutLimit)
+         outgoingCommand -> roundTripTimeout = outgoingCommand -> roundTripTimeoutLimit;

       enet_list_insert (insertPosition, enet_list_remove (& outgoingCommand -> outgoingCommandList));