From c09b312b058a9fb7d5da15abeb8708d69fd97cf5 Mon Sep 17 00:00:00 2001 From: UbitUmarov Date: Tue, 9 Apr 2019 18:50:08 +0100 Subject: testing ... --- OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs | 6 ++++-- OpenSim/Region/ClientStack/Linden/UDP/LLUDPClient.cs | 6 ++++++ OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs | 1 - 3 files changed, 10 insertions(+), 3 deletions(-) (limited to 'OpenSim/Region') diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs index 2fb67e0..b7e9117 100644 --- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs @@ -5429,7 +5429,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP buf.DataLength = lastpos; // zero encode is not as spec m_udpServer.SendUDPPacket(m_udpClient, buf, ThrottleOutPacketType.Task, - delegate (OutgoingPacket oPacket) { ResendPrimUpdates(tau, oPacket); }, false, true); + //delegate (OutgoingPacket oPacket) { ResendPrimUpdates(tau, oPacket); }, false, true); + null, false, true); tau = new List(30); tau.Add(eu); @@ -5444,7 +5445,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP buf.Data[17] = (byte)count; buf.DataLength = pos; m_udpServer.SendUDPPacket(m_udpClient, buf, ThrottleOutPacketType.Task, - delegate (OutgoingPacket oPacket) { ResendPrimUpdates(tau, oPacket); }, false, true); + //delegate (OutgoingPacket oPacket) { ResendPrimUpdates(tau, oPacket); }, false, true); + null, false, true); } } diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPClient.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPClient.cs index 303f505..fc1e846 100644 --- a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPClient.cs +++ b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPClient.cs @@ -728,6 +728,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP /// acknowledgement public void UpdateRoundTrip(float r) { + return; + /* const float ALPHA = 0.125f; const float BETA = 0.25f; const float K = 4.0f; @@ -755,6 +757,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP //if (RTO != rto) // m_log.Debug("[LLUDPCLIENT]: Setting RTO to " + RTO + "ms from " + rto + "ms with an RTTVAR of " + //RTTVAR + " based on new RTT of " + r + "ms"); + */ } /// @@ -763,13 +766,16 @@ namespace OpenSim.Region.ClientStack.LindenUDP /// public void BackoffRTO() { + return; // Reset SRTT and RTTVAR, we assume they are bogus since things // didn't work out and we're backing off the timeout + /* SRTT = 0.0f; RTTVAR = 0.0f; // Double the retransmission timeout RTO = Math.Min(RTO * 2, m_maxRTO); + */ } const double MIN_CALLBACK_MS = 20.0; diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs index 3817830..285751d 100755 --- a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs +++ b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs @@ -1214,7 +1214,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP // Stats tracking Interlocked.Increment(ref udpClient.PacketsSent); PacketsSentCount++; - SyncSend(buffer); // Keep track of when this packet was sent out (right now) -- cgit v1.1