From ee068dd24361058f8fecb6568cc889e25ecea9b0 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Tue, 3 Aug 2010 16:27:11 -0700
Subject: One more thing related to the previous commit. Must avoid all
 in-process remote calls.

---
 .../Services/HypergridService/GatekeeperService.cs | 25 +++++++++++++---------
 1 file changed, 15 insertions(+), 10 deletions(-)

(limited to 'OpenSim/Services/HypergridService/GatekeeperService.cs')

diff --git a/OpenSim/Services/HypergridService/GatekeeperService.cs b/OpenSim/Services/HypergridService/GatekeeperService.cs
index 3fc9327..82543ab 100644
--- a/OpenSim/Services/HypergridService/GatekeeperService.cs
+++ b/OpenSim/Services/HypergridService/GatekeeperService.cs
@@ -283,18 +283,23 @@ namespace OpenSim.Services.HypergridService
                 return false;
             }
 
-            Object[] args = new Object[] { userURL };
-            IUserAgentService userAgentService = new UserAgentServiceConnector(userURL); //ServerUtils.LoadPlugin<IUserAgentService>(m_AuthDll, args);
-            if (userAgentService != null)
+            if (userURL == m_ExternalName)
+                m_UserAgentService.VerifyAgent(aCircuit.SecureSessionID, aCircuit.ServiceSessionID);
+            else
             {
-                try
+                Object[] args = new Object[] { userURL };
+                IUserAgentService userAgentService = new UserAgentServiceConnector(userURL); 
+                if (userAgentService != null)
                 {
-                    return userAgentService.VerifyAgent(aCircuit.SessionID, aCircuit.ServiceSessionID);
-                }
-                catch
-                {
-                    m_log.DebugFormat("[GATEKEEPER SERVICE]: Unable to contact authentication service at {0}", userURL);
-                    return false;
+                    try
+                    {
+                        return userAgentService.VerifyAgent(aCircuit.SessionID, aCircuit.ServiceSessionID);
+                    }
+                    catch
+                    {
+                        m_log.DebugFormat("[GATEKEEPER SERVICE]: Unable to contact authentication service at {0}", userURL);
+                        return false;
+                    }
                 }
             }
 
-- 
cgit v1.1


From 87046652b18800a80c6525e81798cf117232c02b Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Tue, 3 Aug 2010 16:33:56 -0700
Subject: One more buglet related to the issue at hand.

---
 OpenSim/Services/HypergridService/GatekeeperService.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'OpenSim/Services/HypergridService/GatekeeperService.cs')

diff --git a/OpenSim/Services/HypergridService/GatekeeperService.cs b/OpenSim/Services/HypergridService/GatekeeperService.cs
index 82543ab..95efdde 100644
--- a/OpenSim/Services/HypergridService/GatekeeperService.cs
+++ b/OpenSim/Services/HypergridService/GatekeeperService.cs
@@ -73,7 +73,7 @@ namespace OpenSim.Services.HypergridService
                     throw new Exception(String.Format("No section GatekeeperService in config file"));
 
                 string accountService = serverConfig.GetString("UserAccountService", String.Empty);
-                string homeUsersService = serverConfig.GetString("HomeUsersSecurityService", string.Empty);
+                string homeUsersService = serverConfig.GetString("UserAgentService", string.Empty);
                 string gridService = serverConfig.GetString("GridService", String.Empty);
                 string presenceService = serverConfig.GetString("PresenceService", String.Empty);
                 string simulationService = serverConfig.GetString("SimulationService", String.Empty);
-- 
cgit v1.1


From dd688a599489bda40d99cdfd23e7c8f3d103715b Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Tue, 3 Aug 2010 16:59:34 -0700
Subject: sigh. fried brain.

---
 OpenSim/Services/HypergridService/GatekeeperService.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'OpenSim/Services/HypergridService/GatekeeperService.cs')

diff --git a/OpenSim/Services/HypergridService/GatekeeperService.cs b/OpenSim/Services/HypergridService/GatekeeperService.cs
index 95efdde..47eb96a 100644
--- a/OpenSim/Services/HypergridService/GatekeeperService.cs
+++ b/OpenSim/Services/HypergridService/GatekeeperService.cs
@@ -284,7 +284,7 @@ namespace OpenSim.Services.HypergridService
             }
 
             if (userURL == m_ExternalName)
-                m_UserAgentService.VerifyAgent(aCircuit.SecureSessionID, aCircuit.ServiceSessionID);
+                m_UserAgentService.VerifyAgent(aCircuit.SessionID, aCircuit.ServiceSessionID);
             else
             {
                 Object[] args = new Object[] { userURL };
-- 
cgit v1.1


From dd0ebbfb1f0bd4819255fd0f769e4a2a6c1f4891 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Tue, 3 Aug 2010 17:05:48 -0700
Subject: this is so bad, brain is beyond fried. must stop.

---
 OpenSim/Services/HypergridService/GatekeeperService.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'OpenSim/Services/HypergridService/GatekeeperService.cs')

diff --git a/OpenSim/Services/HypergridService/GatekeeperService.cs b/OpenSim/Services/HypergridService/GatekeeperService.cs
index 47eb96a..3aaafe8 100644
--- a/OpenSim/Services/HypergridService/GatekeeperService.cs
+++ b/OpenSim/Services/HypergridService/GatekeeperService.cs
@@ -284,7 +284,7 @@ namespace OpenSim.Services.HypergridService
             }
 
             if (userURL == m_ExternalName)
-                m_UserAgentService.VerifyAgent(aCircuit.SessionID, aCircuit.ServiceSessionID);
+                return m_UserAgentService.VerifyAgent(aCircuit.SessionID, aCircuit.ServiceSessionID);
             else
             {
                 Object[] args = new Object[] { userURL };
-- 
cgit v1.1