2 files changed, 128 insertions, 14 deletions

diff --git a/OpenSim/Server/Handlers/Grid/GridServerPostHandler.cs b/OpenSim/Server/Handlers/Grid/GridServerPostHandler.cs
index b9a4867..e22328d 100644
--- a/OpenSim/Server/Handlers/Grid/GridServerPostHandler.cs
+++ b/OpenSim/Server/Handlers/Grid/GridServerPostHandler.cs
@@ -118,6 +118,24 @@ namespace OpenSim.Server.Handlers.Grid
             else
                 m_log.WarnFormat("[GRID HANDLER]: no scopeID in request to register region");
 
+            int versionNumberMin = 0, versionNumberMax = 0;
+            if (request.ContainsKey("VERSIONMIN"))
+                Int32.TryParse(request["VERSIONMIN"], out versionNumberMin);
+            else
+                m_log.WarnFormat("[GRID HANDLER]: no minimum protocol version in request to register region");
+
+            if (request.ContainsKey("VERSIONMAX"))
+                Int32.TryParse(request["VERSIONMAX"], out versionNumberMax);
+            else
+                m_log.WarnFormat("[GRID HANDLER]: no maximum protocol version in request to register region");
+
+            // Check the protocol version
+            if ((versionNumberMin > ProtocolVersions.ServerProtocolVersionMax && versionNumberMax < ProtocolVersions.ServerProtocolVersionMax))
+            {
+                // Can't do, there is no overlap in the acceptable ranges
+                return FailureResult();
+            }
+
             Dictionary<string, object> rinfoData = new Dictionary<string, object>();
             foreach (KeyValuePair<string, string> kvp in request)
                 rinfoData[kvp.Key] = kvp.Value;
diff --git a/OpenSim/Server/Handlers/Grid/HypergridServerConnector.cs b/OpenSim/Server/Handlers/Grid/HypergridServerConnector.cs
index ad63485..c47f652 100644
--- a/OpenSim/Server/Handlers/Grid/HypergridServerConnector.cs
+++ b/OpenSim/Server/Handlers/Grid/HypergridServerConnector.cs
@@ -36,7 +36,9 @@ using OpenSim.Server.Base;
 using OpenSim.Services.Interfaces;
 using OpenSim.Framework.Servers.HttpServer;
 using OpenSim.Server.Handlers.Base;
+using GridRegion = OpenSim.Services.Interfaces.GridRegion;
 
+using OpenMetaverse;
 using log4net;
 using Nwc.XmlRpc;
 
@@ -48,12 +50,26 @@ namespace OpenSim.Server.Handlers.Grid
                 LogManager.GetLogger(
                 MethodBase.GetCurrentMethod().DeclaringType);
 
-        private List<SimpleRegionInfo> m_RegionsOnSim = new List<SimpleRegionInfo>();
+        private List<GridRegion> m_RegionsOnSim = new List<GridRegion>();
+        private IHyperlinkService m_HyperlinkService;
 
-        public HypergridServiceInConnector(IConfigSource config, IHttpServer server) :
+        public HypergridServiceInConnector(IConfigSource config, IHttpServer server, IHyperlinkService hyperService) :
                 base(config, server)
         {
-            server.AddXmlRPCHandler("linkk_region", LinkRegionRequest, false);
+            m_HyperlinkService = hyperService;
+            server.AddXmlRPCHandler("link_region", LinkRegionRequest, false);
+            server.AddXmlRPCHandler("expect_hg_user", ExpectHGUser, false);
+        }
+
+        public void AddRegion(GridRegion rinfo)
+        {
+            m_RegionsOnSim.Add(rinfo);
+        }
+
+        public void RemoveRegion(GridRegion rinfo)
+        {
+            if (m_RegionsOnSim.Contains(rinfo))
+                m_RegionsOnSim.Remove(rinfo);
         }
 
         /// <summary>
@@ -70,8 +86,8 @@ namespace OpenSim.Server.Handlers.Grid
 
             m_log.DebugFormat("[HGrid]: Hyperlink request");
 
-            SimpleRegionInfo regInfo = null;
-            foreach (SimpleRegionInfo r in m_RegionsOnSim)
+            GridRegion regInfo = null;
+            foreach (GridRegion r in m_RegionsOnSim)
             {
                 if ((r.RegionName != null) && (name != null) && (r.RegionName.ToLower() == name.ToLower()))
                 {
@@ -85,9 +101,9 @@ namespace OpenSim.Server.Handlers.Grid
 
             Hashtable hash = new Hashtable();
             hash["uuid"] = regInfo.RegionID.ToString();
+            m_log.Debug(">> Here " + regInfo.RegionID);
             hash["handle"] = regInfo.RegionHandle.ToString();
-            //m_log.Debug(">> Here " + regInfo.RegionHandle);
-            //hash["region_image"] = regInfo.RegionSettings.TerrainImageID.ToString();
+            hash["region_image"] = regInfo.TerrainImage.ToString();
             hash["region_name"] = regInfo.RegionName;
             hash["internal_port"] = regInfo.InternalEndPoint.Port.ToString();
             //m_log.Debug(">> Here: " + regInfo.InternalEndPoint.Port);
@@ -98,15 +114,95 @@ namespace OpenSim.Server.Handlers.Grid
             return response;
         }
 
-        public void AddRegion(SimpleRegionInfo rinfo)
+        /// <summary>
+        /// Received from other HGrid nodes when a user wants to teleport here.  This call allows
+        /// the region to prepare for direct communication from the client.  Sends back an empty
+        /// xmlrpc response on completion.
+        /// This is somewhat similar to OGS1's ExpectUser, but with the additional task of
+        /// registering the user in the local user cache.
+        /// </summary>
+        /// <param name="request"></param>
+        /// <returns></returns>
+        public XmlRpcResponse ExpectHGUser(XmlRpcRequest request, IPEndPoint remoteClient)
         {
-            m_RegionsOnSim.Add(rinfo);
-        }
+            Hashtable requestData = (Hashtable)request.Params[0];
+            ForeignUserProfileData userData = new ForeignUserProfileData();
 
-        public void RemoveRegion(SimpleRegionInfo rinfo)
-        {
-            if (m_RegionsOnSim.Contains(rinfo))
-                m_RegionsOnSim.Remove(rinfo);
+            userData.FirstName = (string)requestData["firstname"];
+            userData.SurName = (string)requestData["lastname"];
+            userData.ID = new UUID((string)requestData["agent_id"]);
+            UUID sessionID = new UUID((string)requestData["session_id"]);
+            userData.HomeLocation = new Vector3((float)Convert.ToDecimal((string)requestData["startpos_x"]),
+                                  (float)Convert.ToDecimal((string)requestData["startpos_y"]),
+                                  (float)Convert.ToDecimal((string)requestData["startpos_z"]));
+
+            userData.UserServerURI = (string)requestData["userserver_id"];
+            userData.UserAssetURI = (string)requestData["assetserver_id"];
+            userData.UserInventoryURI = (string)requestData["inventoryserver_id"];
+
+            m_log.DebugFormat("[HGrid]: Prepare for connection from {0} {1} (@{2}) UUID={3}",
+                              userData.FirstName, userData.SurName, userData.UserServerURI, userData.ID);
+
+            ulong userRegionHandle = 0;
+            int userhomeinternalport = 0;
+            if (requestData.ContainsKey("region_uuid"))
+            {
+                UUID uuid = UUID.Zero;
+                UUID.TryParse((string)requestData["region_uuid"], out uuid);
+                userData.HomeRegionID = uuid;
+                userRegionHandle = Convert.ToUInt64((string)requestData["regionhandle"]);
+                userData.UserHomeAddress = (string)requestData["home_address"];
+                userData.UserHomePort = (string)requestData["home_port"];
+                userhomeinternalport = Convert.ToInt32((string)requestData["internal_port"]);
+
+                m_log.Debug("[HGrid]: home_address: " + userData.UserHomeAddress +
+                           "; home_port: " + userData.UserHomePort);
+            }
+            else
+                m_log.WarnFormat("[HGrid]: User has no home region information");
+
+            XmlRpcResponse resp = new XmlRpcResponse();
+
+            // Let's check if someone is trying to get in with a stolen local identity.
+            // The need for this test is a consequence of not having truly global names :-/
+            bool comingHome = false;
+            if (m_HyperlinkService.CheckUserAtEntry(userData.ID, sessionID, out comingHome) == false)
+            {
+                m_log.WarnFormat("[HGrid]: Access denied to foreign user.");
+                Hashtable respdata = new Hashtable();
+                respdata["success"] = "FALSE";
+                respdata["reason"] = "Foreign user has the same ID as a local user, or logins disabled.";
+                resp.Value = respdata;
+                return resp;
+            }
+
+            // Finally, everything looks ok
+            //m_log.Debug("XXX---- EVERYTHING OK ---XXX");
+
+            if (!comingHome)
+            {
+                // We don't do this if the user is coming to the home grid
+                GridRegion home = new GridRegion();
+                home.RegionID = userData.HomeRegionID;
+                home.ExternalHostName = userData.UserHomeAddress;
+                home.HttpPort = Convert.ToUInt32(userData.UserHomePort);
+                uint x = 0, y = 0;
+                Utils.LongToUInts(userRegionHandle, out x, out y);
+                home.RegionLocX = (int)x;
+                home.RegionLocY = (int)y;
+                home.InternalEndPoint = new IPEndPoint(IPAddress.Parse("0.0.0.0"), (int)userhomeinternalport);
+
+                m_HyperlinkService.AcceptUser(userData, home);
+            }
+            // else the user is coming to a non-home region of the home grid
+            // We simply drop this user information altogether
+ 
+            Hashtable respdata2 = new Hashtable();
+            respdata2["success"] = "TRUE";
+            resp.Value = respdata2;
+
+            return resp;
         }
+
     }
 }