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

* Added more debugging output to GridManager to pin down the key exchange weirdness 

[Provided by openlifegrid.com]
ThreadPoolClientBranch
lbsa71 2008-02-14 13:02:41 +00:00
parent 3c22da9efc
commit cf6e268d6d
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
OpenSim/Grid/GridServer/GridManager.cs
View File

@ -308,7 +308,6 @@ namespace OpenSim.Grid.GridServer
TheSim.httpServerURI = "http://" + TheSim.serverIP + ":" + TheSim.httpPort + "/"; TheSim.httpServerURI = "http://" + TheSim.serverIP + ":" + TheSim.httpPort + "/";
TheSim.regionName = (string)requestData["sim_name"]; TheSim.regionName = (string)requestData["sim_name"];
TheSim.UUID = new LLUUID((string)requestData["UUID"]); TheSim.UUID = new LLUUID((string)requestData["UUID"]);
@ -477,8 +476,21 @@ namespace OpenSim.Grid.GridServer
} }
else else
{ {
m_log.Warn("[grid]: Authentication failed when trying to add new region " + TheSim.regionName + " at location " + TheSim.regionLocX + " " + TheSim.regionLocY + " currently occupied by " + OldSim.regionName); if (OldSim == null)
responseData["error"] = "The key required to connect to your region did not match. Please check your send and recieve keys."; {
m_log.Warn("[grid]: Authentication failed when trying to add new region " + TheSim.regionName +
" at location " + TheSim.regionLocX +
" " + TheSim.regionLocY + " with TheSim.regionRecvKey " + TheSim.regionRecvKey + "(" + config.SimSendKey + ") and TheSim.regionRecvKey " + TheSim.regionSendKey + "(" + config.SimRecvKey + ") ");
}
else
{
m_log.Warn("[grid]: Authentication failed when trying to add new region " + TheSim.regionName +
" at location " + TheSim.regionLocX +
" " + TheSim.regionLocY + " currently occupied by " + OldSim.regionName);
}
responseData["error"] =
"The key required to connect to your region did not match. Please check your send and recieve keys.";
return response; return response;
} }
} }