diff options
Diffstat (limited to 'OpenSim/Region/CoreModules/Framework/EntityTransfer')
-rw-r--r-- | OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs | 58 | ||||
-rw-r--r-- | OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs | 7 |
2 files changed, 21 insertions, 44 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs index b57dc88..47548c7 100644 --- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs +++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs | |||
@@ -197,9 +197,8 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer | |||
197 | sp.ControllingClient.SendTeleportFailed("Problem at destination"); | 197 | sp.ControllingClient.SendTeleportFailed("Problem at destination"); |
198 | return; | 198 | return; |
199 | } | 199 | } |
200 | 200 | m_log.DebugFormat("[ENTITY TRANSFER MODULE]: Final destination is x={0} y={1} {2}@{3}", | |
201 | m_log.DebugFormat("[ENTITY TRANSFER MODULE]: Final destination is x={0} y={1} uuid={2}", | 201 | finalDestination.RegionLocX / Constants.RegionSize, finalDestination.RegionLocY / Constants.RegionSize, finalDestination.RegionID, finalDestination.ServerURI); |
202 | finalDestination.RegionLocX / Constants.RegionSize, finalDestination.RegionLocY / Constants.RegionSize, finalDestination.RegionID); | ||
203 | 202 | ||
204 | // Check that these are not the same coordinates | 203 | // Check that these are not the same coordinates |
205 | if (finalDestination.RegionLocX == sp.Scene.RegionInfo.RegionLocX && | 204 | if (finalDestination.RegionLocX == sp.Scene.RegionInfo.RegionLocX && |
@@ -255,8 +254,8 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer | |||
255 | } | 254 | } |
256 | 255 | ||
257 | m_log.DebugFormat( | 256 | m_log.DebugFormat( |
258 | "[ENTITY TRANSFER MODULE]: Request Teleport to {0}:{1}:{2}/{3}", | 257 | "[ENTITY TRANSFER MODULE]: Request Teleport to {0} ({1}) {2}/{3}", |
259 | reg.ExternalHostName, reg.HttpPort, finalDestination.RegionName, position); | 258 | reg.ServerURI, finalDestination.ServerURI, finalDestination.RegionName, position); |
260 | 259 | ||
261 | uint newRegionX = (uint)(reg.RegionHandle >> 40); | 260 | uint newRegionX = (uint)(reg.RegionHandle >> 40); |
262 | uint newRegionY = (((uint)(reg.RegionHandle)) >> 8); | 261 | uint newRegionY = (((uint)(reg.RegionHandle)) >> 8); |
@@ -328,43 +327,21 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer | |||
328 | 327 | ||
329 | // OK, it got this agent. Let's close some child agents | 328 | // OK, it got this agent. Let's close some child agents |
330 | sp.CloseChildAgents(newRegionX, newRegionY); | 329 | sp.CloseChildAgents(newRegionX, newRegionY); |
331 | 330 | IClientIPEndpoint ipepClient; | |
332 | if (NeedsNewAgent(oldRegionX, newRegionX, oldRegionY, newRegionY)) | 331 | if (NeedsNewAgent(oldRegionX, newRegionX, oldRegionY, newRegionY)) |
333 | { | 332 | { |
334 | //sp.ControllingClient.SendTeleportProgress(teleportFlags, "Creating agent..."); | 333 | //sp.ControllingClient.SendTeleportProgress(teleportFlags, "Creating agent..."); |
335 | |||
336 | #region IP Translation for NAT | 334 | #region IP Translation for NAT |
337 | IClientIPEndpoint ipepClient; | 335 | // Uses ipepClient above |
338 | if (sp.ClientView.TryGet(out ipepClient)) | 336 | if (sp.ClientView.TryGet(out ipepClient)) |
339 | { | 337 | { |
340 | capsPath | 338 | endPoint.Address = NetworkUtil.GetIPFor(ipepClient.EndPoint, endPoint.Address); |
341 | = "http://" | ||
342 | + NetworkUtil.GetHostFor(ipepClient.EndPoint, finalDestination.ExternalHostName) | ||
343 | + ":" | ||
344 | + finalDestination.HttpPort | ||
345 | + CapsUtil.GetCapsSeedPath(agentCircuit.CapsPath); | ||
346 | } | ||
347 | else | ||
348 | { | ||
349 | capsPath | ||
350 | = "http://" | ||
351 | + finalDestination.ExternalHostName | ||
352 | + ":" | ||
353 | + finalDestination.HttpPort | ||
354 | + CapsUtil.GetCapsSeedPath(agentCircuit.CapsPath); | ||
355 | } | 339 | } |
356 | #endregion | 340 | #endregion |
341 | capsPath = finalDestination.ServerURI + CapsUtil.GetCapsSeedPath(agentCircuit.CapsPath); | ||
357 | 342 | ||
358 | if (eq != null) | 343 | if (eq != null) |
359 | { | 344 | { |
360 | #region IP Translation for NAT | ||
361 | // Uses ipepClient above | ||
362 | if (sp.ClientView.TryGet(out ipepClient)) | ||
363 | { | ||
364 | endPoint.Address = NetworkUtil.GetIPFor(ipepClient.EndPoint, endPoint.Address); | ||
365 | } | ||
366 | #endregion | ||
367 | |||
368 | eq.EnableSimulator(destinationHandle, endPoint, sp.UUID); | 345 | eq.EnableSimulator(destinationHandle, endPoint, sp.UUID); |
369 | 346 | ||
370 | // ES makes the client send a UseCircuitCode message to the destination, | 347 | // ES makes the client send a UseCircuitCode message to the destination, |
@@ -383,8 +360,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer | |||
383 | else | 360 | else |
384 | { | 361 | { |
385 | agentCircuit.CapsPath = sp.Scene.CapsModule.GetChildSeed(sp.UUID, reg.RegionHandle); | 362 | agentCircuit.CapsPath = sp.Scene.CapsModule.GetChildSeed(sp.UUID, reg.RegionHandle); |
386 | capsPath = "http://" + finalDestination.ExternalHostName + ":" + finalDestination.HttpPort | 363 | capsPath = finalDestination.ServerURI + CapsUtil.GetCapsSeedPath(agentCircuit.CapsPath); |
387 | + "/CAPS/" + agentCircuit.CapsPath + "0000/"; | ||
388 | } | 364 | } |
389 | 365 | ||
390 | // Expect avatar crossing is a heavy-duty function at the destination. | 366 | // Expect avatar crossing is a heavy-duty function at the destination. |
@@ -518,8 +494,8 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer | |||
518 | 494 | ||
519 | protected virtual void SetCallbackURL(AgentData agent, RegionInfo region) | 495 | protected virtual void SetCallbackURL(AgentData agent, RegionInfo region) |
520 | { | 496 | { |
521 | agent.CallbackURI = "http://" + region.ExternalHostName + ":" + region.HttpPort + | 497 | agent.CallbackURI = region.ServerURI + "agent/" + agent.AgentID.ToString() + "/" + region.RegionID.ToString() + "/release/"; |
522 | "/agent/" + agent.AgentID.ToString() + "/" + region.RegionID.ToString() + "/release/"; | 498 | m_log.Debug("Set callback URL to " + agent.CallbackURI); |
523 | 499 | ||
524 | } | 500 | } |
525 | 501 | ||
@@ -845,8 +821,8 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer | |||
845 | cAgent.Position = pos; | 821 | cAgent.Position = pos; |
846 | if (isFlying) | 822 | if (isFlying) |
847 | cAgent.ControlFlags |= (uint)AgentManager.ControlFlags.AGENT_CONTROL_FLY; | 823 | cAgent.ControlFlags |= (uint)AgentManager.ControlFlags.AGENT_CONTROL_FLY; |
848 | cAgent.CallbackURI = "http://" + m_scene.RegionInfo.ExternalHostName + ":" + m_scene.RegionInfo.HttpPort + | 824 | cAgent.CallbackURI = m_scene.RegionInfo.ServerURI + |
849 | "/agent/" + agent.UUID.ToString() + "/" + m_scene.RegionInfo.RegionID.ToString() + "/release/"; | 825 | "agent/" + agent.UUID.ToString() + "/" + m_scene.RegionInfo.RegionID.ToString() + "/release/"; |
850 | 826 | ||
851 | if (!m_scene.SimulationService.UpdateAgent(neighbourRegion, cAgent)) | 827 | if (!m_scene.SimulationService.UpdateAgent(neighbourRegion, cAgent)) |
852 | { | 828 | { |
@@ -871,10 +847,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer | |||
871 | neighbourRegion.RegionHandle); | 847 | neighbourRegion.RegionHandle); |
872 | return agent; | 848 | return agent; |
873 | } | 849 | } |
874 | // TODO Should construct this behind a method | 850 | string capsPath = neighbourRegion.ServerURI + CapsUtil.GetCapsSeedPath(agentcaps); |
875 | string capsPath = | ||
876 | "http://" + neighbourRegion.ExternalHostName + ":" + neighbourRegion.HttpPort | ||
877 | + "/CAPS/" + agentcaps /*circuitdata.CapsPath*/ + "0000/"; | ||
878 | 851 | ||
879 | m_log.DebugFormat("[ENTITY TRANSFER MODULE]: Sending new CAPS seed url {0} to client {1}", capsPath, agent.UUID); | 852 | m_log.DebugFormat("[ENTITY TRANSFER MODULE]: Sending new CAPS seed url {0} to client {1}", capsPath, agent.UUID); |
880 | 853 | ||
@@ -1195,8 +1168,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer | |||
1195 | y = y / Constants.RegionSize; | 1168 | y = y / Constants.RegionSize; |
1196 | m_log.Debug("[ENTITY TRANSFER MODULE]: Starting to inform client about neighbour " + x + ", " + y + "(" + endPoint.ToString() + ")"); | 1169 | m_log.Debug("[ENTITY TRANSFER MODULE]: Starting to inform client about neighbour " + x + ", " + y + "(" + endPoint.ToString() + ")"); |
1197 | 1170 | ||
1198 | string capsPath = "http://" + reg.ExternalHostName + ":" + reg.HttpPort | 1171 | string capsPath = reg.ServerURI + CapsUtil.GetCapsSeedPath(a.CapsPath); |
1199 | + "/CAPS/" + a.CapsPath + "0000/"; | ||
1200 | 1172 | ||
1201 | string reason = String.Empty; | 1173 | string reason = String.Empty; |
1202 | 1174 | ||
diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs index 1ac7508..7796a08 100644 --- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs +++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs | |||
@@ -123,7 +123,9 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer | |||
123 | if ((flags & (int)OpenSim.Data.RegionFlags.Hyperlink) != 0) | 123 | if ((flags & (int)OpenSim.Data.RegionFlags.Hyperlink) != 0) |
124 | { | 124 | { |
125 | m_log.DebugFormat("[HG ENTITY TRANSFER MODULE]: Destination region {0} is hyperlink", region.RegionID); | 125 | m_log.DebugFormat("[HG ENTITY TRANSFER MODULE]: Destination region {0} is hyperlink", region.RegionID); |
126 | return m_GatekeeperConnector.GetHyperlinkRegion(region, region.RegionID); | 126 | GridRegion real_destination = m_GatekeeperConnector.GetHyperlinkRegion(region, region.RegionID); |
127 | m_log.Debug("GetfinalDestination serveruri -> " + real_destination.ServerURI); | ||
128 | return real_destination; | ||
127 | } | 129 | } |
128 | return region; | 130 | return region; |
129 | } | 131 | } |
@@ -149,6 +151,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer | |||
149 | 151 | ||
150 | protected override bool CreateAgent(ScenePresence sp, GridRegion reg, GridRegion finalDestination, AgentCircuitData agentCircuit, uint teleportFlags, out string reason, out bool logout) | 152 | protected override bool CreateAgent(ScenePresence sp, GridRegion reg, GridRegion finalDestination, AgentCircuitData agentCircuit, uint teleportFlags, out string reason, out bool logout) |
151 | { | 153 | { |
154 | m_log.Debug("CreateAgent " + reg.ServerURI + " " + finalDestination.ServerURI); | ||
152 | reason = string.Empty; | 155 | reason = string.Empty; |
153 | logout = false; | 156 | logout = false; |
154 | int flags = m_aScene.GridService.GetRegionFlags(m_aScene.RegionInfo.ScopeID, reg.RegionID); | 157 | int flags = m_aScene.GridService.GetRegionFlags(m_aScene.RegionInfo.ScopeID, reg.RegionID); |
@@ -235,6 +238,8 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer | |||
235 | string url = aCircuit.ServiceURLs["HomeURI"].ToString(); | 238 | string url = aCircuit.ServiceURLs["HomeURI"].ToString(); |
236 | IUserAgentService security = new UserAgentServiceConnector(url); | 239 | IUserAgentService security = new UserAgentServiceConnector(url); |
237 | return security.VerifyClient(aCircuit.SessionID, token); | 240 | return security.VerifyClient(aCircuit.SessionID, token); |
241 | } else { | ||
242 | m_log.Debug("this gent does not have a HomeURI OH NO"); | ||
238 | } | 243 | } |
239 | 244 | ||
240 | return false; | 245 | return false; |