diff options
author | Diva Canto | 2013-07-14 09:21:28 -0700 |
---|---|---|
committer | Diva Canto | 2013-07-14 09:21:28 -0700 |
commit | c61ff917ef99a00d4062f264ed10c2a662585e8a (patch) | |
tree | c624d0237759bc402f33473bf12f753c45b29135 /OpenSim/Region/Framework/Scenes/Scene.cs | |
parent | Change the auth token to be the user's sessionid. (diff) | |
download | opensim-SC_OLD-c61ff917ef99a00d4062f264ed10c2a662585e8a.zip opensim-SC_OLD-c61ff917ef99a00d4062f264ed10c2a662585e8a.tar.gz opensim-SC_OLD-c61ff917ef99a00d4062f264ed10c2a662585e8a.tar.bz2 opensim-SC_OLD-c61ff917ef99a00d4062f264ed10c2a662585e8a.tar.xz |
Authenticate ChildAgentUpdate too.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 42 |
1 files changed, 27 insertions, 15 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index ea7081c..b07faa2 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
@@ -4202,10 +4202,18 @@ namespace OpenSim.Region.Framework.Scenes | |||
4202 | 4202 | ||
4203 | if (childAgentUpdate != null) | 4203 | if (childAgentUpdate != null) |
4204 | { | 4204 | { |
4205 | childAgentUpdate.ChildAgentDataUpdate(cAgentData); | 4205 | if (cAgentData.SessionID == childAgentUpdate.ControllingClient.SessionId) |
4206 | return true; | 4206 | { |
4207 | childAgentUpdate.ChildAgentDataUpdate(cAgentData); | ||
4208 | return true; | ||
4209 | } | ||
4210 | else | ||
4211 | { | ||
4212 | m_log.WarnFormat("[SCENE]: Attempt to update agent {0} with invalid session id {1}", childAgentUpdate.UUID, cAgentData.SessionID); | ||
4213 | Console.WriteLine(String.Format("[SCENE]: Attempt to update agent {0} ({1}) with invalid session id {2}", | ||
4214 | childAgentUpdate.UUID, childAgentUpdate.ControllingClient.SessionId, cAgentData.SessionID)); | ||
4215 | } | ||
4207 | } | 4216 | } |
4208 | |||
4209 | return false; | 4217 | return false; |
4210 | } | 4218 | } |
4211 | 4219 | ||
@@ -4221,20 +4229,24 @@ namespace OpenSim.Region.Framework.Scenes | |||
4221 | ScenePresence childAgentUpdate = GetScenePresence(cAgentData.AgentID); | 4229 | ScenePresence childAgentUpdate = GetScenePresence(cAgentData.AgentID); |
4222 | if (childAgentUpdate != null) | 4230 | if (childAgentUpdate != null) |
4223 | { | 4231 | { |
4224 | // I can't imagine *yet* why we would get an update if the agent is a root agent.. | 4232 | if (childAgentUpdate.ControllingClient.SessionId == cAgentData.SessionID) |
4225 | // however to avoid a race condition crossing borders.. | ||
4226 | if (childAgentUpdate.IsChildAgent) | ||
4227 | { | 4233 | { |
4228 | uint rRegionX = (uint)(cAgentData.RegionHandle >> 40); | 4234 | // I can't imagine *yet* why we would get an update if the agent is a root agent.. |
4229 | uint rRegionY = (((uint)(cAgentData.RegionHandle)) >> 8); | 4235 | // however to avoid a race condition crossing borders.. |
4230 | uint tRegionX = RegionInfo.RegionLocX; | 4236 | if (childAgentUpdate.IsChildAgent) |
4231 | uint tRegionY = RegionInfo.RegionLocY; | 4237 | { |
4232 | //Send Data to ScenePresence | 4238 | uint rRegionX = (uint)(cAgentData.RegionHandle >> 40); |
4233 | childAgentUpdate.ChildAgentDataUpdate(cAgentData, tRegionX, tRegionY, rRegionX, rRegionY); | 4239 | uint rRegionY = (((uint)(cAgentData.RegionHandle)) >> 8); |
4234 | // Not Implemented: | 4240 | uint tRegionX = RegionInfo.RegionLocX; |
4235 | //TODO: Do we need to pass the message on to one of our neighbors? | 4241 | uint tRegionY = RegionInfo.RegionLocY; |
4242 | //Send Data to ScenePresence | ||
4243 | childAgentUpdate.ChildAgentDataUpdate(cAgentData, tRegionX, tRegionY, rRegionX, rRegionY); | ||
4244 | // Not Implemented: | ||
4245 | //TODO: Do we need to pass the message on to one of our neighbors? | ||
4246 | } | ||
4236 | } | 4247 | } |
4237 | 4248 | else | |
4249 | m_log.WarnFormat("[SCENE]: Attempt at updating position of agent {0} with invalid session id {1}", childAgentUpdate.UUID, cAgentData.SessionID); | ||
4238 | return true; | 4250 | return true; |
4239 | } | 4251 | } |
4240 | 4252 | ||