diff options
author | UbitUmarov | 2015-09-22 18:56:03 +0100 |
---|---|---|
committer | UbitUmarov | 2015-09-22 18:56:03 +0100 |
commit | ae70f61a645583ff6e6dca0dedb255684544664c (patch) | |
tree | 91a0fca444de07f985da90ee4eb31b6846e660a8 /OpenSim/Region/ClientStack | |
parent | removed a protocol breaking lludp debug option that no one should try, chang... (diff) | |
download | opensim-SC_OLD-ae70f61a645583ff6e6dca0dedb255684544664c.zip opensim-SC_OLD-ae70f61a645583ff6e6dca0dedb255684544664c.tar.gz opensim-SC_OLD-ae70f61a645583ff6e6dca0dedb255684544664c.tar.bz2 opensim-SC_OLD-ae70f61a645583ff6e6dca0dedb255684544664c.tar.xz |
let minimum wqburst be a bit larger than MTU
Diffstat (limited to 'OpenSim/Region/ClientStack')
-rw-r--r-- | OpenSim/Region/ClientStack/Linden/UDP/LLUDPClient.cs | 4 | ||||
-rw-r--r-- | OpenSim/Region/ClientStack/Linden/UDP/TokenBucket.cs | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPClient.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPClient.cs index 507c07c..e005960 100644 --- a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPClient.cs +++ b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPClient.cs | |||
@@ -351,7 +351,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
351 | public int GetPacketsQueuedCount(ThrottleOutPacketType throttleType) | 351 | public int GetPacketsQueuedCount(ThrottleOutPacketType throttleType) |
352 | { | 352 | { |
353 | int icat = (int)throttleType; | 353 | int icat = (int)throttleType; |
354 | if (icat > 0 && icat < THROTTLE_CATEGORY_COUNT) | 354 | if ((int)throttleType > 0 && icat < THROTTLE_CATEGORY_COUNT) |
355 | return m_packetOutboxes[icat].Count; | 355 | return m_packetOutboxes[icat].Count; |
356 | else | 356 | else |
357 | return 0; | 357 | return 0; |
@@ -437,7 +437,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
437 | // Make sure none of the throttles are set below our packet MTU, | 437 | // Make sure none of the throttles are set below our packet MTU, |
438 | // otherwise a throttle could become permanently clogged | 438 | // otherwise a throttle could become permanently clogged |
439 | 439 | ||
440 | /* not using floats | 440 | /* now using floats |
441 | resend = Math.Max(resend, LLUDPServer.MTU); | 441 | resend = Math.Max(resend, LLUDPServer.MTU); |
442 | land = Math.Max(land, LLUDPServer.MTU); | 442 | land = Math.Max(land, LLUDPServer.MTU); |
443 | wind = Math.Max(wind, LLUDPServer.MTU); | 443 | wind = Math.Max(wind, LLUDPServer.MTU); |
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/TokenBucket.cs b/OpenSim/Region/ClientStack/Linden/UDP/TokenBucket.cs index fd369c4..f769383 100644 --- a/OpenSim/Region/ClientStack/Linden/UDP/TokenBucket.cs +++ b/OpenSim/Region/ClientStack/Linden/UDP/TokenBucket.cs | |||
@@ -104,8 +104,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
104 | get { return m_burst; } | 104 | get { return m_burst; } |
105 | set { | 105 | set { |
106 | float rate = (value < 0 ? 0 : value); | 106 | float rate = (value < 0 ? 0 : value); |
107 | if (rate < m_minimumDripRate) | 107 | if (rate < 1.5f * m_minimumDripRate) |
108 | rate = m_minimumDripRate; | 108 | rate = 1.5f * m_minimumDripRate; |
109 | else if (rate > m_minimumDripRate * m_quantumsPerBurst) | 109 | else if (rate > m_minimumDripRate * m_quantumsPerBurst) |
110 | rate = m_minimumDripRate * m_quantumsPerBurst; | 110 | rate = m_minimumDripRate * m_quantumsPerBurst; |
111 | 111 | ||