From ed9cdbe99f8c108925417e53f7cf85bff4434491 Mon Sep 17 00:00:00 2001
From: Justin Clarke Casey
Date: Tue, 25 Mar 2008 19:39:41 +0000
Subject: * Temporary hack to swallow neighbour contact problems on startup (in
 response to osgrid issues) * Not sure what the effect will be, but can't be
 any worse than the current constant sim crashes.

---
 OpenSim/Region/Communications/OGS1/OGS1GridServices.cs | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

(limited to 'OpenSim/Region/Communications/OGS1/OGS1GridServices.cs')

diff --git a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
index 23b8fb4..a783050 100644
--- a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
+++ b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
@@ -226,7 +226,17 @@ namespace OpenSim.Region.Communications.OGS1
                         uint port = Convert.ToUInt32(neighbourData["sim_port"]);
                         string externalUri = (string) neighbourData["sim_uri"];
 
-                        string externalIpStr = Util.GetHostFromDNS(simIp).ToString();
+                        string externalIpStr = String.Empty;
+                        try
+                        {                            
+                            externalIpStr = Util.GetHostFromDNS(simIp).ToString();
+                        }
+                        catch (SocketException e)
+                        {
+                            m_log.WarnFormat("RequestNeighbours(): Lookup of neighbour {0} failed!  Not including in neighbours list");
+                            continue;
+                        }
+                        
                         SimpleRegionInfo sri = new SimpleRegionInfo(regX, regY, simIp, port);
                         
                         sri.RemotingPort = Convert.ToUInt32(neighbourData["remoting_port"]);
-- 
cgit v1.1