aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Data/RegionProfileData.cs2
-rw-r--r--OpenSim/Framework/Servers/VersionInfo.cs2
-rw-r--r--OpenSim/Grid/GridServer/GridManager.cs13
-rw-r--r--OpenSim/Region/Communications/OGS1/OGS1GridServices.cs18
4 files changed, 16 insertions, 19 deletions
diff --git a/OpenSim/Data/RegionProfileData.cs b/OpenSim/Data/RegionProfileData.cs
index 3759341..0ec79ac 100644
--- a/OpenSim/Data/RegionProfileData.cs
+++ b/OpenSim/Data/RegionProfileData.cs
@@ -161,7 +161,7 @@ namespace OpenSim.Data
161 simData.httpPort = Convert.ToUInt32((string) responseData["http_port"]); 161 simData.httpPort = Convert.ToUInt32((string) responseData["http_port"]);
162 simData.remotingPort = Convert.ToUInt32((string) responseData["remoting_port"]); 162 simData.remotingPort = Convert.ToUInt32((string) responseData["remoting_port"]);
163 simData.serverURI = (string) responseData["server_uri"]; 163 simData.serverURI = (string) responseData["server_uri"];
164 simData.httpServerURI = "http://" + (string)responseData["sim_host"] + ":" + simData.httpPort.ToString() + "/"; 164 simData.httpServerURI = "http://" + (string)responseData["sim_ip"] + ":" + simData.httpPort.ToString() + "/";
165 simData.UUID = new UUID((string) responseData["region_UUID"]); 165 simData.UUID = new UUID((string) responseData["region_UUID"]);
166 simData.regionName = (string) responseData["region_name"]; 166 simData.regionName = (string) responseData["region_name"];
167 } 167 }
diff --git a/OpenSim/Framework/Servers/VersionInfo.cs b/OpenSim/Framework/Servers/VersionInfo.cs
index 4b3f829..1efd82f 100644
--- a/OpenSim/Framework/Servers/VersionInfo.cs
+++ b/OpenSim/Framework/Servers/VersionInfo.cs
@@ -48,6 +48,6 @@ namespace OpenSim
48 /// of the code that is too old. 48 /// of the code that is too old.
49 /// 49 ///
50 /// </value> 50 /// </value>
51 public readonly static int MajorInterfaceVersion = 1; 51 public readonly static int MajorInterfaceVersion = 2;
52 } 52 }
53} 53}
diff --git a/OpenSim/Grid/GridServer/GridManager.cs b/OpenSim/Grid/GridServer/GridManager.cs
index 08d5393..1ec4fd8 100644
--- a/OpenSim/Grid/GridServer/GridManager.cs
+++ b/OpenSim/Grid/GridServer/GridManager.cs
@@ -563,8 +563,7 @@ namespace OpenSim.Grid.GridServer
563 foreach (RegionProfileData aSim in neighbours) 563 foreach (RegionProfileData aSim in neighbours)
564 { 564 {
565 NeighbourBlock = new Hashtable(); 565 NeighbourBlock = new Hashtable();
566 NeighbourBlock["sim_host"] = aSim.serverIP; 566 NeighbourBlock["sim_ip"] = aSim.serverIP;
567 NeighbourBlock["sim_ip"] = Util.GetHostFromDNS(aSim.serverIP.ToString()).ToString();
568 NeighbourBlock["sim_port"] = aSim.serverPort.ToString(); 567 NeighbourBlock["sim_port"] = aSim.serverPort.ToString();
569 NeighbourBlock["region_locx"] = aSim.regionLocX.ToString(); 568 NeighbourBlock["region_locx"] = aSim.regionLocX.ToString();
570 NeighbourBlock["region_locy"] = aSim.regionLocY.ToString(); 569 NeighbourBlock["region_locy"] = aSim.regionLocY.ToString();
@@ -594,8 +593,7 @@ namespace OpenSim.Grid.GridServer
594 (uint)(sim.regionLocY + y) * Constants.RegionSize)); 593 (uint)(sim.regionLocY + y) * Constants.RegionSize));
595 594
596 NeighbourBlock = new Hashtable(); 595 NeighbourBlock = new Hashtable();
597 NeighbourBlock["sim_host"] = neighbour.serverIP; 596 NeighbourBlock["sim_ip"] = neighbour.serverIP;
598 NeighbourBlock["sim_ip"] = Util.GetHostFromDNS(neighbour.serverIP).ToString();
599 NeighbourBlock["sim_port"] = neighbour.serverPort.ToString(); 597 NeighbourBlock["sim_port"] = neighbour.serverPort.ToString();
600 NeighbourBlock["region_locx"] = neighbour.regionLocX.ToString(); 598 NeighbourBlock["region_locx"] = neighbour.regionLocX.ToString();
601 NeighbourBlock["region_locy"] = neighbour.regionLocY.ToString(); 599 NeighbourBlock["region_locy"] = neighbour.regionLocY.ToString();
@@ -813,8 +811,7 @@ namespace OpenSim.Grid.GridServer
813 { 811 {
814 m_log.Info("[DATA]: found " + (string)simData.regionName + " regionHandle = " + 812 m_log.Info("[DATA]: found " + (string)simData.regionName + " regionHandle = " +
815 (string)requestData["region_handle"]); 813 (string)requestData["region_handle"]);
816 responseData["sim_ip"] = Util.GetHostFromDNS(simData.serverIP).ToString(); 814 responseData["sim_ip"] = simData.serverIP;
817 responseData["sim_host"] = simData.serverIP;
818 responseData["sim_port"] = simData.serverPort.ToString(); 815 responseData["sim_port"] = simData.serverPort.ToString();
819 responseData["server_uri"] = simData.serverURI; 816 responseData["server_uri"] = simData.serverURI;
820 responseData["http_port"] = simData.httpPort.ToString(); 817 responseData["http_port"] = simData.httpPort.ToString();
@@ -881,7 +878,7 @@ namespace OpenSim.Grid.GridServer
881 878
882 // For Sugilite compatibility 879 // For Sugilite compatibility
883 simProfileBlock["regionhandle"] = aSim.regionHandle.ToString(); 880 simProfileBlock["regionhandle"] = aSim.regionHandle.ToString();
884 simProfileBlock["sim_ip"] = aSim.serverIP.ToString(); 881 simProfileBlock["sim_ip"] = aSim.serverIP;
885 simProfileBlock["sim_port"] = aSim.serverPort.ToString(); 882 simProfileBlock["sim_port"] = aSim.serverPort.ToString();
886 simProfileBlock["sim_uri"] = aSim.serverURI.ToString(); 883 simProfileBlock["sim_uri"] = aSim.serverURI.ToString();
887 simProfileBlock["uuid"] = aSim.UUID.ToString(); 884 simProfileBlock["uuid"] = aSim.UUID.ToString();
@@ -1044,7 +1041,7 @@ namespace OpenSim.Grid.GridServer
1044 respstring += "<sim>"; 1041 respstring += "<sim>";
1045 respstring += "<uuid>" + TheSim.ToString() + "</uuid>"; 1042 respstring += "<uuid>" + TheSim.ToString() + "</uuid>";
1046 respstring += "<regionname>" + TheSim.regionName + "</regionname>"; 1043 respstring += "<regionname>" + TheSim.regionName + "</regionname>";
1047 respstring += "<sim_ip>" + Util.GetHostFromDNS(TheSim.serverIP).ToString() + "</sim_ip>"; 1044 respstring += "<sim_ip>" + TheSim.serverIP + "</sim_ip>";
1048 respstring += "<sim_port>" + TheSim.serverPort.ToString() + "</sim_port>"; 1045 respstring += "<sim_port>" + TheSim.serverPort.ToString() + "</sim_port>";
1049 respstring += "<region_locx>" + TheSim.regionLocX.ToString() + "</region_locx>"; 1046 respstring += "<region_locx>" + TheSim.regionLocX.ToString() + "</region_locx>";
1050 respstring += "<region_locy>" + TheSim.regionLocY.ToString() + "</region_locy>"; 1047 respstring += "<region_locy>" + TheSim.regionLocY.ToString() + "</region_locy>";
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 {