From 9fbcceb1db84e62eedb75b2bd43f5e59142ec6c8 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Mon, 18 Jan 2010 20:35:59 -0800
Subject: * Towards enabling hyperlinks at grid-level. * Updated grid configs

---
 .../Hypergrid/GatekeeperServerConnector.cs         | 11 +++++--
 .../Server/Handlers/Hypergrid/HypergridHandlers.cs | 34 +++++++++++++++++++++-
 2 files changed, 42 insertions(+), 3 deletions(-)

(limited to 'OpenSim/Server')

diff --git a/OpenSim/Server/Handlers/Hypergrid/GatekeeperServerConnector.cs b/OpenSim/Server/Handlers/Hypergrid/GatekeeperServerConnector.cs
index 15b29d2..940ec7a 100644
--- a/OpenSim/Server/Handlers/Hypergrid/GatekeeperServerConnector.cs
+++ b/OpenSim/Server/Handlers/Hypergrid/GatekeeperServerConnector.cs
@@ -51,6 +51,8 @@ namespace OpenSim.Server.Handlers.Hypergrid
             get { return m_GatekeeperService; }
         }
 
+        private IHypergridService m_HypergridService;
+
         public GatekeeperServiceInConnector(IConfigSource config, IHttpServer server, ISimulationService simService) :
                 base(config, server, String.Empty)
         {
@@ -60,12 +62,17 @@ namespace OpenSim.Server.Handlers.Hypergrid
                 string serviceDll = gridConfig.GetString("LocalServiceModule", string.Empty);
                 Object[] args = new Object[] { config, simService };
                 m_GatekeeperService = ServerUtils.LoadPlugin<IGatekeeperService>(serviceDll, args);
+
+                serviceDll = gridConfig.GetString("HypergridService", string.Empty);
+                m_HypergridService = ServerUtils.LoadPlugin<IHypergridService>(serviceDll, args);
+
             }
-            if (m_GatekeeperService == null)
+            if (m_GatekeeperService == null || m_HypergridService == null)
                 throw new Exception("Gatekeeper server connector cannot proceed because of missing service");
 
-            HypergridHandlers hghandlers = new HypergridHandlers(m_GatekeeperService);
+            HypergridHandlers hghandlers = new HypergridHandlers(m_GatekeeperService, m_HypergridService);
             server.AddXmlRPCHandler("link_region", hghandlers.LinkRegionRequest, false);
+            server.AddXmlRPCHandler("link_region_by_desc", hghandlers.LinkRegionByDescRequest, false);
             server.AddXmlRPCHandler("get_region", hghandlers.GetRegion, false);
             server.AddXmlRPCHandler("get_home_region", hghandlers.GetHomeRegion, false);
 
diff --git a/OpenSim/Server/Handlers/Hypergrid/HypergridHandlers.cs b/OpenSim/Server/Handlers/Hypergrid/HypergridHandlers.cs
index 846d1c2..1d711a8 100644
--- a/OpenSim/Server/Handlers/Hypergrid/HypergridHandlers.cs
+++ b/OpenSim/Server/Handlers/Hypergrid/HypergridHandlers.cs
@@ -44,10 +44,12 @@ namespace OpenSim.Server.Handlers.Hypergrid
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
         private IGatekeeperService m_GatekeeperService;
+        private IHypergridService m_HypergridService;
 
-        public HypergridHandlers(IGatekeeperService gatekeeper)
+        public HypergridHandlers(IGatekeeperService gatekeeper, IHypergridService hyper)
         {
             m_GatekeeperService = gatekeeper;
+            m_HypergridService = hyper;
         }
 
         /// <summary>
@@ -80,6 +82,36 @@ namespace OpenSim.Server.Handlers.Hypergrid
             return response;
         }
 
+        /// <summary>
+        /// A local region wants to establish a grid-wide hyperlink to another region
+        /// </summary>
+        /// <param name="request"></param>
+        /// <returns></returns>
+        public XmlRpcResponse LinkRegionByDescRequest(XmlRpcRequest request, IPEndPoint remoteClient)
+        {
+            Hashtable requestData = (Hashtable)request.Params[0];
+            //string host = (string)requestData["host"];
+            //string portstr = (string)requestData["port"];
+            string descriptor = (string)requestData["region_desc"];
+
+            UUID regionID = UUID.Zero;
+            string imageURL = string.Empty;
+            ulong regionHandle = 0;
+            string reason = string.Empty;
+
+            bool success = m_HypergridService.LinkRegion(descriptor, out regionID, out regionHandle, out imageURL, out reason);
+
+            Hashtable hash = new Hashtable();
+            hash["result"] = success.ToString();
+            hash["uuid"] = regionID.ToString();
+            hash["handle"] = regionHandle.ToString();
+            hash["region_image"] = imageURL;
+
+            XmlRpcResponse response = new XmlRpcResponse();
+            response.Value = hash;
+            return response;
+        }
+
         public XmlRpcResponse GetRegion(XmlRpcRequest request, IPEndPoint remoteClient)
         {
             Hashtable requestData = (Hashtable)request.Params[0];
-- 
cgit v1.1