diff options
author | Justin Clark-Casey (justincc) | 2013-07-29 23:53:59 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2013-07-29 23:53:59 +0100 |
commit | 1416c909326d89566cbe785b6dacac228e31a5a0 (patch) | |
tree | de13c3004fcd8e855156945ff3311484915bae6d /OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs | |
parent | Fix issue just introduced in 8efe4bfc2ed7086e9fdf4812297e6525f955f6ac where I... (diff) | |
download | opensim-SC_OLD-1416c909326d89566cbe785b6dacac228e31a5a0.zip opensim-SC_OLD-1416c909326d89566cbe785b6dacac228e31a5a0.tar.gz opensim-SC_OLD-1416c909326d89566cbe785b6dacac228e31a5a0.tar.bz2 opensim-SC_OLD-1416c909326d89566cbe785b6dacac228e31a5a0.tar.xz |
minor: Add timeout secs to connection timeout message. Change message to reflect it is a timeout due to no data received rather than an ack issue.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs index bf50868..85fe1a4 100644 --- a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs +++ b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs | |||
@@ -1062,7 +1062,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
1062 | // Fire this out on a different thread so that we don't hold up outgoing packet processing for | 1062 | // Fire this out on a different thread so that we don't hold up outgoing packet processing for |
1063 | // everybody else if this is being called due to an ack timeout. | 1063 | // everybody else if this is being called due to an ack timeout. |
1064 | // This is the same as processing as the async process of a logout request. | 1064 | // This is the same as processing as the async process of a logout request. |
1065 | Util.FireAndForget(o => DeactivateClientDueToTimeout(client)); | 1065 | Util.FireAndForget(o => DeactivateClientDueToTimeout(client, timeoutTicks)); |
1066 | 1066 | ||
1067 | return; | 1067 | return; |
1068 | } | 1068 | } |
@@ -1786,18 +1786,19 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
1786 | /// regular client pings. | 1786 | /// regular client pings. |
1787 | /// </remarks> | 1787 | /// </remarks> |
1788 | /// <param name='client'></param> | 1788 | /// <param name='client'></param> |
1789 | private void DeactivateClientDueToTimeout(LLClientView client) | 1789 | /// <param name='timeoutTicks'></param> |
1790 | private void DeactivateClientDueToTimeout(LLClientView client, int timeoutTicks) | ||
1790 | { | 1791 | { |
1791 | lock (client.CloseSyncLock) | 1792 | lock (client.CloseSyncLock) |
1792 | { | 1793 | { |
1793 | m_log.WarnFormat( | ||
1794 | "[LLUDPSERVER]: Ack timeout, disconnecting {0} agent for {1} in {2}", | ||
1795 | client.SceneAgent.IsChildAgent ? "child" : "root", client.Name, m_scene.RegionInfo.RegionName); | ||
1796 | |||
1797 | ClientLogoutsDueToNoReceives++; | 1794 | ClientLogoutsDueToNoReceives++; |
1795 | |||
1796 | m_log.WarnFormat( | ||
1797 | "[LLUDPSERVER]: No packets received from {0} agent of {1} for {2}ms in {3}. Disconnecting.", | ||
1798 | client.SceneAgent.IsChildAgent ? "child" : "root", client.Name, timeoutTicks, m_scene.Name); | ||
1798 | 1799 | ||
1799 | if (!client.SceneAgent.IsChildAgent) | 1800 | if (!client.SceneAgent.IsChildAgent) |
1800 | client.Kick("Simulator logged you out due to connection timeout"); | 1801 | client.Kick("Simulator logged you out due to connection timeout."); |
1801 | 1802 | ||
1802 | client.CloseWithoutChecks(); | 1803 | client.CloseWithoutChecks(); |
1803 | } | 1804 | } |