aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Communications/OGS1
diff options
context:
space:
mode:
authorCharles Krinke2008-12-13 16:25:20 +0000
committerCharles Krinke2008-12-13 16:25:20 +0000
commit6cf0b818642518aadd8aa288127de03f6fd1a079 (patch)
tree7a08024aaab37537b52b73c7854a3ab3a4696848 /OpenSim/Region/Communications/OGS1
parentmore work on moving FileTransfer code to the clientstack. (diff)
downloadopensim-SC_OLD-6cf0b818642518aadd8aa288127de03f6fd1a079.zip
opensim-SC_OLD-6cf0b818642518aadd8aa288127de03f6fd1a079.tar.gz
opensim-SC_OLD-6cf0b818642518aadd8aa288127de03f6fd1a079.tar.bz2
opensim-SC_OLD-6cf0b818642518aadd8aa288127de03f6fd1a079.tar.xz
Mantis#2811. Thank you kindly, Diva for a patch that resolves
some of our DNS/dotted decimal issues that plague teleporting. We are increasing the MajorInterfaceVersion from 1 to 2 in the gridserver, so sims will need to be updated on various grids.
Diffstat (limited to 'OpenSim/Region/Communications/OGS1')
-rw-r--r--OpenSim/Region/Communications/OGS1/OGS1GridServices.cs18
1 files changed, 9 insertions, 9 deletions
diff --git a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
index 59250fd..c0fecee 100644
--- a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
+++ b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
@@ -410,16 +410,17 @@ namespace OpenSim.Region.Communications.OGS1
410 410
411 uint regX = Convert.ToUInt32((string) responseData["region_locx"]); 411 uint regX = Convert.ToUInt32((string) responseData["region_locx"]);
412 uint regY = Convert.ToUInt32((string) responseData["region_locy"]); 412 uint regY = Convert.ToUInt32((string) responseData["region_locy"]);
413 string internalIpStr = (string) responseData["sim_ip"]; 413 string externalHostName = (string) responseData["sim_ip"];
414 uint port = Convert.ToUInt32(responseData["sim_port"]); 414 uint port = Convert.ToUInt32(responseData["sim_port"]);
415 // string externalUri = (string) responseData["sim_uri"]; 415 // string externalUri = (string) responseData["sim_uri"];
416 416
417 IPEndPoint neighbourInternalEndPoint = new IPEndPoint(IPAddress.Parse(internalIpStr), (int) port); 417 //IPEndPoint neighbourInternalEndPoint = new IPEndPoint(IPAddress.Parse(internalIpStr), (int) port);
418 // string neighbourExternalUri = externalUri; 418 IPEndPoint neighbourInternalEndPoint = new IPEndPoint(Util.GetHostFromDNS(externalHostName), (int)port);
419 regionInfo = new RegionInfo(regX, regY, neighbourInternalEndPoint, internalIpStr); 419
420 regionInfo = new RegionInfo(regX, regY, neighbourInternalEndPoint, externalHostName);
420 421
421 regionInfo.RemotingPort = Convert.ToUInt32((string) responseData["remoting_port"]); 422 regionInfo.RemotingPort = Convert.ToUInt32((string) responseData["remoting_port"]);
422 regionInfo.RemotingAddress = internalIpStr; 423 regionInfo.RemotingAddress = externalHostName;
423 424
424 if (responseData.ContainsKey("http_port")) 425 if (responseData.ContainsKey("http_port"))
425 { 426 {
@@ -437,11 +438,11 @@ namespace OpenSim.Region.Communications.OGS1
437 } 438 }
438 } 439 }
439 } 440 }
440 catch 441 catch (Exception e)
441 { 442 {
442 m_log.Error("[OGS1 GRID SERVICES]: " + 443 m_log.Error("[OGS1 GRID SERVICES]: " +
443 "Region lookup failed for: " + regionHandle.ToString() + 444 "Region lookup failed for: " + regionHandle.ToString() +
444 " - Is the GridServer down?"); 445 " - Is the GridServer down?" + e.ToString());
445 return null; 446 return null;
446 } 447 }
447 } 448 }
@@ -1551,8 +1552,7 @@ namespace OpenSim.Region.Communications.OGS1
1551 bool available = false; 1552 bool available = false;
1552 bool timed_out = true; 1553 bool timed_out = true;
1553 1554
1554 IPAddress ia; 1555 IPAddress ia = Util.GetHostFromDNS(address);
1555 IPAddress.TryParse(address, out ia);
1556 IPEndPoint m_EndPoint; 1556 IPEndPoint m_EndPoint;
1557 try 1557 try
1558 { 1558 {