diff options
author | Oren Hurvitz | 2014-04-09 08:03:25 +0300 |
---|---|---|
committer | Oren Hurvitz | 2014-04-09 09:22:20 +0100 |
commit | 06e0528d0b9929cbd8d2b360b0baa00288340d13 (patch) | |
tree | 0ffd33e5eda96badff712bdd78794ce6debbb392 /OpenSim/Services/HypergridService/GatekeeperService.cs | |
parent | Log when the presence service logs-out all the users in a region (diff) | |
download | opensim-SC_OLD-06e0528d0b9929cbd8d2b360b0baa00288340d13.zip opensim-SC_OLD-06e0528d0b9929cbd8d2b360b0baa00288340d13.tar.gz opensim-SC_OLD-06e0528d0b9929cbd8d2b360b0baa00288340d13.tar.bz2 opensim-SC_OLD-06e0528d0b9929cbd8d2b360b0baa00288340d13.tar.xz |
In teleports, pass the source region to the destination (similar to an HTTP referrer)
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Services/HypergridService/GatekeeperService.cs | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/OpenSim/Services/HypergridService/GatekeeperService.cs b/OpenSim/Services/HypergridService/GatekeeperService.cs index 24b98fd..69a593b 100644 --- a/OpenSim/Services/HypergridService/GatekeeperService.cs +++ b/OpenSim/Services/HypergridService/GatekeeperService.cs | |||
@@ -230,16 +230,18 @@ namespace OpenSim.Services.HypergridService | |||
230 | } | 230 | } |
231 | 231 | ||
232 | #region Login Agent | 232 | #region Login Agent |
233 | public bool LoginAgent(AgentCircuitData aCircuit, GridRegion destination, out string reason) | 233 | public bool LoginAgent(GridRegion source, AgentCircuitData aCircuit, GridRegion destination, out string reason) |
234 | { | 234 | { |
235 | reason = string.Empty; | 235 | reason = string.Empty; |
236 | 236 | ||
237 | string authURL = string.Empty; | 237 | string authURL = string.Empty; |
238 | if (aCircuit.ServiceURLs.ContainsKey("HomeURI")) | 238 | if (aCircuit.ServiceURLs.ContainsKey("HomeURI")) |
239 | authURL = aCircuit.ServiceURLs["HomeURI"].ToString(); | 239 | authURL = aCircuit.ServiceURLs["HomeURI"].ToString(); |
240 | m_log.InfoFormat("[GATEKEEPER SERVICE]: Login request for {0} {1} @ {2} ({3}) at {4} using viewer {5}, channel {6}, IP {7}, Mac {8}, Id0 {9} Teleport Flags {10}", | 240 | |
241 | aCircuit.firstname, aCircuit.lastname, authURL, aCircuit.AgentID, destination.RegionName, | 241 | m_log.InfoFormat("[GATEKEEPER SERVICE]: Login request for {0} {1} @ {2} ({3}) at {4} using viewer {5}, channel {6}, IP {7}, Mac {8}, Id0 {9}, Teleport Flags: {10}. From region {11}", |
242 | aCircuit.Viewer, aCircuit.Channel, aCircuit.IPAddress, aCircuit.Mac, aCircuit.Id0, aCircuit.teleportFlags.ToString()); | 242 | aCircuit.firstname, aCircuit.lastname, authURL, aCircuit.AgentID, destination.RegionID, |
243 | aCircuit.Viewer, aCircuit.Channel, aCircuit.IPAddress, aCircuit.Mac, aCircuit.Id0, (TeleportFlags)aCircuit.teleportFlags, | ||
244 | (source == null) ? "Unknown" : string.Format("{0} ({1}){2}", source.RegionName, source.RegionID, (source.RawServerURI == null) ? "" : " @ " + source.ServerURI)); | ||
243 | 245 | ||
244 | string curViewer = Util.GetViewerName(aCircuit); | 246 | string curViewer = Util.GetViewerName(aCircuit); |
245 | 247 | ||
@@ -428,9 +430,9 @@ namespace OpenSim.Services.HypergridService | |||
428 | // Preserve our TeleportFlags we have gathered so-far | 430 | // Preserve our TeleportFlags we have gathered so-far |
429 | loginFlag |= (Constants.TeleportFlags) aCircuit.teleportFlags; | 431 | loginFlag |= (Constants.TeleportFlags) aCircuit.teleportFlags; |
430 | 432 | ||
431 | m_log.DebugFormat("[GATEKEEPER SERVICE]: Launching {0} {1}", aCircuit.Name, loginFlag); | 433 | m_log.DebugFormat("[GATEKEEPER SERVICE]: Launching {0}, Teleport Flags: {1}", aCircuit.Name, loginFlag); |
432 | 434 | ||
433 | return m_SimulationService.CreateAgent(destination, aCircuit, (uint)loginFlag, out reason); | 435 | return m_SimulationService.CreateAgent(source, destination, aCircuit, (uint)loginFlag, out reason); |
434 | } | 436 | } |
435 | 437 | ||
436 | protected bool Authenticate(AgentCircuitData aCircuit) | 438 | protected bool Authenticate(AgentCircuitData aCircuit) |