From 4a7588b0f0a7a03c94c69c45dec6b115dc86f19d Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Fri, 30 Jul 2010 14:04:13 -0700
Subject: 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.

---
 OpenSim/Services/LLLoginService/LLLoginService.cs | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'OpenSim/Services/LLLoginService/LLLoginService.cs')

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
             m_log.Debug("[LLOGIN SERVICE] Launching agent at " + destination.RegionName);
             if (m_UserAgentService.LoginAgentToGrid(aCircuit, gatekeeper, destination, out reason))
             {
-                // We may need to do this at some point,
-                // so leaving it here in comments.
-                //IPAddress addr = NetworkUtil.GetIPFor(clientIP.Address, destination.ExternalEndPoint.Address);
-                m_UserAgentService.SetClientToken(aCircuit.SessionID, /*addr.Address.ToString() */ clientIP.Address.ToString());
+                IPAddress addr = NetworkUtil.GetExternalIPOf(clientIP.Address);
+                m_UserAgentService.SetClientToken(aCircuit.SessionID, addr.ToString() /* clientIP.Address.ToString() */);
                 return true;
             }
             return false;
-- 
cgit v1.1