1 files changed, 103 insertions, 86 deletions

diff --git a/OpenSim/Services/GridService/HypergridLinker.cs b/OpenSim/Services/GridService/HypergridLinker.cs
index aebbf7c..dabfd3b 100644
--- a/OpenSim/Services/GridService/HypergridLinker.cs
+++ b/OpenSim/Services/GridService/HypergridLinker.cs
@@ -63,6 +63,7 @@ namespace OpenSim.Services.GridService
         protected GatekeeperServiceConnector m_GatekeeperConnector;
 
         protected UUID m_ScopeID = UUID.Zero;
+//        protected bool m_Check4096 = true;
         protected string m_MapTileDirectory = string.Empty;
         protected string m_ThisGatekeeper = string.Empty;
         protected Uri m_ThisGatekeeperURI = null;
@@ -119,8 +120,9 @@ namespace OpenSim.Services.GridService
             if (scope != string.Empty)
                 UUID.TryParse(scope, out m_ScopeID);
 
-// TODO OpenSim is crazy, this is called from Robust and OpenSim, Robust needs the ../caches bit, OpenSim somehow adds a path already.  I can't tell why.  So strip the path.
-            m_MapTileDirectory = "../caches/" +  Path.GetFileName(gridConfig.GetString("MapTileDirectory", "maptiles"));
+//                m_Check4096 = gridConfig.GetBoolean("Check4096", true);
+
+            m_MapTileDirectory = gridConfig.GetString("MapTileDirectory", "maptiles");
 
             m_ThisGatekeeper = Util.GetConfigVarFromSections<string>(config, "GatekeeperURI",
                 new string[] { "Startup", "Hypergrid", "GridService" }, String.Empty);
@@ -135,18 +137,27 @@ namespace OpenSim.Services.GridService
                 m_log.WarnFormat("[HYPERGRID LINKER]: Malformed URL in [GridService], variable Gatekeeper = {0}", m_ThisGatekeeper);
             }
 
+            m_ThisGatekeeper = m_ThisGatekeeperURI.AbsoluteUri;
+            if(m_ThisGatekeeperURI.Port == 80)
+                m_ThisGatekeeper = m_ThisGatekeeper.Trim(new char[] { '/', ' ' }) +":80/";
+            else if(m_ThisGatekeeperURI.Port == 443)
+                m_ThisGatekeeper = m_ThisGatekeeper.Trim(new char[] { '/', ' ' }) +":443/";
+
             m_GatekeeperConnector = new GatekeeperServiceConnector(m_AssetService);
 
             m_log.Debug("[HYPERGRID LINKER]: Loaded all services...");
 
-            try
-            {
-                Directory.CreateDirectory(m_MapTileDirectory);
-            }
-            catch (Exception e)
+            if (!string.IsNullOrEmpty(m_MapTileDirectory))
             {
-                m_log.WarnFormat("[HYPERGRID LINKER]: Could not create map tile storage directory {0}: {1}", m_MapTileDirectory, e);
-                m_MapTileDirectory = string.Empty;
+                try
+                {
+                    Directory.CreateDirectory(m_MapTileDirectory);
+                }
+                catch (Exception e)
+                {
+                    m_log.WarnFormat("[HYPERGRID LINKER]: Could not create map tile storage directory {0}: {1}", m_MapTileDirectory, e);
+                    m_MapTileDirectory = string.Empty;
+                }
             }
 
             if (MainConsole.Instance != null)
@@ -186,85 +197,29 @@ namespace OpenSim.Services.GridService
             return TryLinkRegionToCoords(scopeID, mapName, xloc, yloc, UUID.Zero, out reason);
         }
 
+        public bool IsLocalGrid(string serverURI)
+        {
+            return serverURI == m_ThisGatekeeper;
+        }
+
         public GridRegion TryLinkRegionToCoords(UUID scopeID, string mapName, int xloc, int yloc, UUID ownerID, out string reason)
         {
             reason = string.Empty;
             GridRegion regInfo = null;
 
-            mapName = mapName.Trim();
+            string serverURI = string.Empty;
+            string regionName = string.Empty;
 
-            if (!mapName.StartsWith("http"))
+            if(!Util.buildHGRegionURI(mapName, out serverURI, out regionName))
             {
-                // Formats: grid.example.com:8002:region name
-                //          grid.example.com:region name
-                //          grid.example.com:8002
-                //          grid.example.com
-
-                string host;
-                uint port = 80;
-                string regionName = "";
-
-                string[] parts = mapName.Split(new char[] { ':' });
-
-                if (parts.Length == 0)
-                {
-                    reason = "Wrong format for link-region";
-                    return null;
-                }
-
-                host = parts[0];
-
-                if (parts.Length >= 2)
-                {
-                    // If it's a number then assume it's a port. Otherwise, it's a region name.
-                    if (!UInt32.TryParse(parts[1], out port))
-                        regionName = parts[1];
-                }
-
-                // always take the last one
-                if (parts.Length >= 3)
-                {
-                    regionName = parts[2];
-                }
-
-
-                bool success = TryCreateLink(scopeID, xloc, yloc, regionName, port, host, ownerID, out regInfo, out reason);
-                if (success)
-                {
-                    regInfo.RegionName = mapName;
-                    return regInfo;
-                }
+                reason = "Wrong URI format for link-region";
+                return null;
             }
-            else
-            {
-                // Formats: http://grid.example.com region name
-                //          http://grid.example.com "region name"
-                //          http://grid.example.com
-
-                string serverURI;
-                string regionName = "";
 
-                string[] parts = mapName.Split(new char[] { ' ' });
-
-                if (parts.Length == 0)
-                {
-                    reason = "Wrong format for link-region";
-                    return null;
-                }
-
-                serverURI = parts[0];
-
-                if (parts.Length >= 2)
-                {
-                    regionName = mapName.Substring(serverURI.Length);
-                    regionName = regionName.Trim(new char[] { '"', ' ' });
-                }
-
-                if (TryCreateLink(scopeID, xloc, yloc, regionName, 0, null, serverURI, ownerID, out regInfo, out reason))
-                {
-                    regInfo.RegionName = mapName; 
-                    return regInfo;
-                }
+            if (TryCreateLink(scopeID, xloc, yloc, regionName, 0, null, serverURI, ownerID, out regInfo, out reason))
+            {
+                regInfo.RegionName = serverURI + regionName;
+                return regInfo;
             }
 
             return null;
@@ -285,7 +240,7 @@ namespace OpenSim.Services.GridService
 
         private bool TryCreateLinkImpl(UUID scopeID, int xloc, int yloc, string remoteRegionName, uint externalPort, string externalHostName, string serverURI, UUID ownerID, out GridRegion regInfo, out string reason)
         {
-            m_log.InfoFormat("[HYPERGRID LINKER]: Link to {0} {1}, in <{2},{3}>", 
+            m_log.InfoFormat("[HYPERGRID LINKER]: Link to {0} {1}, in <{2},{3}>",
                 ((serverURI == null) ? (externalHostName + ":" + externalPort) : serverURI),
                 remoteRegionName, Util.WorldToRegionLoc((uint)xloc), Util.WorldToRegionLoc((uint)yloc));
 
@@ -361,7 +316,9 @@ namespace OpenSim.Services.GridService
             UUID regionID = UUID.Zero;
             string externalName = string.Empty;
             string imageURL = string.Empty;
-            if (!m_GatekeeperConnector.LinkRegion(regInfo, out regionID, out handle, out externalName, out imageURL, out reason))
+            int sizeX = (int)Constants.RegionSize;
+            int sizeY = (int)Constants.RegionSize;
+            if (!m_GatekeeperConnector.LinkRegion(regInfo, out regionID, out handle, out externalName, out imageURL, out reason, out sizeX, out sizeY))
                 return false;
 
             if (regionID == UUID.Zero)
@@ -374,13 +331,27 @@ namespace OpenSim.Services.GridService
             region = m_GridService.GetRegionByUUID(scopeID, regionID);
             if (region != null)
             {
-                m_log.DebugFormat("[HYPERGRID LINKER]: Region already exists in coordinates <{0},{1}>",
-                    Util.WorldToRegionLoc((uint)region.RegionLocX), Util.WorldToRegionLoc((uint)region.RegionLocY));
+              m_log.DebugFormat("[HYPERGRID LINKER]: Region already exists in coordinates <{0},{1}>",            Util.WorldToRegionLoc((uint)region.RegionLocX), Util.WorldToRegionLoc((uint)region.RegionLocY));
                 regInfo = region;
                 return true;
             }
 
+            // We are now performing this check for each individual teleport in the EntityTransferModule instead.  This
+            // allows us to give better feedback when teleports fail because of the distance reason (which can't be
+            // done here) and it also hypergrid teleports that are within range (possibly because the source grid
+            // itself has regions that are very far apart).
+//            uint x, y;
+//            if (m_Check4096 && !Check4096(handle, out x, out y))
+//            {
+//                //RemoveHyperlinkRegion(regInfo.RegionID);
+//                reason = "Region is too far (" + x + ", " + y + ")";
+//                m_log.Info("[HYPERGRID LINKER]: Unable to link, region is too far (" + x + ", " + y + ")");
+//                //return false;
+//            }
+
             regInfo.RegionID = regionID;
+            regInfo.RegionSizeX = sizeX;
+            regInfo.RegionSizeY = sizeY;
 
             if (externalName == string.Empty)
                 regInfo.RegionName = regInfo.ServerURI;
@@ -412,7 +383,7 @@ namespace OpenSim.Services.GridService
                 OpenSim.Framework.RegionFlags rflags = (OpenSim.Framework.RegionFlags)Convert.ToInt32(regions[0].Data["flags"]);
                 if ((rflags & OpenSim.Framework.RegionFlags.Hyperlink) != 0)
                 {
-                    regInfo = new GridRegion(); 
+                    regInfo = new GridRegion();
                     regInfo.RegionID = regions[0].RegionID;
                     regInfo.ScopeID = m_ScopeID;
                 }
@@ -430,6 +401,52 @@ namespace OpenSim.Services.GridService
             }
         }
 
+// Not currently used
+//        /// <summary>
+//        /// Cope with this viewer limitation.
+//        /// </summary>
+//        /// <param name="regInfo"></param>
+//        /// <returns></returns>
+//        public bool Check4096(ulong realHandle, out uint x, out uint y)
+//        {
+//            uint ux = 0, uy = 0;
+//            Utils.LongToUInts(realHandle, out ux, out uy);
+//            x = Util.WorldToRegionLoc(ux);
+//            y = Util.WorldToRegionLoc(uy);
+//
+//            const uint limit = Util.RegionToWorldLoc(4096 - 1);
+//            uint xmin = ux - limit;
+//            uint xmax = ux + limit;
+//            uint ymin = uy - limit;
+//            uint ymax = uy + limit;
+//            // World map boundary checks
+//            if (xmin < 0 || xmin > ux)
+//                xmin = 0;
+//            if (xmax > int.MaxValue || xmax < ux)
+//                xmax = int.MaxValue;
+//            if (ymin < 0 || ymin > uy)
+//                ymin = 0;
+//            if (ymax > int.MaxValue || ymax < uy)
+//                ymax = int.MaxValue;
+//
+//            // Check for any regions that are within the possible teleport range to the linked region
+//            List<GridRegion> regions = m_GridService.GetRegionRange(m_ScopeID, (int)xmin, (int)xmax, (int)ymin, (int)ymax);
+//            if (regions.Count == 0)
+//            {
+//                return false;
+//            }
+//            else
+//            {
+//                // Check for regions which are not linked regions
+//                List<GridRegion> hyperlinks = m_GridService.GetHyperlinks(m_ScopeID);
+//                IEnumerable<GridRegion> availableRegions = regions.Except(hyperlinks);
+//                if (availableRegions.Count() == 0)
+//                    return false;
+//            }
+//
+//            return true;
+//        }
+
         private void AddHyperlinkRegion(GridRegion regionInfo, ulong regionHandle)
         {
             RegionData rdata = m_GridService.RegionInfo2RegionData(regionInfo);
@@ -474,7 +491,7 @@ namespace OpenSim.Services.GridService
             {
                 MainConsole.Instance.Output(
                     String.Format("{0}\n{2,-32} {1}\n",
-                        r.RegionName, r.RegionID, 
+                        r.RegionName, r.RegionID,
                         String.Format("{0},{1} ({2},{3})", r.posX, r.posY,
                                     Util.WorldToRegionLoc((uint)r.posX), Util.WorldToRegionLoc((uint)r.posY)
                         )
@@ -556,7 +573,7 @@ namespace OpenSim.Services.GridService
                 if (cmdparams[2].StartsWith("http"))
                 {
                     RunLinkRegionCommand(cmdparams);
-                } 
+                }
                 else if (cmdparams[2].Contains(":"))
                 {
                     // New format