Merge branch 'master' into httptests

httptests
UbitUmarov 2018-01-22 21:44:05 +00:00
commit a67b523acf
1 changed files with 12 additions and 3 deletions

View File

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