HG agent transfers are starting to work. Gatekeeper handlers are missing.

OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs

@@ -61,7 +61,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
             get { return null; }
         }
 
-        public string Name
+        public virtual string Name
         {
             get { return "BasicEntityTransferModule"; }
         }
@@ -76,7 +76,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
                 {
                     m_agentsInTransit = new List<UUID>();
                     m_Enabled = true;
-                    m_log.InfoFormat("[ENTITY TRANSFER MODULE]: {0} nabled.", Name);
+                    m_log.InfoFormat("[ENTITY TRANSFER MODULE]: {0} enabled.", Name);
                 }
             }
         }
@@ -135,6 +135,8 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
             // Reset animations; the viewer does that in teleports.
             sp.Animator.ResetAnimations();
 
+            try
+            {
                 if (regionHandle == sp.Scene.RegionInfo.RegionHandle)
                 {
                     m_log.DebugFormat(
@@ -192,8 +194,15 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
                         uint oldRegionX = (uint)(sp.Scene.RegionInfo.RegionHandle >> 40);
                         uint oldRegionY = (((uint)(sp.Scene.RegionInfo.RegionHandle)) >> 8);
 
-                    ulong destinationHandle = GetRegionHandle(reg);
                         GridRegion finalDestination = GetFinalDestination(reg);
+                        if (finalDestination == null)
+                        {
+                            m_log.DebugFormat("[ENTITY TRANSFER MODULE]: Final destination is having problems. Unable to teleport agent.");
+                            sp.ControllingClient.SendTeleportFailed("Problem at destination");
+                            return;
+                        }
+                        m_log.DebugFormat("[ENTITY TRANSFER MODULE]: Final destination is x={0} y={1} uuid={2}", finalDestination.RegionLocX, finalDestination.RegionLocY, finalDestination.RegionID);
+                        ulong destinationHandle = finalDestination.RegionHandle;
 
                         if (eq == null)
                             sp.ControllingClient.SendTeleportLocationStart();
@@ -201,7 +210,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
                         // Let's do DNS resolution only once in this process, please!
                         // This may be a costly operation. The reg.ExternalEndPoint field is not a passive field,
                         // it's actually doing a lot of work.
-                    IPEndPoint endPoint = reg.ExternalEndPoint;
+                        IPEndPoint endPoint = finalDestination.ExternalEndPoint;
                         if (endPoint.Address == null)
                         {
                             // Couldn't resolve the name. Can't TP, because the viewer wants IP addresses.
@@ -264,18 +273,18 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
                                 {
                                     capsPath
                                         = "http://"
-                                      + NetworkUtil.GetHostFor(ipepClient.EndPoint, reg.ExternalHostName)
+                                          + NetworkUtil.GetHostFor(ipepClient.EndPoint, finalDestination.ExternalHostName)
                                           + ":"
-                                      + reg.HttpPort
+                                          + finalDestination.HttpPort
                                           + CapsUtil.GetCapsSeedPath(agentCircuit.CapsPath);
                                 }
                                 else
                                 {
                                     capsPath
                                         = "http://"
-                                      + reg.ExternalHostName
+                                          + finalDestination.ExternalHostName
                                           + ":"
-                                      + reg.HttpPort
+                                          + finalDestination.HttpPort
                                           + CapsUtil.GetCapsSeedPath(agentCircuit.CapsPath);
                                 }
                                 #endregion
@@ -308,7 +317,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
                             else
                             {
                                 agentCircuit.CapsPath = sp.Scene.CapsModule.GetChildSeed(sp.UUID, reg.RegionHandle);
-                            capsPath = "http://" + reg.ExternalHostName + ":" + reg.HttpPort
+                                capsPath = "http://" + finalDestination.ExternalHostName + ":" + finalDestination.HttpPort
                                             + "/CAPS/" + agentCircuit.CapsPath + "0000/";
                             }
 
@@ -336,6 +345,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
                             agent.CallbackURI = "http://" + sp.Scene.RegionInfo.ExternalHostName + ":" + sp.Scene.RegionInfo.HttpPort +
                                 "/agent/" + sp.UUID.ToString() + "/" + sp.Scene.RegionInfo.RegionID.ToString() + "/release/";
 
+                            // Straight to the region. Safe.
                             m_aScene.SimulationService.UpdateAgent(reg, agent);
 
                             m_log.DebugFormat(
@@ -427,17 +437,18 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
                     }
                 }
             }
+            catch (Exception e)
+            {
+                m_log.DebugFormat("[ENTITY TRANSFER MODULE]: Exception on teleport: {0}\n{1}", e.Message, e.StackTrace);
+                sp.ControllingClient.SendTeleportFailed("Internal error");
+            }
+        }
 
         protected void KillEntity(Scene scene, uint localID)
         {
             scene.SendKillObject(localID);
         }
 
-        protected virtual ulong GetRegionHandle(GridRegion region)
-        {
-            return region.RegionHandle;
-        }
-
         protected virtual GridRegion GetFinalDestination(GridRegion region)
         {
             return region;

OpenSim/Region/CoreModules/Resources/CoreModulePlugin.addin.xml

@@ -9,6 +9,7 @@
 
     <Extension path = "/OpenSim/RegionModules">
         <RegionModule id="EntityTransferModule" type="OpenSim.Region.CoreModules.Framework.EntityTransfer.EntityTransferModule" />
+        <RegionModule id="HGEntityTransferModule" type="OpenSim.Region.CoreModules.Framework.EntityTransfer.HGEntityTransferModule" />
         <RegionModule id="LandManagementModule" type="OpenSim.Region.CoreModules.World.Land.LandManagementModule" />
         <RegionModule id="ExportSerialisationModule" type="OpenSim.Region.CoreModules.World.Serialiser.SerialiserModule" />
         <RegionModule id="ArchiverModule" type="OpenSim.Region.CoreModules.World.Archiver.ArchiverModule" />

OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/HGGridConnector.cs

@@ -48,7 +48,7 @@ using Nini.Config;
 
 namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid
 {
-    public class HGGridConnector : ISharedRegionModule, IGridService
+    public class HGGridConnector : ISharedRegionModule, IGridService, IHypergridService
     {
         private static readonly ILog m_log =
                 LogManager.GetLogger(
@@ -148,6 +148,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid
 
             m_LocalScenes[scene.RegionInfo.RegionHandle] = scene;
             scene.RegisterModuleInterface<IGridService>(this);
+            scene.RegisterModuleInterface<IHypergridService>(this);
 
             ((ISharedRegionModule)m_GridServiceConnector).AddRegion(scene);
 
@@ -158,6 +159,8 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid
             if (m_Enabled)
             {
                 m_LocalScenes.Remove(scene.RegionInfo.RegionHandle);
+                scene.UnregisterModuleInterface<IGridService>(this);
+                scene.UnregisterModuleInterface<IHypergridService>(this);
                 ((ISharedRegionModule)m_GridServiceConnector).RemoveRegion(scene);
             }
         }
@@ -278,5 +281,27 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid
      
         #endregion
 
+        #region IHypergridService
+
+        public bool LinkRegion(string regionDescriptor, out UUID regionID, out ulong regionHandle, out string imageURL, out string reason)
+        {
+            return m_HypergridService.LinkRegion(regionDescriptor, out regionID, out regionHandle, out imageURL, out reason);
+        }
+
+        public GridRegion GetHyperlinkRegion(GridRegion gateway, UUID regionID)
+        {
+            if (m_LocalScenes.ContainsKey(gateway.RegionHandle))
+                return gateway;
+
+            return m_HypergridService.GetHyperlinkRegion(gateway, regionID);
+        }
+
+        public GridRegion GetRegionByUUID(UUID regionID) { return null; }
+        public GridRegion GetRegionByPosition(int x, int y) { return null; }
+        public GridRegion GetRegionByName(string name) { return null; }
+        public List<GridRegion> GetRegionsByName(string name) { return null; }
+        public List<GridRegion> GetRegionRange(int xmin, int xmax, int ymin, int ymax) { return null; }
+
+        #endregion
     }
 }

OpenSim/Server/Handlers/Hypergrid/GatekeeperServerConnector.cs

@@ -109,7 +109,7 @@ namespace OpenSim.Server.Handlers.Hypergrid
             Hashtable requestData = (Hashtable)request.Params[0];
             //string host = (string)requestData["host"];
             //string portstr = (string)requestData["port"];
-            string regionID_str = (string)requestData["regionID"];
+            string regionID_str = (string)requestData["region_uuid"];
             UUID regionID = UUID.Zero;
             UUID.TryParse(regionID_str, out regionID);
 

OpenSim/Server/Handlers/Simulation/AgentHandlers.cs

@@ -59,13 +59,13 @@ namespace OpenSim.Server.Handlers.Simulation
 
         public Hashtable Handler(Hashtable request)
         {
-            //m_log.Debug("[CONNECTION DEBUGGING]: AgentHandler Called");
+            m_log.Debug("[CONNECTION DEBUGGING]: AgentHandler Called");
 
-            //m_log.Debug("---------------------------");
+            m_log.Debug("---------------------------");
-            //m_log.Debug(" >> uri=" + request["uri"]);
+            m_log.Debug(" >> uri=" + request["uri"]);
-            //m_log.Debug(" >> content-type=" + request["content-type"]);
+            m_log.Debug(" >> content-type=" + request["content-type"]);
-            //m_log.Debug(" >> http-method=" + request["http-method"]);
+            m_log.Debug(" >> http-method=" + request["http-method"]);
-            //m_log.Debug("---------------------------\n");
+            m_log.Debug("---------------------------\n");
 
             Hashtable responsedata = new Hashtable();
             responsedata["content_type"] = "text/html";

OpenSim/Services/Connectors/Hypergrid/HypergridServiceConnector.cs

@@ -50,6 +50,8 @@ namespace OpenSim.Services.Connectors.Hypergrid
 
         private IAssetService m_AssetService;
 
+        public HypergridServiceConnector() : this(null) { }
+
         public HypergridServiceConnector(IAssetService assService)
         {
             m_AssetService = assService;
@@ -197,21 +199,24 @@ namespace OpenSim.Services.Connectors.Hypergrid
                     GridRegion region = new GridRegion();
 
                     UUID.TryParse((string)hash["uuid"], out region.RegionID);
-                    //m_log.Debug(">> HERE, uuid: " + uuid);
+                    //m_log.Debug(">> HERE, uuid: " + region.RegionID);
                     int n = 0;
                     if (hash["x"] != null)
                     {
                         Int32.TryParse((string)hash["x"], out n);
                         region.RegionLocX = n;
+                        //m_log.Debug(">> HERE, x: " + region.RegionLocX);
                     }
                     if (hash["y"] != null)
                     {
                         Int32.TryParse((string)hash["y"], out n);
                         region.RegionLocY = n;
+                        //m_log.Debug(">> HERE, y: " + region.RegionLocY);
                     }
                     if (hash["region_name"] != null)
                     {
                         region.RegionName = (string)hash["region_name"];
+                        //m_log.Debug(">> HERE, name: " + region.RegionName);
                     }
                     if (hash["hostname"] != null)
                         region.ExternalHostName = (string)hash["hostname"];

OpenSim/Services/HypergridService/GatekeeperService.cs

@@ -112,6 +112,10 @@ namespace OpenSim.Services.HypergridService
             m_log.DebugFormat("[GATEKEEPER SERVICE]: Request to link to {0}", regionName);
             if (!m_AllowTeleportsToAnyRegion)
             {
+                List<GridRegion> defs = m_GridService.GetDefaultRegions(m_ScopeID);
+                if (defs != null && defs.Count > 0)
+                    m_DefaultGatewayRegion = defs[0];
+
                 try
                 {
                     regionID = m_DefaultGatewayRegion.RegionID;
@@ -150,6 +154,8 @@ namespace OpenSim.Services.HypergridService
 
         public GridRegion GetHyperlinkRegion(UUID regionID)
         {
+            m_log.DebugFormat("[GATEKEEPER SERVICE]: Request to get hyperlink region {0}", regionID);
+
             if (!m_AllowTeleportsToAnyRegion)
                 // Don't even check the given regionID
                 return m_DefaultGatewayRegion;
@@ -160,23 +166,43 @@ namespace OpenSim.Services.HypergridService
 
         public bool LoginAgent(AgentCircuitData aCircuit, GridRegion destination)
         {
+            string authURL = string.Empty;
+            if (aCircuit.ServiceURLs.ContainsKey("HomeURI"))
+                authURL = aCircuit.ServiceURLs["HomeURI"].ToString();
+
+            m_log.DebugFormat("[GATEKEEPER SERVICE]: Request to login foreign agent {0} {1} @ {2} ({3}) at destination {4}", 
+                aCircuit.firstname, aCircuit.lastname, authURL, aCircuit.AgentID, destination.RegionName);
+
             if (!Authenticate(aCircuit))
+            {
+                m_log.InfoFormat("[GATEKEEPER SERVICE]: Unable to verify identity of agent {0} {1}. Refusing service.", aCircuit.firstname, aCircuit.lastname);
                 return false;
+            }
 
             // Check to see if we have a local user with that UUID
             UserAccount account = m_UserAccountService.GetUserAccount(m_ScopeID, aCircuit.AgentID);
             if (account != null)
+            {
                 // No, sorry; go away
+                m_log.InfoFormat("[GATEKEEPER SERVICE]: Foreign agent {0} {1} has UUID of local user {3}. Refusing service.", 
+                    aCircuit.firstname, aCircuit.lastname, aCircuit.AgentID);
                 return false;
+            }
 
             // May want to authorize
 
             // Login the presence
             if (!m_PresenceService.LoginAgent(aCircuit.AgentID.ToString(), aCircuit.SessionID, aCircuit.SecureSessionID))
+            {
+                m_log.InfoFormat("[GATEKEEPER SERVICE]: Presence login failed for foreign agent {0} {1}. Refusing service.",
+                    aCircuit.firstname, aCircuit.lastname);
                 return false;
+            }
 
             // Finally launch the agent at the destination
             string reason = string.Empty;
+            aCircuit.firstname = aCircuit.firstname + "." + aCircuit.lastname;
+            aCircuit.lastname = "@" + aCircuit.ServiceURLs["HomeURI"].ToString();
             return m_SimulationService.CreateAgent(destination, aCircuit, 0, out reason);
         }
 
@@ -188,9 +214,15 @@ namespace OpenSim.Services.HypergridService
 
         protected bool Authenticate(AgentCircuitData aCircuit)
         {
-            string authURL = string.Empty; // GetAuthURL(aCircuit);
+            string authURL = string.Empty; 
+            if (aCircuit.ServiceURLs.ContainsKey("HomeURI"))
+                authURL = aCircuit.ServiceURLs["HomeURI"].ToString();
+
             if (authURL == string.Empty)
+            {
+                m_log.DebugFormat("[GATEKEEPER SERVICE]: Agent did not provide an authentication server URL");
                 return false;
+            }
 
             Object[] args = new Object[] { authURL };
             IAuthenticationService authService = ServerUtils.LoadPlugin<IAuthenticationService>(m_AuthDll, args);

OpenSim/Services/HypergridService/HypergridService.cs

@@ -347,10 +347,12 @@ namespace OpenSim.Services.HypergridService
 
         #region Get Hyperlinks
 
-        public GridRegion GetHyperlinkRegion(UUID regionID)
+        public GridRegion GetHyperlinkRegion(GridRegion gatekeeper, UUID regionID)
         {
-            //GridRegion region = m_HypergridConnector.
+            if (m_HyperlinkRegions.ContainsKey(regionID))
-            return null;
+                return m_HypergridConnector.GetHyperlinkRegion(gatekeeper, regionID);
+            else
+                return gatekeeper;
         }
 
         #endregion

OpenSim/Services/Interfaces/IHypergridService.cs

@@ -36,7 +36,7 @@ namespace OpenSim.Services.Interfaces
     public interface IHypergridService
     {
         bool LinkRegion(string regionDescriptor, out UUID regionID, out ulong regionHandle, out string imageURL, out string reason);
-        GridRegion GetHyperlinkRegion(UUID regionID);
+        GridRegion GetHyperlinkRegion(GridRegion gateway, UUID regionID);
 
         GridRegion GetRegionByUUID(UUID regionID);
         GridRegion GetRegionByPosition(int x, int y);

OpenSim/Services/LLLoginService/LLLoginService.cs

@@ -37,24 +37,26 @@ namespace OpenSim.Services.LLLoginService
         private bool m_RequireInventory;
         private int m_MinLoginLevel;
 
+        IConfig m_LoginServerConfig;
+
         public LLLoginService(IConfigSource config, ISimulationService simService, ILibraryService libraryService)
         {
-            IConfig serverConfig = config.Configs["LoginService"];
+            m_LoginServerConfig = config.Configs["LoginService"];
-            if (serverConfig == null)
+            if (m_LoginServerConfig == null)
                 throw new Exception(String.Format("No section LoginService in config file"));
 
-            string accountService = serverConfig.GetString("UserAccountService", String.Empty);
+            string accountService = m_LoginServerConfig.GetString("UserAccountService", String.Empty);
-            string authService = serverConfig.GetString("AuthenticationService", String.Empty);
+            string authService = m_LoginServerConfig.GetString("AuthenticationService", String.Empty);
-            string invService = serverConfig.GetString("InventoryService", String.Empty);
+            string invService = m_LoginServerConfig.GetString("InventoryService", String.Empty);
-            string gridService = serverConfig.GetString("GridService", String.Empty);
+            string gridService = m_LoginServerConfig.GetString("GridService", String.Empty);
-            string presenceService = serverConfig.GetString("PresenceService", String.Empty);
+            string presenceService = m_LoginServerConfig.GetString("PresenceService", String.Empty);
-            string libService = serverConfig.GetString("LibraryService", String.Empty);
+            string libService = m_LoginServerConfig.GetString("LibraryService", String.Empty);
-            string avatarService = serverConfig.GetString("AvatarService", String.Empty);
+            string avatarService = m_LoginServerConfig.GetString("AvatarService", String.Empty);
-            string simulationService = serverConfig.GetString("SimulationService", String.Empty);
+            string simulationService = m_LoginServerConfig.GetString("SimulationService", String.Empty);
 
-            m_DefaultRegionName = serverConfig.GetString("DefaultRegion", String.Empty);
+            m_DefaultRegionName = m_LoginServerConfig.GetString("DefaultRegion", String.Empty);
-            m_WelcomeMessage = serverConfig.GetString("WelcomeMessage", "Welcome to OpenSim!");
+            m_WelcomeMessage = m_LoginServerConfig.GetString("WelcomeMessage", "Welcome to OpenSim!");
-            m_RequireInventory = serverConfig.GetBoolean("RequireInventory", true);
+            m_RequireInventory = m_LoginServerConfig.GetBoolean("RequireInventory", true);
 
             // These are required; the others aren't
             if (accountService == string.Empty || authService == string.Empty)
@@ -438,7 +440,7 @@ namespace OpenSim.Services.LLLoginService
             aCircuit.SecureSessionID = secureSession;
             aCircuit.SessionID = session;
             aCircuit.startpos = position;
-            aCircuit.ServiceURLs = account.ServiceURLs;
+            SetServiceURLs(aCircuit, account);
 
             if (simConnector.CreateAgent(region, aCircuit, 0, out reason))
                 return aCircuit;
@@ -447,6 +449,25 @@ namespace OpenSim.Services.LLLoginService
 
         }
 
+        private void SetServiceURLs(AgentCircuitData aCircuit, UserAccount account)
+        {
+            aCircuit.ServiceURLs = new Dictionary<string, object>();
+            if (account.ServiceURLs == null)
+                return;
+
+            foreach (KeyValuePair<string, object> kvp in account.ServiceURLs)
+            {
+                if (kvp.Value == null || (kvp.Value != null && kvp.Value.ToString() == string.Empty))
+                {
+                    aCircuit.ServiceURLs[kvp.Key] = m_LoginServerConfig.GetString(kvp.Key, string.Empty);
+                }
+                else
+                {
+                    aCircuit.ServiceURLs[kvp.Key] = kvp.Value;
+                }
+            }
+        }
+
         #region Console Commands
         private void RegisterCommands()
         {

bin/config-include/StandaloneHypergrid.ini

@@ -20,7 +20,7 @@
     UserAccountServices = "LocalUserAccountServicesConnector"
     SimulationServices = "RemoteSimulationConnectorModule"
     AvatarServices = "LocalAvatarServicesConnector"
-    EntityTransferModule = "BasicEntityTransferModule"
+    EntityTransferModule = "HGEntityTransferModule"
     InventoryServiceInConnector = true
     AssetServiceInConnector = true
     HGAuthServiceInConnector = true
@@ -28,6 +28,8 @@
     NeighbourServiceInConnector = true
     LibraryModule = true
     LLLoginServiceInConnector = true
+    ;; err, temporary
+    SimulationServiceInConnector = true
 
 [AssetService]
     ; For the AssetServiceInConnector
@@ -103,3 +105,8 @@
     DefaultRegion = "OpenSim Test"
     WelcomeMessage = "Welcome, Avatar!"
     
+    HomeURI = "http://127.0.0.1:9000"
+    GatewayURI = "http://127.0.0.1:9000"
+    InventoryServerURI = "http://127.0.0.1:9000"
+    AssetServerURI = "http://127.0.0.1:9000"
+