OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Make sure sims on Linux can be restarted without waiting on a 2 mintue socket timeout

melanie
Melanie Thielker 2016-12-13 14:43:10 +00:00
parent 7d8cb244d1
commit ee58beddec
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
OpenSim/Region/ClientStack/Linden/UDP/OpenSimUDPBase.cs
View File

@ -217,10 +217,6 @@ namespace OpenMetaverse
SocketType.Dgram, SocketType.Dgram,
ProtocolType.Udp); ProtocolType.Udp);
// OpenSim may need this but in AVN, this messes up automated
// sim restarts badly
//m_udpSocket.SetSocketOption(SocketOptionLevel.Socket, SocketOptionName.ReuseAddress, false);
try try
{ {
if (m_udpSocket.Ttl < 128) if (m_udpSocket.Ttl < 128)
@ -248,7 +244,13 @@ namespace OpenMetaverse
// we never want two regions to listen on the same port as they cannot demultiplex each other's messages, // we never want two regions to listen on the same port as they cannot demultiplex each other's messages,
// leading to a confusing bug. // leading to a confusing bug.
// By default, Windows does not allow two sockets to bind to the same port. // By default, Windows does not allow two sockets to bind to the same port.
m_udpSocket.SetSocketOption(SocketOptionLevel.Socket, SocketOptionName.ReuseAddress, false); //
// Unfortunately, this also causes a crashed sim to leave the socket in a state
// where it appears to be in use but is really just hung from the old process
// crashing rather than closing it. While this protects agains misconfiguration,
// allowing crashed sims to be started up again right away, rather than having to
// wait 2 minutes for the socket to clear is more valuable. Commented 12/13/2016
// m_udpSocket.SetSocketOption(SocketOptionLevel.Socket, SocketOptionName.ReuseAddress, false);
if (recvBufferSize != 0) if (recvBufferSize != 0)
m_udpSocket.ReceiveBufferSize = recvBufferSize; m_udpSocket.ReceiveBufferSize = recvBufferSize;