Merge branch 'master' of ssh://melanie@opensimulator.org/var/git/opensim

8 files changed, 762 insertions, 68 deletions

diff --git a/OpenSim/Framework/RegionInfo.cs b/OpenSim/Framework/RegionInfo.cs
index 3896a6e..afd50a9 100644
--- a/OpenSim/Framework/RegionInfo.cs
+++ b/OpenSim/Framework/RegionInfo.cs
@@ -26,6 +26,7 @@
  */
 
 using System;
+using System.Collections.Generic;
 using System.Net;
 using System.Net.Sockets;
 using System.Xml;
@@ -197,6 +198,67 @@ namespace OpenSim.Framework
         {
             return m_internalEndPoint.Port;
         }
+
+        public Dictionary<string, object> ToKeyValuePairs()
+        {
+            Dictionary<string, object> kvp = new Dictionary<string, object>();
+            kvp["uuid"] = RegionID.ToString();
+            kvp["locX"] = RegionLocX.ToString();
+            kvp["locY"] = RegionLocY.ToString();
+            kvp["external_ip_address"] = ExternalEndPoint.Address.ToString();
+            kvp["external_port"] = ExternalEndPoint.Port.ToString();
+            kvp["external_host_name"] = ExternalHostName;
+            kvp["http_port"] = HttpPort.ToString();
+            kvp["internal_ip_address"] = InternalEndPoint.Address.ToString();
+            kvp["internal_port"] = InternalEndPoint.Port.ToString();
+            kvp["alternate_ports"] = m_allow_alternate_ports.ToString();
+            kvp["server_uri"] = ServerURI;
+
+            return kvp;
+        }
+
+        public SimpleRegionInfo(Dictionary<string, object> kvp)
+        {
+            if ((kvp["external_ip_address"] != null) && (kvp["external_port"] != null))
+            {
+                int port = 0;
+                Int32.TryParse((string)kvp["external_port"], out port);
+                IPEndPoint ep = new IPEndPoint(IPAddress.Parse((string)kvp["external_ip_address"]), port);
+                ExternalEndPoint = ep;
+            }
+            else
+                ExternalEndPoint = new IPEndPoint(IPAddress.Parse("0.0.0.0"), 0);
+
+            if (kvp["external_host_name"] != null)
+                ExternalHostName = (string)kvp["external_host_name"];
+
+            if (kvp["http_port"] != null)
+            {
+                UInt32 port = 0;
+                UInt32.TryParse((string)kvp["http_port"], out port);
+                HttpPort = port;
+            }
+
+            if ((kvp["internal_ip_address"] != null) && (kvp["internal_port"] != null))
+            {
+                int port = 0;
+                Int32.TryParse((string)kvp["internal_port"], out port);
+                IPEndPoint ep = new IPEndPoint(IPAddress.Parse((string)kvp["internal_ip_address"]), port);
+                InternalEndPoint = ep;
+            }
+            else
+                InternalEndPoint = new IPEndPoint(IPAddress.Parse("0.0.0.0"), 0);
+
+            if (kvp["alternate_ports"] != null)
+            {
+                bool alts = false;
+                Boolean.TryParse((string)kvp["alternate_ports"], out alts);
+                m_allow_alternate_ports = alts;
+            }
+
+            if (kvp["server_uri"] != null)
+                ServerURI = (string)kvp["server_uri"];
+        }
     }
 
     public class RegionInfo : SimpleRegionInfo
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/LocalGridServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/LocalGridServiceConnector.cs
index 6475817..74ece2e 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/LocalGridServiceConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/LocalGridServiceConnector.cs
@@ -140,9 +140,9 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid
             return m_GridService.DeregisterRegion(regionID);
         }
 
-        public List<SimpleRegionInfo> GetNeighbours(UUID scopeID, int x, int y)
+        public List<SimpleRegionInfo> GetNeighbours(UUID scopeID, UUID regionID)
         {
-            return m_GridService.GetNeighbours(scopeID, x, y);
+            return m_GridService.GetNeighbours(scopeID, regionID);
         }
 
         public SimpleRegionInfo GetRegionByUUID(UUID scopeID, UUID regionID)
diff --git a/OpenSim/Server/Handlers/Grid/GridServerConnector.cs b/OpenSim/Server/Handlers/Grid/GridServerConnector.cs
new file mode 100644
index 0000000..b80c479
--- /dev/null
+++ b/OpenSim/Server/Handlers/Grid/GridServerConnector.cs
@@ -0,0 +1,60 @@
+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the OpenSimulator Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+using System;
+using Nini.Config;
+using OpenSim.Server.Base;
+using OpenSim.Services.Interfaces;
+using OpenSim.Framework.Servers.HttpServer;
+using OpenSim.Server.Handlers.Base;
+
+namespace OpenSim.Server.Handlers.Grid
+{
+    public class GridServiceConnector : ServiceConnector
+    {
+        private IGridService m_GridService;
+
+        public GridServiceConnector(IConfigSource config, IHttpServer server) :
+                base(config, server)
+        {
+            IConfig serverConfig = config.Configs["GridService"];
+            if (serverConfig == null)
+                throw new Exception("No section 'Server' in config file");
+
+            string gridService = serverConfig.GetString("GridServiceModule",
+                    String.Empty);
+
+            if (gridService == String.Empty)
+                throw new Exception("No AuthenticationService in config file");
+
+            Object[] args = new Object[] { config };
+            m_GridService = ServerUtils.LoadPlugin<IGridService>(gridService, args);
+
+            server.AddStreamHandler(new GridServerPostHandler(m_GridService));
+        }
+    }
+}
diff --git a/OpenSim/Server/Handlers/Grid/GridServerPostHandler.cs b/OpenSim/Server/Handlers/Grid/GridServerPostHandler.cs
new file mode 100644
index 0000000..39c0584
--- /dev/null
+++ b/OpenSim/Server/Handlers/Grid/GridServerPostHandler.cs
@@ -0,0 +1,269 @@
+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the OpenSimulator Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+using Nini.Config;
+using log4net;
+using System;
+using System.Reflection;
+using System.IO;
+using System.Net;
+using System.Text;
+using System.Text.RegularExpressions;
+using System.Xml;
+using System.Xml.Serialization;
+using System.Collections.Generic;
+using OpenSim.Server.Base;
+using OpenSim.Services.Interfaces;
+using OpenSim.Framework;
+using OpenSim.Framework.Servers.HttpServer;
+using OpenMetaverse;
+
+namespace OpenSim.Server.Handlers.Grid
+{
+    public class GridServerPostHandler : BaseStreamHandler
+    {
+        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+
+        private IGridService m_GridService;
+
+        public GridServerPostHandler(IGridService service) :
+                base("POST", "/grid")
+        {
+            m_GridService = service;
+        }
+
+        public override byte[] Handle(string path, Stream requestData,
+                OSHttpRequest httpRequest, OSHttpResponse httpResponse)
+        {
+            StreamReader sr = new StreamReader(requestData);
+            string body = sr.ReadToEnd();
+            sr.Close();
+            
+            Dictionary<string, string> request =
+                    ServerUtils.ParseQueryString(body);
+
+            if (!request.ContainsKey("METHOD"))
+                return FailureResult();
+
+            string method = request["METHOD"];
+
+            switch (method)
+            {
+                case "register":
+                    return Register(request);
+
+                case "deregister":
+                    return Deregister(request);
+
+                case "get_neighbours":
+                    return GetNeighbours(request);
+
+                case "get_region_by_uuid":
+                    return GetRegionByUUID(request);
+
+                case "get_region_by_position":
+                    return GetRegionByPosition(request);
+
+                case "get_region_by_name":
+                    return GetRegionByName(request);
+
+                case "get_regions_by_name":
+                    return GetRegionsByName(request);
+
+                case "get_region_range":
+                    return GetRegionRange(request);
+
+                default:
+                    m_log.DebugFormat("[GRID HANDLER]: unknown method request {0}", method);
+                    return FailureResult();
+            }
+
+        }
+
+        #region Method-specific handlers
+
+        byte[] Register(Dictionary<string, string> request)
+        {
+            UUID scopeID = UUID.Zero;
+            if (request["SCOPEID"] != null)
+                UUID.TryParse(request["SCOPEID"], out scopeID);
+            else
+                m_log.WarnFormat("[GRID HANDLER]: no scopeID in request to register region");
+
+            Dictionary<string, object> rinfoData = new Dictionary<string, object>();
+            foreach (KeyValuePair<string, string> kvp in request)
+                rinfoData[kvp.Key] = kvp.Value;
+            SimpleRegionInfo rinfo = new SimpleRegionInfo(rinfoData);
+
+            bool result = m_GridService.RegisterRegion(scopeID, rinfo);
+
+            if (result)
+                return SuccessResult();
+            else
+                return FailureResult();
+        }
+
+        byte[] Deregister(Dictionary<string, string> request)
+        {
+            UUID regionID = UUID.Zero;
+            if (request["REGIONID"] != null)
+                UUID.TryParse(request["REGIONID"], out regionID);
+            else
+                m_log.WarnFormat("[GRID HANDLER]: no regionID in request to deregister region");
+
+            bool result = m_GridService.DeregisterRegion(regionID);
+
+            if (result)
+                return SuccessResult();
+            else
+                return FailureResult();
+
+        }
+
+        byte[] GetNeighbours(Dictionary<string, string> request)
+        {
+            UUID scopeID = UUID.Zero;
+            if (request["SCOPEID"] != null)
+                UUID.TryParse(request["SCOPEID"], out scopeID);
+            else
+                m_log.WarnFormat("[GRID HANDLER]: no scopeID in request to get neighbours");
+
+            UUID regionID = UUID.Zero;
+            if (request["REGIONID"] != null)
+                UUID.TryParse(request["REGIONID"], out scopeID);
+            else
+                m_log.WarnFormat("[GRID HANDLER]: no regionID in request to get neighbours");
+
+            List<SimpleRegionInfo> rinfos = m_GridService.GetNeighbours(scopeID, regionID);
+
+            Dictionary<string, object> result = new Dictionary<string, object>();
+            int i = 0;
+            foreach (SimpleRegionInfo rinfo in rinfos)
+            {
+                Dictionary<string, object> rinfoDict = rinfo.ToKeyValuePairs();
+                result["region" + i] = rinfoDict;
+                i++;
+            }
+
+            string xmlString = ServerUtils.BuildXmlResponse(result);
+            UTF8Encoding encoding = new UTF8Encoding();
+            return encoding.GetBytes(xmlString);
+
+        }
+
+        byte[] GetRegionByUUID(Dictionary<string, string> request)
+        {
+            // TODO
+            return new byte[0];
+        }
+
+        byte[] GetRegionByPosition(Dictionary<string, string> request)
+        {
+            // TODO
+            return new byte[0];
+        }
+
+        byte[] GetRegionByName(Dictionary<string, string> request)
+        {
+            // TODO
+            return new byte[0];
+        }
+
+        byte[] GetRegionsByName(Dictionary<string, string> request)
+        {
+            // TODO
+            return new byte[0];
+        }
+
+        byte[] GetRegionRange(Dictionary<string, string> request)
+        {
+            // TODO
+            return new byte[0];
+        }
+
+        #endregion
+
+        #region Misc
+
+        private byte[] SuccessResult()
+        {
+            XmlDocument doc = new XmlDocument();
+
+            XmlNode xmlnode = doc.CreateNode(XmlNodeType.XmlDeclaration,
+                    "", "");
+
+            doc.AppendChild(xmlnode);
+
+            XmlElement rootElement = doc.CreateElement("", "ServerResponse",
+                    "");
+
+            doc.AppendChild(rootElement);
+
+            XmlElement result = doc.CreateElement("", "Result", "");
+            result.AppendChild(doc.CreateTextNode("Success"));
+
+            rootElement.AppendChild(result);
+
+            return DocToBytes(doc);
+        }
+
+        private byte[] FailureResult()
+        {
+            XmlDocument doc = new XmlDocument();
+
+            XmlNode xmlnode = doc.CreateNode(XmlNodeType.XmlDeclaration,
+                    "", "");
+
+            doc.AppendChild(xmlnode);
+
+            XmlElement rootElement = doc.CreateElement("", "ServerResponse",
+                    "");
+
+            doc.AppendChild(rootElement);
+
+            XmlElement result = doc.CreateElement("", "Result", "");
+            result.AppendChild(doc.CreateTextNode("Failure"));
+
+            rootElement.AppendChild(result);
+
+            return DocToBytes(doc);
+        }
+
+        private byte[] DocToBytes(XmlDocument doc)
+        {
+            MemoryStream ms = new MemoryStream();
+            XmlTextWriter xw = new XmlTextWriter(ms, null);
+            xw.Formatting = Formatting.Indented;
+            doc.WriteTo(xw);
+            xw.Flush();
+
+            return ms.GetBuffer();
+        }
+
+        #endregion
+    }
+}
diff --git a/OpenSim/Services/Connectors/Grid/GridServiceConnector.cs b/OpenSim/Services/Connectors/Grid/GridServiceConnector.cs
new file mode 100644
index 0000000..ae7db7e
--- /dev/null
+++ b/OpenSim/Services/Connectors/Grid/GridServiceConnector.cs
@@ -0,0 +1,346 @@
+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the OpenSimulator Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+using log4net;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Reflection;
+using Nini.Config;
+using OpenSim.Framework;
+using OpenSim.Framework.Communications;
+using OpenSim.Framework.Servers.HttpServer;
+using OpenSim.Services.Interfaces;
+using OpenSim.Server.Base;
+using OpenMetaverse;
+
+namespace OpenSim.Services.Connectors
+{
+    public class GridServicesConnector : IGridService
+    {
+        private static readonly ILog m_log =
+                LogManager.GetLogger(
+                MethodBase.GetCurrentMethod().DeclaringType);
+
+        private string m_ServerURI = String.Empty;
+
+        public GridServicesConnector()
+        {
+        }
+
+        public GridServicesConnector(string serverURI)
+        {
+            m_ServerURI = serverURI.TrimEnd('/');
+        }
+
+        public GridServicesConnector(IConfigSource source)
+        {
+            Initialise(source);
+        }
+
+        public virtual void Initialise(IConfigSource source)
+        {
+            IConfig gridConfig = source.Configs["GridService"];
+            if (gridConfig == null)
+            {
+                m_log.Error("[GRID CONNECTOR]: GridService missing from OpenSim.ini");
+                throw new Exception("Grid connector init error");
+            }
+
+            string serviceURI = gridConfig.GetString("GridServerURI",
+                    String.Empty);
+
+            if (serviceURI == String.Empty)
+            {
+                m_log.Error("[GRID CONNECTOR]: No Server URI named in section GridService");
+                throw new Exception("Grid connector init error");
+            }
+            m_ServerURI = serviceURI;
+        }
+
+
+        #region IGridService
+
+        public bool RegisterRegion(UUID scopeID, SimpleRegionInfo regionInfo)
+        {
+            Dictionary<string, object> rinfo = regionInfo.ToKeyValuePairs();
+            Dictionary<string, string> sendData = new Dictionary<string,string>();
+            foreach (KeyValuePair<string, object> kvp in rinfo)
+                sendData[kvp.Key] = (string)kvp.Value;
+
+            sendData["SCOPEID"] = scopeID.ToString();
+
+            sendData["METHOD"] = "register";
+
+            string reply = SynchronousRestFormsRequester.MakeRequest("POST",
+                    m_ServerURI + "/grid",
+                    ServerUtils.BuildQueryString(sendData));
+
+            Dictionary<string, object> replyData = ServerUtils.ParseXmlResponse(reply);
+
+            if ((replyData["Result"] != null) && (replyData["Result"].ToString().ToLower() == "success"))
+                return true;
+
+            return false;
+        }
+
+        public bool DeregisterRegion(UUID regionID)
+        {
+            Dictionary<string, string> sendData = new Dictionary<string, string>();
+
+            sendData["REGIONID"] = regionID.ToString();
+
+            sendData["METHOD"] = "deregister";
+
+            string reply = SynchronousRestFormsRequester.MakeRequest("POST",
+                    m_ServerURI + "/grid",
+                    ServerUtils.BuildQueryString(sendData));
+
+            Dictionary<string, object> replyData = ServerUtils.ParseXmlResponse(reply);
+
+            if ((replyData["Result"] != null) && (replyData["Result"].ToString().ToLower() == "success"))
+                return true;
+
+            return false;
+        }
+
+        public List<SimpleRegionInfo> GetNeighbours(UUID scopeID, UUID regionID)
+        {
+            Dictionary<string, string> sendData = new Dictionary<string, string>();
+
+            sendData["SCOPEID"] = scopeID.ToString();
+            sendData["REGIONID"] = regionID.ToString();
+
+            sendData["METHOD"] = "get_neighbours";
+
+            string reply = SynchronousRestFormsRequester.MakeRequest("POST",
+                    m_ServerURI + "/grid",
+                    ServerUtils.BuildQueryString(sendData));
+
+            Dictionary<string, object> replyData = ServerUtils.ParseXmlResponse(reply);
+
+            List<SimpleRegionInfo> rinfos = new List<SimpleRegionInfo>();
+            if (replyData != null)
+            {
+                Dictionary<string, object>.ValueCollection rinfosList = replyData.Values;
+                foreach (object r in rinfosList)
+                {
+                    if (r is Dictionary<string, object>)
+                    {
+                        SimpleRegionInfo rinfo = new SimpleRegionInfo((Dictionary<string, object>)r);
+                        rinfos.Add(rinfo);
+                    }
+                    else
+                        m_log.DebugFormat("[GRID CONNECTOR]: GetNeighbours {0}, {1} received invalid response",
+                            scopeID, regionID);
+                }
+            }
+            else
+                m_log.DebugFormat("[GRID CONNECTOR]: GetNeighbours {0}, {1} received null response",
+                    scopeID, regionID);
+
+            return rinfos;
+        }
+
+        public SimpleRegionInfo GetRegionByUUID(UUID scopeID, UUID regionID)
+        {
+            Dictionary<string, string> sendData = new Dictionary<string, string>();
+
+            sendData["SCOPEID"] = scopeID.ToString();
+            sendData["REGIONID"] = regionID.ToString();
+
+            sendData["METHOD"] = "get_region_by_uuid";
+
+            string reply = SynchronousRestFormsRequester.MakeRequest("POST",
+                    m_ServerURI + "/grid",
+                    ServerUtils.BuildQueryString(sendData));
+
+            Dictionary<string, object> replyData = ServerUtils.ParseXmlResponse(reply);
+
+            SimpleRegionInfo rinfo = null;
+            if ((replyData != null) && (replyData["result"] != null))
+            {
+                if (replyData["result"] is Dictionary<string, object>)
+                    rinfo = new SimpleRegionInfo((Dictionary<string, object>)replyData["result"]);
+                else
+                    m_log.DebugFormat("[GRID CONNECTOR]: GetRegionByUUID {0}, {1} received invalid response",
+                        scopeID, regionID);
+            }
+            else
+                m_log.DebugFormat("[GRID CONNECTOR]: GetRegionByUUID {0}, {1} received null response",
+                    scopeID, regionID);
+
+            return rinfo;
+        }
+
+        public SimpleRegionInfo GetRegionByPosition(UUID scopeID, int x, int y)
+        {
+            Dictionary<string, string> sendData = new Dictionary<string, string>();
+
+            sendData["SCOPEID"] = scopeID.ToString();
+            sendData["X"] = x.ToString();
+            sendData["Y"] = y.ToString();
+
+            sendData["METHOD"] = "get_region_by_position";
+
+            string reply = SynchronousRestFormsRequester.MakeRequest("POST",
+                    m_ServerURI + "/grid",
+                    ServerUtils.BuildQueryString(sendData));
+
+            Dictionary<string, object> replyData = ServerUtils.ParseXmlResponse(reply);
+
+            SimpleRegionInfo rinfo = null;
+            if ((replyData != null) && (replyData["result"] != null))
+            {
+                if (replyData["result"] is Dictionary<string, object>)
+                    rinfo = new SimpleRegionInfo((Dictionary<string, object>)replyData["result"]);
+                else
+                    m_log.DebugFormat("[GRID CONNECTOR]: GetRegionByPosition {0}, {1}-{2} received invalid response",
+                        scopeID, x, y);
+            }
+            else
+                m_log.DebugFormat("[GRID CONNECTOR]: GetRegionByPosition {0}, {1}-{2} received null response",
+                    scopeID, x, y);
+
+            return rinfo;
+        }
+
+        public SimpleRegionInfo GetRegionByName(UUID scopeID, string regionName)
+        {
+            Dictionary<string, string> sendData = new Dictionary<string, string>();
+
+            sendData["SCOPEID"] = scopeID.ToString();
+            sendData["NAME"] = regionName;
+
+            sendData["METHOD"] = "get_region_by_name";
+
+            string reply = SynchronousRestFormsRequester.MakeRequest("POST",
+                    m_ServerURI + "/grid",
+                    ServerUtils.BuildQueryString(sendData));
+
+            Dictionary<string, object> replyData = ServerUtils.ParseXmlResponse(reply);
+
+            SimpleRegionInfo rinfo = null;
+            if ((replyData != null) && (replyData["result"] != null))
+            {
+                if (replyData["result"] is Dictionary<string, object>)
+                    rinfo = new SimpleRegionInfo((Dictionary<string, object>)replyData["result"]);
+                else
+                    m_log.DebugFormat("[GRID CONNECTOR]: GetRegionByPosition {0}, {1} received invalid response",
+                        scopeID, regionName);
+            }
+            else
+                m_log.DebugFormat("[GRID CONNECTOR]: GetRegionByPosition {0}, {1} received null response",
+                    scopeID, regionName);
+
+            return rinfo;
+        }
+
+        public List<SimpleRegionInfo> GetRegionsByName(UUID scopeID, string name, int maxNumber)
+        {
+            Dictionary<string, string> sendData = new Dictionary<string, string>();
+
+            sendData["SCOPEID"] = scopeID.ToString();
+            sendData["NAME"] = name;
+            sendData["MAX"] = maxNumber.ToString();
+
+            sendData["METHOD"] = "get_regions_by_name";
+
+            string reply = SynchronousRestFormsRequester.MakeRequest("POST",
+                    m_ServerURI + "/grid",
+                    ServerUtils.BuildQueryString(sendData));
+
+            Dictionary<string, object> replyData = ServerUtils.ParseXmlResponse(reply);
+
+            List<SimpleRegionInfo> rinfos = new List<SimpleRegionInfo>();
+            if (replyData != null)
+            {
+                Dictionary<string, object>.ValueCollection rinfosList = replyData.Values;
+                foreach (object r in rinfosList)
+                {
+                    if (r is Dictionary<string, object>)
+                    {
+                        SimpleRegionInfo rinfo = new SimpleRegionInfo((Dictionary<string, object>)r);
+                        rinfos.Add(rinfo);
+                    }
+                    else
+                        m_log.DebugFormat("[GRID CONNECTOR]: GetRegionsByName {0}, {1}, {2} received invalid response",
+                            scopeID, name, maxNumber);
+                }
+            }
+            else
+                m_log.DebugFormat("[GRID CONNECTOR]: GetRegionsByName {0}, {1}, {2} received null response",
+                    scopeID, name, maxNumber);
+
+            return rinfos;
+        }
+
+        public List<SimpleRegionInfo> GetRegionRange(UUID scopeID, int xmin, int xmax, int ymin, int ymax)
+        {
+            Dictionary<string, string> sendData = new Dictionary<string, string>();
+
+            sendData["SCOPEID"] = scopeID.ToString();
+            sendData["XMIN"] = xmin.ToString();
+            sendData["XMAX"] = xmax.ToString();
+            sendData["YMIN"] = ymin.ToString();
+            sendData["YMAX"] = ymax.ToString();
+
+            sendData["METHOD"] = "get_region_range";
+
+            string reply = SynchronousRestFormsRequester.MakeRequest("POST",
+                    m_ServerURI + "/grid",
+                    ServerUtils.BuildQueryString(sendData));
+
+            Dictionary<string, object> replyData = ServerUtils.ParseXmlResponse(reply);
+
+            List<SimpleRegionInfo> rinfos = new List<SimpleRegionInfo>();
+            if (replyData != null)
+            {
+                Dictionary<string, object>.ValueCollection rinfosList = replyData.Values;
+                foreach (object r in rinfosList)
+                {
+                    if (r is Dictionary<string, object>)
+                    {
+                        SimpleRegionInfo rinfo = new SimpleRegionInfo((Dictionary<string, object>)r);
+                        rinfos.Add(rinfo);
+                    }
+                    else
+                        m_log.DebugFormat("[GRID CONNECTOR]: GetRegionRange {0}, {1}-{2} {3}-{4} received invalid response",
+                            scopeID, xmin, xmax, ymin, ymax);
+                }
+            }
+            else
+                m_log.DebugFormat("[GRID CONNECTOR]: GetRegionRange {0}, {1}-{2} {3}-{4} received null response",
+                    scopeID, xmin, xmax, ymin, ymax);
+
+            return rinfos;
+        }
+
+        #endregion
+
+    }
+}
diff --git a/OpenSim/Services/GridService/GridService.cs b/OpenSim/Services/GridService/GridService.cs
index 6aa1c4f..2229421 100644
--- a/OpenSim/Services/GridService/GridService.cs
+++ b/OpenSim/Services/GridService/GridService.cs
@@ -88,13 +88,18 @@ namespace OpenSim.Services.GridService
             return m_Database.Delete(regionID);
         }
 
-        public List<SimpleRegionInfo> GetNeighbours(UUID scopeID, int x, int y)
+        public List<SimpleRegionInfo> GetNeighbours(UUID scopeID, UUID regionID)
         {
-            List<RegionData> rdatas = m_Database.Get(x - 1, y - 1, x + 1, y + 1, scopeID);
             List<SimpleRegionInfo> rinfos = new List<SimpleRegionInfo>();
-            foreach (RegionData rdata in rdatas)
-                rinfos.Add(RegionData2RegionInfo(rdata));
+            RegionData region = m_Database.Get(regionID, scopeID);
+            if (region != null)
+            {
+                // Not really? Maybe?
+                List<RegionData> rdatas = m_Database.Get(region.posX - 1, region.posY - 1, region.posX + 1, region.posY + 1, scopeID);
+                foreach (RegionData rdata in rdatas)
+                    rinfos.Add(RegionData2RegionInfo(rdata));
 
+            }
             return rinfos;
         }
 
@@ -164,68 +169,20 @@ namespace OpenSim.Services.GridService
             rdata.posX = (int)rinfo.RegionLocX;
             rdata.posY = (int)rinfo.RegionLocY;
             rdata.RegionID = rinfo.RegionID;
+            rdata.Data = rinfo.ToKeyValuePairs();
             //rdata.RegionName = rinfo.RegionName;
-            rdata.Data["external_ip_address"] = rinfo.ExternalEndPoint.Address.ToString();
-            rdata.Data["external_port"] = rinfo.ExternalEndPoint.Port.ToString();
-            rdata.Data["external_host_name"] = rinfo.ExternalHostName;
-            rdata.Data["http_port"] = rinfo.HttpPort.ToString();
-            rdata.Data["internal_ip_address"] = rinfo.InternalEndPoint.Address.ToString();
-            rdata.Data["internal_port"] = rinfo.InternalEndPoint.Port.ToString();
-            rdata.Data["alternate_ports"] = rinfo.m_allow_alternate_ports.ToString();
-            rdata.Data["server_uri"] = rinfo.ServerURI;
 
             return rdata;
         }
 
         protected SimpleRegionInfo RegionData2RegionInfo(RegionData rdata)
         {
-            SimpleRegionInfo rinfo = new SimpleRegionInfo();
+            SimpleRegionInfo rinfo = new SimpleRegionInfo(rdata.Data);
             rinfo.RegionLocX = (uint)rdata.posX;
             rinfo.RegionLocY = (uint)rdata.posY;
             rinfo.RegionID = rdata.RegionID;
             //rinfo.RegionName = rdata.RegionName;
 
-            // Now for the variable data
-            if ((rdata.Data["external_ip_address"] != null) && (rdata.Data["external_port"] != null))
-            {
-                int port = 0;
-                Int32.TryParse((string)rdata.Data["external_port"], out port);
-                IPEndPoint ep = new IPEndPoint(IPAddress.Parse((string)rdata.Data["external_ip_address"]), port);
-                rinfo.ExternalEndPoint = ep;
-            }
-            else
-                rinfo.ExternalEndPoint = new IPEndPoint(new IPAddress(0), 0);
-
-            if (rdata.Data["external_host_name"] != null)
-                rinfo.ExternalHostName = (string)rdata.Data["external_host_name"] ;
-
-            if (rdata.Data["http_port"] != null)
-            {
-                UInt32 port = 0;
-                UInt32.TryParse((string)rdata.Data["http_port"], out port);
-                rinfo.HttpPort = port;
-            }
-
-            if ((rdata.Data["internal_ip_address"] != null) && (rdata.Data["internal_port"] != null))
-            {
-                int port = 0;
-                Int32.TryParse((string)rdata.Data["internal_port"], out port);
-                IPEndPoint ep = new IPEndPoint(IPAddress.Parse((string)rdata.Data["internal_ip_address"]), port);
-                rinfo.InternalEndPoint = ep;
-            }
-            else
-                rinfo.InternalEndPoint = new IPEndPoint(new IPAddress(0), 0);
-
-            if (rdata.Data["alternate_ports"] != null)
-            {
-                bool alts = false;
-                Boolean.TryParse((string)rdata.Data["alternate_ports"], out alts);
-                rinfo.m_allow_alternate_ports = alts;
-            }
-
-            if (rdata.Data["server_uri"] != null)
-                rinfo.ServerURI = (string)rdata.Data["server_uri"];
-
             return rinfo;
         }
 
diff --git a/OpenSim/Services/GridService/GridServiceBase.cs b/OpenSim/Services/GridService/GridServiceBase.cs
index 7b69290..7522e64 100644
--- a/OpenSim/Services/GridService/GridServiceBase.cs
+++ b/OpenSim/Services/GridService/GridServiceBase.cs
@@ -47,17 +47,6 @@ namespace OpenSim.Services.GridService
             string realm = "regions";
 
             //
-            // Try reading the [AssetService] section first, if it exists
-            //
-            IConfig gridConfig = config.Configs["GridService"];
-            if (gridConfig != null)
-            {
-                dllName = gridConfig.GetString("StorageProvider", dllName);
-                connString = gridConfig.GetString("ConnectionString", connString);
-                realm = gridConfig.GetString("Realm", realm);
-            }
-
-            //
             // Try reading the [DatabaseService] section, if it exists
             //
             IConfig dbConfig = config.Configs["DatabaseService"];
@@ -70,6 +59,17 @@ namespace OpenSim.Services.GridService
             }
 
             //
+            // [GridService] section overrides [DatabaseService], if it exists
+            //
+            IConfig gridConfig = config.Configs["GridService"];
+            if (gridConfig != null)
+            {
+                dllName = gridConfig.GetString("StorageProvider", dllName);
+                connString = gridConfig.GetString("ConnectionString", connString);
+                realm = gridConfig.GetString("Realm", realm);
+            }
+
+            //
             // We tried, but this doesn't exist. We can't proceed.
             //
             if (dllName.Equals(String.Empty))
diff --git a/OpenSim/Services/Interfaces/IGridService.cs b/OpenSim/Services/Interfaces/IGridService.cs
index 83ab9c1..8f6c524 100644
--- a/OpenSim/Services/Interfaces/IGridService.cs
+++ b/OpenSim/Services/Interfaces/IGridService.cs
@@ -55,7 +55,7 @@ namespace OpenSim.Services.Interfaces
         /// <param name="x"></param>
         /// <param name="y"></param>
         /// <returns></returns>
-        List<SimpleRegionInfo> GetNeighbours(UUID scopeID, int x, int y);
+        List<SimpleRegionInfo> GetNeighbours(UUID scopeID, UUID regionID);
 
         SimpleRegionInfo GetRegionByUUID(UUID scopeID, UUID regionID);