* re-fixed the utf-16 bug in xmlRpcResponse serialization

* added LLSDStreamHandler.cs to Caps (Haven't enabled it yet, though)
* removed last traces of old rest handling

7 files changed, 84 insertions, 68 deletions

diff --git a/OpenSim/Region/Capabilities/Caps.cs b/OpenSim/Region/Capabilities/Caps.cs
index 1d07683..70d601f 100644
--- a/OpenSim/Region/Capabilities/Caps.cs
+++ b/OpenSim/Region/Capabilities/Caps.cs
@@ -71,20 +71,33 @@ namespace OpenSim.Region.Capabilities
         public void RegisterHandlers()

         {

             Console.WriteLine("registering CAPS handlers");

+            string capsBase = "/CAPS/" + m_capsObjectPath;

+

+            AddLegacyCapsHandler( httpListener, m_mapLayerPath, MapLayer);

+

+            //httpListener.AddStreamHandler(

+            //    new LLSDStreamhandler<LLSDMapRequest, LLSDMapLayerResponse>("POST", capsBase + m_mapLayerPath, this.GetMapLayer ));

 

-            AddCapsHandler( httpListener, m_requestPath, CapsRequest);

-            AddCapsHandler( httpListener, m_mapLayerPath, MapLayer);

-            AddCapsHandler( httpListener, m_newInventory, NewAgentInventory);

-            AddCapsHandler( httpListener, eventQueue, ProcessEventQueue);

-            AddCapsHandler( httpListener, m_requestTexture, RequestTexture);

+            AddLegacyCapsHandler(httpListener, m_requestPath, CapsRequest);                       

+            AddLegacyCapsHandler(httpListener, m_newInventory, NewAgentInventory);

+            AddLegacyCapsHandler( httpListener, eventQueue, ProcessEventQueue);

+            AddLegacyCapsHandler( httpListener, m_requestTexture, RequestTexture);

         }

 

-        private void AddCapsHandler( BaseHttpServer httpListener, string path, RestMethod restMethod )

+        public LLSDMapLayerResponse GetMapLayer(LLSDMapRequest mapReq)

+        {

+            LLSDMapLayerResponse mapResponse = new LLSDMapLayerResponse();

+            mapResponse.LayerData.Array.Add(this.BuildLLSDMapLayerResponse());

+            return mapResponse;

+        }

+

+        [Obsolete("Use BaseHttpServer.AddStreamHandler(new LLSDStreamHandler( LLSDMethod delegate )) instead.")]

+        private void AddLegacyCapsHandler(BaseHttpServer httpListener, string path, RestMethod restMethod)

         {

             string capsBase = "/CAPS/" + m_capsObjectPath;

             httpListener.AddStreamHandler(new RestStreamHandler("POST", capsBase + path, restMethod));

         }

-        

+

         /// <summary>

         /// 

         /// </summary>

@@ -125,17 +138,18 @@ namespace OpenSim.Region.Capabilities
         public string MapLayer(string request, string path, string param)

         {

             Encoding _enc = Encoding.UTF8;

-            Hashtable hash =(Hashtable) LLSD.LLSDDeserialize(_enc.GetBytes(request));

+            Hashtable hash = (Hashtable)LLSD.LLSDDeserialize(_enc.GetBytes(request));

             LLSDMapRequest mapReq = new LLSDMapRequest();

-            LLSDHelpers.DeserialiseLLSDMap(hash, mapReq );

+            LLSDHelpers.DeserialiseLLSDMap(hash, mapReq);

 

-            LLSDMapLayerResponse mapResponse= new LLSDMapLayerResponse();

+            LLSDMapLayerResponse mapResponse = new LLSDMapLayerResponse();

             mapResponse.LayerData.Array.Add(this.BuildLLSDMapLayerResponse());

             string res = LLSDHelpers.SerialiseLLSDReply(mapResponse);

-          

+

             return res;

         }

 

+        

         /// <summary>

         /// 

         /// </summary>

@@ -214,7 +228,7 @@ namespace OpenSim.Region.Capabilities
             string uploaderPath = Util.RandomClass.Next(5000, 8000).ToString("0000");

             AssetUploader uploader = new AssetUploader(newAsset, newInvItem, uploaderPath, this.httpListener);

             

-            AddCapsHandler( httpListener, uploaderPath, uploader.uploaderCaps);

+            AddLegacyCapsHandler( httpListener, uploaderPath, uploader.uploaderCaps);

             

             string uploaderURL = "http://" + m_httpListenerHostName + ":" + m_httpListenPort.ToString() + "/CAPS/" + uploaderPath;

             //Console.WriteLine("uploader url is " + uploaderURL);

diff --git a/OpenSim/Region/Capabilities/LLSDMethod.cs b/OpenSim/Region/Capabilities/LLSDMethod.cs
new file mode 100644
index 0000000..5f42f44
--- /dev/null
+++ b/OpenSim/Region/Capabilities/LLSDMethod.cs
@@ -0,0 +1,8 @@
+using System;

+using System.Collections.Generic;

+using System.Text;

+

+namespace OpenSim.Region.Capabilities

+{

+    public delegate TResponse LLSDMethod<TRequest, TResponse>(TRequest request);

+}

diff --git a/OpenSim/Region/Capabilities/LLSDStreamHandler.cs b/OpenSim/Region/Capabilities/LLSDStreamHandler.cs
new file mode 100644
index 0000000..ff63353
--- /dev/null
+++ b/OpenSim/Region/Capabilities/LLSDStreamHandler.cs
@@ -0,0 +1,40 @@
+using System;

+using System.Collections.Generic;

+using System.Text;

+using OpenSim.Framework.Servers;

+using System.IO;

+using System.Collections;

+using libsecondlife;

+

+namespace OpenSim.Region.Capabilities

+{

+    public class LLSDStreamhandler<TRequest, TResponse> : BaseStreamHandler

+        where TRequest : new()

+    {

+        private LLSDMethod<TRequest, TResponse> m_method;

+

+        public LLSDStreamhandler(string httpMethod, string path, LLSDMethod<TRequest, TResponse> method)

+            : base(httpMethod, path)

+        {

+            m_method = method;

+        }

+        

+        public override byte[] Handle(string path, Stream request)

+        {

+            Encoding encoding = Encoding.UTF8;

+            StreamReader streamReader = new StreamReader(request, encoding);

+

+            string requestBody = streamReader.ReadToEnd();

+            streamReader.Close();

+

+            Hashtable hash = (Hashtable)LLSD.LLSDDeserialize(encoding.GetBytes(requestBody));

+            TRequest llsdRequest = new TRequest();

+            LLSDHelpers.DeserialiseLLSDMap(hash, llsdRequest);

+

+            TResponse response = m_method(llsdRequest);

+

+            return encoding.GetBytes( LLSDHelpers.SerialiseLLSDReply(response) );

+

+        }

+    }

+}

diff --git a/OpenSim/Region/Capabilities/OpenSim.Region.Capabilities.csproj b/OpenSim/Region/Capabilities/OpenSim.Region.Capabilities.csproj
index 4667d52..4b672ae 100644
--- a/OpenSim/Region/Capabilities/OpenSim.Region.Capabilities.csproj
+++ b/OpenSim/Region/Capabilities/OpenSim.Region.Capabilities.csproj
@@ -123,6 +123,12 @@
     <Compile Include="LLSDMapRequest.cs">

       <SubType>Code</SubType>

     </Compile>

+    <Compile Include="LLSDMethod.cs">

+      <SubType>Code</SubType>

+    </Compile>

+    <Compile Include="LLSDStreamHandler.cs">

+      <SubType>Code</SubType>

+    </Compile>

     <Compile Include="LLSDTest.cs">

       <SubType>Code</SubType>

     </Compile>

diff --git a/OpenSim/Region/Capabilities/OpenSim.Region.Capabilities.dll.build b/OpenSim/Region/Capabilities/OpenSim.Region.Capabilities.dll.build
index a091b5c..1d552c2 100644
--- a/OpenSim/Region/Capabilities/OpenSim.Region.Capabilities.dll.build
+++ b/OpenSim/Region/Capabilities/OpenSim.Region.Capabilities.dll.build
@@ -20,6 +20,8 @@
                 <include name="LLSDMapLayer.cs" />

                 <include name="LLSDMapLayerResponse.cs" />

                 <include name="LLSDMapRequest.cs" />

+                <include name="LLSDMethod.cs" />

+                <include name="LLSDStreamHandler.cs" />

                 <include name="LLSDTest.cs" />

                 <include name="LLSDType.cs" />

                 <include name="LLSDUploadReply.cs" />

diff --git a/OpenSim/Region/Examples/SimpleApp/LlsdMethodEntry.cs b/OpenSim/Region/Examples/SimpleApp/LlsdMethodEntry.cs
index f946482..d0ef2af 100644
--- a/OpenSim/Region/Examples/SimpleApp/LlsdMethodEntry.cs
+++ b/OpenSim/Region/Examples/SimpleApp/LlsdMethodEntry.cs
@@ -2,40 +2,9 @@ using System.Collections;
 using System.Text;

 using libsecondlife;

 using OpenSim.Region.Capabilities;

+using System.IO;

 

 namespace OpenSim.Framework.Servers

 {

-    public class LlsdMethodEntry<TResponse, TRequest> : ILlsdMethodHandler

-        where TRequest : new()

-    {

-        private LlsdMethod<TResponse, TRequest> m_method;

-

-

-        public LlsdMethodEntry( )

-        {

- 

-        }

-        

-        public LlsdMethodEntry(LlsdMethod<TResponse, TRequest> method)

-        {

-            m_method = method;

-        }

-

-        #region ILlsdMethodHandler Members

-

-        public string Handle(string body, string path)

-        {

-            Encoding _enc = Encoding.UTF8;

-            Hashtable hash = (Hashtable)LLSD.LLSDDeserialize(_enc.GetBytes( body ));

-            TRequest request = new TRequest();

-            

-            LLSDHelpers.DeserialiseLLSDMap(hash, request );

-

-            TResponse response = m_method(request);

-            

-            return LLSDHelpers.SerialiseLLSDReply( response );   

-        }

-

-        #endregion

-    }

+  

 }

diff --git a/OpenSim/Region/Examples/SimpleApp/Program.cs b/OpenSim/Region/Examples/SimpleApp/Program.cs
index bc84c35..ad70df8 100644
--- a/OpenSim/Region/Examples/SimpleApp/Program.cs
+++ b/OpenSim/Region/Examples/SimpleApp/Program.cs
@@ -60,8 +60,6 @@ namespace SimpleApp
 

             httpServer.AddXmlRPCHandler("login_to_simulator", communicationsManager.UserServices.XmlRpcLoginMethod );

             

-            RegisterLlsdHandler<LLSDMapLayerResponse, LLSDMapRequest>("/Caps/test/", LlsdMethodDemo);

-            

             httpServer.Start();

             

             m_log.WriteLine( LogPriority.NORMAL, "Press enter to quit.");

@@ -74,27 +72,6 @@ namespace SimpleApp
 

         }

 

-        private LLSDMapLayerResponse LlsdMethodDemo(LLSDMapRequest request)

-        {

-            return new LLSDMapLayerResponse();

-        }

-

-        ILlsdMethodHandler m_handler;

-        

-        private void RegisterLlsdHandler<TResponse, TRequest>( string path, LlsdMethod<TResponse, TRequest> method )

-            where TRequest : new()

-        {

-            // path should be handler key, but for now just conceptually store it.

-            m_handler = new LlsdMethodEntry<TResponse, TRequest>( method );

-        }

-        

-        private string ProcessLlsdMethod( string request,string path )

-        {

-            LlsdMethodEntry<LLSDMapLayerResponse, LLSDMapRequest> concreteHandler = new LlsdMethodEntry<LLSDMapLayerResponse, LLSDMapRequest>( LlsdMethodDemo );

-

-            return m_handler.Handle(request, path);

-        }

-                       

         private bool AddNewSessionHandler(ulong regionHandle, Login loginData)

         {

             m_log.WriteLine(LogPriority.NORMAL, "Region [{0}] recieved Login from [{1}] [{2}]", regionHandle, loginData.First, loginData.Last);