diff options
| author | Mic Bowman | 2011-04-04 14:18:26 -0700 |
|---|---|---|
| committer | Mic Bowman | 2011-04-10 16:57:02 -0700 |
| commit | 83dc2470f2e815f6f9d469104be3a2806438a29a (patch) | |
| tree | ab599d679f94a6d7219a5ff3fac4b64e9d06216c /OpenSim/Region | |
| parent | Fixed the prioritizer functions for the new priority queues (diff) | |
| download | opensim-SC-83dc2470f2e815f6f9d469104be3a2806438a29a.zip opensim-SC-83dc2470f2e815f6f9d469104be3a2806438a29a.tar.gz opensim-SC-83dc2470f2e815f6f9d469104be3a2806438a29a.tar.bz2 opensim-SC-83dc2470f2e815f6f9d469104be3a2806438a29a.tar.xz | |
Fix a bug in the computation of the RTO. Basically... the RTO (the
time to wait to retransmit packets) always maxed out (no retransmissions
for 24 or 48 seconds.
Note that this is going to cause faster (and more) retransmissions. Fix
for dynamic throttling needs to go with this.
Diffstat (limited to 'OpenSim/Region')
| -rw-r--r-- | OpenSim/Region/ClientStack/LindenUDP/LLUDPClient.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLUDPClient.cs b/OpenSim/Region/ClientStack/LindenUDP/LLUDPClient.cs index 65a8fe3..9a8bfd3 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/LLUDPClient.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/LLUDPClient.cs | |||
| @@ -149,7 +149,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
| 149 | /// <summary>Caches packed throttle information</summary> | 149 | /// <summary>Caches packed throttle information</summary> |
| 150 | private byte[] m_packedThrottles; | 150 | private byte[] m_packedThrottles; |
| 151 | 151 | ||
| 152 | private int m_defaultRTO = 3000; | 152 | private int m_defaultRTO = 1000; // 1sec is the recommendation in the RFC |
| 153 | private int m_maxRTO = 60000; | 153 | private int m_maxRTO = 60000; |
| 154 | 154 | ||
| 155 | /// <summary> | 155 | /// <summary> |
| @@ -557,7 +557,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
| 557 | int rto = (int)(SRTT + Math.Max(m_udpServer.TickCountResolution, K * RTTVAR)); | 557 | int rto = (int)(SRTT + Math.Max(m_udpServer.TickCountResolution, K * RTTVAR)); |
| 558 | 558 | ||
| 559 | // Clamp the retransmission timeout to manageable values | 559 | // Clamp the retransmission timeout to manageable values |
| 560 | rto = Utils.Clamp(RTO, m_defaultRTO, m_maxRTO); | 560 | rto = Utils.Clamp(rto, m_defaultRTO, m_maxRTO); |
| 561 | 561 | ||
| 562 | RTO = rto; | 562 | RTO = rto; |
| 563 | 563 | ||