diff options
author | Justin Clark-Casey (justincc) | 2010-10-22 23:35:01 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2010-10-22 23:35:01 +0100 |
commit | 8f34e46d7449be1c29419a232a8f7f1e5918f03c (patch) | |
tree | e1af6e01bd9be556fe652a32e4ec93c31c80a283 /OpenSim/Services/Connectors | |
parent | Revert "* additional serveruri cleanup" (diff) | |
download | opensim-SC_OLD-8f34e46d7449be1c29419a232a8f7f1e5918f03c.zip opensim-SC_OLD-8f34e46d7449be1c29419a232a8f7f1e5918f03c.tar.gz opensim-SC_OLD-8f34e46d7449be1c29419a232a8f7f1e5918f03c.tar.bz2 opensim-SC_OLD-8f34e46d7449be1c29419a232a8f7f1e5918f03c.tar.xz |
Revert "* refactor refactor refactor ServerURI 4 lyfe"
This reverts commit 55974df14b6d64c1e1f9e386a3eacce3ba86dc98.
Diffstat (limited to 'OpenSim/Services/Connectors')
5 files changed, 58 insertions, 27 deletions
diff --git a/OpenSim/Services/Connectors/Hypergrid/GatekeeperServiceConnector.cs b/OpenSim/Services/Connectors/Hypergrid/GatekeeperServiceConnector.cs index 89a8f7a..479a80e 100644 --- a/OpenSim/Services/Connectors/Hypergrid/GatekeeperServiceConnector.cs +++ b/OpenSim/Services/Connectors/Hypergrid/GatekeeperServiceConnector.cs | |||
@@ -108,8 +108,8 @@ namespace OpenSim.Services.Connectors.Hypergrid | |||
108 | } | 108 | } |
109 | 109 | ||
110 | hash = (Hashtable)response.Value; | 110 | hash = (Hashtable)response.Value; |
111 | foreach (Object o in hash) | 111 | //foreach (Object o in hash) |
112 | m_log.Debug(">> " + ((DictionaryEntry)o).Key + ":" + ((DictionaryEntry)o).Value); | 112 | // m_log.Debug(">> " + ((DictionaryEntry)o).Key + ":" + ((DictionaryEntry)o).Value); |
113 | try | 113 | try |
114 | { | 114 | { |
115 | bool success = false; | 115 | bool success = false; |
@@ -117,20 +117,16 @@ namespace OpenSim.Services.Connectors.Hypergrid | |||
117 | if (success) | 117 | if (success) |
118 | { | 118 | { |
119 | UUID.TryParse((string)hash["uuid"], out regionID); | 119 | UUID.TryParse((string)hash["uuid"], out regionID); |
120 | m_log.Debug(">> HERE, uuid: " + regionID); | 120 | //m_log.Debug(">> HERE, uuid: " + uuid); |
121 | if ((string)hash["handle"] != null) | 121 | if ((string)hash["handle"] != null) |
122 | { | 122 | { |
123 | realHandle = Convert.ToUInt64((string)hash["handle"]); | 123 | realHandle = Convert.ToUInt64((string)hash["handle"]); |
124 | m_log.Debug(">> HERE, realHandle: " + realHandle); | 124 | //m_log.Debug(">> HERE, realHandle: " + realHandle); |
125 | } | 125 | } |
126 | if (hash["region_image"] != null) { | 126 | if (hash["region_image"] != null) |
127 | imageURL = (string)hash["region_image"]; | 127 | imageURL = (string)hash["region_image"]; |
128 | m_log.Debug(">> HERE, imageURL: " + imageURL); | 128 | if (hash["external_name"] != null) |
129 | } | ||
130 | if (hash["external_name"] != null) { | ||
131 | externalName = (string)hash["external_name"]; | 129 | externalName = (string)hash["external_name"]; |
132 | m_log.Debug(">> HERE, externalName: " + externalName); | ||
133 | } | ||
134 | } | 130 | } |
135 | 131 | ||
136 | } | 132 | } |
@@ -212,8 +208,8 @@ namespace OpenSim.Services.Connectors.Hypergrid | |||
212 | } | 208 | } |
213 | 209 | ||
214 | hash = (Hashtable)response.Value; | 210 | hash = (Hashtable)response.Value; |
215 | foreach (Object o in hash) | 211 | //foreach (Object o in hash) |
216 | m_log.Debug(">> " + ((DictionaryEntry)o).Key + ":" + ((DictionaryEntry)o).Value); | 212 | // m_log.Debug(">> " + ((DictionaryEntry)o).Key + ":" + ((DictionaryEntry)o).Value); |
217 | try | 213 | try |
218 | { | 214 | { |
219 | bool success = false; | 215 | bool success = false; |
@@ -223,41 +219,38 @@ namespace OpenSim.Services.Connectors.Hypergrid | |||
223 | GridRegion region = new GridRegion(); | 219 | GridRegion region = new GridRegion(); |
224 | 220 | ||
225 | UUID.TryParse((string)hash["uuid"], out region.RegionID); | 221 | UUID.TryParse((string)hash["uuid"], out region.RegionID); |
226 | m_log.Debug(">> HERE, uuid: " + region.RegionID); | 222 | //m_log.Debug(">> HERE, uuid: " + region.RegionID); |
227 | int n = 0; | 223 | int n = 0; |
228 | if (hash["x"] != null) | 224 | if (hash["x"] != null) |
229 | { | 225 | { |
230 | Int32.TryParse((string)hash["x"], out n); | 226 | Int32.TryParse((string)hash["x"], out n); |
231 | region.RegionLocX = n; | 227 | region.RegionLocX = n; |
232 | m_log.Debug(">> HERE, x: " + region.RegionLocX); | 228 | //m_log.Debug(">> HERE, x: " + region.RegionLocX); |
233 | } | 229 | } |
234 | if (hash["y"] != null) | 230 | if (hash["y"] != null) |
235 | { | 231 | { |
236 | Int32.TryParse((string)hash["y"], out n); | 232 | Int32.TryParse((string)hash["y"], out n); |
237 | region.RegionLocY = n; | 233 | region.RegionLocY = n; |
238 | m_log.Debug(">> HERE, y: " + region.RegionLocY); | 234 | //m_log.Debug(">> HERE, y: " + region.RegionLocY); |
239 | } | 235 | } |
240 | if (hash["region_name"] != null) | 236 | if (hash["region_name"] != null) |
241 | { | 237 | { |
242 | region.RegionName = (string)hash["region_name"]; | 238 | region.RegionName = (string)hash["region_name"]; |
243 | m_log.Debug(">> HERE, region_name: " + region.RegionName); | 239 | //m_log.Debug(">> HERE, name: " + region.RegionName); |
244 | } | 240 | } |
245 | if (hash["hostname"] != null) | 241 | if (hash["hostname"] != null) |
246 | region.ExternalHostName = (string)hash["hostname"]; | 242 | region.ExternalHostName = (string)hash["hostname"]; |
247 | m_log.Debug(">> HERE, hostname: " + region.ExternalHostName); | ||
248 | if (hash["http_port"] != null) | 243 | if (hash["http_port"] != null) |
249 | { | 244 | { |
250 | uint p = 0; | 245 | uint p = 0; |
251 | UInt32.TryParse((string)hash["http_port"], out p); | 246 | UInt32.TryParse((string)hash["http_port"], out p); |
252 | region.HttpPort = p; | 247 | region.HttpPort = p; |
253 | m_log.Debug(">> HERE, http_port: " + region.HttpPort); | ||
254 | } | 248 | } |
255 | if (hash["internal_port"] != null) | 249 | if (hash["internal_port"] != null) |
256 | { | 250 | { |
257 | int p = 0; | 251 | int p = 0; |
258 | Int32.TryParse((string)hash["internal_port"], out p); | 252 | Int32.TryParse((string)hash["internal_port"], out p); |
259 | region.InternalEndPoint = new IPEndPoint(IPAddress.Parse("0.0.0.0"), p); | 253 | region.InternalEndPoint = new IPEndPoint(IPAddress.Parse("0.0.0.0"), p); |
260 | m_log.Debug(">> HERE, internal_port: " + region.InternalEndPoint); | ||
261 | } | 254 | } |
262 | 255 | ||
263 | // Successful return | 256 | // Successful return |
diff --git a/OpenSim/Services/Connectors/Land/LandServiceConnector.cs b/OpenSim/Services/Connectors/Land/LandServiceConnector.cs index 4b25ac8..8143b5a 100644 --- a/OpenSim/Services/Connectors/Land/LandServiceConnector.cs +++ b/OpenSim/Services/Connectors/Land/LandServiceConnector.cs | |||
@@ -84,7 +84,8 @@ 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 | XmlRpcResponse response = request.Send(info.ServerURI, 10000); | 87 | string uri = "http://" + info.ExternalEndPoint.Address + ":" + info.HttpPort + "/"; |
88 | XmlRpcResponse response = request.Send(uri, 10000); | ||
88 | if (response.IsFault) | 89 | if (response.IsFault) |
89 | { | 90 | { |
90 | m_log.ErrorFormat("[LAND CONNECTOR]: remote call returned an error: {0}", response.FaultString); | 91 | 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 9c57a40..0a982f8 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 = region.ServerURI + "/region/" + thisRegion.RegionID + "/"; | 90 | string uri = "http://" + region.ExternalEndPoint.Address + ":" + region.HttpPort + "/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 8076fab..168b233 100644 --- a/OpenSim/Services/Connectors/SimianGrid/SimianGridServiceConnector.cs +++ b/OpenSim/Services/Connectors/SimianGrid/SimianGridServiceConnector.cs | |||
@@ -145,6 +145,8 @@ 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 | |||
148 | OSDMap extraData = new OSDMap | 150 | OSDMap extraData = new OSDMap |
149 | { | 151 | { |
150 | { "ServerURI", OSD.FromString(regionInfo.ServerURI) }, | 152 | { "ServerURI", OSD.FromString(regionInfo.ServerURI) }, |
@@ -166,7 +168,7 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
166 | { "Name", regionInfo.RegionName }, | 168 | { "Name", regionInfo.RegionName }, |
167 | { "MinPosition", minPosition.ToString() }, | 169 | { "MinPosition", minPosition.ToString() }, |
168 | { "MaxPosition", maxPosition.ToString() }, | 170 | { "MaxPosition", maxPosition.ToString() }, |
169 | { "Address", regionInfo.ServerURI }, | 171 | { "Address", httpAddress }, |
170 | { "Enabled", "1" }, | 172 | { "Enabled", "1" }, |
171 | { "ExtraData", OSDParser.SerializeJsonString(extraData) } | 173 | { "ExtraData", OSDParser.SerializeJsonString(extraData) } |
172 | }; | 174 | }; |
diff --git a/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs b/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs index 07839d3..a5f748f 100644 --- a/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs +++ b/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs | |||
@@ -104,7 +104,24 @@ namespace OpenSim.Services.Connectors.Simulation | |||
104 | return false; | 104 | return false; |
105 | } | 105 | } |
106 | 106 | ||
107 | string uri = destination.ServerURI + AgentPath() + aCircuit.AgentID + "/"; | 107 | string uri = string.Empty; |
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 | } | ||
108 | 125 | ||
109 | //Console.WriteLine(" >>> DoCreateChildAgentCall <<< " + uri); | 126 | //Console.WriteLine(" >>> DoCreateChildAgentCall <<< " + uri); |
110 | 127 | ||
@@ -260,7 +277,16 @@ namespace OpenSim.Services.Connectors.Simulation | |||
260 | private bool UpdateAgent(GridRegion destination, IAgentData cAgentData) | 277 | private bool UpdateAgent(GridRegion destination, IAgentData cAgentData) |
261 | { | 278 | { |
262 | // Eventually, we want to use a caps url instead of the agentID | 279 | // Eventually, we want to use a caps url instead of the agentID |
263 | string uri = destination.ServerURI + AgentPath() + cAgentData.AgentID + "/"; | 280 | string uri = string.Empty; |
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 | } | ||
264 | //Console.WriteLine(" >>> DoAgentUpdateCall <<< " + uri); | 290 | //Console.WriteLine(" >>> DoAgentUpdateCall <<< " + uri); |
265 | 291 | ||
266 | HttpWebRequest ChildUpdateRequest = (HttpWebRequest)WebRequest.Create(uri); | 292 | HttpWebRequest ChildUpdateRequest = (HttpWebRequest)WebRequest.Create(uri); |
@@ -359,7 +385,7 @@ namespace OpenSim.Services.Connectors.Simulation | |||
359 | { | 385 | { |
360 | agent = null; | 386 | agent = null; |
361 | // Eventually, we want to use a caps url instead of the agentID | 387 | // Eventually, we want to use a caps url instead of the agentID |
362 | string uri = destination.ServerURI + AgentPath() + id + "/" + destination.RegionID.ToString() + "/"; | 388 | string uri = "http://" + destination.ExternalEndPoint.Address + ":" + destination.HttpPort + AgentPath() + id + "/" + destination.RegionID.ToString() + "/"; |
363 | //Console.WriteLine(" >>> DoRetrieveRootAgentCall <<< " + uri); | 389 | //Console.WriteLine(" >>> DoRetrieveRootAgentCall <<< " + uri); |
364 | 390 | ||
365 | HttpWebRequest request = (HttpWebRequest)WebRequest.Create(uri); | 391 | HttpWebRequest request = (HttpWebRequest)WebRequest.Create(uri); |
@@ -453,7 +479,16 @@ namespace OpenSim.Services.Connectors.Simulation | |||
453 | 479 | ||
454 | public bool CloseAgent(GridRegion destination, UUID id) | 480 | public bool CloseAgent(GridRegion destination, UUID id) |
455 | { | 481 | { |
456 | string uri = destination.ServerURI + AgentPath() + id + "/" + destination.RegionID.ToString() + "/"; | 482 | string uri = string.Empty; |
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 | } | ||
457 | 492 | ||
458 | //Console.WriteLine(" >>> DoCloseAgentCall <<< " + uri); | 493 | //Console.WriteLine(" >>> DoCloseAgentCall <<< " + uri); |
459 | 494 | ||
@@ -503,7 +538,7 @@ namespace OpenSim.Services.Connectors.Simulation | |||
503 | public bool CreateObject(GridRegion destination, ISceneObject sog, bool isLocalCall) | 538 | public bool CreateObject(GridRegion destination, ISceneObject sog, bool isLocalCall) |
504 | { | 539 | { |
505 | string uri | 540 | string uri |
506 | = destination.ServerURI + ObjectPath() + sog.UUID + "/"; | 541 | = "http://" + destination.ExternalEndPoint.Address + ":" + destination.HttpPort + ObjectPath() + sog.UUID + "/"; |
507 | //m_log.Debug(" >>> DoCreateObjectCall <<< " + uri); | 542 | //m_log.Debug(" >>> DoCreateObjectCall <<< " + uri); |
508 | 543 | ||
509 | WebRequest ObjectCreateRequest = WebRequest.Create(uri); | 544 | WebRequest ObjectCreateRequest = WebRequest.Create(uri); |