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

Merge branch 'master' into httptests

httptests
UbitUmarov 2018-01-22 21:44:05 +00:00
parent b164925262 af9bff7ed2
commit a67b523acf
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -228,14 +228,23 @@ namespace OpenMetaverse
{ {
m_log.Debug("[UDPBASE]: Failed to increase default TTL"); m_log.Debug("[UDPBASE]: Failed to increase default TTL");
} }
try try
{ {
// This udp socket flag is not supported under mono, // This udp socket flag is not supported under mono,
// so we'll catch the exception and continue // so we'll catch the exception and continue
m_udpSocket.IOControl(SIO_UDP_CONNRESET, new byte[] { 0 }, null); // Try does not protect some mono versions on mac
m_log.Debug("[UDPBASE]: SIO_UDP_CONNRESET flag set"); if(Util.IsWindows())
{
m_udpSocket.IOControl(SIO_UDP_CONNRESET, new byte[] { 0 }, null);
m_log.Debug("[UDPBASE]: SIO_UDP_CONNRESET flag set");
}
else
{
m_log.Debug("[UDPBASE]: SIO_UDP_CONNRESET flag not supported on this platform, ignoring");
}
} }
catch (SocketException) catch
{ {
m_log.Debug("[UDPBASE]: SIO_UDP_CONNRESET flag not supported on this platform, ignoring"); m_log.Debug("[UDPBASE]: SIO_UDP_CONNRESET flag not supported on this platform, ignoring");
} }