aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services/LLLoginService/LLLoginService.cs
diff options
context:
space:
mode:
authorDiva Canto2010-07-30 14:04:13 -0700
committerDiva Canto2010-07-30 14:04:13 -0700
commit8ab7d80b093de2e2ed71737e0138b7a7c2c92f99 (patch)
tree7036b62efbbf2d0cf7d98f37f4a18d53d95263d4 /OpenSim/Services/LLLoginService/LLLoginService.cs
parent* Added debug logging to SimianGrid inventory service response parsing (diff)
downloadopensim-SC_OLD-8ab7d80b093de2e2ed71737e0138b7a7c2c92f99.zip
opensim-SC_OLD-8ab7d80b093de2e2ed71737e0138b7a7c2c92f99.tar.gz
opensim-SC_OLD-8ab7d80b093de2e2ed71737e0138b7a7c2c92f99.tar.bz2
opensim-SC_OLD-8ab7d80b093de2e2ed71737e0138b7a7c2c92f99.tar.xz
Changed the way HG client verification is done: now transforming local and LAN client IPs into external IPs. This addresses some issues related to running both the user agents service and the viewer in the same machine/LAN, which then presents a problem when the user agent goes to an external network.
Diffstat (limited to '')
-rw-r--r--OpenSim/Services/LLLoginService/LLLoginService.cs6
1 files changed, 2 insertions, 4 deletions
diff --git a/OpenSim/Services/LLLoginService/LLLoginService.cs b/OpenSim/Services/LLLoginService/LLLoginService.cs
index f4e045c..036bec6 100644
--- a/OpenSim/Services/LLLoginService/LLLoginService.cs
+++ b/OpenSim/Services/LLLoginService/LLLoginService.cs
@@ -754,10 +754,8 @@ namespace OpenSim.Services.LLLoginService
754 m_log.Debug("[LLOGIN SERVICE] Launching agent at " + destination.RegionName); 754 m_log.Debug("[LLOGIN SERVICE] Launching agent at " + destination.RegionName);
755 if (m_UserAgentService.LoginAgentToGrid(aCircuit, gatekeeper, destination, out reason)) 755 if (m_UserAgentService.LoginAgentToGrid(aCircuit, gatekeeper, destination, out reason))
756 { 756 {
757 // We may need to do this at some point, 757 IPAddress addr = NetworkUtil.GetExternalIPOf(clientIP.Address);
758 // so leaving it here in comments. 758 m_UserAgentService.SetClientToken(aCircuit.SessionID, addr.ToString() /* clientIP.Address.ToString() */);
759 //IPAddress addr = NetworkUtil.GetIPFor(clientIP.Address, destination.ExternalEndPoint.Address);
760 m_UserAgentService.SetClientToken(aCircuit.SessionID, /*addr.Address.ToString() */ clientIP.Address.ToString());
761 return true; 759 return true;
762 } 760 }
763 return false; 761 return false;