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

Implement ability for hg logins to try fallback regions just like local logins. 

These would be specified in the [GridService] section of Robust.HG.ini, which already lists these in the example text.
Untested patch so that Neb can easily pull in for testing, though shouldn't disrupt existing hg logins since fallback processing is a bit of code stuck on the end of the login sequence.
0.7.6-extended
Justin Clark-Casey (justincc) 2013-08-21 23:19:31 +01:00
parent 1f39a763a5
commit 3d9b73c47a
1 changed files with 39 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
OpenSim/Services/HypergridService/GatekeeperService.cs
View File

@ -326,7 +326,7 @@ namespace OpenSim.Services.HypergridService
return false; return false;
} }
m_log.DebugFormat("[GATEKEEPER SERVICE]: User is OK"); m_log.DebugFormat("[GATEKEEPER SERVICE]: User {0} is ok", aCircuit.Name);
bool isFirstLogin = false; bool isFirstLogin = false;
// //
@ -345,7 +345,7 @@ namespace OpenSim.Services.HypergridService
aCircuit.firstname, aCircuit.lastname); aCircuit.firstname, aCircuit.lastname);
return false; return false;
} }
m_log.DebugFormat("[GATEKEEPER SERVICE]: Login presence ok"); m_log.DebugFormat("[GATEKEEPER SERVICE]: Login presence {0} is ok", aCircuit.Name);
// Also login foreigners with GridUser service // Also login foreigners with GridUser service
if (m_GridUserService != null && account == null) if (m_GridUserService != null && account == null)
@ -376,7 +376,8 @@ namespace OpenSim.Services.HypergridService
reason = "Destination region not found"; reason = "Destination region not found";
return false; return false;
} }
m_log.DebugFormat("[GATEKEEPER SERVICE]: destination ok: {0}", destination.RegionName); m_log.DebugFormat(
"[GATEKEEPER SERVICE]: Destination {0} is ok for {1}", destination.RegionName, aCircuit.Name);
// //
// Adjust the visible name // Adjust the visible name
@ -410,8 +411,41 @@ namespace OpenSim.Services.HypergridService
// Preserve our TeleportFlags we have gathered so-far // Preserve our TeleportFlags we have gathered so-far
loginFlag |= (Constants.TeleportFlags) aCircuit.teleportFlags; loginFlag |= (Constants.TeleportFlags) aCircuit.teleportFlags;
m_log.DebugFormat("[GATEKEEPER SERVICE]: launching agent {0}", loginFlag); m_log.DebugFormat("[GATEKEEPER SERVICE]: Launching {0} {1}", aCircuit.Name, loginFlag);
return m_SimulationService.CreateAgent(destination, aCircuit, (uint)loginFlag, out reason);
bool success = m_SimulationService.CreateAgent(destination, aCircuit, (uint)loginFlag, out reason);
if (!success)
{
List<GridRegion> fallbackRegions = m_GridService.GetFallbackRegions(account.ScopeID, destination.RegionLocX, destination.RegionLocY);
if (fallbackRegions != null)
{
// Try the fallback regions
m_log.DebugFormat(
"[GATEKEEPER SERVICE]: Could not successfully log agent {0} into {1}. Trying fallback regions.",
aCircuit.Name, destination.RegionName);
foreach (GridRegion fallbackRegion in fallbackRegions)
{
m_log.DebugFormat(
"[GATEKEEPER SERVICE]: Trying fallback region {0} for {1}",
fallbackRegion.RegionName, aCircuit.Name);
success = m_SimulationService.CreateAgent(fallbackRegion, aCircuit, (uint)loginFlag, out reason);
if (success)
break;
}
}
else
{
m_log.DebugFormat(
"[GATEKEEPER SERVICE]: Could not successfully log agent {0} into {1} and no fallback regions to try.",
aCircuit.Name, destination.RegionName);
}
}
return success;
} }
protected bool Authenticate(AgentCircuitData aCircuit) protected bool Authenticate(AgentCircuitData aCircuit)