diff options
author | Melanie | 2010-10-21 07:33:01 +0100 |
---|---|---|
committer | Melanie | 2010-10-21 07:33:01 +0100 |
commit | fc33d569cd760b0ecf2d487b8d91d4ac3c53d08e (patch) | |
tree | ffe3d70e95b159dc4c7b3bf9613bca865d4067d3 /OpenSim/Services | |
parent | COmmented the wrong line instead, now I commented them all to be on the safe ... (diff) | |
parent | Skip empty strings in ParseString* functions (diff) | |
download | opensim-SC-fc33d569cd760b0ecf2d487b8d91d4ac3c53d08e.zip opensim-SC-fc33d569cd760b0ecf2d487b8d91d4ac3c53d08e.tar.gz opensim-SC-fc33d569cd760b0ecf2d487b8d91d4ac3c53d08e.tar.bz2 opensim-SC-fc33d569cd760b0ecf2d487b8d91d4ac3c53d08e.tar.xz |
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to '')
12 files changed, 64 insertions, 119 deletions
diff --git a/OpenSim/Services/Connectors/Hypergrid/GatekeeperServiceConnector.cs b/OpenSim/Services/Connectors/Hypergrid/GatekeeperServiceConnector.cs index 479a80e..4231be1 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,16 +191,15 @@ 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 | { |
200 | m_log.Debug("[GATEKEEPER SERVICE CONNECTOR]: Exception " + e.Message); | 202 | //m_log.Debug("[GATEKEEPER SERVICE CONNECTOR]: Exception " + e.Message); |
201 | return null; | 203 | return null; |
202 | } | 204 | } |
203 | 205 | ||
@@ -236,21 +238,24 @@ namespace OpenSim.Services.Connectors.Hypergrid | |||
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 8f74335..10499e2 100644 --- a/OpenSim/Services/Connectors/Land/LandServiceConnector.cs +++ b/OpenSim/Services/Connectors/Land/LandServiceConnector.cs | |||
@@ -84,10 +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 | 87 | XmlRpcResponse response = request.Send(info.ServerURI, 10000); | |
88 | //Possible nullref from info.externalendpoint will be caught here | ||
89 | string uri = "http://" + info.ExternalEndPoint.Address + ":" + info.HttpPort + "/"; | ||
90 | XmlRpcResponse response = request.Send(uri, 10000); | ||
91 | if (response.IsFault) | 88 | if (response.IsFault) |
92 | { | 89 | { |
93 | 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); |
@@ -134,4 +131,4 @@ namespace OpenSim.Services.Connectors | |||
134 | return landData; | 131 | return landData; |
135 | } | 132 | } |
136 | } | 133 | } |
137 | } \ No newline at end of file | 134 | } |
diff --git a/OpenSim/Services/Connectors/Neighbour/NeighbourServiceConnector.cs b/OpenSim/Services/Connectors/Neighbour/NeighbourServiceConnector.cs index daf0439..9c57a40 100644 --- a/OpenSim/Services/Connectors/Neighbour/NeighbourServiceConnector.cs +++ b/OpenSim/Services/Connectors/Neighbour/NeighbourServiceConnector.cs | |||
@@ -87,9 +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 | IPEndPoint ext = region.ExternalEndPoint; | 90 | string uri = region.ServerURI + "/region/" + thisRegion.RegionID + "/"; |
91 | if (ext == null) return false; | ||
92 | string uri = "http://" + ext.Address + ":" + region.HttpPort + "/region/" + thisRegion.RegionID + "/"; | ||
93 | //m_log.Debug(" >>> DoHelloNeighbourCall <<< " + uri); | 91 | //m_log.Debug(" >>> DoHelloNeighbourCall <<< " + uri); |
94 | 92 | ||
95 | 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 4fc2a6d..f86eba3 100644 --- a/OpenSim/Services/Connectors/SimianGrid/SimianGridServiceConnector.cs +++ b/OpenSim/Services/Connectors/SimianGrid/SimianGridServiceConnector.cs | |||
@@ -147,8 +147,6 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
147 | Vector3d minPosition = new Vector3d(regionInfo.RegionLocX, regionInfo.RegionLocY, 0.0); | 147 | Vector3d minPosition = new Vector3d(regionInfo.RegionLocX, regionInfo.RegionLocY, 0.0); |
148 | Vector3d maxPosition = minPosition + new Vector3d(Constants.RegionSize, Constants.RegionSize, 4096.0); | 148 | Vector3d maxPosition = minPosition + new Vector3d(Constants.RegionSize, Constants.RegionSize, 4096.0); |
149 | 149 | ||
150 | string httpAddress = "http://" + regionInfo.ExternalHostName + ":" + regionInfo.HttpPort + "/"; | ||
151 | |||
152 | OSDMap extraData = new OSDMap | 150 | OSDMap extraData = new OSDMap |
153 | { | 151 | { |
154 | { "ServerURI", OSD.FromString(regionInfo.ServerURI) }, | 152 | { "ServerURI", OSD.FromString(regionInfo.ServerURI) }, |
@@ -170,7 +168,7 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
170 | { "Name", regionInfo.RegionName }, | 168 | { "Name", regionInfo.RegionName }, |
171 | { "MinPosition", minPosition.ToString() }, | 169 | { "MinPosition", minPosition.ToString() }, |
172 | { "MaxPosition", maxPosition.ToString() }, | 170 | { "MaxPosition", maxPosition.ToString() }, |
173 | { "Address", httpAddress }, | 171 | { "Address", regionInfo.ServerURI }, |
174 | { "Enabled", "1" }, | 172 | { "Enabled", "1" }, |
175 | { "ExtraData", OSDParser.SerializeJsonString(extraData) } | 173 | { "ExtraData", OSDParser.SerializeJsonString(extraData) } |
176 | }; | 174 | }; |
diff --git a/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs b/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs index a8ed66d..f855fde 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"; |
@@ -387,8 +358,7 @@ namespace OpenSim.Services.Connectors.Simulation | |||
387 | agent = null; | 358 | agent = null; |
388 | if (ext == null) return false; | 359 | if (ext == null) return false; |
389 | // Eventually, we want to use a caps url instead of the agentID | 360 | // Eventually, we want to use a caps url instead of the agentID |
390 | string uri = "http://" + ext.Address + ":" + destination.HttpPort + AgentPath() + id + "/" + destination.RegionID.ToString() + "/"; | 361 | string uri = destination.ServerURI + AgentPath() + id + "/" + destination.RegionID.ToString() + "/"; |
391 | //Console.WriteLine(" >>> DoRetrieveRootAgentCall <<< " + uri); | ||
392 | 362 | ||
393 | HttpWebRequest request = (HttpWebRequest)WebRequest.Create(uri); | 363 | HttpWebRequest request = (HttpWebRequest)WebRequest.Create(uri); |
394 | request.Method = "GET"; | 364 | request.Method = "GET"; |
@@ -409,7 +379,6 @@ namespace OpenSim.Services.Connectors.Simulation | |||
409 | sr = new StreamReader(webResponse.GetResponseStream()); | 379 | sr = new StreamReader(webResponse.GetResponseStream()); |
410 | reply = sr.ReadToEnd().Trim(); | 380 | reply = sr.ReadToEnd().Trim(); |
411 | 381 | ||
412 | //Console.WriteLine("[REMOTE SIMULATION CONNECTOR]: ChilAgentUpdate reply was " + reply); | ||
413 | 382 | ||
414 | } | 383 | } |
415 | catch (WebException ex) | 384 | catch (WebException ex) |
@@ -430,7 +399,6 @@ namespace OpenSim.Services.Connectors.Simulation | |||
430 | OSDMap args = Util.GetOSDMap(reply); | 399 | OSDMap args = Util.GetOSDMap(reply); |
431 | if (args == null) | 400 | if (args == null) |
432 | { | 401 | { |
433 | //Console.WriteLine("[REMOTE SIMULATION CONNECTOR]: Error getting OSDMap from reply"); | ||
434 | return false; | 402 | return false; |
435 | } | 403 | } |
436 | 404 | ||
@@ -439,7 +407,6 @@ namespace OpenSim.Services.Connectors.Simulation | |||
439 | return true; | 407 | return true; |
440 | } | 408 | } |
441 | 409 | ||
442 | //Console.WriteLine("[REMOTE SIMULATION CONNECTOR]: DoRetrieveRootAgentCall returned status " + webResponse.StatusCode); | ||
443 | return false; | 410 | return false; |
444 | } | 411 | } |
445 | 412 | ||
@@ -481,18 +448,8 @@ namespace OpenSim.Services.Connectors.Simulation | |||
481 | 448 | ||
482 | private bool CloseAgent(GridRegion destination, UUID id, bool ChildOnly) | 449 | private bool CloseAgent(GridRegion destination, UUID id, bool ChildOnly) |
483 | { | 450 | { |
484 | string uri = string.Empty; | 451 | string uri = destination.ServerURI + AgentPath() + id + "/" + destination.RegionID.ToString() + "/"; |
485 | try | ||
486 | { | ||
487 | uri = "http://" + destination.ExternalEndPoint.Address + ":" + destination.HttpPort + AgentPath() + id + "/" + destination.RegionID.ToString() + "/"; | ||
488 | } | ||
489 | catch (Exception e) | ||
490 | { | ||
491 | m_log.Debug("[REMOTE SIMULATION CONNECTOR]: Unable to resolve external endpoint on agent close. Reason: " + e.Message); | ||
492 | return false; | ||
493 | } | ||
494 | 452 | ||
495 | //Console.WriteLine(" >>> DoCloseAgentCall <<< " + uri); | ||
496 | 453 | ||
497 | WebRequest request = WebRequest.Create(uri); | 454 | WebRequest request = WebRequest.Create(uri); |
498 | request.Method = "DELETE"; | 455 | request.Method = "DELETE"; |
@@ -554,7 +511,7 @@ namespace OpenSim.Services.Connectors.Simulation | |||
554 | IPEndPoint ext = destination.ExternalEndPoint; | 511 | IPEndPoint ext = destination.ExternalEndPoint; |
555 | if (ext == null) return false; | 512 | if (ext == null) return false; |
556 | string uri | 513 | string uri |
557 | = "http://" + ext.Address + ":" + destination.HttpPort + ObjectPath() + sog.UUID + "/"; | 514 | = destination.ServerURI + ObjectPath() + sog.UUID + "/"; |
558 | //m_log.Debug(" >>> DoCreateObjectCall <<< " + uri); | 515 | //m_log.Debug(" >>> DoCreateObjectCall <<< " + uri); |
559 | 516 | ||
560 | WebRequest ObjectCreateRequest = WebRequest.Create(uri); | 517 | WebRequest ObjectCreateRequest = WebRequest.Create(uri); |
diff --git a/OpenSim/Services/Connectors/UserAccounts/UserAccountServiceConnector.cs b/OpenSim/Services/Connectors/UserAccounts/UserAccountServiceConnector.cs index 67c482b..2a5df83 100644 --- a/OpenSim/Services/Connectors/UserAccounts/UserAccountServiceConnector.cs +++ b/OpenSim/Services/Connectors/UserAccounts/UserAccountServiceConnector.cs | |||
@@ -113,7 +113,7 @@ namespace OpenSim.Services.Connectors | |||
113 | 113 | ||
114 | public virtual UserAccount GetUserAccount(UUID scopeID, UUID userID) | 114 | public virtual UserAccount GetUserAccount(UUID scopeID, UUID userID) |
115 | { | 115 | { |
116 | // m_log.DebugFormat("[ACCOUNTS CONNECTOR]: GetUserAccount {0}", userID); | 116 | //m_log.DebugFormat("[ACCOUNTS CONNECTOR]: GetUserAccount {0}", userID); |
117 | Dictionary<string, object> sendData = new Dictionary<string, object>(); | 117 | Dictionary<string, object> sendData = new Dictionary<string, object>(); |
118 | //sendData["SCOPEID"] = scopeID.ToString(); | 118 | //sendData["SCOPEID"] = scopeID.ToString(); |
119 | sendData["VERSIONMIN"] = ProtocolVersions.ClientProtocolVersionMin.ToString(); | 119 | sendData["VERSIONMIN"] = ProtocolVersions.ClientProtocolVersionMin.ToString(); |
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 cce8f2c..a0d270c 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 011cad8..e98cc22 100644 --- a/OpenSim/Services/LLLoginService/LLLoginResponse.cs +++ b/OpenSim/Services/LLLoginService/LLLoginResponse.cs | |||
@@ -339,34 +339,7 @@ namespace OpenSim.Services.LLLoginService | |||
339 | 339 | ||
340 | private void FillOutSeedCap(AgentCircuitData aCircuit, GridRegion destination, IPEndPoint ipepClient) | 340 | private void FillOutSeedCap(AgentCircuitData aCircuit, GridRegion destination, IPEndPoint ipepClient) |
341 | { | 341 | { |
342 | string capsSeedPath = String.Empty; | 342 | SeedCapability = destination.ServerURI + CapsUtil.GetCapsSeedPath(aCircuit.CapsPath); |
343 | |||
344 | // Don't use the following! It Fails for logging into any region not on the same port as the http server! | ||
345 | // Kept here so it doesn't happen again! | ||
346 | // response.SeedCapability = regionInfo.ServerURI + capsSeedPath; | ||
347 | |||
348 | #region IP Translation for NAT | ||
349 | if (ipepClient != null) | ||
350 | { | ||
351 | capsSeedPath | ||
352 | = "http://" | ||
353 | + NetworkUtil.GetHostFor(ipepClient.Address, destination.ExternalHostName) | ||
354 | + ":" | ||
355 | + destination.HttpPort | ||
356 | + CapsUtil.GetCapsSeedPath(aCircuit.CapsPath); | ||
357 | } | ||
358 | else | ||
359 | { | ||
360 | capsSeedPath | ||
361 | = "http://" | ||
362 | + destination.ExternalHostName | ||
363 | + ":" | ||
364 | + destination.HttpPort | ||
365 | + CapsUtil.GetCapsSeedPath(aCircuit.CapsPath); | ||
366 | } | ||
367 | #endregion | ||
368 | |||
369 | SeedCapability = capsSeedPath; | ||
370 | } | 343 | } |
371 | 344 | ||
372 | private void SetDefaultValues() | 345 | private void SetDefaultValues() |