diff --git a/OpenSim/Capabilities/Handlers/FetchInventory/FetchInvDescHandler.cs b/OpenSim/Capabilities/Handlers/FetchInventory/FetchInvDescHandler.cs
index a9cb134143..a476e91b5a 100644
--- a/OpenSim/Capabilities/Handlers/FetchInventory/FetchInvDescHandler.cs
+++ b/OpenSim/Capabilities/Handlers/FetchInventory/FetchInvDescHandler.cs
@@ -38,10 +38,10 @@ using OpenMetaverse;
using OpenMetaverse.StructuredData;
using OpenSim.Framework;
using OpenSim.Framework.Capabilities;
-using OpenSim.Region.Framework.Interfaces;
using OpenSim.Framework.Servers.HttpServer;
using OpenSim.Services.Interfaces;
-using Caps = OpenSim.Framework.Capabilities.Caps;
+using OSDMap = OpenMetaverse.StructuredData.OSDMap;
+using OSDArray = OpenMetaverse.StructuredData.OSDArray;
namespace OpenSim.Capabilities.Handlers
{
@@ -50,10 +50,10 @@ namespace OpenSim.Capabilities.Handlers
private static readonly ILog m_log =
LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+ private static byte[] EmptyResponse = Util.UTF8NBGetbytes("");
private IInventoryService m_InventoryService;
private ILibraryService m_LibraryService;
private IScene m_Scene;
-// private object m_fetchLock = new Object();
public FetchInvDescHandler(IInventoryService invService, ILibraryService libService, IScene s)
{
@@ -62,62 +62,66 @@ namespace OpenSim.Capabilities.Handlers
m_Scene = s;
}
- public string FetchInventoryDescendentsRequest(string request, string path, string param, IOSHttpRequest httpRequest, IOSHttpResponse httpResponse)
- {
- using (MemoryStream ms = new MemoryStream(Utils.StringToBytes(request), false))
- {
- return FetchInventoryDescendentsRequest(ms, path, param, httpRequest, httpResponse);
- }
- }
-
- public string FetchInventoryDescendentsRequest(Stream request, string path, string param, IOSHttpRequest httpRequest, IOSHttpResponse httpResponse)
+ public void FetchInventoryDescendentsRequest(IOSHttpRequest httpRequest, IOSHttpResponse httpResponse)
{
//m_log.DebugFormat("[XXX]: FetchInventoryDescendentsRequest in {0}, {1}", (m_Scene == null) ? "none" : m_Scene.Name, request);
- ArrayList foldersrequested = null;
+ List folders = null;
try
{
- Hashtable hash = (Hashtable)LLSD.LLSDDeserialize(request);
- foldersrequested = (ArrayList)hash["folders"];
- hash = null;
+ OSDArray foldersrequested = null;
+ OSD tmp = OSDParser.DeserializeLLSDXml(httpRequest.InputStream);
+ OSDMap map = (OSDMap)tmp;
+ if(map.TryGetValue("folders", out tmp) && tmp is OSDArray)
+ foldersrequested = tmp as OSDArray;
+
+ if (foldersrequested == null || foldersrequested.Count == 0)
+ {
+ httpResponse.RawBuffer = EmptyResponse;
+ return;
+ }
+
+ folders = new List(foldersrequested.Count);
+ for (int i = 0; i < foldersrequested.Count; i++)
+ {
+ LLSDFetchInventoryDescendents llsdRequest = new LLSDFetchInventoryDescendents();
+ try
+ {
+ OSDMap mfolder = (OSDMap)foldersrequested[i];
+ llsdRequest.folder_id = mfolder["folder_id"].AsUUID();
+ llsdRequest.owner_id = mfolder["owner_id"].AsUUID();
+ llsdRequest.sort_order = mfolder["sort_order"].AsInteger();
+ llsdRequest.fetch_folders = mfolder["fetch_folders"].AsBoolean();
+ llsdRequest.fetch_items = mfolder["fetch_items"].AsBoolean();
+ }
+ catch (Exception e)
+ {
+ m_log.Debug("[WEB FETCH INV DESC HANDLER]: caught exception doing OSD deserialize" + e.Message);
+ continue;
+ }
+ folders.Add(llsdRequest);
+ }
+ foldersrequested = null;
+ tmp = null;
}
catch (Exception e)
{
- m_log.ErrorFormat("[FETCH INV DESC]: fail parsing request: '{0}'; path: '{1}'; exception: '{2}'", request, path, e.Message);
- foldersrequested = null;
+ m_log.ErrorFormat("[FETCH INV DESC]: fail parsing request: {0}", e.Message);
+ httpResponse.RawBuffer = EmptyResponse;
+ return;
}
- if(foldersrequested == null || foldersrequested.Count == 0)
- return "";
-
- List folders = new List();
- for (int i = 0; i < foldersrequested.Count; i++)
+ if (folders == null || folders.Count == 0)
{
- Hashtable inventoryhash = (Hashtable)foldersrequested[i];
- LLSDFetchInventoryDescendents llsdRequest = new LLSDFetchInventoryDescendents();
-
- try
- {
- LLSDHelpers.DeserialiseOSDMap(inventoryhash, llsdRequest);
- }
- catch (Exception e)
- {
- m_log.Debug("[WEB FETCH INV DESC HANDLER]: caught exception doing OSD deserialize" + e.Message);
- continue;
- }
-
- folders.Add(llsdRequest);
+ httpResponse.RawBuffer = EmptyResponse;
+ return;
}
- foldersrequested.Clear();
-
- if(folders.Count == 0)
- return "";
-
List bad_folders = new List();
int total_folders = 0;
int total_items = 0;
+
List invcollSet = Fetch(folders, bad_folders, ref total_folders, ref total_items);
//m_log.DebugFormat("[XXX]: Got {0} folders from a request of {1}", invcollSet.Count, folders.Count);
@@ -133,57 +137,57 @@ namespace OpenSim.Capabilities.Handlers
StringBuilder lastresponse = new StringBuilder(mem);
lastresponse.Append("");
- if(invcollSetCount > 0)
+ if (invcollSetCount > 0)
{
lastresponse.Append("");
- return lastresponse.ToString();
+ httpResponse.RawBuffer = Util.UTF8NBGetbytes(lastresponse.ToString());
}
private void AddLibraryFolders(List libFolders, List result, ref int total_folders, ref int total_items)
@@ -400,7 +404,7 @@ namespace OpenSim.Capabilities.Handlers
if (linked != null)
{
- List linkedItems = new List();
+ List linkedItems = new List(linked.Length);
// check for broken
foreach (InventoryItemBase linkedItem in linked)
{
diff --git a/OpenSim/Capabilities/Handlers/FetchInventory/FetchInvDescServerConnector.cs b/OpenSim/Capabilities/Handlers/FetchInventory/FetchInvDescServerConnector.cs
index 9dcfaa48f1..f537bfb9f4 100644
--- a/OpenSim/Capabilities/Handlers/FetchInventory/FetchInvDescServerConnector.cs
+++ b/OpenSim/Capabilities/Handlers/FetchInventory/FetchInvDescServerConnector.cs
@@ -68,15 +68,9 @@ namespace OpenSim.Capabilities.Handlers
ServerUtils.LoadPlugin(libService, args);
FetchInvDescHandler webFetchHandler = new FetchInvDescHandler(m_InventoryService, m_LibraryService, null);
- IRequestHandler reqHandler
- = new RestStreamHandler(
- "POST",
- "/CAPS/WebFetchInvDesc/" /*+ UUID.Random()*/,
- webFetchHandler.FetchInventoryDescendentsRequest,
- "FetchInvDescendents",
- null);
- server.AddStreamHandler(reqHandler);
+ ISimpleStreamHandler reqHandler
+ = new SimpleStreamHandler( "/CAPS/WebFetchInvDesc/", webFetchHandler.FetchInventoryDescendentsRequest);
+ server.AddSimpleStreamHandler(reqHandler);
}
-
}
}
diff --git a/OpenSim/Capabilities/Handlers/FetchInventory/Tests/FetchInventoryDescendents2HandlerTests.cs b/OpenSim/Capabilities/Handlers/FetchInventory/Tests/FetchInventoryDescendents2HandlerTests.cs
index e950d2a3a1..b8ccf4b202 100644
--- a/OpenSim/Capabilities/Handlers/FetchInventory/Tests/FetchInventoryDescendents2HandlerTests.cs
+++ b/OpenSim/Capabilities/Handlers/FetchInventory/Tests/FetchInventoryDescendents2HandlerTests.cs
@@ -28,7 +28,7 @@
using System;
using System.Collections.Generic;
using System.Linq;
-using System.Net;
+using System.IO;
using System.Text.RegularExpressions;
using log4net;
using log4net.Config;
@@ -127,6 +127,18 @@ namespace OpenSim.Capabilities.Handlers.FetchInventory.Tests
Console.WriteLine("Number of descendents: " + m_rootDescendents);
}
+ private string dorequest(FetchInvDescHandler handler, string request)
+ {
+ TestOSHttpRequest req = new TestOSHttpRequest();
+ TestOSHttpResponse resp = new TestOSHttpResponse();
+ using (MemoryStream ms = new MemoryStream(Utils.StringToBytes(request), false))
+ {
+ req.InputStream = ms;
+ handler.FetchInventoryDescendentsRequest(req, resp);
+ }
+ return Util.UTF8.GetString(resp.RawBuffer);
+ }
+
[Test]
public void Test_001_SimpleFolder()
{
@@ -135,8 +147,6 @@ namespace OpenSim.Capabilities.Handlers.FetchInventory.Tests
Init();
FetchInvDescHandler handler = new FetchInvDescHandler(m_scene.InventoryService, null, m_scene);
- TestOSHttpRequest req = new TestOSHttpRequest();
- TestOSHttpResponse resp = new TestOSHttpResponse();
string request = "";
- string llsdresponse = handler.FetchInventoryDescendentsRequest(request, "/FETCH", string.Empty, req, resp);
+ string llsdresponse = dorequest(handler, request);
Assert.That(llsdresponse != null, Is.True, "Incorrect null response");
Assert.That(llsdresponse != string.Empty, Is.True, "Incorrect empty response");
@@ -161,8 +171,6 @@ namespace OpenSim.Capabilities.Handlers.FetchInventory.Tests
TestHelpers.InMethod();
FetchInvDescHandler handler = new FetchInvDescHandler(m_scene.InventoryService, null, m_scene);
- TestOSHttpRequest req = new TestOSHttpRequest();
- TestOSHttpResponse resp = new TestOSHttpResponse();
string request = "";
- string llsdresponse = handler.FetchInventoryDescendentsRequest(request, "/FETCH", string.Empty, req, resp);
+ string llsdresponse = dorequest(handler, request);
Console.WriteLine(llsdresponse);
string descendents = "descendents" + m_rootDescendents + "";
@@ -191,14 +199,12 @@ namespace OpenSim.Capabilities.Handlers.FetchInventory.Tests
TestHelpers.InMethod();
FetchInvDescHandler handler = new FetchInvDescHandler(m_scene.InventoryService, null, m_scene);
- TestOSHttpRequest req = new TestOSHttpRequest();
- TestOSHttpResponse resp = new TestOSHttpResponse();
string request = "";
- string llsdresponse = handler.FetchInventoryDescendentsRequest(request, "/FETCH", string.Empty, req, resp);
+ string llsdresponse = dorequest(handler, request);
Console.WriteLine(llsdresponse);
string descendents = "descendents2";
@@ -235,8 +241,6 @@ namespace OpenSim.Capabilities.Handlers.FetchInventory.Tests
TestHelpers.InMethod();
FetchInvDescHandler handler = new FetchInvDescHandler(m_scene.InventoryService, null, m_scene);
- TestOSHttpRequest req = new TestOSHttpRequest();
- TestOSHttpResponse resp = new TestOSHttpResponse();
string request = "";
- string llsdresponse = handler.FetchInventoryDescendentsRequest(request, "/FETCH", string.Empty, req, resp);
+ string llsdresponse = dorequest(handler, request);
Console.WriteLine(llsdresponse);
string root_folder = "folder_id" + m_rootFolderID + "";
@@ -276,14 +280,12 @@ namespace OpenSim.Capabilities.Handlers.FetchInventory.Tests
Init();
FetchInvDescHandler handler = new FetchInvDescHandler(m_scene.InventoryService, null, m_scene);
- TestOSHttpRequest req = new TestOSHttpRequest();
- TestOSHttpResponse resp = new TestOSHttpResponse();
string request = "";
- string llsdresponse = handler.FetchInventoryDescendentsRequest(request, "/FETCH", string.Empty, req, resp);
+ string llsdresponse = dorequest(handler, request);
Assert.That(llsdresponse != null, Is.True, "Incorrect null response");
Assert.That(llsdresponse != string.Empty, Is.True, "Incorrect empty response");
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs
index 1580eae7e2..15b65af1da 100755
--- a/OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs
@@ -330,17 +330,8 @@ namespace OpenSim.Region.ClientStack.Linden
}
}
- Hashtable response = new Hashtable();
-
- response["int_response_code"] = 200;
- response["content_type"] = "text/plain";
-
- response["bin_response_data"] = Encoding.UTF8.GetBytes(
- m_webFetchHandler.FetchInventoryDescendentsRequest(
- requestinfo.request.InputStream,
- String.Empty, String.Empty, null, null)
- );
-
+ OSHttpResponse osresponse = new OSHttpResponse(requestinfo.request);
+ m_webFetchHandler.FetchInventoryDescendentsRequest(requestinfo.request, osresponse);
requestinfo.request.InputStream.Dispose();
lock (responses)
@@ -350,16 +341,16 @@ namespace OpenSim.Region.ClientStack.Linden
if(dropedResponses.Contains(requestID))
{
dropedResponses.Remove(requestID);
- WebFetchInvDescModule.ProcessedRequestsCount++;
+ ProcessedRequestsCount++;
return;
}
}
- if (responses.ContainsKey(requestID))
- m_log.WarnFormat("[FETCH INVENTORY DESCENDENTS2 MODULE]: Caught in the act of loosing responses! Please report this on mantis #7054");
+ Hashtable response = new Hashtable();
+ response["h"] = osresponse;
responses[requestID] = response;
}
- WebFetchInvDescModule.ProcessedRequestsCount++;
+ ProcessedRequestsCount++;
}
}