OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

This combination is working. It all points to not being able to use 127.0.0.1/localhost in testing HG situations. The login server must have the LAN IP address, and the regions must show ExternalHostname as SYSTEMIP. Working, but this needs more testing.

soprefactor
Diva Canto 2010-05-15 20:27:25 -07:00
parent 74b23ff9c6
commit e5e52e4072
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
OpenSim/Services/HypergridService/UserAgentService.cs
View File

@ -213,15 +213,15 @@ namespace OpenSim.Services.HypergridService
public bool VerifyClient(UUID sessionID, string token) public bool VerifyClient(UUID sessionID, string token)
{ {
m_log.DebugFormat("[USER AGENT SERVICE]: Verifying Client session {0} with token {1}", sessionID, token); m_log.DebugFormat("[USER AGENT SERVICE]: Verifying Client session {0} with token {1}", sessionID, token);
return true; //return true;
// Commenting this for now until I understand better what part of a sender's // Commenting this for now until I understand better what part of a sender's
// info stays unchanged throughout a session // info stays unchanged throughout a session
//
//if (m_TravelingAgents.ContainsKey(sessionID))
// return m_TravelingAgents[sessionID].ClientToken == token;
//return false; if (m_TravelingAgents.ContainsKey(sessionID))
return m_TravelingAgents[sessionID].ClientToken == token;
return false;
} }
public bool VerifyAgent(UUID sessionID, string token) public bool VerifyAgent(UUID sessionID, string token)

1
OpenSim/Services/LLLoginService/LLLoginService.cs
View File

@ -746,6 +746,7 @@ namespace OpenSim.Services.LLLoginService
m_log.Debug("[LLOGIN SERVICE] Launching agent at " + destination.RegionName); m_log.Debug("[LLOGIN SERVICE] Launching agent at " + destination.RegionName);
if (m_UserAgentService.LoginAgentToGrid(aCircuit, gatekeeper, destination, out reason)) if (m_UserAgentService.LoginAgentToGrid(aCircuit, gatekeeper, destination, out reason))
{ {
//IPAddress addr = NetworkUtil.GetIPFor(clientIP.Address, gatekeeper.ExternalEndPoint.Address);
m_UserAgentService.SetClientToken(aCircuit.SessionID, clientIP.Address.ToString()); m_UserAgentService.SetClientToken(aCircuit.SessionID, clientIP.Address.ToString());
return true; return true;
} }