OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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.
0.6.1-post-fixes
Charles Krinke 2008-12-13 16:25:20 +00:00
parent 40bbf886f2
commit 6cf0b81864
4 changed files with 16 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Data/RegionProfileData.cs
View File

@ -161,7 +161,7 @@ namespace OpenSim.Data
simData.httpPort = Convert.ToUInt32((string) responseData["http_port"]); simData.httpPort = Convert.ToUInt32((string) responseData["http_port"]);
simData.remotingPort = Convert.ToUInt32((string) responseData["remoting_port"]); simData.remotingPort = Convert.ToUInt32((string) responseData["remoting_port"]);
simData.serverURI = (string) responseData["server_uri"]; simData.serverURI = (string) responseData["server_uri"];
simData.httpServerURI = "http://" + (string)responseData["sim_host"] + ":" + simData.httpPort.ToString() + "/"; simData.httpServerURI = "http://" + (string)responseData["sim_ip"] + ":" + simData.httpPort.ToString() + "/";
simData.UUID = new UUID((string) responseData["region_UUID"]); simData.UUID = new UUID((string) responseData["region_UUID"]);
simData.regionName = (string) responseData["region_name"]; simData.regionName = (string) responseData["region_name"];
} }

2
OpenSim/Framework/Servers/VersionInfo.cs
View File

@ -48,6 +48,6 @@ namespace OpenSim
/// of the code that is too old. /// of the code that is too old.
/// ///
/// </value> /// </value>
public readonly static int MajorInterfaceVersion = 1; public readonly static int MajorInterfaceVersion = 2;
} }
} }

13
OpenSim/Grid/GridServer/GridManager.cs
View File

@ -563,8 +563,7 @@ namespace OpenSim.Grid.GridServer
foreach (RegionProfileData aSim in neighbours) foreach (RegionProfileData aSim in neighbours)
{ {
NeighbourBlock = new Hashtable(); NeighbourBlock = new Hashtable();
NeighbourBlock["sim_host"] = aSim.serverIP; NeighbourBlock["sim_ip"] = aSim.serverIP;
NeighbourBlock["sim_ip"] = Util.GetHostFromDNS(aSim.serverIP.ToString()).ToString();
NeighbourBlock["sim_port"] = aSim.serverPort.ToString(); NeighbourBlock["sim_port"] = aSim.serverPort.ToString();
NeighbourBlock["region_locx"] = aSim.regionLocX.ToString(); NeighbourBlock["region_locx"] = aSim.regionLocX.ToString();
NeighbourBlock["region_locy"] = aSim.regionLocY.ToString(); NeighbourBlock["region_locy"] = aSim.regionLocY.ToString();
@ -594,8 +593,7 @@ namespace OpenSim.Grid.GridServer
(uint)(sim.regionLocY + y) * Constants.RegionSize)); (uint)(sim.regionLocY + y) * Constants.RegionSize));
NeighbourBlock = new Hashtable(); NeighbourBlock = new Hashtable();
NeighbourBlock["sim_host"] = neighbour.serverIP; NeighbourBlock["sim_ip"] = neighbour.serverIP;
NeighbourBlock["sim_ip"] = Util.GetHostFromDNS(neighbour.serverIP).ToString();
NeighbourBlock["sim_port"] = neighbour.serverPort.ToString(); NeighbourBlock["sim_port"] = neighbour.serverPort.ToString();
NeighbourBlock["region_locx"] = neighbour.regionLocX.ToString(); NeighbourBlock["region_locx"] = neighbour.regionLocX.ToString();
NeighbourBlock["region_locy"] = neighbour.regionLocY.ToString(); NeighbourBlock["region_locy"] = neighbour.regionLocY.ToString();
@ -813,8 +811,7 @@ namespace OpenSim.Grid.GridServer
{ {
m_log.Info("[DATA]: found " + (string)simData.regionName + " regionHandle = " + m_log.Info("[DATA]: found " + (string)simData.regionName + " regionHandle = " +
(string)requestData["region_handle"]); (string)requestData["region_handle"]);
responseData["sim_ip"] = Util.GetHostFromDNS(simData.serverIP).ToString(); responseData["sim_ip"] = simData.serverIP;
responseData["sim_host"] = simData.serverIP;
responseData["sim_port"] = simData.serverPort.ToString(); responseData["sim_port"] = simData.serverPort.ToString();
responseData["server_uri"] = simData.serverURI; responseData["server_uri"] = simData.serverURI;
responseData["http_port"] = simData.httpPort.ToString(); responseData["http_port"] = simData.httpPort.ToString();
@ -881,7 +878,7 @@ namespace OpenSim.Grid.GridServer
// For Sugilite compatibility // For Sugilite compatibility
simProfileBlock["regionhandle"] = aSim.regionHandle.ToString(); simProfileBlock["regionhandle"] = aSim.regionHandle.ToString();
simProfileBlock["sim_ip"] = aSim.serverIP.ToString(); simProfileBlock["sim_ip"] = aSim.serverIP;
simProfileBlock["sim_port"] = aSim.serverPort.ToString(); simProfileBlock["sim_port"] = aSim.serverPort.ToString();
simProfileBlock["sim_uri"] = aSim.serverURI.ToString(); simProfileBlock["sim_uri"] = aSim.serverURI.ToString();
simProfileBlock["uuid"] = aSim.UUID.ToString(); simProfileBlock["uuid"] = aSim.UUID.ToString();
@ -1044,7 +1041,7 @@ namespace OpenSim.Grid.GridServer
respstring += "<sim>"; respstring += "<sim>";
respstring += "<uuid>" + TheSim.ToString() + "</uuid>"; respstring += "<uuid>" + TheSim.ToString() + "</uuid>";
respstring += "<regionname>" + TheSim.regionName + "</regionname>"; respstring += "<regionname>" + TheSim.regionName + "</regionname>";
respstring += "<sim_ip>" + Util.GetHostFromDNS(TheSim.serverIP).ToString() + "</sim_ip>"; respstring += "<sim_ip>" + TheSim.serverIP + "</sim_ip>";
respstring += "<sim_port>" + TheSim.serverPort.ToString() + "</sim_port>"; respstring += "<sim_port>" + TheSim.serverPort.ToString() + "</sim_port>";
respstring += "<region_locx>" + TheSim.regionLocX.ToString() + "</region_locx>"; respstring += "<region_locx>" + TheSim.regionLocX.ToString() + "</region_locx>";
respstring += "<region_locy>" + TheSim.regionLocY.ToString() + "</region_locy>"; respstring += "<region_locy>" + TheSim.regionLocY.ToString() + "</region_locy>";

18
OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
View File

@ -410,16 +410,17 @@ namespace OpenSim.Region.Communications.OGS1
uint regX = Convert.ToUInt32((string) responseData["region_locx"]); uint regX = Convert.ToUInt32((string) responseData["region_locx"]);
uint regY = Convert.ToUInt32((string) responseData["region_locy"]); uint regY = Convert.ToUInt32((string) responseData["region_locy"]);
string internalIpStr = (string) responseData["sim_ip"]; string externalHostName = (string) responseData["sim_ip"];
uint port = Convert.ToUInt32(responseData["sim_port"]); uint port = Convert.ToUInt32(responseData["sim_port"]);
// string externalUri = (string) responseData["sim_uri"]; // string externalUri = (string) responseData["sim_uri"];
IPEndPoint neighbourInternalEndPoint = new IPEndPoint(IPAddress.Parse(internalIpStr), (int) port); //IPEndPoint neighbourInternalEndPoint = new IPEndPoint(IPAddress.Parse(internalIpStr), (int) port);
// string neighbourExternalUri = externalUri; IPEndPoint neighbourInternalEndPoint = new IPEndPoint(Util.GetHostFromDNS(externalHostName), (int)port);
regionInfo = new RegionInfo(regX, regY, neighbourInternalEndPoint, internalIpStr);
regionInfo = new RegionInfo(regX, regY, neighbourInternalEndPoint, externalHostName);
regionInfo.RemotingPort = Convert.ToUInt32((string) responseData["remoting_port"]); regionInfo.RemotingPort = Convert.ToUInt32((string) responseData["remoting_port"]);
regionInfo.RemotingAddress = internalIpStr; regionInfo.RemotingAddress = externalHostName;
if (responseData.ContainsKey("http_port")) if (responseData.ContainsKey("http_port"))
{ {
@ -437,11 +438,11 @@ namespace OpenSim.Region.Communications.OGS1
} }
} }
} }
catch catch (Exception e)
{ {
m_log.Error("[OGS1 GRID SERVICES]: " + m_log.Error("[OGS1 GRID SERVICES]: " +
"Region lookup failed for: " + regionHandle.ToString() + "Region lookup failed for: " + regionHandle.ToString() +
" - Is the GridServer down?"); " - Is the GridServer down?" + e.ToString());
return null; return null;
} }
} }
@ -1551,8 +1552,7 @@ namespace OpenSim.Region.Communications.OGS1
bool available = false; bool available = false;
bool timed_out = true; bool timed_out = true;
IPAddress ia; IPAddress ia = Util.GetHostFromDNS(address);
IPAddress.TryParse(address, out ia);
IPEndPoint m_EndPoint; IPEndPoint m_EndPoint;
try try
{ {