3 files changed, 202 insertions, 3 deletions

diff --git a/OpenSim/Server/Handlers/Hypergrid/GatekeeperServerConnector.cs b/OpenSim/Server/Handlers/Hypergrid/GatekeeperServerConnector.cs
index c56ea3f..940ec7a 100644
--- a/OpenSim/Server/Handlers/Hypergrid/GatekeeperServerConnector.cs
+++ b/OpenSim/Server/Handlers/Hypergrid/GatekeeperServerConnector.cs
@@ -46,6 +46,12 @@ namespace OpenSim.Server.Handlers.Hypergrid
                 MethodBase.GetCurrentMethod().DeclaringType);
 
         private IGatekeeperService m_GatekeeperService;
+        public IGatekeeperService GateKeeper
+        {
+            get { return m_GatekeeperService; }
+        }
+
+        private IHypergridService m_HypergridService;
 
         public GatekeeperServiceInConnector(IConfigSource config, IHttpServer server, ISimulationService simService) :
                 base(config, server, String.Empty)
@@ -56,13 +62,19 @@ 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);
 
             server.AddHTTPHandler("/foreignagent/", new AgentHandler(m_GatekeeperService).Handler);
 
diff --git a/OpenSim/Server/Handlers/Hypergrid/HomeUsersSecurityServerConnector.cs b/OpenSim/Server/Handlers/Hypergrid/HomeUsersSecurityServerConnector.cs
new file mode 100644
index 0000000..5379784
--- /dev/null
+++ b/OpenSim/Server/Handlers/Hypergrid/HomeUsersSecurityServerConnector.cs
@@ -0,0 +1,122 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Net;
+using System.Reflection;
+
+using Nini.Config;
+using OpenSim.Framework;
+using OpenSim.Server.Base;
+using OpenSim.Services.Interfaces;
+using OpenSim.Framework.Servers.HttpServer;
+using OpenSim.Server.Handlers.Base;
+
+using log4net;
+using Nwc.XmlRpc;
+using OpenMetaverse;
+
+namespace OpenSim.Server.Handlers.Hypergrid
+{
+    public class HomeUsersSecurityServerConnector : ServiceConnector
+    {
+        private static readonly ILog m_log =
+                LogManager.GetLogger(
+                MethodBase.GetCurrentMethod().DeclaringType);
+
+        private IHomeUsersSecurityService m_HomeUsersService;
+
+        public HomeUsersSecurityServerConnector(IConfigSource config, IHttpServer server) :
+                base(config, server, String.Empty)
+        {
+            IConfig gridConfig = config.Configs["HomeUsersSecurityService"];
+            if (gridConfig != null)
+            {
+                string serviceDll = gridConfig.GetString("LocalServiceModule", string.Empty);
+                Object[] args = new Object[] { config };
+                m_HomeUsersService = ServerUtils.LoadPlugin<IHomeUsersSecurityService>(serviceDll, args);
+            }
+            if (m_HomeUsersService == null)
+                throw new Exception("HomeUsersSecurity server connector cannot proceed because of missing service");
+
+            server.AddXmlRPCHandler("ep_get", GetEndPoint, false);
+            server.AddXmlRPCHandler("ep_set", SetEndPoint, false);
+            server.AddXmlRPCHandler("ep_remove", RemoveEndPoint, false);
+
+        }
+
+        public XmlRpcResponse GetEndPoint(XmlRpcRequest request, IPEndPoint remoteClient)
+        {
+            Hashtable requestData = (Hashtable)request.Params[0];
+            //string host = (string)requestData["host"];
+            //string portstr = (string)requestData["port"];
+            string sessionID_str = (string)requestData["sessionID"];
+            UUID sessionID = UUID.Zero;
+            UUID.TryParse(sessionID_str, out sessionID);
+
+            IPEndPoint ep = m_HomeUsersService.GetEndPoint(sessionID);
+
+            Hashtable hash = new Hashtable();
+            if (ep == null)
+                hash["result"] = "false";
+            else
+            {
+                hash["result"] = "true";
+                hash["ep_addr"] = ep.Address.ToString();
+                hash["ep_port"] = ep.Port.ToString();
+            }
+            XmlRpcResponse response = new XmlRpcResponse();
+            response.Value = hash;
+            return response;
+
+        }
+
+        public XmlRpcResponse SetEndPoint(XmlRpcRequest request, IPEndPoint remoteClient)
+        {
+            Hashtable requestData = (Hashtable)request.Params[0];
+            string host = (string)requestData["ep_addr"];
+            string portstr = (string)requestData["ep_port"];
+            string sessionID_str = (string)requestData["sessionID"];
+            UUID sessionID = UUID.Zero;
+            UUID.TryParse(sessionID_str, out sessionID);
+            int port = 0;
+            Int32.TryParse(portstr, out port);
+
+            IPEndPoint ep = null;
+            try
+            {
+                ep = new IPEndPoint(IPAddress.Parse(host), port);
+            }
+            catch
+            {
+                m_log.Debug("[HOME USERS SECURITY]: Exception in creating EndPoint");
+            }
+
+            m_HomeUsersService.SetEndPoint(sessionID, ep);
+
+            Hashtable hash = new Hashtable();
+            hash["result"] = "true";
+            XmlRpcResponse response = new XmlRpcResponse();
+            response.Value = hash;
+            return response;
+
+        }
+
+        public XmlRpcResponse RemoveEndPoint(XmlRpcRequest request, IPEndPoint remoteClient)
+        {
+            Hashtable requestData = (Hashtable)request.Params[0];
+            string sessionID_str = (string)requestData["sessionID"];
+            UUID sessionID = UUID.Zero;
+            UUID.TryParse(sessionID_str, out sessionID);
+
+            m_HomeUsersService.RemoveEndPoint(sessionID);
+
+            Hashtable hash = new Hashtable();
+            hash["result"] = "true";
+            XmlRpcResponse response = new XmlRpcResponse();
+            response.Value = hash;
+            return response;
+
+        }
+
+    }
+}
diff --git a/OpenSim/Server/Handlers/Hypergrid/HypergridHandlers.cs b/OpenSim/Server/Handlers/Hypergrid/HypergridHandlers.cs
index baafd7d..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];
@@ -111,5 +143,38 @@ namespace OpenSim.Server.Handlers.Hypergrid
 
         }
 
+        public XmlRpcResponse GetHomeRegion(XmlRpcRequest request, IPEndPoint remoteClient)
+        {
+            Hashtable requestData = (Hashtable)request.Params[0];
+            //string host = (string)requestData["host"];
+            //string portstr = (string)requestData["port"];
+            string userID_str = (string)requestData["userID"];
+            UUID userID = UUID.Zero;
+            UUID.TryParse(userID_str, out userID);
+
+            Vector3 position = Vector3.UnitY, lookAt = Vector3.UnitY;
+            GridRegion regInfo = m_GatekeeperService.GetHomeRegion(userID, out position, out lookAt);
+
+            Hashtable hash = new Hashtable();
+            if (regInfo == null)
+                hash["result"] = "false";
+            else
+            {
+                hash["result"] = "true";
+                hash["uuid"] = regInfo.RegionID.ToString();
+                hash["x"] = regInfo.RegionLocX.ToString();
+                hash["y"] = regInfo.RegionLocY.ToString();
+                hash["region_name"] = regInfo.RegionName;
+                hash["hostname"] = regInfo.ExternalHostName;
+                hash["http_port"] = regInfo.HttpPort.ToString();
+                hash["internal_port"] = regInfo.InternalEndPoint.Port.ToString();
+                hash["position"] = position.ToString();
+                hash["lookAt"] = lookAt.ToString();
+            }
+            XmlRpcResponse response = new XmlRpcResponse();
+            response.Value = hash;
+            return response;
+
+        }
     }
 }