From 7be6e16555a25177128f6767661387cdffe084cc Mon Sep 17 00:00:00 2001
From: UbitUmarov
Date: Mon, 29 May 2017 03:41:09 +0100
Subject: no.. still a fail
---
OpenSim/Framework/Util.cs | 32 +++++++++-------------
.../EntityTransfer/EntityTransferModule.cs | 2 +-
2 files changed, 14 insertions(+), 20 deletions(-)
(limited to 'OpenSim')
diff --git a/OpenSim/Framework/Util.cs b/OpenSim/Framework/Util.cs
index 3ddeafb..fe84498 100644
--- a/OpenSim/Framework/Util.cs
+++ b/OpenSim/Framework/Util.cs
@@ -1078,31 +1078,25 @@ namespace OpenSim.Framework
// Reset for next check
ia = null;
-#if (_MONO)
- // mono is a TOTAL CRAP
- int retry = 3;
- while(ia == null && retry-- >= 0)
-#endif
+ try
{
- try
+ foreach (IPAddress Adr in Dns.GetHostAddresses(hostname))
{
- foreach (IPAddress Adr in Dns.GetHostAddresses(hostname))
- {
- if (ia == null)
- ia = Adr;
+ if (ia == null)
+ ia = Adr;
- if (Adr.AddressFamily == AddressFamily.InterNetwork)
- {
- ia = Adr;
- break;
- }
+ if (Adr.AddressFamily == AddressFamily.InterNetwork)
+ {
+ ia = Adr;
+ break;
}
}
- catch // (SocketException e)
- {
- ia = null;
- }
}
+ catch // (SocketException e)
+ {
+ ia = null;
+ }
+
return getEndPoint(ia,port);
}
diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
index 0505e58..9959f6e 100644
--- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
@@ -2171,7 +2171,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
InformClientOfNeighbourAsync(sp, cagents[count], neighbour, ipe, true);
else
{
- m_log.Debug("[ENTITY TRANSFER MODULE]: DNS for neighbour lost");
+ m_log.DebugFormat("[ENTITY TRANSFER MODULE]: DNS for neighbour {0} lost", neighbour.ExternalHostName);
}
count++;
}
--
cgit v1.1