aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services/Connectors
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs291
-rw-r--r--OpenSim/Services/Connectors/Authentication/AuthenticationServicesConnector.cs7
-rw-r--r--OpenSim/Services/Connectors/Friends/FriendsSimConnector.cs68
-rw-r--r--OpenSim/Services/Connectors/Grid/GridServicesConnector.cs10
-rw-r--r--OpenSim/Services/Connectors/Hypergrid/GatekeeperServiceConnector.cs6
-rw-r--r--OpenSim/Services/Connectors/Hypergrid/UserAgentServiceConnector.cs2
-rw-r--r--OpenSim/Services/Connectors/Land/LandServicesConnector.cs2
-rw-r--r--OpenSim/Services/Connectors/Presence/PresenceServicesConnector.cs11
-rw-r--r--OpenSim/Services/Connectors/SimianGrid/SimianAuthenticationServiceConnector.cs6
-rw-r--r--OpenSim/Services/Connectors/SimianGrid/SimianGridServiceConnector.cs90
-rw-r--r--OpenSim/Services/Connectors/SimianGrid/SimianUserAccountServiceConnector.cs5
-rw-r--r--OpenSim/Services/Connectors/Simulation/SimulationDataService.cs5
-rw-r--r--OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs45
-rw-r--r--OpenSim/Services/Connectors/UserAccounts/UserAccountServicesConnector.cs5
14 files changed, 450 insertions, 103 deletions
diff --git a/OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs b/OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs
index 086b5ad..9d6d9ad 100644
--- a/OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs
+++ b/OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs
@@ -27,9 +27,11 @@
27 27
28using log4net; 28using log4net;
29using System; 29using System;
30using System.Threading;
30using System.Collections.Generic; 31using System.Collections.Generic;
31using System.IO; 32using System.IO;
32using System.Reflection; 33using System.Reflection;
34using System.Timers;
33using Nini.Config; 35using Nini.Config;
34using OpenSim.Framework; 36using OpenSim.Framework;
35using OpenSim.Framework.Console; 37using OpenSim.Framework.Console;
@@ -47,13 +49,20 @@ namespace OpenSim.Services.Connectors
47 49
48 private string m_ServerURI = String.Empty; 50 private string m_ServerURI = String.Empty;
49 private IImprovedAssetCache m_Cache = null; 51 private IImprovedAssetCache m_Cache = null;
50 52 private int m_retryCounter;
53 private Dictionary<int, List<AssetBase>> m_retryQueue = new Dictionary<int, List<AssetBase>>();
54 private System.Timers.Timer m_retryTimer;
51 private delegate void AssetRetrievedEx(AssetBase asset); 55 private delegate void AssetRetrievedEx(AssetBase asset);
52 56
53 // Keeps track of concurrent requests for the same asset, so that it's only loaded once. 57 // Keeps track of concurrent requests for the same asset, so that it's only loaded once.
54 // Maps: Asset ID -> Handlers which will be called when the asset has been loaded 58 // Maps: Asset ID -> Handlers which will be called when the asset has been loaded
55 private Dictionary<string, AssetRetrievedEx> m_AssetHandlers = new Dictionary<string, AssetRetrievedEx>(); 59// private Dictionary<string, AssetRetrievedEx> m_AssetHandlers = new Dictionary<string, AssetRetrievedEx>();
60
61 private Dictionary<string, List<AssetRetrievedEx>> m_AssetHandlers = new Dictionary<string, List<AssetRetrievedEx>>();
56 62
63 private Dictionary<string, string> m_UriMap = new Dictionary<string, string>();
64
65 private Thread[] m_fetchThreads;
57 66
58 public AssetServicesConnector() 67 public AssetServicesConnector()
59 { 68 {
@@ -81,13 +90,102 @@ namespace OpenSim.Services.Connectors
81 string serviceURI = assetConfig.GetString("AssetServerURI", 90 string serviceURI = assetConfig.GetString("AssetServerURI",
82 String.Empty); 91 String.Empty);
83 92
93 m_ServerURI = serviceURI;
94
84 if (serviceURI == String.Empty) 95 if (serviceURI == String.Empty)
85 { 96 {
86 m_log.Error("[ASSET CONNECTOR]: No Server URI named in section AssetService"); 97 m_log.Error("[ASSET CONNECTOR]: No Server URI named in section AssetService");
87 throw new Exception("Asset connector init error"); 98 throw new Exception("Asset connector init error");
88 } 99 }
89 100
90 m_ServerURI = serviceURI; 101
102 m_retryTimer = new System.Timers.Timer();
103 m_retryTimer.Elapsed += new ElapsedEventHandler(retryCheck);
104 m_retryTimer.Interval = 60000;
105
106 Uri serverUri = new Uri(m_ServerURI);
107
108 string groupHost = serverUri.Host;
109
110 for (int i = 0 ; i < 256 ; i++)
111 {
112 string prefix = i.ToString("x2");
113 groupHost = assetConfig.GetString("AssetServerHost_"+prefix, groupHost);
114
115 m_UriMap[prefix] = groupHost;
116 //m_log.DebugFormat("[ASSET]: Using {0} for prefix {1}", groupHost, prefix);
117 }
118
119 m_fetchThreads = new Thread[2];
120
121 for (int i = 0 ; i < 2 ; i++)
122 {
123 m_fetchThreads[i] = new Thread(AssetRequestProcessor);
124 m_fetchThreads[i].Start();
125 }
126 }
127
128 private string MapServer(string id)
129 {
130 UriBuilder serverUri = new UriBuilder(m_ServerURI);
131
132 string prefix = id.Substring(0, 2).ToLower();
133
134 string host = m_UriMap[prefix];
135
136 serverUri.Host = host;
137
138 // m_log.DebugFormat("[ASSET]: Using {0} for host name for prefix {1}", host, prefix);
139
140 string ret = serverUri.Uri.AbsoluteUri;
141 if (ret.EndsWith("/"))
142 ret = ret.Substring(0, ret.Length - 1);
143 return ret;
144 }
145
146 protected void retryCheck(object source, ElapsedEventArgs e)
147 {
148 m_retryCounter++;
149 if (m_retryCounter > 60) m_retryCounter -= 60;
150 List<int> keys = new List<int>();
151 foreach (int a in m_retryQueue.Keys)
152 {
153 keys.Add(a);
154 }
155 foreach (int a in keys)
156 {
157 //We exponentially fall back on frequency until we reach one attempt per hour
158 //The net result is that we end up in the queue for roughly 24 hours..
159 //24 hours worth of assets could be a lot, so the hope is that the region admin
160 //will have gotten the asset connector back online quickly!
161
162 int timefactor = a ^ 2;
163 if (timefactor > 60)
164 {
165 timefactor = 60;
166 }
167
168 //First, find out if we care about this timefactor
169 if (timefactor % a == 0)
170 {
171 //Yes, we do!
172 List<AssetBase> retrylist = m_retryQueue[a];
173 m_retryQueue.Remove(a);
174
175 foreach(AssetBase ass in retrylist)
176 {
177 Store(ass); //Store my ass. This function will put it back in the dictionary if it fails
178 }
179 }
180 }
181
182 if (m_retryQueue.Count == 0)
183 {
184 //It might only be one tick per minute, but I have
185 //repented and abandoned my wasteful ways
186 m_retryCounter = 0;
187 m_retryTimer.Stop();
188 }
91 } 189 }
92 190
93 protected void SetCache(IImprovedAssetCache cache) 191 protected void SetCache(IImprovedAssetCache cache)
@@ -97,15 +195,13 @@ namespace OpenSim.Services.Connectors
97 195
98 public AssetBase Get(string id) 196 public AssetBase Get(string id)
99 { 197 {
100// m_log.DebugFormat("[ASSET SERVICE CONNECTOR]: Synchronous get request for {0}", id); 198 string uri = MapServer(id) + "/assets/" + id;
101
102 string uri = m_ServerURI + "/assets/" + id;
103 199
104 AssetBase asset = null; 200 AssetBase asset = null;
105 if (m_Cache != null) 201 if (m_Cache != null)
106 asset = m_Cache.Get(id); 202 asset = m_Cache.Get(id);
107 203
108 if (asset == null) 204 if (asset == null || asset.Data == null || asset.Data.Length == 0)
109 { 205 {
110 asset = SynchronousRestObjectRequester. 206 asset = SynchronousRestObjectRequester.
111 MakeRequest<int, AssetBase>("GET", uri, 0, 30); 207 MakeRequest<int, AssetBase>("GET", uri, 0, 30);
@@ -136,7 +232,7 @@ namespace OpenSim.Services.Connectors
136 return fullAsset.Metadata; 232 return fullAsset.Metadata;
137 } 233 }
138 234
139 string uri = m_ServerURI + "/assets/" + id + "/metadata"; 235 string uri = MapServer(id) + "/assets/" + id + "/metadata";
140 236
141 AssetMetadata asset = SynchronousRestObjectRequester. 237 AssetMetadata asset = SynchronousRestObjectRequester.
142 MakeRequest<int, AssetMetadata>("GET", uri, 0); 238 MakeRequest<int, AssetMetadata>("GET", uri, 0);
@@ -153,7 +249,7 @@ namespace OpenSim.Services.Connectors
153 return fullAsset.Data; 249 return fullAsset.Data;
154 } 250 }
155 251
156 RestClient rc = new RestClient(m_ServerURI); 252 RestClient rc = new RestClient(MapServer(id));
157 rc.AddResourcePath("assets"); 253 rc.AddResourcePath("assets");
158 rc.AddResourcePath(id); 254 rc.AddResourcePath(id);
159 rc.AddResourcePath("data"); 255 rc.AddResourcePath("data");
@@ -176,34 +272,25 @@ namespace OpenSim.Services.Connectors
176 return null; 272 return null;
177 } 273 }
178 274
179 public bool Get(string id, Object sender, AssetRetrieved handler) 275 private class QueuedAssetRequest
180 { 276 {
181// m_log.DebugFormat("[ASSET SERVICE CONNECTOR]: Potentially asynchronous get request for {0}", id); 277 public string uri;
278 public string id;
279 }
182 280
183 string uri = m_ServerURI + "/assets/" + id; 281 private OpenMetaverse.BlockingQueue<QueuedAssetRequest> m_requestQueue =
282 new OpenMetaverse.BlockingQueue<QueuedAssetRequest>();
184 283
185 AssetBase asset = null; 284 private void AssetRequestProcessor()
186 if (m_Cache != null) 285 {
187 asset = m_Cache.Get(id); 286 QueuedAssetRequest r;
188 287
189 if (asset == null) 288 while (true)
190 { 289 {
191 lock (m_AssetHandlers) 290 r = m_requestQueue.Dequeue();
192 {
193 AssetRetrievedEx handlerEx = new AssetRetrievedEx(delegate(AssetBase _asset) { handler(id, sender, _asset); });
194 291
195 AssetRetrievedEx handlers; 292 string uri = r.uri;
196 if (m_AssetHandlers.TryGetValue(id, out handlers)) 293 string id = r.id;
197 {
198 // Someone else is already loading this asset. It will notify our handler when done.
199 handlers += handlerEx;
200 return true;
201 }
202
203 // Load the asset ourselves
204 handlers += handlerEx;
205 m_AssetHandlers.Add(id, handlers);
206 }
207 294
208 bool success = false; 295 bool success = false;
209 try 296 try
@@ -214,13 +301,16 @@ namespace OpenSim.Services.Connectors
214 if (m_Cache != null) 301 if (m_Cache != null)
215 m_Cache.Cache(a); 302 m_Cache.Cache(a);
216 303
217 AssetRetrievedEx handlers; 304 List<AssetRetrievedEx> handlers;
218 lock (m_AssetHandlers) 305 lock (m_AssetHandlers)
219 { 306 {
220 handlers = m_AssetHandlers[id]; 307 handlers = m_AssetHandlers[id];
221 m_AssetHandlers.Remove(id); 308 m_AssetHandlers.Remove(id);
222 } 309 }
223 handlers.Invoke(a); 310 foreach (AssetRetrievedEx h in handlers)
311 h.Invoke(a);
312 if (handlers != null)
313 handlers.Clear();
224 }, 30); 314 }, 30);
225 315
226 success = true; 316 success = true;
@@ -229,13 +319,57 @@ namespace OpenSim.Services.Connectors
229 { 319 {
230 if (!success) 320 if (!success)
231 { 321 {
322 List<AssetRetrievedEx> handlers;
232 lock (m_AssetHandlers) 323 lock (m_AssetHandlers)
233 { 324 {
325 handlers = m_AssetHandlers[id];
234 m_AssetHandlers.Remove(id); 326 m_AssetHandlers.Remove(id);
235 } 327 }
328 if (handlers != null)
329 handlers.Clear();
236 } 330 }
237 } 331 }
238 } 332 }
333 }
334
335 public bool Get(string id, Object sender, AssetRetrieved handler)
336 {
337 string uri = MapServer(id) + "/assets/" + id;
338
339 AssetBase asset = null;
340 if (m_Cache != null)
341 asset = m_Cache.Get(id);
342
343 if (asset == null || asset.Data == null || asset.Data.Length == 0)
344 {
345 lock (m_AssetHandlers)
346 {
347 AssetRetrievedEx handlerEx = new AssetRetrievedEx(delegate(AssetBase _asset) { handler(id, sender, _asset); });
348
349// AssetRetrievedEx handlers;
350 List<AssetRetrievedEx> handlers;
351 if (m_AssetHandlers.TryGetValue(id, out handlers))
352 {
353 // Someone else is already loading this asset. It will notify our handler when done.
354// handlers += handlerEx;
355 handlers.Add(handlerEx);
356 return true;
357 }
358
359 // Load the asset ourselves
360// handlers += handlerEx;
361 handlers = new List<AssetRetrievedEx>();
362 handlers.Add(handlerEx);
363
364 m_AssetHandlers.Add(id, handlers);
365 }
366
367 QueuedAssetRequest request = new QueuedAssetRequest();
368 request.id = id;
369 request.uri = uri;
370
371 m_requestQueue.Enqueue(request);
372 }
239 else 373 else
240 { 374 {
241 handler(id, sender, asset); 375 handler(id, sender, asset);
@@ -246,38 +380,95 @@ namespace OpenSim.Services.Connectors
246 380
247 public string Store(AssetBase asset) 381 public string Store(AssetBase asset)
248 { 382 {
249 if (asset.Temporary || asset.Local) 383 // Have to assign the asset ID here. This isn't likely to
384 // trigger since current callers don't pass emtpy IDs
385 // We need the asset ID to route the request to the proper
386 // cluster member, so we can't have the server assign one.
387 if (asset.ID == string.Empty)
250 { 388 {
251 if (m_Cache != null) 389 if (asset.FullID == UUID.Zero)
252 m_Cache.Cache(asset); 390 {
391 asset.FullID = UUID.Random();
392 }
393 asset.ID = asset.FullID.ToString();
394 }
395 else if (asset.FullID == UUID.Zero)
396 {
397 UUID uuid = UUID.Zero;
398 if (UUID.TryParse(asset.ID, out uuid))
399 {
400 asset.FullID = uuid;
401 }
402 else
403 {
404 asset.FullID = UUID.Random();
405 }
406 }
253 407
408 if (m_Cache != null)
409 m_Cache.Cache(asset);
410 if (asset.Temporary || asset.Local)
411 {
254 return asset.ID; 412 return asset.ID;
255 } 413 }
256 414
257 string uri = m_ServerURI + "/assets/"; 415 string uri = MapServer(asset.FullID.ToString()) + "/assets/";
258 416
259 string newID = string.Empty; 417 string newID = string.Empty;
260 try 418 try
261 { 419 {
262 newID = SynchronousRestObjectRequester. 420 newID = SynchronousRestObjectRequester.
263 MakeRequest<AssetBase, string>("POST", uri, asset); 421 MakeRequest<AssetBase, string>("POST", uri, asset, 25);
422 if (newID == null || newID == "")
423 {
424 newID = UUID.Zero.ToString();
425 }
264 } 426 }
265 catch (Exception e) 427 catch (Exception e)
266 { 428 {
267 m_log.WarnFormat("[ASSET CONNECTOR]: Unable to send asset {0} to asset server. Reason: {1}", asset.ID, e.Message); 429 newID = UUID.Zero.ToString();
268 } 430 }
269 431
270 if (newID != String.Empty) 432 if (newID == UUID.Zero.ToString())
271 { 433 {
272 // Placing this here, so that this work with old asset servers that don't send any reply back 434 //The asset upload failed, put it in a queue for later
273 // SynchronousRestObjectRequester returns somethins that is not an empty string 435 asset.UploadAttempts++;
274 if (newID != null) 436 if (asset.UploadAttempts > 30)
275 asset.ID = newID; 437 {
438 //By this stage we've been in the queue for a good few hours;
439 //We're going to drop the asset.
440 m_log.ErrorFormat("[Assets] Dropping asset {0} - Upload has been in the queue for too long.", asset.ID.ToString());
441 }
442 else
443 {
444 if (!m_retryQueue.ContainsKey(asset.UploadAttempts))
445 {
446 m_retryQueue.Add(asset.UploadAttempts, new List<AssetBase>());
447 }
448 List<AssetBase> m_queue = m_retryQueue[asset.UploadAttempts];
449 m_queue.Add(asset);
450 m_log.WarnFormat("[Assets] Upload failed: {0} - Requeuing asset for another run.", asset.ID.ToString());
451 m_retryTimer.Start();
452 }
453 }
454 else
455 {
456 if (asset.UploadAttempts > 0)
457 {
458 m_log.InfoFormat("[Assets] Upload of {0} succeeded after {1} failed attempts", asset.ID.ToString(), asset.UploadAttempts.ToString());
459 }
460 if (newID != String.Empty)
461 {
462 // Placing this here, so that this work with old asset servers that don't send any reply back
463 // SynchronousRestObjectRequester returns somethins that is not an empty string
464 if (newID != null)
465 asset.ID = newID;
276 466
277 if (m_Cache != null) 467 if (m_Cache != null)
278 m_Cache.Cache(asset); 468 m_Cache.Cache(asset);
469 }
279 } 470 }
280 return newID; 471 return asset.ID;
281 } 472 }
282 473
283 public bool UpdateContent(string id, byte[] data) 474 public bool UpdateContent(string id, byte[] data)
@@ -298,7 +489,7 @@ namespace OpenSim.Services.Connectors
298 } 489 }
299 asset.Data = data; 490 asset.Data = data;
300 491
301 string uri = m_ServerURI + "/assets/" + id; 492 string uri = MapServer(id) + "/assets/" + id;
302 493
303 if (SynchronousRestObjectRequester. 494 if (SynchronousRestObjectRequester.
304 MakeRequest<AssetBase, bool>("POST", uri, asset)) 495 MakeRequest<AssetBase, bool>("POST", uri, asset))
@@ -313,7 +504,7 @@ namespace OpenSim.Services.Connectors
313 504
314 public bool Delete(string id) 505 public bool Delete(string id)
315 { 506 {
316 string uri = m_ServerURI + "/assets/" + id; 507 string uri = MapServer(id) + "/assets/" + id;
317 508
318 if (SynchronousRestObjectRequester. 509 if (SynchronousRestObjectRequester.
319 MakeRequest<int, bool>("DELETE", uri, 0)) 510 MakeRequest<int, bool>("DELETE", uri, 0))
diff --git a/OpenSim/Services/Connectors/Authentication/AuthenticationServicesConnector.cs b/OpenSim/Services/Connectors/Authentication/AuthenticationServicesConnector.cs
index 2b77154..f996aca 100644
--- a/OpenSim/Services/Connectors/Authentication/AuthenticationServicesConnector.cs
+++ b/OpenSim/Services/Connectors/Authentication/AuthenticationServicesConnector.cs
@@ -81,6 +81,13 @@ namespace OpenSim.Services.Connectors
81 m_ServerURI = serviceURI; 81 m_ServerURI = serviceURI;
82 } 82 }
83 83
84 public string Authenticate(UUID principalID, string password, int lifetime, out UUID realID)
85 {
86 realID = UUID.Zero;
87
88 return Authenticate(principalID, password, lifetime);
89 }
90
84 public string Authenticate(UUID principalID, string password, int lifetime) 91 public string Authenticate(UUID principalID, string password, int lifetime)
85 { 92 {
86 Dictionary<string, object> sendData = new Dictionary<string, object>(); 93 Dictionary<string, object> sendData = new Dictionary<string, object>();
diff --git a/OpenSim/Services/Connectors/Friends/FriendsSimConnector.cs b/OpenSim/Services/Connectors/Friends/FriendsSimConnector.cs
index 3fd0c53..6cd21d1 100644
--- a/OpenSim/Services/Connectors/Friends/FriendsSimConnector.cs
+++ b/OpenSim/Services/Connectors/Friends/FriendsSimConnector.cs
@@ -144,44 +144,48 @@ namespace OpenSim.Services.Connectors.Friends
144 144
145 private bool Call(GridRegion region, Dictionary<string, object> sendData) 145 private bool Call(GridRegion region, Dictionary<string, object> sendData)
146 { 146 {
147 string reqString = ServerUtils.BuildQueryString(sendData); 147 Util.FireAndForget(x => {
148 //m_log.DebugFormat("[FRIENDS SIM CONNECTOR]: queryString = {0}", reqString); 148 string reqString = ServerUtils.BuildQueryString(sendData);
149 if (region == null) 149 //m_log.DebugFormat("[FRIENDS SIM CONNECTOR]: queryString = {0}", reqString);
150 return false; 150 if (region == null)
151 151 return;
152 string path = ServicePath(); 152
153 if (!region.ServerURI.EndsWith("/")) 153 string path = ServicePath();
154 path = "/" + path; 154 if (!region.ServerURI.EndsWith("/"))
155 string uri = region.ServerURI + path; 155 path = "/" + path;
156 m_log.DebugFormat("[FRIENDS SIM CONNECTOR]: calling {0}", uri); 156 string uri = region.ServerURI + path;
157 157 m_log.DebugFormat("[FRIENDS SIM CONNECTOR]: calling {0}", uri);
158 try 158
159 { 159 try
160 string reply = SynchronousRestFormsRequester.MakeRequest("POST", uri, reqString);
161 if (reply != string.Empty)
162 { 160 {
163 Dictionary<string, object> replyData = ServerUtils.ParseXmlResponse(reply); 161 string reply = SynchronousRestFormsRequester.MakeRequest("POST", uri, reqString);
164 162 if (reply != string.Empty)
165 if (replyData.ContainsKey("RESULT"))
166 { 163 {
167 if (replyData["RESULT"].ToString().ToLower() == "true") 164 Dictionary<string, object> replyData = ServerUtils.ParseXmlResponse(reply);
168 return true; 165
166 if (replyData.ContainsKey("RESULT"))
167 {
168// if (replyData["RESULT"].ToString().ToLower() == "true")
169// return;
170// else
171 return;
172 }
169 else 173 else
170 return false; 174 m_log.DebugFormat("[FRIENDS SIM CONNECTOR]: reply data does not contain result field");
175
171 } 176 }
172 else 177 else
173 m_log.DebugFormat("[FRIENDS SIM CONNECTOR]: reply data does not contain result field"); 178 m_log.DebugFormat("[FRIENDS SIM CONNECTOR]: received empty reply");
174 179 }
180 catch (Exception e)
181 {
182 m_log.DebugFormat("[FRIENDS SIM CONNECTOR]: Exception when contacting remote sim at {0}: {1}", uri, e.Message);
175 } 183 }
176 else 184
177 m_log.DebugFormat("[FRIENDS SIM CONNECTOR]: received empty reply"); 185 return;
178 } 186 });
179 catch (Exception e) 187
180 { 188 return true;
181 m_log.DebugFormat("[FRIENDS SIM CONNECTOR]: Exception when contacting remote sim at {0}: {1}", uri, e.Message);
182 }
183
184 return false;
185 } 189 }
186 } 190 }
187} 191}
diff --git a/OpenSim/Services/Connectors/Grid/GridServicesConnector.cs b/OpenSim/Services/Connectors/Grid/GridServicesConnector.cs
index 34ed0d7..f982cc1 100644
--- a/OpenSim/Services/Connectors/Grid/GridServicesConnector.cs
+++ b/OpenSim/Services/Connectors/Grid/GridServicesConnector.cs
@@ -48,6 +48,9 @@ namespace OpenSim.Services.Connectors
48 48
49 private string m_ServerURI = String.Empty; 49 private string m_ServerURI = String.Empty;
50 50
51 private ExpiringCache<ulong, GridRegion> m_regionCache =
52 new ExpiringCache<ulong, GridRegion>();
53
51 public GridServicesConnector() 54 public GridServicesConnector()
52 { 55 {
53 } 56 }
@@ -272,6 +275,11 @@ namespace OpenSim.Services.Connectors
272 275
273 public GridRegion GetRegionByPosition(UUID scopeID, int x, int y) 276 public GridRegion GetRegionByPosition(UUID scopeID, int x, int y)
274 { 277 {
278 ulong regionHandle = Util.UIntsToLong((uint)x, (uint)y);
279
280 if (m_regionCache.Contains(regionHandle))
281 return (GridRegion)m_regionCache[regionHandle];
282
275 Dictionary<string, object> sendData = new Dictionary<string, object>(); 283 Dictionary<string, object> sendData = new Dictionary<string, object>();
276 284
277 sendData["SCOPEID"] = scopeID.ToString(); 285 sendData["SCOPEID"] = scopeID.ToString();
@@ -313,6 +321,8 @@ namespace OpenSim.Services.Connectors
313 else 321 else
314 m_log.DebugFormat("[GRID CONNECTOR]: GetRegionByPosition received null reply"); 322 m_log.DebugFormat("[GRID CONNECTOR]: GetRegionByPosition received null reply");
315 323
324 m_regionCache.Add(regionHandle, rinfo, TimeSpan.FromSeconds(600));
325
316 return rinfo; 326 return rinfo;
317 } 327 }
318 328
diff --git a/OpenSim/Services/Connectors/Hypergrid/GatekeeperServiceConnector.cs b/OpenSim/Services/Connectors/Hypergrid/GatekeeperServiceConnector.cs
index 19dffc3..4cd933c 100644
--- a/OpenSim/Services/Connectors/Hypergrid/GatekeeperServiceConnector.cs
+++ b/OpenSim/Services/Connectors/Hypergrid/GatekeeperServiceConnector.cs
@@ -158,6 +158,7 @@ namespace OpenSim.Services.Connectors.Hypergrid
158 try 158 try
159 { 159 {
160 WebClient c = new WebClient(); 160 WebClient c = new WebClient();
161 //m_log.Debug("JPEG: " + imageURL);
161 string name = regionID.ToString(); 162 string name = regionID.ToString();
162 filename = Path.Combine(storagePath, name + ".jpg"); 163 filename = Path.Combine(storagePath, name + ".jpg");
163 m_log.DebugFormat("[GATEKEEPER SERVICE CONNECTOR]: Map image at {0}, cached at {1}", imageURL, filename); 164 m_log.DebugFormat("[GATEKEEPER SERVICE CONNECTOR]: Map image at {0}, cached at {1}", imageURL, filename);
@@ -186,11 +187,10 @@ namespace OpenSim.Services.Connectors.Hypergrid
186 187
187 ass.Data = imageData; 188 ass.Data = imageData;
188 189
189 mapTile = ass.FullID;
190
191 // finally
192 m_AssetService.Store(ass); 190 m_AssetService.Store(ass);
193 191
192 // finally
193 mapTile = ass.FullID;
194 } 194 }
195 catch // LEGIT: Catching problems caused by OpenJPEG p/invoke 195 catch // LEGIT: Catching problems caused by OpenJPEG p/invoke
196 { 196 {
diff --git a/OpenSim/Services/Connectors/Hypergrid/UserAgentServiceConnector.cs b/OpenSim/Services/Connectors/Hypergrid/UserAgentServiceConnector.cs
index 2f263ae..c542c29 100644
--- a/OpenSim/Services/Connectors/Hypergrid/UserAgentServiceConnector.cs
+++ b/OpenSim/Services/Connectors/Hypergrid/UserAgentServiceConnector.cs
@@ -98,8 +98,6 @@ namespace OpenSim.Services.Connectors.Hypergrid
98 throw new Exception("UserAgent connector init error"); 98 throw new Exception("UserAgent connector init error");
99 } 99 }
100 m_ServerURL = serviceURI; 100 m_ServerURL = serviceURI;
101 if (!m_ServerURL.EndsWith("/"))
102 m_ServerURL += "/";
103 101
104 m_log.DebugFormat("[USER AGENT CONNECTOR]: UserAgentServiceConnector started for {0}", m_ServerURL); 102 m_log.DebugFormat("[USER AGENT CONNECTOR]: UserAgentServiceConnector started for {0}", m_ServerURL);
105 } 103 }
diff --git a/OpenSim/Services/Connectors/Land/LandServicesConnector.cs b/OpenSim/Services/Connectors/Land/LandServicesConnector.cs
index 30a73a4..833e22a 100644
--- a/OpenSim/Services/Connectors/Land/LandServicesConnector.cs
+++ b/OpenSim/Services/Connectors/Land/LandServicesConnector.cs
@@ -130,4 +130,4 @@ namespace OpenSim.Services.Connectors
130 return landData; 130 return landData;
131 } 131 }
132 } 132 }
133} \ No newline at end of file 133}
diff --git a/OpenSim/Services/Connectors/Presence/PresenceServicesConnector.cs b/OpenSim/Services/Connectors/Presence/PresenceServicesConnector.cs
index f7d8c53..378aab6 100644
--- a/OpenSim/Services/Connectors/Presence/PresenceServicesConnector.cs
+++ b/OpenSim/Services/Connectors/Presence/PresenceServicesConnector.cs
@@ -304,6 +304,17 @@ namespace OpenSim.Services.Connectors
304 { 304 {
305 pinfo = new PresenceInfo((Dictionary<string, object>)replyData["result"]); 305 pinfo = new PresenceInfo((Dictionary<string, object>)replyData["result"]);
306 } 306 }
307 else
308 {
309 if (replyData["result"].ToString() == "null")
310 return null;
311
312 m_log.DebugFormat("[PRESENCE CONNECTOR]: Invalid reply (result not dictionary) received from presence server when querying for sessionID {0}", sessionID.ToString());
313 }
314 }
315 else
316 {
317 m_log.DebugFormat("[PRESENCE CONNECTOR]: Invalid reply received from presence server when querying for sessionID {0}", sessionID.ToString());
307 } 318 }
308 319
309 return pinfo; 320 return pinfo;
diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianAuthenticationServiceConnector.cs b/OpenSim/Services/Connectors/SimianGrid/SimianAuthenticationServiceConnector.cs
index 69f6ed2..ffae0da 100644
--- a/OpenSim/Services/Connectors/SimianGrid/SimianAuthenticationServiceConnector.cs
+++ b/OpenSim/Services/Connectors/SimianGrid/SimianAuthenticationServiceConnector.cs
@@ -102,6 +102,12 @@ namespace OpenSim.Services.Connectors.SimianGrid
102 m_log.Info("[SIMIAN AUTH CONNECTOR]: No AuthenticationServerURI specified, disabling connector"); 102 m_log.Info("[SIMIAN AUTH CONNECTOR]: No AuthenticationServerURI specified, disabling connector");
103 } 103 }
104 104
105 public string Authenticate(UUID principalID, string password, int lifetime, out UUID realID)
106 {
107 realID = UUID.Zero;
108 return Authenticate(principalID, password, lifetime);
109 }
110
105 public string Authenticate(UUID principalID, string password, int lifetime) 111 public string Authenticate(UUID principalID, string password, int lifetime)
106 { 112 {
107 NameValueCollection requestArgs = new NameValueCollection 113 NameValueCollection requestArgs = new NameValueCollection
diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianGridServiceConnector.cs b/OpenSim/Services/Connectors/SimianGrid/SimianGridServiceConnector.cs
index 35cb408..67a10b0 100644
--- a/OpenSim/Services/Connectors/SimianGrid/SimianGridServiceConnector.cs
+++ b/OpenSim/Services/Connectors/SimianGrid/SimianGridServiceConnector.cs
@@ -28,6 +28,8 @@
28using System; 28using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Collections.Specialized; 30using System.Collections.Specialized;
31using System.Drawing;
32using System.Drawing.Imaging;
31using System.IO; 33using System.IO;
32using System.Net; 34using System.Net;
33using System.Reflection; 35using System.Reflection;
@@ -100,6 +102,15 @@ namespace OpenSim.Services.Connectors.SimianGrid
100 102
101 public string RegisterRegion(UUID scopeID, GridRegion regionInfo) 103 public string RegisterRegion(UUID scopeID, GridRegion regionInfo)
102 { 104 {
105 IPEndPoint ext = regionInfo.ExternalEndPoint;
106 if (ext == null) return "Region registration for " + regionInfo.RegionName + " failed: Could not resolve EndPoint";
107 // Generate and upload our map tile in PNG format to the SimianGrid AddMapTile service
108// Scene scene;
109// if (m_scenes.TryGetValue(regionInfo.RegionID, out scene))
110// UploadMapTile(scene);
111// else
112// m_log.Warn("Registering region " + regionInfo.RegionName + " (" + regionInfo.RegionID + ") that we are not tracking");
113
103 Vector3d minPosition = new Vector3d(regionInfo.RegionLocX, regionInfo.RegionLocY, 0.0); 114 Vector3d minPosition = new Vector3d(regionInfo.RegionLocX, regionInfo.RegionLocY, 0.0);
104 Vector3d maxPosition = minPosition + new Vector3d(Constants.RegionSize, Constants.RegionSize, Constants.RegionHeight); 115 Vector3d maxPosition = minPosition + new Vector3d(Constants.RegionSize, Constants.RegionSize, Constants.RegionHeight);
105 116
@@ -108,7 +119,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
108 { "ServerURI", OSD.FromString(regionInfo.ServerURI) }, 119 { "ServerURI", OSD.FromString(regionInfo.ServerURI) },
109 { "InternalAddress", OSD.FromString(regionInfo.InternalEndPoint.Address.ToString()) }, 120 { "InternalAddress", OSD.FromString(regionInfo.InternalEndPoint.Address.ToString()) },
110 { "InternalPort", OSD.FromInteger(regionInfo.InternalEndPoint.Port) }, 121 { "InternalPort", OSD.FromInteger(regionInfo.InternalEndPoint.Port) },
111 { "ExternalAddress", OSD.FromString(regionInfo.ExternalEndPoint.Address.ToString()) }, 122 { "ExternalAddress", OSD.FromString(ext.Address.ToString()) },
112 { "ExternalPort", OSD.FromInteger(regionInfo.ExternalEndPoint.Port) }, 123 { "ExternalPort", OSD.FromInteger(regionInfo.ExternalEndPoint.Port) },
113 { "MapTexture", OSD.FromUUID(regionInfo.TerrainImage) }, 124 { "MapTexture", OSD.FromUUID(regionInfo.TerrainImage) },
114 { "Access", OSD.FromInteger(regionInfo.Access) }, 125 { "Access", OSD.FromInteger(regionInfo.Access) },
@@ -399,6 +410,83 @@ namespace OpenSim.Services.Connectors.SimianGrid
399 410
400 #endregion IGridService 411 #endregion IGridService
401 412
413 private void UploadMapTile(IScene scene)
414 {
415 string errorMessage = null;
416
417 // Create a PNG map tile and upload it to the AddMapTile API
418 byte[] pngData = Utils.EmptyBytes;
419 IMapImageGenerator tileGenerator = scene.RequestModuleInterface<IMapImageGenerator>();
420 if (tileGenerator == null)
421 {
422 m_log.Warn("[SIMIAN GRID CONNECTOR]: Cannot upload PNG map tile without an IMapImageGenerator");
423 return;
424 }
425
426 using (Image mapTile = tileGenerator.CreateMapTile())
427 {
428 using (MemoryStream stream = new MemoryStream())
429 {
430 mapTile.Save(stream, ImageFormat.Png);
431 pngData = stream.ToArray();
432 }
433 }
434
435 List<MultipartForm.Element> postParameters = new List<MultipartForm.Element>()
436 {
437 new MultipartForm.Parameter("X", scene.RegionInfo.RegionLocX.ToString()),
438 new MultipartForm.Parameter("Y", scene.RegionInfo.RegionLocY.ToString()),
439 new MultipartForm.File("Tile", "tile.png", "image/png", pngData)
440 };
441
442 // Make the remote storage request
443 try
444 {
445 HttpWebRequest request = (HttpWebRequest)HttpWebRequest.Create(m_ServerURI);
446
447 HttpWebResponse response = MultipartForm.Post(request, postParameters);
448 using (Stream responseStream = response.GetResponseStream())
449 {
450 string responseStr = null;
451
452 try
453 {
454 responseStr = responseStream.GetStreamString();
455 OSD responseOSD = OSDParser.Deserialize(responseStr);
456 if (responseOSD.Type == OSDType.Map)
457 {
458 OSDMap responseMap = (OSDMap)responseOSD;
459 if (responseMap["Success"].AsBoolean())
460 m_log.Info("[SIMIAN GRID CONNECTOR]: Uploaded " + pngData.Length + " byte PNG map tile to AddMapTile");
461 else
462 errorMessage = "Upload failed: " + responseMap["Message"].AsString();
463 }
464 else
465 {
466 errorMessage = "Response format was invalid:\n" + responseStr;
467 }
468 }
469 catch (Exception ex)
470 {
471 if (!String.IsNullOrEmpty(responseStr))
472 errorMessage = "Failed to parse the response:\n" + responseStr;
473 else
474 errorMessage = "Failed to retrieve the response: " + ex.Message;
475 }
476 }
477 }
478 catch (WebException ex)
479 {
480 errorMessage = ex.Message;
481 }
482
483 if (!String.IsNullOrEmpty(errorMessage))
484 {
485 m_log.WarnFormat("[SIMIAN GRID CONNECTOR]: Failed to store {0} byte PNG map tile for {1}: {2}",
486 pngData.Length, scene.RegionInfo.RegionName, errorMessage.Replace('\n', ' '));
487 }
488 }
489
402 private GridRegion GetNearestRegion(Vector3d position, bool onlyEnabled) 490 private GridRegion GetNearestRegion(Vector3d position, bool onlyEnabled)
403 { 491 {
404 NameValueCollection requestArgs = new NameValueCollection 492 NameValueCollection requestArgs = new NameValueCollection
diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianUserAccountServiceConnector.cs b/OpenSim/Services/Connectors/SimianGrid/SimianUserAccountServiceConnector.cs
index 4350749..f38ebe8 100644
--- a/OpenSim/Services/Connectors/SimianGrid/SimianUserAccountServiceConnector.cs
+++ b/OpenSim/Services/Connectors/SimianGrid/SimianUserAccountServiceConnector.cs
@@ -191,6 +191,11 @@ namespace OpenSim.Services.Connectors.SimianGrid
191 return accounts; 191 return accounts;
192 } 192 }
193 193
194 public List<UserAccount> GetUserAccountsWhere(UUID scopeID, string query)
195 {
196 return null;
197 }
198
194 public bool StoreUserAccount(UserAccount data) 199 public bool StoreUserAccount(UserAccount data)
195 { 200 {
196// m_log.InfoFormat("[SIMIAN ACCOUNT CONNECTOR]: Storing user account for " + data.Name); 201// m_log.InfoFormat("[SIMIAN ACCOUNT CONNECTOR]: Storing user account for " + data.Name);
diff --git a/OpenSim/Services/Connectors/Simulation/SimulationDataService.cs b/OpenSim/Services/Connectors/Simulation/SimulationDataService.cs
index 504fcaf..96c02d9 100644
--- a/OpenSim/Services/Connectors/Simulation/SimulationDataService.cs
+++ b/OpenSim/Services/Connectors/Simulation/SimulationDataService.cs
@@ -164,6 +164,11 @@ namespace OpenSim.Services.Connectors
164 m_database.RemoveRegionEnvironmentSettings(regionUUID); 164 m_database.RemoveRegionEnvironmentSettings(regionUUID);
165 } 165 }
166 166
167 public UUID[] GetObjectIDs(UUID regionID)
168 {
169 return m_database.GetObjectIDs(regionID);
170 }
171
167 public void SaveExtra(UUID regionID, string name, string val) 172 public void SaveExtra(UUID regionID, string name, string val)
168 { 173 {
169 m_database.SaveExtra(regionID, name, val); 174 m_database.SaveExtra(regionID, name, val);
diff --git a/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs b/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs
index 95c4f87..508baf7 100644
--- a/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs
+++ b/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs
@@ -86,6 +86,7 @@ namespace OpenSim.Services.Connectors.Simulation
86 reason = String.Empty; 86 reason = String.Empty;
87 if (destination == null) 87 if (destination == null)
88 { 88 {
89 reason = "Destination not found";
89 m_log.Debug("[REMOTE SIMULATION CONNECTOR]: Given destination is null"); 90 m_log.Debug("[REMOTE SIMULATION CONNECTOR]: Given destination is null");
90 return false; 91 return false;
91 } 92 }
@@ -359,6 +360,10 @@ namespace OpenSim.Services.Connectors.Simulation
359 return false; 360 return false;
360 } 361 }
361 362
363 OSDMap resp = (OSDMap)result["_Result"];
364 success = resp["success"].AsBoolean();
365 reason = resp["reason"].AsString();
366
362 return success; 367 return success;
363 } 368 }
364 catch (Exception e) 369 catch (Exception e)
@@ -387,26 +392,35 @@ namespace OpenSim.Services.Connectors.Simulation
387 return true; 392 return true;
388 } 393 }
389 394
390 /// <summary> 395 private bool CloseAgent(GridRegion destination, UUID id, bool ChildOnly)
391 /// </summary>
392 public bool CloseAgent(GridRegion destination, UUID id)
393 { 396 {
394// m_log.DebugFormat("[REMOTE SIMULATION CONNECTOR]: CloseAgent start"); 397// m_log.DebugFormat("[REMOTE SIMULATION CONNECTOR]: CloseAgent start");
398 Util.FireAndForget(x => {
399 string uri = destination.ServerURI + AgentPath() + id + "/" + destination.RegionID.ToString() + "/";
395 400
396 string uri = destination.ServerURI + AgentPath() + id + "/" + destination.RegionID.ToString() + "/"; 401 try
397 402 {
398 try 403 WebUtil.ServiceOSDRequest(uri, null, "DELETE", 10000, false);
399 { 404 }
400 WebUtil.ServiceOSDRequest(uri, null, "DELETE", 10000, false); 405 catch (Exception e)
401 } 406 {
402 catch (Exception e) 407 m_log.WarnFormat("[REMOTE SIMULATION CONNECTOR] CloseAgent failed with exception; {0}",e.ToString());
403 { 408 }
404 m_log.WarnFormat("[REMOTE SIMULATION CONNECTOR] CloseAgent failed with exception; {0}",e.ToString()); 409 });
405 }
406 410
407 return true; 411 return true;
408 } 412 }
409 413
414 public bool CloseChildAgent(GridRegion destination, UUID id)
415 {
416 return CloseAgent(destination, id, true);
417 }
418
419 public bool CloseAgent(GridRegion destination, UUID id)
420 {
421 return CloseAgent(destination, id, false);
422 }
423
410 #endregion Agents 424 #endregion Agents
411 425
412 #region Objects 426 #region Objects
@@ -444,11 +458,14 @@ namespace OpenSim.Services.Connectors.Simulation
444 args["destination_name"] = OSD.FromString(destination.RegionName); 458 args["destination_name"] = OSD.FromString(destination.RegionName);
445 args["destination_uuid"] = OSD.FromString(destination.RegionID.ToString()); 459 args["destination_uuid"] = OSD.FromString(destination.RegionID.ToString());
446 460
447 WebUtil.PostToService(uri, args, 40000); 461 OSDMap response = WebUtil.PostToService(uri, args, 40000);
462 if (response["Success"] == "False")
463 return false;
448 } 464 }
449 catch (Exception e) 465 catch (Exception e)
450 { 466 {
451 m_log.WarnFormat("[REMOTE SIMULATION CONNECTOR] CreateObject failed with exception; {0}",e.ToString()); 467 m_log.WarnFormat("[REMOTE SIMULATION CONNECTOR] CreateObject failed with exception; {0}",e.ToString());
468 return false;
452 } 469 }
453 470
454 return true; 471 return true;
diff --git a/OpenSim/Services/Connectors/UserAccounts/UserAccountServicesConnector.cs b/OpenSim/Services/Connectors/UserAccounts/UserAccountServicesConnector.cs
index 6d5ce28..5731e2f 100644
--- a/OpenSim/Services/Connectors/UserAccounts/UserAccountServicesConnector.cs
+++ b/OpenSim/Services/Connectors/UserAccounts/UserAccountServicesConnector.cs
@@ -187,6 +187,11 @@ namespace OpenSim.Services.Connectors
187 return accounts; 187 return accounts;
188 } 188 }
189 189
190 public List<UserAccount> GetUserAccountsWhere(UUID scopeID, string where)
191 {
192 return null; // Not implemented for regions
193 }
194
190 public virtual bool StoreUserAccount(UserAccount data) 195 public virtual bool StoreUserAccount(UserAccount data)
191 { 196 {
192 Dictionary<string, object> sendData = new Dictionary<string, object>(); 197 Dictionary<string, object> sendData = new Dictionary<string, object>();
generated by cgit v1.1 at 2024-12-24 11:26:02 +0000