ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-08 18:25:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

on HG landmark teleport, check gatekeeper first

Browse Source
This commit is contained in:
UbitUmarov
2022-01-28 16:25:31 +00:00
parent 63b7e2ca15
commit f997d77075
1 changed files with 21 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs
View File

@@ -550,10 +550,17 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
if (sp == null || sp.IsDeleted || sp.IsInTransit || sp.IsChildAgent || sp.IsNPC)
return;
GridRegion info = Scene.GridService.GetRegionByUUID(UUID.Zero, lm.RegionID);
// Local region?
if (info != null)
OSHHTPHost gatekeeperHost = new OSHHTPHost(lm.Gatekeeper);
if (m_thisGridInfo.IsLocalGrid(gatekeeperHost) != 0)
{
// Local region?
GridRegion info = Scene.GridService.GetRegionByUUID(UUID.Zero, lm.RegionID);
if (info == null)
{
remoteClient.SendTeleportFailed("Landmark region not found");
return;
}
//check if region on same position and fix local offset
if (Util.CompareRegionHandles(lm.RegionHandle, lm.Position, info.RegionLocX, info.RegionLocY, info.RegionSizeX, info.RegionSizeY, out Vector3 offset))
{
@@ -566,19 +573,22 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
return;
}
if (string.IsNullOrEmpty(lm.Gatekeeper))
if (!gatekeeperHost.ResolveDNS())
{
remoteClient.SendTeleportFailed("Landmark region not found");
remoteClient.SendTeleportFailed("Could not resolve Landmark grid gatekeeper");
return;
}
// Foreign region
GridRegion gatekeeper = MakeGateKeeperRegion(lm.Gatekeeper);
if (gatekeeper == null)
{
remoteClient.SendTeleportFailed("Could not parse landmark destiny gatekeeper");
return;
}
GridRegion gatekeeper = new GridRegion()
{
ExternalHostName = gatekeeperHost.Host,
HttpPort = (uint)gatekeeperHost.Port,
ServerURI = lm.Gatekeeper,
RegionName = string.Empty,
InternalEndPoint = new System.Net.IPEndPoint(System.Net.IPAddress.Parse("0.0.0.0"), (int)0),
RegionFlags = OpenSim.Framework.RegionFlags.Hyperlink
};
string homeURI = Scene.GetAgentHomeURI(remoteClient.AgentId);