1 files changed, 51 insertions, 58 deletions

diff --git a/OpenSim/Grid/Framework/XMPPHTTPService.cs b/OpenSim/Server/Handlers/Simulation/Utils.cs
index 9d27409..ed379da 100644
--- a/OpenSim/Grid/Framework/XMPPHTTPService.cs
+++ b/OpenSim/Server/Handlers/Simulation/Utils.cs
@@ -1,4 +1,4 @@
-/*
+/*
  * Copyright (c) Contributors, http://opensimulator.org/
  * See CONTRIBUTORS.TXT for a full list of copyright holders.
  *
@@ -26,84 +26,77 @@
  */
 
 using System;
-using System.IO;
+using System.Collections.Generic;
 using System.Reflection;
-using log4net;
+
 using OpenMetaverse;
-using OpenSim.Framework.Servers.HttpServer;
+using OpenMetaverse.StructuredData;
+
+using log4net;
 
-namespace OpenSim.Grid.Framework
+namespace OpenSim.Server.Handlers.Simulation
 {
-    public class XMPPHTTPStreamHandler : BaseStreamHandler
+    public class Utils
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
-
         /// <summary>
-        /// Constructor.
+        /// Extract the param from an uri.
         /// </summary>
-        /// <param name="assetManager"></param>
-        /// <param name="assetProvider"></param>
-        public XMPPHTTPStreamHandler()
-            : base("GET", "/presence")
+        /// <param name="uri">Something like this: /agent/uuid/ or /agent/uuid/handle/release</param>
+        /// <param name="uri">uuid on uuid field</param>
+        /// <param name="action">optional action</param>
+        public static bool GetParams(string uri, out UUID uuid, out UUID regionID, out string action)
         {
-            m_log.Info("[REST]: In Get Request");
+            uuid = UUID.Zero;
+            regionID = UUID.Zero;
+            action = "";
 
+            uri = uri.Trim(new char[] { '/' });
+            string[] parts = uri.Split('/');
+            if (parts.Length <= 1)
+            {
+                return false;
+            }
+            else
+            {
+                if (!UUID.TryParse(parts[1], out uuid))
+                    return false;
+
+                if (parts.Length >= 3)
+                    UUID.TryParse(parts[2], out regionID);
+                if (parts.Length >= 4)
+                    action = parts[3];
+
+                return true;
+            }
         }
 
-        public override byte[] Handle(string path, Stream request,
-                                      OSHttpRequest httpRequest, OSHttpResponse httpResponse)
+        public static OSDMap GetOSDMap(string data)
         {
-            string param = GetParam(path);
-            byte[] result = new byte[] {};
+            OSDMap args = null;
             try
             {
-                string[] p = param.Split(new char[] {'/', '?', '&'}, StringSplitOptions.RemoveEmptyEntries);
-
-                if (p.Length > 0)
+                OSD buffer;
+                // We should pay attention to the content-type, but let's assume we know it's Json
+                buffer = OSDParser.DeserializeJson(data);
+                if (buffer.Type == OSDType.Map)
                 {
-                    UUID assetID = UUID.Zero;
-
-                    if (!UUID.TryParse(p[0], out assetID))
-                    {
-                        m_log.InfoFormat(
-                            "[REST]: GET:/presence ignoring request with malformed UUID {0}", p[0]);
-                        return result;
-                    }
-
+                    args = (OSDMap)buffer;
+                    return args;
+                }
+                else
+                {
+                    // uh?
+                    m_log.Debug(("[REST COMMS]: Got OSD of unexpected type " + buffer.Type.ToString()));
+                    return null;
                 }
             }
-            catch (Exception e)
+            catch (Exception ex)
             {
-                m_log.Error(e.ToString());
+                m_log.Debug("[REST COMMS]: exception on parse of REST message " + ex.Message);
+                return null;
             }
-            return result;
-        }
-    }
-
-    public class PostXMPPStreamHandler : BaseStreamHandler
-    {
-        // private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-
-        public override byte[] Handle(string path, Stream request,
-                                      OSHttpRequest httpRequest, OSHttpResponse httpResponse)
-        {
-            string param = GetParam(path);
-
-            UUID assetId;
-            if (param.Length > 0)
-                UUID.TryParse(param, out assetId);
-            // byte[] txBuffer = new byte[4096];
-
-            // TODO: Read POST serialize XMPP stanzas
-
-            return new byte[] {};
-        }
-
-        public PostXMPPStreamHandler()
-            : base("POST", "/presence")
-        {
-
         }
 
     }