diff options
20 files changed, 129 insertions, 174 deletions
diff --git a/OpenSim/Framework/Capabilities/CapsUtil.cs b/OpenSim/Framework/Capabilities/CapsUtil.cs index 0334e4b..faf2708 100644 --- a/OpenSim/Framework/Capabilities/CapsUtil.cs +++ b/OpenSim/Framework/Capabilities/CapsUtil.cs | |||
@@ -41,7 +41,7 @@ namespace OpenSim.Framework.Capabilities | |||
41 | /// <returns></returns> | 41 | /// <returns></returns> |
42 | public static string GetCapsSeedPath(string capsObjectPath) | 42 | public static string GetCapsSeedPath(string capsObjectPath) |
43 | { | 43 | { |
44 | return "/CAPS/" + capsObjectPath + "0000/"; | 44 | return "CAPS/" + capsObjectPath + "0000/"; |
45 | } | 45 | } |
46 | 46 | ||
47 | /// <summary> | 47 | /// <summary> |
diff --git a/OpenSim/Framework/RegionInfo.cs b/OpenSim/Framework/RegionInfo.cs index 08d5398..73b8bd0 100644 --- a/OpenSim/Framework/RegionInfo.cs +++ b/OpenSim/Framework/RegionInfo.cs | |||
@@ -115,8 +115,20 @@ namespace OpenSim.Framework | |||
115 | /// </summary> | 115 | /// </summary> |
116 | public string ServerURI | 116 | public string ServerURI |
117 | { | 117 | { |
118 | get { return m_serverURI; } | 118 | get { |
119 | set { m_serverURI = value; } | 119 | if ( m_serverURI != string.Empty ) { |
120 | return m_serverURI; | ||
121 | } else { | ||
122 | return "http://" + m_externalHostName + ":" + m_httpPort + "/"; | ||
123 | } | ||
124 | } | ||
125 | set { | ||
126 | if ( value.EndsWith("/") ) { | ||
127 | m_serverURI = value; | ||
128 | } else { | ||
129 | m_serverURI = value + '/'; | ||
130 | } | ||
131 | } | ||
120 | } | 132 | } |
121 | protected string m_serverURI; | 133 | protected string m_serverURI; |
122 | 134 | ||
@@ -141,6 +153,7 @@ namespace OpenSim.Framework | |||
141 | 153 | ||
142 | public SimpleRegionInfo() | 154 | public SimpleRegionInfo() |
143 | { | 155 | { |
156 | m_serverURI = string.Empty; | ||
144 | } | 157 | } |
145 | 158 | ||
146 | public SimpleRegionInfo(uint regionLocX, uint regionLocY, IPEndPoint internalEndPoint, string externalUri) | 159 | public SimpleRegionInfo(uint regionLocX, uint regionLocY, IPEndPoint internalEndPoint, string externalUri) |
@@ -150,6 +163,7 @@ namespace OpenSim.Framework | |||
150 | 163 | ||
151 | m_internalEndPoint = internalEndPoint; | 164 | m_internalEndPoint = internalEndPoint; |
152 | m_externalHostName = externalUri; | 165 | m_externalHostName = externalUri; |
166 | m_serverURI = string.Empty; | ||
153 | } | 167 | } |
154 | 168 | ||
155 | public SimpleRegionInfo(uint regionLocX, uint regionLocY, string externalUri, uint port) | 169 | public SimpleRegionInfo(uint regionLocX, uint regionLocY, string externalUri, uint port) |
@@ -160,6 +174,7 @@ namespace OpenSim.Framework | |||
160 | m_externalHostName = externalUri; | 174 | m_externalHostName = externalUri; |
161 | 175 | ||
162 | m_internalEndPoint = new IPEndPoint(IPAddress.Parse("0.0.0.0"), (int) port); | 176 | m_internalEndPoint = new IPEndPoint(IPAddress.Parse("0.0.0.0"), (int) port); |
177 | m_serverURI = string.Empty; | ||
163 | } | 178 | } |
164 | 179 | ||
165 | public SimpleRegionInfo(RegionInfo ConvertFrom) | 180 | public SimpleRegionInfo(RegionInfo ConvertFrom) |
@@ -449,6 +464,7 @@ namespace OpenSim.Framework | |||
449 | configMember = | 464 | configMember = |
450 | new ConfigurationMember(xmlNode, description, loadConfigurationOptions, handleIncomingConfiguration, !skipConsoleConfig); | 465 | new ConfigurationMember(xmlNode, description, loadConfigurationOptions, handleIncomingConfiguration, !skipConsoleConfig); |
451 | configMember.performConfigurationRetrieve(); | 466 | configMember.performConfigurationRetrieve(); |
467 | m_serverURI = string.Empty; | ||
452 | } | 468 | } |
453 | 469 | ||
454 | public RegionInfo(uint regionLocX, uint regionLocY, IPEndPoint internalEndPoint, string externalUri) | 470 | public RegionInfo(uint regionLocX, uint regionLocY, IPEndPoint internalEndPoint, string externalUri) |
@@ -458,10 +474,12 @@ namespace OpenSim.Framework | |||
458 | 474 | ||
459 | m_internalEndPoint = internalEndPoint; | 475 | m_internalEndPoint = internalEndPoint; |
460 | m_externalHostName = externalUri; | 476 | m_externalHostName = externalUri; |
477 | m_serverURI = string.Empty; | ||
461 | } | 478 | } |
462 | 479 | ||
463 | public RegionInfo() | 480 | public RegionInfo() |
464 | { | 481 | { |
482 | m_serverURI = string.Empty; | ||
465 | } | 483 | } |
466 | 484 | ||
467 | public EstateSettings EstateSettings | 485 | public EstateSettings EstateSettings |
@@ -551,10 +569,23 @@ namespace OpenSim.Framework | |||
551 | /// <summary> | 569 | /// <summary> |
552 | /// A well-formed URI for the host region server (namely "http://" + ExternalHostName) | 570 | /// A well-formed URI for the host region server (namely "http://" + ExternalHostName) |
553 | /// </summary> | 571 | /// </summary> |
572 | |||
554 | public string ServerURI | 573 | public string ServerURI |
555 | { | 574 | { |
556 | get { return m_serverURI; } | 575 | get { |
557 | set { m_serverURI = value; } | 576 | if ( m_serverURI != string.Empty ) { |
577 | return m_serverURI; | ||
578 | } else { | ||
579 | return "http://" + m_externalHostName + ":" + m_httpPort + "/"; | ||
580 | } | ||
581 | } | ||
582 | set { | ||
583 | if ( value.EndsWith("/") ) { | ||
584 | m_serverURI = value; | ||
585 | } else { | ||
586 | m_serverURI = value + '/'; | ||
587 | } | ||
588 | } | ||
558 | } | 589 | } |
559 | 590 | ||
560 | public string RegionName | 591 | public string RegionName |
diff --git a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs index ba8c194..47e86ad 100644 --- a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs +++ b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs | |||
@@ -348,7 +348,7 @@ namespace OpenSim.Framework.Servers.HttpServer | |||
348 | { | 348 | { |
349 | try | 349 | try |
350 | { | 350 | { |
351 | // m_log.Debug("[BASE HTTP SERVER]: Handling request to " + request.RawUrl); | 351 | m_log.Debug("[BASE HTTP SERVER]: Handling request to " + request.RawUrl); |
352 | 352 | ||
353 | Thread.CurrentThread.CurrentCulture = new CultureInfo("en-US", true); | 353 | Thread.CurrentThread.CurrentCulture = new CultureInfo("en-US", true); |
354 | 354 | ||
@@ -376,11 +376,11 @@ namespace OpenSim.Framework.Servers.HttpServer | |||
376 | string path = request.RawUrl; | 376 | string path = request.RawUrl; |
377 | string handlerKey = GetHandlerKey(request.HttpMethod, path); | 377 | string handlerKey = GetHandlerKey(request.HttpMethod, path); |
378 | 378 | ||
379 | // m_log.DebugFormat("[BASE HTTP SERVER]: Handling {0} request for {1}", request.HttpMethod, path); | 379 | m_log.DebugFormat("[BASE HTTP SERVER]: Handling {0} request for {1}", request.HttpMethod, path); |
380 | 380 | ||
381 | if (TryGetStreamHandler(handlerKey, out requestHandler)) | 381 | if (TryGetStreamHandler(handlerKey, out requestHandler)) |
382 | { | 382 | { |
383 | //m_log.Debug("[BASE HTTP SERVER]: Found Stream Handler"); | 383 | m_log.Debug("[BASE HTTP SERVER]: Found Stream Handler"); |
384 | // Okay, so this is bad, but should be considered temporary until everything is IStreamHandler. | 384 | // Okay, so this is bad, but should be considered temporary until everything is IStreamHandler. |
385 | byte[] buffer = null; | 385 | byte[] buffer = null; |
386 | 386 | ||
@@ -395,7 +395,7 @@ namespace OpenSim.Framework.Servers.HttpServer | |||
395 | } | 395 | } |
396 | else if (requestHandler is IGenericHTTPHandler) | 396 | else if (requestHandler is IGenericHTTPHandler) |
397 | { | 397 | { |
398 | //m_log.Debug("[BASE HTTP SERVER]: Found Caps based HTTP Handler"); | 398 | m_log.Debug("[BASE HTTP SERVER]: Found Caps based HTTP Handler"); |
399 | IGenericHTTPHandler HTTPRequestHandler = requestHandler as IGenericHTTPHandler; | 399 | IGenericHTTPHandler HTTPRequestHandler = requestHandler as IGenericHTTPHandler; |
400 | Stream requestStream = request.InputStream; | 400 | Stream requestStream = request.InputStream; |
401 | 401 | ||
@@ -422,7 +422,7 @@ namespace OpenSim.Framework.Servers.HttpServer | |||
422 | 422 | ||
423 | foreach (string headername in rHeaders) | 423 | foreach (string headername in rHeaders) |
424 | { | 424 | { |
425 | //m_log.Warn("[HEADER]: " + headername + "=" + request.Headers[headername]); | 425 | m_log.Warn("[HEADER]: " + headername + "=" + request.Headers[headername]); |
426 | headervals[headername] = request.Headers[headername]; | 426 | headervals[headername] = request.Headers[headername]; |
427 | } | 427 | } |
428 | 428 | ||
diff --git a/OpenSim/Region/Application/OpenSimBase.cs b/OpenSim/Region/Application/OpenSimBase.cs index 74ad168..904a50c 100644 --- a/OpenSim/Region/Application/OpenSimBase.cs +++ b/OpenSim/Region/Application/OpenSimBase.cs | |||
@@ -327,8 +327,8 @@ namespace OpenSim | |||
327 | //regionInfo.originRegionID = regionInfo.RegionID; | 327 | //regionInfo.originRegionID = regionInfo.RegionID; |
328 | 328 | ||
329 | // set initial ServerURI | 329 | // set initial ServerURI |
330 | regionInfo.ServerURI = "http://" + regionInfo.ExternalHostName + ":" + regionInfo.InternalEndPoint.Port; | ||
331 | regionInfo.HttpPort = m_httpServerPort; | 330 | regionInfo.HttpPort = m_httpServerPort; |
331 | regionInfo.ServerURI = "http://" + regionInfo.ExternalHostName + ":" + regionInfo.HttpPort.ToString() + "/"; | ||
332 | 332 | ||
333 | regionInfo.osSecret = m_osSecret; | 333 | regionInfo.osSecret = m_osSecret; |
334 | 334 | ||
diff --git a/OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs b/OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs index 918fa04..fdc48c6 100644 --- a/OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs | |||
@@ -599,7 +599,7 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage | |||
599 | try | 599 | try |
600 | { | 600 | { |
601 | 601 | ||
602 | XmlRpcResponse GridResp = GridReq.Send("http://" + reginfo.ExternalHostName + ":" + reginfo.HttpPort, 3000); | 602 | XmlRpcResponse GridResp = GridReq.Send(reginfo.ServerURI, 3000); |
603 | 603 | ||
604 | Hashtable responseData = (Hashtable)GridResp.Value; | 604 | Hashtable responseData = (Hashtable)GridResp.Value; |
605 | 605 | ||
@@ -621,8 +621,8 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage | |||
621 | } | 621 | } |
622 | catch (WebException e) | 622 | catch (WebException e) |
623 | { | 623 | { |
624 | m_log.ErrorFormat("[GRID INSTANT MESSAGE]: Error sending message to http://{0}:{1} the host didn't respond ({2})", | 624 | m_log.ErrorFormat("[GRID INSTANT MESSAGE]: Error sending message to {0}} the host didn't respond ({2})", |
625 | reginfo.ExternalHostName, reginfo.HttpPort, e.Message); | 625 | reginfo.ServerURI, e.Message); |
626 | } | 626 | } |
627 | 627 | ||
628 | return false; | 628 | return false; |
diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs index 38fff1c..54cc80f 100644 --- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs +++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs | |||
@@ -327,43 +327,21 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer | |||
327 | 327 | ||
328 | // OK, it got this agent. Let's close some child agents | 328 | // OK, it got this agent. Let's close some child agents |
329 | sp.CloseChildAgents(newRegionX, newRegionY); | 329 | sp.CloseChildAgents(newRegionX, newRegionY); |
330 | 330 | IClientIPEndpoint ipepClient; | |
331 | if (NeedsNewAgent(oldRegionX, newRegionX, oldRegionY, newRegionY)) | 331 | if (NeedsNewAgent(oldRegionX, newRegionX, oldRegionY, newRegionY)) |
332 | { | 332 | { |
333 | //sp.ControllingClient.SendTeleportProgress(teleportFlags, "Creating agent..."); | 333 | //sp.ControllingClient.SendTeleportProgress(teleportFlags, "Creating agent..."); |
334 | |||
335 | #region IP Translation for NAT | 334 | #region IP Translation for NAT |
336 | IClientIPEndpoint ipepClient; | 335 | // Uses ipepClient above |
337 | if (sp.ClientView.TryGet(out ipepClient)) | 336 | if (sp.ClientView.TryGet(out ipepClient)) |
338 | { | 337 | { |
339 | capsPath | 338 | endPoint.Address = NetworkUtil.GetIPFor(ipepClient.EndPoint, endPoint.Address); |
340 | = "http://" | ||
341 | + NetworkUtil.GetHostFor(ipepClient.EndPoint, finalDestination.ExternalHostName) | ||
342 | + ":" | ||
343 | + finalDestination.HttpPort | ||
344 | + CapsUtil.GetCapsSeedPath(agentCircuit.CapsPath); | ||
345 | } | ||
346 | else | ||
347 | { | ||
348 | capsPath | ||
349 | = "http://" | ||
350 | + finalDestination.ExternalHostName | ||
351 | + ":" | ||
352 | + finalDestination.HttpPort | ||
353 | + CapsUtil.GetCapsSeedPath(agentCircuit.CapsPath); | ||
354 | } | 339 | } |
355 | #endregion | 340 | #endregion |
341 | capsPath = finalDestination.ServerURI + CapsUtil.GetCapsSeedPath(agentCircuit.CapsPath); | ||
356 | 342 | ||
357 | if (eq != null) | 343 | if (eq != null) |
358 | { | 344 | { |
359 | #region IP Translation for NAT | ||
360 | // Uses ipepClient above | ||
361 | if (sp.ClientView.TryGet(out ipepClient)) | ||
362 | { | ||
363 | endPoint.Address = NetworkUtil.GetIPFor(ipepClient.EndPoint, endPoint.Address); | ||
364 | } | ||
365 | #endregion | ||
366 | |||
367 | eq.EnableSimulator(destinationHandle, endPoint, sp.UUID); | 345 | eq.EnableSimulator(destinationHandle, endPoint, sp.UUID); |
368 | 346 | ||
369 | // ES makes the client send a UseCircuitCode message to the destination, | 347 | // ES makes the client send a UseCircuitCode message to the destination, |
@@ -382,8 +360,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer | |||
382 | else | 360 | else |
383 | { | 361 | { |
384 | agentCircuit.CapsPath = sp.Scene.CapsModule.GetChildSeed(sp.UUID, reg.RegionHandle); | 362 | agentCircuit.CapsPath = sp.Scene.CapsModule.GetChildSeed(sp.UUID, reg.RegionHandle); |
385 | capsPath = "http://" + finalDestination.ExternalHostName + ":" + finalDestination.HttpPort | 363 | capsPath = finalDestination.ServerURI + CapsUtil.GetCapsSeedPath(agentCircuit.CapsPath); |
386 | + "/CAPS/" + agentCircuit.CapsPath + "0000/"; | ||
387 | } | 364 | } |
388 | 365 | ||
389 | // Expect avatar crossing is a heavy-duty function at the destination. | 366 | // Expect avatar crossing is a heavy-duty function at the destination. |
@@ -516,8 +493,8 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer | |||
516 | 493 | ||
517 | protected virtual void SetCallbackURL(AgentData agent, RegionInfo region) | 494 | protected virtual void SetCallbackURL(AgentData agent, RegionInfo region) |
518 | { | 495 | { |
519 | agent.CallbackURI = "http://" + region.ExternalHostName + ":" + region.HttpPort + | 496 | agent.CallbackURI = region.ServerURI + "agent/" + agent.AgentID.ToString() + "/" + region.RegionID.ToString() + "/release/"; |
520 | "/agent/" + agent.AgentID.ToString() + "/" + region.RegionID.ToString() + "/release/"; | 497 | m_log.Debug("Set callback URL to " + agent.CallbackURI); |
521 | 498 | ||
522 | } | 499 | } |
523 | 500 | ||
@@ -842,8 +819,8 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer | |||
842 | cAgent.Position = pos; | 819 | cAgent.Position = pos; |
843 | if (isFlying) | 820 | if (isFlying) |
844 | cAgent.ControlFlags |= (uint)AgentManager.ControlFlags.AGENT_CONTROL_FLY; | 821 | cAgent.ControlFlags |= (uint)AgentManager.ControlFlags.AGENT_CONTROL_FLY; |
845 | cAgent.CallbackURI = "http://" + m_scene.RegionInfo.ExternalHostName + ":" + m_scene.RegionInfo.HttpPort + | 822 | cAgent.CallbackURI = m_scene.RegionInfo.ServerURI + |
846 | "/agent/" + agent.UUID.ToString() + "/" + m_scene.RegionInfo.RegionID.ToString() + "/release/"; | 823 | "agent/" + agent.UUID.ToString() + "/" + m_scene.RegionInfo.RegionID.ToString() + "/release/"; |
847 | 824 | ||
848 | if (!m_scene.SimulationService.UpdateAgent(neighbourRegion, cAgent)) | 825 | if (!m_scene.SimulationService.UpdateAgent(neighbourRegion, cAgent)) |
849 | { | 826 | { |
@@ -868,10 +845,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer | |||
868 | neighbourRegion.RegionHandle); | 845 | neighbourRegion.RegionHandle); |
869 | return agent; | 846 | return agent; |
870 | } | 847 | } |
871 | // TODO Should construct this behind a method | 848 | string capsPath = neighbourRegion.ServerURI + CapsUtil.GetCapsSeedPath(agentcaps); |
872 | string capsPath = | ||
873 | "http://" + neighbourRegion.ExternalHostName + ":" + neighbourRegion.HttpPort | ||
874 | + "/CAPS/" + agentcaps /*circuitdata.CapsPath*/ + "0000/"; | ||
875 | 849 | ||
876 | m_log.DebugFormat("[ENTITY TRANSFER MODULE]: Sending new CAPS seed url {0} to client {1}", capsPath, agent.UUID); | 850 | m_log.DebugFormat("[ENTITY TRANSFER MODULE]: Sending new CAPS seed url {0} to client {1}", capsPath, agent.UUID); |
877 | 851 | ||
@@ -1190,8 +1164,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer | |||
1190 | y = y / Constants.RegionSize; | 1164 | y = y / Constants.RegionSize; |
1191 | m_log.Info("[ENTITY TRANSFER MODULE]: Starting to inform client about neighbour " + x + ", " + y + "(" + endPoint.ToString() + ")"); | 1165 | m_log.Info("[ENTITY TRANSFER MODULE]: Starting to inform client about neighbour " + x + ", " + y + "(" + endPoint.ToString() + ")"); |
1192 | 1166 | ||
1193 | string capsPath = "http://" + reg.ExternalHostName + ":" + reg.HttpPort | 1167 | string capsPath = reg.ServerURI + CapsUtil.GetCapsSeedPath(a.CapsPath); |
1194 | + "/CAPS/" + a.CapsPath + "0000/"; | ||
1195 | 1168 | ||
1196 | string reason = String.Empty; | 1169 | string reason = String.Empty; |
1197 | 1170 | ||
diff --git a/OpenSim/Region/CoreModules/InterGrid/OpenGridProtocolModule.cs b/OpenSim/Region/CoreModules/InterGrid/OpenGridProtocolModule.cs index fd0e879..2dd7767 100644 --- a/OpenSim/Region/CoreModules/InterGrid/OpenGridProtocolModule.cs +++ b/OpenSim/Region/CoreModules/InterGrid/OpenGridProtocolModule.cs | |||
@@ -595,12 +595,12 @@ namespace OpenSim.Region.CoreModules.InterGrid | |||
595 | // DEPRECATED | 595 | // DEPRECATED |
596 | responseMap["seed_capability"] | 596 | responseMap["seed_capability"] |
597 | = OSD.FromString( | 597 | = OSD.FromString( |
598 | regionCapsHttpProtocol + httpaddr + ":" + reg.HttpPort + CapsUtil.GetCapsSeedPath(userCap.CapsObjectPath)); | 598 | regionCapsHttpProtocol + httpaddr + ":" + reg.HttpPort + "/" + CapsUtil.GetCapsSeedPath(userCap.CapsObjectPath)); |
599 | 599 | ||
600 | // REPLACEMENT | 600 | // REPLACEMENT |
601 | responseMap["region_seed_capability"] | 601 | responseMap["region_seed_capability"] |
602 | = OSD.FromString( | 602 | = OSD.FromString( |
603 | regionCapsHttpProtocol + httpaddr + ":" + reg.HttpPort + CapsUtil.GetCapsSeedPath(userCap.CapsObjectPath)); | 603 | regionCapsHttpProtocol + httpaddr + ":" + reg.HttpPort + "/" + CapsUtil.GetCapsSeedPath(userCap.CapsObjectPath)); |
604 | 604 | ||
605 | responseMap["rez_avatar"] = OSD.FromString(rezHttpProtocol + httpaddr + ":" + urlport + rezAvatarPath); | 605 | responseMap["rez_avatar"] = OSD.FromString(rezHttpProtocol + httpaddr + ":" + urlport + rezAvatarPath); |
606 | responseMap["rez_avatar/rez"] = OSD.FromString(rezHttpProtocol + httpaddr + ":" + urlport + rezAvatarPath); | 606 | responseMap["rez_avatar/rez"] = OSD.FromString(rezHttpProtocol + httpaddr + ":" + urlport + rezAvatarPath); |
diff --git a/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs b/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs index a182eea..fdbbccf 100644 --- a/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs +++ b/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs | |||
@@ -147,7 +147,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap | |||
147 | 147 | ||
148 | string regionimage = "regionImage" + m_scene.RegionInfo.RegionID.ToString(); | 148 | string regionimage = "regionImage" + m_scene.RegionInfo.RegionID.ToString(); |
149 | regionimage = regionimage.Replace("-", ""); | 149 | regionimage = regionimage.Replace("-", ""); |
150 | m_log.Info("[WORLD MAP]: JPEG Map location: http://" + m_scene.RegionInfo.ExternalEndPoint.Address.ToString() + ":" + m_scene.RegionInfo.HttpPort.ToString() + "/index.php?method=" + regionimage); | 150 | m_log.Info("[WORLD MAP]: JPEG Map location: " + m_scene.RegionInfo.ServerURI + "/index.php?method=" + regionimage); |
151 | 151 | ||
152 | MainServer.Instance.AddHTTPHandler(regionimage, OnHTTPGetMapImage); | 152 | MainServer.Instance.AddHTTPHandler(regionimage, OnHTTPGetMapImage); |
153 | MainServer.Instance.AddLLSDHandler( | 153 | MainServer.Instance.AddLLSDHandler( |
@@ -579,7 +579,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap | |||
579 | 579 | ||
580 | if (mreg != null) | 580 | if (mreg != null) |
581 | { | 581 | { |
582 | httpserver = "http://" + mreg.ExternalEndPoint.Address.ToString() + ":" + mreg.HttpPort + "/MAP/MapItems/" + regionhandle.ToString(); | 582 | httpserver = mreg.ServerURI + "MAP/MapItems/" + regionhandle.ToString(); |
583 | lock (m_cachedRegionMapItemsAddress) | 583 | lock (m_cachedRegionMapItemsAddress) |
584 | { | 584 | { |
585 | if (!m_cachedRegionMapItemsAddress.ContainsKey(regionhandle)) | 585 | if (!m_cachedRegionMapItemsAddress.ContainsKey(regionhandle)) |
diff --git a/OpenSim/Server/Handlers/Hypergrid/HomeAgentHandlers.cs b/OpenSim/Server/Handlers/Hypergrid/HomeAgentHandlers.cs index f64a079..a1bcba6 100644 --- a/OpenSim/Server/Handlers/Hypergrid/HomeAgentHandlers.cs +++ b/OpenSim/Server/Handlers/Hypergrid/HomeAgentHandlers.cs | |||
@@ -124,6 +124,7 @@ namespace OpenSim.Server.Handlers.Hypergrid | |||
124 | UUID uuid = UUID.Zero; | 124 | UUID uuid = UUID.Zero; |
125 | string regionname = string.Empty; | 125 | string regionname = string.Empty; |
126 | string gatekeeper_host = string.Empty; | 126 | string gatekeeper_host = string.Empty; |
127 | string server_uri = string.Empty; | ||
127 | int gatekeeper_port = 0; | 128 | int gatekeeper_port = 0; |
128 | IPEndPoint client_ipaddress = null; | 129 | IPEndPoint client_ipaddress = null; |
129 | 130 | ||
@@ -173,6 +174,7 @@ namespace OpenSim.Server.Handlers.Hypergrid | |||
173 | destination.RegionLocX = x; | 174 | destination.RegionLocX = x; |
174 | destination.RegionLocY = y; | 175 | destination.RegionLocY = y; |
175 | destination.RegionName = regionname; | 176 | destination.RegionName = regionname; |
177 | |||
176 | 178 | ||
177 | AgentCircuitData aCircuit = new AgentCircuitData(); | 179 | AgentCircuitData aCircuit = new AgentCircuitData(); |
178 | try | 180 | try |
diff --git a/OpenSim/Services/Connectors/Hypergrid/GatekeeperServiceConnector.cs b/OpenSim/Services/Connectors/Hypergrid/GatekeeperServiceConnector.cs index 479a80e..2b19b87 100644 --- a/OpenSim/Services/Connectors/Hypergrid/GatekeeperServiceConnector.cs +++ b/OpenSim/Services/Connectors/Hypergrid/GatekeeperServiceConnector.cs | |||
@@ -63,12 +63,12 @@ namespace OpenSim.Services.Connectors.Hypergrid | |||
63 | 63 | ||
64 | protected override string AgentPath() | 64 | protected override string AgentPath() |
65 | { | 65 | { |
66 | return "/foreignagent/"; | 66 | return "foreignagent/"; |
67 | } | 67 | } |
68 | 68 | ||
69 | protected override string ObjectPath() | 69 | protected override string ObjectPath() |
70 | { | 70 | { |
71 | return "/foreignobject/"; | 71 | return "foreignobject/"; |
72 | } | 72 | } |
73 | 73 | ||
74 | public bool LinkRegion(GridRegion info, out UUID regionID, out ulong realHandle, out string externalName, out string imageURL, out string reason) | 74 | public bool LinkRegion(GridRegion info, out UUID regionID, out ulong realHandle, out string externalName, out string imageURL, out string reason) |
@@ -86,12 +86,11 @@ namespace OpenSim.Services.Connectors.Hypergrid | |||
86 | paramList.Add(hash); | 86 | paramList.Add(hash); |
87 | 87 | ||
88 | XmlRpcRequest request = new XmlRpcRequest("link_region", paramList); | 88 | XmlRpcRequest request = new XmlRpcRequest("link_region", paramList); |
89 | string uri = "http://" + ((info.ServerURI != null && info.ServerURI != string.Empty && !info.ServerURI.StartsWith("http:")) ? info.ServerURI : info.ExternalEndPoint.Address + ":" + info.HttpPort + "/"); | 89 | m_log.Debug("[GATEKEEPER SERVICE CONNECTOR]: Linking to " + info.ServerURI); |
90 | m_log.Debug("[GATEKEEPER SERVICE CONNECTOR]: Linking to " + uri); | ||
91 | XmlRpcResponse response = null; | 90 | XmlRpcResponse response = null; |
92 | try | 91 | try |
93 | { | 92 | { |
94 | response = request.Send(uri, 10000); | 93 | response = request.Send(info.ServerURI, 10000); |
95 | } | 94 | } |
96 | catch (Exception e) | 95 | catch (Exception e) |
97 | { | 96 | { |
@@ -108,8 +107,8 @@ namespace OpenSim.Services.Connectors.Hypergrid | |||
108 | } | 107 | } |
109 | 108 | ||
110 | hash = (Hashtable)response.Value; | 109 | hash = (Hashtable)response.Value; |
111 | //foreach (Object o in hash) | 110 | foreach (Object o in hash) |
112 | // m_log.Debug(">> " + ((DictionaryEntry)o).Key + ":" + ((DictionaryEntry)o).Value); | 111 | m_log.Debug(">> " + ((DictionaryEntry)o).Key + ":" + ((DictionaryEntry)o).Value); |
113 | try | 112 | try |
114 | { | 113 | { |
115 | bool success = false; | 114 | bool success = false; |
@@ -117,16 +116,20 @@ namespace OpenSim.Services.Connectors.Hypergrid | |||
117 | if (success) | 116 | if (success) |
118 | { | 117 | { |
119 | UUID.TryParse((string)hash["uuid"], out regionID); | 118 | UUID.TryParse((string)hash["uuid"], out regionID); |
120 | //m_log.Debug(">> HERE, uuid: " + uuid); | 119 | m_log.Debug(">> HERE, uuid: " + regionID); |
121 | if ((string)hash["handle"] != null) | 120 | if ((string)hash["handle"] != null) |
122 | { | 121 | { |
123 | realHandle = Convert.ToUInt64((string)hash["handle"]); | 122 | realHandle = Convert.ToUInt64((string)hash["handle"]); |
124 | //m_log.Debug(">> HERE, realHandle: " + realHandle); | 123 | m_log.Debug(">> HERE, realHandle: " + realHandle); |
125 | } | 124 | } |
126 | if (hash["region_image"] != null) | 125 | if (hash["region_image"] != null) { |
127 | imageURL = (string)hash["region_image"]; | 126 | imageURL = (string)hash["region_image"]; |
128 | if (hash["external_name"] != null) | 127 | m_log.Debug(">> HERE, imageURL: " + imageURL); |
128 | } | ||
129 | if (hash["external_name"] != null) { | ||
129 | externalName = (string)hash["external_name"]; | 130 | externalName = (string)hash["external_name"]; |
131 | m_log.Debug(">> HERE, externalName: " + externalName); | ||
132 | } | ||
130 | } | 133 | } |
131 | 134 | ||
132 | } | 135 | } |
@@ -188,12 +191,11 @@ namespace OpenSim.Services.Connectors.Hypergrid | |||
188 | paramList.Add(hash); | 191 | paramList.Add(hash); |
189 | 192 | ||
190 | XmlRpcRequest request = new XmlRpcRequest("get_region", paramList); | 193 | XmlRpcRequest request = new XmlRpcRequest("get_region", paramList); |
191 | string uri = "http://" + ((gatekeeper.ServerURI != null && gatekeeper.ServerURI != string.Empty && !gatekeeper.ServerURI.StartsWith("http:")) ? gatekeeper.ServerURI : gatekeeper.ExternalEndPoint.Address + ":" + gatekeeper.HttpPort + "/"); | 194 | m_log.Debug("[GATEKEEPER SERVICE CONNECTOR]: contacting " + gatekeeper.ServerURI); |
192 | m_log.Debug("[GATEKEEPER SERVICE CONNECTOR]: contacting " + uri); | ||
193 | XmlRpcResponse response = null; | 195 | XmlRpcResponse response = null; |
194 | try | 196 | try |
195 | { | 197 | { |
196 | response = request.Send(uri, 10000); | 198 | response = request.Send(gatekeeper.ServerURI, 10000); |
197 | } | 199 | } |
198 | catch (Exception e) | 200 | catch (Exception e) |
199 | { | 201 | { |
@@ -208,8 +210,8 @@ namespace OpenSim.Services.Connectors.Hypergrid | |||
208 | } | 210 | } |
209 | 211 | ||
210 | hash = (Hashtable)response.Value; | 212 | hash = (Hashtable)response.Value; |
211 | //foreach (Object o in hash) | 213 | foreach (Object o in hash) |
212 | // m_log.Debug(">> " + ((DictionaryEntry)o).Key + ":" + ((DictionaryEntry)o).Value); | 214 | m_log.Debug(">> " + ((DictionaryEntry)o).Key + ":" + ((DictionaryEntry)o).Value); |
213 | try | 215 | try |
214 | { | 216 | { |
215 | bool success = false; | 217 | bool success = false; |
@@ -219,38 +221,41 @@ namespace OpenSim.Services.Connectors.Hypergrid | |||
219 | GridRegion region = new GridRegion(); | 221 | GridRegion region = new GridRegion(); |
220 | 222 | ||
221 | UUID.TryParse((string)hash["uuid"], out region.RegionID); | 223 | UUID.TryParse((string)hash["uuid"], out region.RegionID); |
222 | //m_log.Debug(">> HERE, uuid: " + region.RegionID); | 224 | m_log.Debug(">> HERE, uuid: " + region.RegionID); |
223 | int n = 0; | 225 | int n = 0; |
224 | if (hash["x"] != null) | 226 | if (hash["x"] != null) |
225 | { | 227 | { |
226 | Int32.TryParse((string)hash["x"], out n); | 228 | Int32.TryParse((string)hash["x"], out n); |
227 | region.RegionLocX = n; | 229 | region.RegionLocX = n; |
228 | //m_log.Debug(">> HERE, x: " + region.RegionLocX); | 230 | m_log.Debug(">> HERE, x: " + region.RegionLocX); |
229 | } | 231 | } |
230 | if (hash["y"] != null) | 232 | if (hash["y"] != null) |
231 | { | 233 | { |
232 | Int32.TryParse((string)hash["y"], out n); | 234 | Int32.TryParse((string)hash["y"], out n); |
233 | region.RegionLocY = n; | 235 | region.RegionLocY = n; |
234 | //m_log.Debug(">> HERE, y: " + region.RegionLocY); | 236 | m_log.Debug(">> HERE, y: " + region.RegionLocY); |
235 | } | 237 | } |
236 | if (hash["region_name"] != null) | 238 | if (hash["region_name"] != null) |
237 | { | 239 | { |
238 | region.RegionName = (string)hash["region_name"]; | 240 | region.RegionName = (string)hash["region_name"]; |
239 | //m_log.Debug(">> HERE, name: " + region.RegionName); | 241 | m_log.Debug(">> HERE, region_name: " + region.RegionName); |
240 | } | 242 | } |
241 | if (hash["hostname"] != null) | 243 | if (hash["hostname"] != null) |
242 | region.ExternalHostName = (string)hash["hostname"]; | 244 | region.ExternalHostName = (string)hash["hostname"]; |
245 | m_log.Debug(">> HERE, hostname: " + region.ExternalHostName); | ||
243 | if (hash["http_port"] != null) | 246 | if (hash["http_port"] != null) |
244 | { | 247 | { |
245 | uint p = 0; | 248 | uint p = 0; |
246 | UInt32.TryParse((string)hash["http_port"], out p); | 249 | UInt32.TryParse((string)hash["http_port"], out p); |
247 | region.HttpPort = p; | 250 | region.HttpPort = p; |
251 | m_log.Debug(">> HERE, http_port: " + region.HttpPort); | ||
248 | } | 252 | } |
249 | if (hash["internal_port"] != null) | 253 | if (hash["internal_port"] != null) |
250 | { | 254 | { |
251 | int p = 0; | 255 | int p = 0; |
252 | Int32.TryParse((string)hash["internal_port"], out p); | 256 | Int32.TryParse((string)hash["internal_port"], out p); |
253 | region.InternalEndPoint = new IPEndPoint(IPAddress.Parse("0.0.0.0"), p); | 257 | region.InternalEndPoint = new IPEndPoint(IPAddress.Parse("0.0.0.0"), p); |
258 | m_log.Debug(">> HERE, internal_port: " + region.InternalEndPoint); | ||
254 | } | 259 | } |
255 | 260 | ||
256 | // Successful return | 261 | // Successful return |
diff --git a/OpenSim/Services/Connectors/Land/LandServiceConnector.cs b/OpenSim/Services/Connectors/Land/LandServiceConnector.cs index 8143b5a..4b25ac8 100644 --- a/OpenSim/Services/Connectors/Land/LandServiceConnector.cs +++ b/OpenSim/Services/Connectors/Land/LandServiceConnector.cs | |||
@@ -84,8 +84,7 @@ namespace OpenSim.Services.Connectors | |||
84 | if (info != null) // just to be sure | 84 | if (info != null) // just to be sure |
85 | { | 85 | { |
86 | XmlRpcRequest request = new XmlRpcRequest("land_data", paramList); | 86 | XmlRpcRequest request = new XmlRpcRequest("land_data", paramList); |
87 | string uri = "http://" + info.ExternalEndPoint.Address + ":" + info.HttpPort + "/"; | 87 | XmlRpcResponse response = request.Send(info.ServerURI, 10000); |
88 | XmlRpcResponse response = request.Send(uri, 10000); | ||
89 | if (response.IsFault) | 88 | if (response.IsFault) |
90 | { | 89 | { |
91 | m_log.ErrorFormat("[LAND CONNECTOR]: remote call returned an error: {0}", response.FaultString); | 90 | m_log.ErrorFormat("[LAND CONNECTOR]: remote call returned an error: {0}", response.FaultString); |
diff --git a/OpenSim/Services/Connectors/Neighbour/NeighbourServiceConnector.cs b/OpenSim/Services/Connectors/Neighbour/NeighbourServiceConnector.cs index 0a982f8..9c57a40 100644 --- a/OpenSim/Services/Connectors/Neighbour/NeighbourServiceConnector.cs +++ b/OpenSim/Services/Connectors/Neighbour/NeighbourServiceConnector.cs | |||
@@ -87,7 +87,7 @@ namespace OpenSim.Services.Connectors | |||
87 | 87 | ||
88 | public bool DoHelloNeighbourCall(GridRegion region, RegionInfo thisRegion) | 88 | public bool DoHelloNeighbourCall(GridRegion region, RegionInfo thisRegion) |
89 | { | 89 | { |
90 | string uri = "http://" + region.ExternalEndPoint.Address + ":" + region.HttpPort + "/region/" + thisRegion.RegionID + "/"; | 90 | string uri = region.ServerURI + "/region/" + thisRegion.RegionID + "/"; |
91 | //m_log.Debug(" >>> DoHelloNeighbourCall <<< " + uri); | 91 | //m_log.Debug(" >>> DoHelloNeighbourCall <<< " + uri); |
92 | 92 | ||
93 | WebRequest HelloNeighbourRequest = WebRequest.Create(uri); | 93 | WebRequest HelloNeighbourRequest = WebRequest.Create(uri); |
diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianGridServiceConnector.cs b/OpenSim/Services/Connectors/SimianGrid/SimianGridServiceConnector.cs index 168b233..8076fab 100644 --- a/OpenSim/Services/Connectors/SimianGrid/SimianGridServiceConnector.cs +++ b/OpenSim/Services/Connectors/SimianGrid/SimianGridServiceConnector.cs | |||
@@ -145,8 +145,6 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
145 | Vector3d minPosition = new Vector3d(regionInfo.RegionLocX, regionInfo.RegionLocY, 0.0); | 145 | Vector3d minPosition = new Vector3d(regionInfo.RegionLocX, regionInfo.RegionLocY, 0.0); |
146 | Vector3d maxPosition = minPosition + new Vector3d(Constants.RegionSize, Constants.RegionSize, 4096.0); | 146 | Vector3d maxPosition = minPosition + new Vector3d(Constants.RegionSize, Constants.RegionSize, 4096.0); |
147 | 147 | ||
148 | string httpAddress = "http://" + regionInfo.ExternalHostName + ":" + regionInfo.HttpPort + "/"; | ||
149 | |||
150 | OSDMap extraData = new OSDMap | 148 | OSDMap extraData = new OSDMap |
151 | { | 149 | { |
152 | { "ServerURI", OSD.FromString(regionInfo.ServerURI) }, | 150 | { "ServerURI", OSD.FromString(regionInfo.ServerURI) }, |
@@ -168,7 +166,7 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
168 | { "Name", regionInfo.RegionName }, | 166 | { "Name", regionInfo.RegionName }, |
169 | { "MinPosition", minPosition.ToString() }, | 167 | { "MinPosition", minPosition.ToString() }, |
170 | { "MaxPosition", maxPosition.ToString() }, | 168 | { "MaxPosition", maxPosition.ToString() }, |
171 | { "Address", httpAddress }, | 169 | { "Address", regionInfo.ServerURI }, |
172 | { "Enabled", "1" }, | 170 | { "Enabled", "1" }, |
173 | { "ExtraData", OSDParser.SerializeJsonString(extraData) } | 171 | { "ExtraData", OSDParser.SerializeJsonString(extraData) } |
174 | }; | 172 | }; |
diff --git a/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs b/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs index a5f748f..c4284eb 100644 --- a/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs +++ b/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs | |||
@@ -72,7 +72,7 @@ namespace OpenSim.Services.Connectors.Simulation | |||
72 | 72 | ||
73 | protected virtual string AgentPath() | 73 | protected virtual string AgentPath() |
74 | { | 74 | { |
75 | return "/agent/"; | 75 | return "agent/"; |
76 | } | 76 | } |
77 | 77 | ||
78 | public bool CreateAgent(GridRegion destination, AgentCircuitData aCircuit, uint flags, out string reason) | 78 | public bool CreateAgent(GridRegion destination, AgentCircuitData aCircuit, uint flags, out string reason) |
@@ -104,26 +104,7 @@ namespace OpenSim.Services.Connectors.Simulation | |||
104 | return false; | 104 | return false; |
105 | } | 105 | } |
106 | 106 | ||
107 | string uri = string.Empty; | 107 | string uri = destination.ServerURI + AgentPath() + aCircuit.AgentID + "/"; |
108 | |||
109 | // HACK -- Simian grid make it work!!! | ||
110 | if (destination.ServerURI != null && destination.ServerURI != string.Empty && !destination.ServerURI.StartsWith("http:")) | ||
111 | uri = "http://" + destination.ServerURI + AgentPath() + aCircuit.AgentID + "/"; | ||
112 | else | ||
113 | { | ||
114 | try | ||
115 | { | ||
116 | uri = "http://" + destination.ExternalEndPoint.Address + ":" + destination.HttpPort + AgentPath() + aCircuit.AgentID + "/"; | ||
117 | } | ||
118 | catch (Exception e) | ||
119 | { | ||
120 | m_log.Debug("[REMOTE SIMULATION CONNECTOR]: Unable to resolve external endpoint on agent create. Reason: " + e.Message); | ||
121 | reason = e.Message; | ||
122 | return false; | ||
123 | } | ||
124 | } | ||
125 | |||
126 | //Console.WriteLine(" >>> DoCreateChildAgentCall <<< " + uri); | ||
127 | 108 | ||
128 | AgentCreateRequest = (HttpWebRequest)WebRequest.Create(uri); | 109 | AgentCreateRequest = (HttpWebRequest)WebRequest.Create(uri); |
129 | AgentCreateRequest.Method = "POST"; | 110 | AgentCreateRequest.Method = "POST"; |
@@ -277,17 +258,7 @@ namespace OpenSim.Services.Connectors.Simulation | |||
277 | private bool UpdateAgent(GridRegion destination, IAgentData cAgentData) | 258 | private bool UpdateAgent(GridRegion destination, IAgentData cAgentData) |
278 | { | 259 | { |
279 | // Eventually, we want to use a caps url instead of the agentID | 260 | // Eventually, we want to use a caps url instead of the agentID |
280 | string uri = string.Empty; | 261 | string uri = destination.ServerURI + AgentPath() + cAgentData.AgentID + "/"; |
281 | try | ||
282 | { | ||
283 | uri = "http://" + destination.ExternalEndPoint.Address + ":" + destination.HttpPort + AgentPath() + cAgentData.AgentID + "/"; | ||
284 | } | ||
285 | catch (Exception e) | ||
286 | { | ||
287 | m_log.Debug("[REMOTE SIMULATION CONNECTOR]: Unable to resolve external endpoint on agent update. Reason: " + e.Message); | ||
288 | return false; | ||
289 | } | ||
290 | //Console.WriteLine(" >>> DoAgentUpdateCall <<< " + uri); | ||
291 | 262 | ||
292 | HttpWebRequest ChildUpdateRequest = (HttpWebRequest)WebRequest.Create(uri); | 263 | HttpWebRequest ChildUpdateRequest = (HttpWebRequest)WebRequest.Create(uri); |
293 | ChildUpdateRequest.Method = "PUT"; | 264 | ChildUpdateRequest.Method = "PUT"; |
@@ -385,8 +356,7 @@ namespace OpenSim.Services.Connectors.Simulation | |||
385 | { | 356 | { |
386 | agent = null; | 357 | agent = null; |
387 | // Eventually, we want to use a caps url instead of the agentID | 358 | // Eventually, we want to use a caps url instead of the agentID |
388 | string uri = "http://" + destination.ExternalEndPoint.Address + ":" + destination.HttpPort + AgentPath() + id + "/" + destination.RegionID.ToString() + "/"; | 359 | string uri = destination.ServerURI + AgentPath() + id + "/" + destination.RegionID.ToString() + "/"; |
389 | //Console.WriteLine(" >>> DoRetrieveRootAgentCall <<< " + uri); | ||
390 | 360 | ||
391 | HttpWebRequest request = (HttpWebRequest)WebRequest.Create(uri); | 361 | HttpWebRequest request = (HttpWebRequest)WebRequest.Create(uri); |
392 | request.Method = "GET"; | 362 | request.Method = "GET"; |
@@ -407,7 +377,6 @@ namespace OpenSim.Services.Connectors.Simulation | |||
407 | sr = new StreamReader(webResponse.GetResponseStream()); | 377 | sr = new StreamReader(webResponse.GetResponseStream()); |
408 | reply = sr.ReadToEnd().Trim(); | 378 | reply = sr.ReadToEnd().Trim(); |
409 | 379 | ||
410 | //Console.WriteLine("[REMOTE SIMULATION CONNECTOR]: ChilAgentUpdate reply was " + reply); | ||
411 | 380 | ||
412 | } | 381 | } |
413 | catch (WebException ex) | 382 | catch (WebException ex) |
@@ -428,7 +397,6 @@ namespace OpenSim.Services.Connectors.Simulation | |||
428 | OSDMap args = Util.GetOSDMap(reply); | 397 | OSDMap args = Util.GetOSDMap(reply); |
429 | if (args == null) | 398 | if (args == null) |
430 | { | 399 | { |
431 | //Console.WriteLine("[REMOTE SIMULATION CONNECTOR]: Error getting OSDMap from reply"); | ||
432 | return false; | 400 | return false; |
433 | } | 401 | } |
434 | 402 | ||
@@ -437,7 +405,6 @@ namespace OpenSim.Services.Connectors.Simulation | |||
437 | return true; | 405 | return true; |
438 | } | 406 | } |
439 | 407 | ||
440 | //Console.WriteLine("[REMOTE SIMULATION CONNECTOR]: DoRetrieveRootAgentCall returned status " + webResponse.StatusCode); | ||
441 | return false; | 408 | return false; |
442 | } | 409 | } |
443 | 410 | ||
@@ -479,18 +446,8 @@ namespace OpenSim.Services.Connectors.Simulation | |||
479 | 446 | ||
480 | public bool CloseAgent(GridRegion destination, UUID id) | 447 | public bool CloseAgent(GridRegion destination, UUID id) |
481 | { | 448 | { |
482 | string uri = string.Empty; | 449 | string uri = destination.ServerURI + AgentPath() + id + "/" + destination.RegionID.ToString() + "/"; |
483 | try | ||
484 | { | ||
485 | uri = "http://" + destination.ExternalEndPoint.Address + ":" + destination.HttpPort + AgentPath() + id + "/" + destination.RegionID.ToString() + "/"; | ||
486 | } | ||
487 | catch (Exception e) | ||
488 | { | ||
489 | m_log.Debug("[REMOTE SIMULATION CONNECTOR]: Unable to resolve external endpoint on agent close. Reason: " + e.Message); | ||
490 | return false; | ||
491 | } | ||
492 | 450 | ||
493 | //Console.WriteLine(" >>> DoCloseAgentCall <<< " + uri); | ||
494 | 451 | ||
495 | WebRequest request = WebRequest.Create(uri); | 452 | WebRequest request = WebRequest.Create(uri); |
496 | request.Method = "DELETE"; | 453 | request.Method = "DELETE"; |
@@ -538,7 +495,7 @@ namespace OpenSim.Services.Connectors.Simulation | |||
538 | public bool CreateObject(GridRegion destination, ISceneObject sog, bool isLocalCall) | 495 | public bool CreateObject(GridRegion destination, ISceneObject sog, bool isLocalCall) |
539 | { | 496 | { |
540 | string uri | 497 | string uri |
541 | = "http://" + destination.ExternalEndPoint.Address + ":" + destination.HttpPort + ObjectPath() + sog.UUID + "/"; | 498 | = destination.ServerURI + ObjectPath() + sog.UUID + "/"; |
542 | //m_log.Debug(" >>> DoCreateObjectCall <<< " + uri); | 499 | //m_log.Debug(" >>> DoCreateObjectCall <<< " + uri); |
543 | 500 | ||
544 | WebRequest ObjectCreateRequest = WebRequest.Create(uri); | 501 | WebRequest ObjectCreateRequest = WebRequest.Create(uri); |
diff --git a/OpenSim/Services/GridService/GridService.cs b/OpenSim/Services/GridService/GridService.cs index e7988d6..125c2be 100644 --- a/OpenSim/Services/GridService/GridService.cs +++ b/OpenSim/Services/GridService/GridService.cs | |||
@@ -479,7 +479,7 @@ namespace OpenSim.Services.GridService | |||
479 | OpenSim.Data.RegionFlags flags = (OpenSim.Data.RegionFlags)Convert.ToInt32(r.Data["flags"]); | 479 | OpenSim.Data.RegionFlags flags = (OpenSim.Data.RegionFlags)Convert.ToInt32(r.Data["flags"]); |
480 | MainConsole.Instance.Output(String.Format("{0,-20} {1}\n{2,-20} {3}\n{4,-39} {5}\n\n", | 480 | MainConsole.Instance.Output(String.Format("{0,-20} {1}\n{2,-20} {3}\n{4,-39} {5}\n\n", |
481 | r.RegionName, r.RegionID, | 481 | r.RegionName, r.RegionID, |
482 | String.Format("{0},{1}", r.posX, r.posY), "http://" + r.Data["serverIP"].ToString() + ":" + r.Data["serverPort"].ToString(), | 482 | String.Format("{0},{1}", r.posX, r.posY), r.Data["serverURI"], |
483 | r.Data["owner_uuid"].ToString(), flags.ToString())); | 483 | r.Data["owner_uuid"].ToString(), flags.ToString())); |
484 | } | 484 | } |
485 | return; | 485 | return; |
diff --git a/OpenSim/Services/GridService/HypergridLinker.cs b/OpenSim/Services/GridService/HypergridLinker.cs index b86fb6f..74e864b 100644 --- a/OpenSim/Services/GridService/HypergridLinker.cs +++ b/OpenSim/Services/GridService/HypergridLinker.cs | |||
@@ -127,7 +127,7 @@ namespace OpenSim.Services.GridService | |||
127 | if (MainConsole.Instance != null) | 127 | if (MainConsole.Instance != null) |
128 | { | 128 | { |
129 | MainConsole.Instance.Commands.AddCommand("hypergrid", false, "link-region", | 129 | MainConsole.Instance.Commands.AddCommand("hypergrid", false, "link-region", |
130 | "link-region <Xloc> <Yloc> <HostName>:<HttpPort>[:<RemoteRegionName>] <cr>", | 130 | "link-region <Xloc> <Yloc> <RegionIP> <RegionPort> [<RegionServerURI] [<RemoteRegionName>] <cr>", |
131 | "Link a hypergrid region", RunCommand); | 131 | "Link a hypergrid region", RunCommand); |
132 | MainConsole.Instance.Commands.AddCommand("hypergrid", false, "unlink-region", | 132 | MainConsole.Instance.Commands.AddCommand("hypergrid", false, "unlink-region", |
133 | "unlink-region <local name> or <HostName>:<HttpPort> <cr>", | 133 | "unlink-region <local name> or <HostName>:<HttpPort> <cr>", |
@@ -198,11 +198,7 @@ namespace OpenSim.Services.GridService | |||
198 | 198 | ||
199 | return null; | 199 | return null; |
200 | } | 200 | } |
201 | 201 | public bool TryCreateLink(UUID scopeID, int xloc, int yloc, string externalRegionName, uint externalPort, string externalHostName, out GridRegion regInfo, out string reason) | |
202 | |||
203 | // From the command line and the 2 above | ||
204 | public bool TryCreateLink(UUID scopeID, int xloc, int yloc, | ||
205 | string externalRegionName, uint externalPort, string externalHostName, out GridRegion regInfo, out string reason) | ||
206 | { | 202 | { |
207 | m_log.DebugFormat("[HYPERGRID LINKER]: Link to {0}:{1}:{2}, in {3}-{4}", externalHostName, externalPort, externalRegionName, xloc, yloc); | 203 | m_log.DebugFormat("[HYPERGRID LINKER]: Link to {0}:{1}:{2}, in {3}-{4}", externalHostName, externalPort, externalRegionName, xloc, yloc); |
208 | 204 | ||
@@ -217,8 +213,11 @@ namespace OpenSim.Services.GridService | |||
217 | 213 | ||
218 | // Big HACK for Simian Grid !!! | 214 | // Big HACK for Simian Grid !!! |
219 | // We need to clean up all URLs used in OpenSim !!! | 215 | // We need to clean up all URLs used in OpenSim !!! |
220 | if (externalHostName.Contains("/")) | 216 | if (externalHostName.Contains("/")) { |
221 | regInfo.ServerURI = externalHostName; | 217 | regInfo.ServerURI = externalHostName; |
218 | } else { | ||
219 | regInfo.ServerURI = "http://" + externalHostName + ":" + externalPort.ToString(); | ||
220 | } | ||
222 | 221 | ||
223 | try | 222 | try |
224 | { | 223 | { |
@@ -509,12 +508,16 @@ namespace OpenSim.Services.GridService | |||
509 | int xloc, yloc; | 508 | int xloc, yloc; |
510 | uint externalPort; | 509 | uint externalPort; |
511 | string externalHostName; | 510 | string externalHostName; |
511 | string serverURI; | ||
512 | try | 512 | try |
513 | { | 513 | { |
514 | xloc = Convert.ToInt32(cmdparams[0]); | 514 | xloc = Convert.ToInt32(cmdparams[0]); |
515 | yloc = Convert.ToInt32(cmdparams[1]); | 515 | yloc = Convert.ToInt32(cmdparams[1]); |
516 | externalPort = Convert.ToUInt32(cmdparams[3]); | 516 | externalPort = Convert.ToUInt32(cmdparams[3]); |
517 | externalHostName = cmdparams[2]; | 517 | externalHostName = cmdparams[2]; |
518 | if ( cmdparams.Length == 4 ) { | ||
519 | |||
520 | } | ||
518 | //internalPort = Convert.ToUInt32(cmdparams[4]); | 521 | //internalPort = Convert.ToUInt32(cmdparams[4]); |
519 | //remotingPort = Convert.ToUInt32(cmdparams[5]); | 522 | //remotingPort = Convert.ToUInt32(cmdparams[5]); |
520 | } | 523 | } |
diff --git a/OpenSim/Services/HypergridService/GatekeeperService.cs b/OpenSim/Services/HypergridService/GatekeeperService.cs index 3f5c4f1..9e96163 100644 --- a/OpenSim/Services/HypergridService/GatekeeperService.cs +++ b/OpenSim/Services/HypergridService/GatekeeperService.cs | |||
@@ -157,7 +157,7 @@ namespace OpenSim.Services.HypergridService | |||
157 | string regionimage = "regionImage" + region.RegionID.ToString(); | 157 | string regionimage = "regionImage" + region.RegionID.ToString(); |
158 | regionimage = regionimage.Replace("-", ""); | 158 | regionimage = regionimage.Replace("-", ""); |
159 | 159 | ||
160 | imageURL = "http://" + region.ExternalHostName + ":" + region.HttpPort + "/index.php?method=" + regionimage; | 160 | imageURL = region.ServerURI + "index.php?method=" + regionimage; |
161 | 161 | ||
162 | return true; | 162 | return true; |
163 | } | 163 | } |
diff --git a/OpenSim/Services/HypergridService/UserAgentService.cs b/OpenSim/Services/HypergridService/UserAgentService.cs index eb6433c..aed2dc8 100644 --- a/OpenSim/Services/HypergridService/UserAgentService.cs +++ b/OpenSim/Services/HypergridService/UserAgentService.cs | |||
@@ -136,6 +136,7 @@ namespace OpenSim.Services.HypergridService | |||
136 | m_log.DebugFormat("[USER AGENT SERVICE]: Request to login user {0} {1} (@{2}) to grid {3}", | 136 | m_log.DebugFormat("[USER AGENT SERVICE]: Request to login user {0} {1} (@{2}) to grid {3}", |
137 | agentCircuit.firstname, agentCircuit.lastname, ((clientIP == null) ? "stored IP" : clientIP.Address.ToString()), | 137 | agentCircuit.firstname, agentCircuit.lastname, ((clientIP == null) ? "stored IP" : clientIP.Address.ToString()), |
138 | gatekeeper.ExternalHostName +":"+ gatekeeper.HttpPort); | 138 | gatekeeper.ExternalHostName +":"+ gatekeeper.HttpPort); |
139 | m_log.Debug("gatekeeper serveruri -> " + gatekeeper.ServerURI ); | ||
139 | 140 | ||
140 | // Take the IP address + port of the gatekeeper (reg) plus the info of finalDestination | 141 | // Take the IP address + port of the gatekeeper (reg) plus the info of finalDestination |
141 | GridRegion region = new GridRegion(gatekeeper); | 142 | GridRegion region = new GridRegion(gatekeeper); |
@@ -145,12 +146,12 @@ namespace OpenSim.Services.HypergridService | |||
145 | region.RegionLocY = finalDestination.RegionLocY; | 146 | region.RegionLocY = finalDestination.RegionLocY; |
146 | 147 | ||
147 | // Generate a new service session | 148 | // Generate a new service session |
148 | agentCircuit.ServiceSessionID = "http://" + region.ExternalHostName + ":" + region.HttpPort + ";" + UUID.Random(); | 149 | agentCircuit.ServiceSessionID = region.ServerURI + ";" + UUID.Random(); |
149 | TravelingAgentInfo old = UpdateTravelInfo(agentCircuit, region); | 150 | TravelingAgentInfo old = UpdateTravelInfo(agentCircuit, region); |
150 | 151 | ||
151 | bool success = false; | 152 | bool success = false; |
152 | string myExternalIP = string.Empty; | 153 | string myExternalIP = string.Empty; |
153 | string gridName = "http://" + gatekeeper.ExternalHostName + ":" + gatekeeper.HttpPort; | 154 | string gridName = gatekeeper.ServerURI; |
154 | if (m_GridName == gridName) | 155 | if (m_GridName == gridName) |
155 | success = m_GatekeeperService.LoginAgent(agentCircuit, finalDestination, out reason); | 156 | success = m_GatekeeperService.LoginAgent(agentCircuit, finalDestination, out reason); |
156 | else | 157 | else |
@@ -159,7 +160,7 @@ namespace OpenSim.Services.HypergridService | |||
159 | if (!success) | 160 | if (!success) |
160 | { | 161 | { |
161 | m_log.DebugFormat("[USER AGENT SERVICE]: Unable to login user {0} {1} to grid {2}, reason: {3}", | 162 | m_log.DebugFormat("[USER AGENT SERVICE]: Unable to login user {0} {1} to grid {2}, reason: {3}", |
162 | agentCircuit.firstname, agentCircuit.lastname, region.ExternalHostName + ":" + region.HttpPort, reason); | 163 | agentCircuit.firstname, agentCircuit.lastname, region.ServerURI, reason); |
163 | 164 | ||
164 | // restore the old travel info | 165 | // restore the old travel info |
165 | lock (m_TravelingAgents) | 166 | lock (m_TravelingAgents) |
@@ -210,7 +211,7 @@ namespace OpenSim.Services.HypergridService | |||
210 | m_TravelingAgents[agentCircuit.SessionID] = travel; | 211 | m_TravelingAgents[agentCircuit.SessionID] = travel; |
211 | } | 212 | } |
212 | travel.UserID = agentCircuit.AgentID; | 213 | travel.UserID = agentCircuit.AgentID; |
213 | travel.GridExternalName = "http://" + region.ExternalHostName + ":" + region.HttpPort; | 214 | travel.GridExternalName = region.ServerURI; |
214 | travel.ServiceToken = agentCircuit.ServiceSessionID; | 215 | travel.ServiceToken = agentCircuit.ServiceSessionID; |
215 | if (old != null) | 216 | if (old != null) |
216 | travel.ClientIPAddress = old.ClientIPAddress; | 217 | travel.ClientIPAddress = old.ClientIPAddress; |
diff --git a/OpenSim/Services/Interfaces/IGridService.cs b/OpenSim/Services/Interfaces/IGridService.cs index 77230a3..6d3bff7 100644 --- a/OpenSim/Services/Interfaces/IGridService.cs +++ b/OpenSim/Services/Interfaces/IGridService.cs | |||
@@ -115,8 +115,20 @@ namespace OpenSim.Services.Interfaces | |||
115 | /// </summary> | 115 | /// </summary> |
116 | public string ServerURI | 116 | public string ServerURI |
117 | { | 117 | { |
118 | get { return m_serverURI; } | 118 | get { |
119 | set { m_serverURI = value; } | 119 | if ( m_serverURI != string.Empty ) { |
120 | return m_serverURI; | ||
121 | } else { | ||
122 | return "http://" + m_externalHostName + ":" + m_httpPort + "/"; | ||
123 | } | ||
124 | } | ||
125 | set { | ||
126 | if ( value.EndsWith("/") ) { | ||
127 | m_serverURI = value; | ||
128 | } else { | ||
129 | m_serverURI = value + '/'; | ||
130 | } | ||
131 | } | ||
120 | } | 132 | } |
121 | protected string m_serverURI; | 133 | protected string m_serverURI; |
122 | 134 | ||
@@ -164,6 +176,7 @@ namespace OpenSim.Services.Interfaces | |||
164 | 176 | ||
165 | public GridRegion() | 177 | public GridRegion() |
166 | { | 178 | { |
179 | m_serverURI = string.Empty; | ||
167 | } | 180 | } |
168 | 181 | ||
169 | public GridRegion(int regionLocX, int regionLocY, IPEndPoint internalEndPoint, string externalUri) | 182 | public GridRegion(int regionLocX, int regionLocY, IPEndPoint internalEndPoint, string externalUri) |
diff --git a/OpenSim/Services/LLLoginService/LLLoginResponse.cs b/OpenSim/Services/LLLoginService/LLLoginResponse.cs index 0da1715..f985ab2 100644 --- a/OpenSim/Services/LLLoginService/LLLoginResponse.cs +++ b/OpenSim/Services/LLLoginService/LLLoginResponse.cs | |||
@@ -333,34 +333,7 @@ namespace OpenSim.Services.LLLoginService | |||
333 | 333 | ||
334 | private void FillOutSeedCap(AgentCircuitData aCircuit, GridRegion destination, IPEndPoint ipepClient) | 334 | private void FillOutSeedCap(AgentCircuitData aCircuit, GridRegion destination, IPEndPoint ipepClient) |
335 | { | 335 | { |
336 | string capsSeedPath = String.Empty; | 336 | SeedCapability = destination.ServerURI + CapsUtil.GetCapsSeedPath(aCircuit.CapsPath); |
337 | |||
338 | // Don't use the following! It Fails for logging into any region not on the same port as the http server! | ||
339 | // Kept here so it doesn't happen again! | ||
340 | // response.SeedCapability = regionInfo.ServerURI + capsSeedPath; | ||
341 | |||
342 | #region IP Translation for NAT | ||
343 | if (ipepClient != null) | ||
344 | { | ||
345 | capsSeedPath | ||
346 | = "http://" | ||
347 | + NetworkUtil.GetHostFor(ipepClient.Address, destination.ExternalHostName) | ||
348 | + ":" | ||
349 | + destination.HttpPort | ||
350 | + CapsUtil.GetCapsSeedPath(aCircuit.CapsPath); | ||
351 | } | ||
352 | else | ||
353 | { | ||
354 | capsSeedPath | ||
355 | = "http://" | ||
356 | + destination.ExternalHostName | ||
357 | + ":" | ||
358 | + destination.HttpPort | ||
359 | + CapsUtil.GetCapsSeedPath(aCircuit.CapsPath); | ||
360 | } | ||
361 | #endregion | ||
362 | |||
363 | SeedCapability = capsSeedPath; | ||
364 | } | 337 | } |
365 | 338 | ||
366 | private void SetDefaultValues() | 339 | private void SetDefaultValues() |