diff options
author | Teravus Ovares | 2009-04-08 16:31:56 +0000 |
---|---|---|
committer | Teravus Ovares | 2009-04-08 16:31:56 +0000 |
commit | 8d8c45b659a25f47b14ddbd7f340b6ece446ed36 (patch) | |
tree | 455aa6cc121ae1b3a419620458f2e0722bd9b498 /OpenSim/Region/ClientStack/LindenUDP | |
parent | * Restored GridLaunch that was mistakenly deleted in 9036 (diff) | |
download | opensim-SC_OLD-8d8c45b659a25f47b14ddbd7f340b6ece446ed36.zip opensim-SC_OLD-8d8c45b659a25f47b14ddbd7f340b6ece446ed36.tar.gz opensim-SC_OLD-8d8c45b659a25f47b14ddbd7f340b6ece446ed36.tar.bz2 opensim-SC_OLD-8d8c45b659a25f47b14ddbd7f340b6ece446ed36.tar.xz |
* Fix the remainder of the packets that require sessionId checks.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | 961 |
1 files changed, 929 insertions, 32 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs index 70ca375..891fa9e 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | |||
@@ -3853,6 +3853,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
3853 | private bool HandleUUIDGroupNameRequest(IClientAPI sender, Packet Pack) | 3853 | private bool HandleUUIDGroupNameRequest(IClientAPI sender, Packet Pack) |
3854 | { | 3854 | { |
3855 | UUIDGroupNameRequestPacket upack = (UUIDGroupNameRequestPacket)Pack; | 3855 | UUIDGroupNameRequestPacket upack = (UUIDGroupNameRequestPacket)Pack; |
3856 | |||
3856 | 3857 | ||
3857 | for (int i = 0; i < upack.UUIDNameBlock.Length; i++) | 3858 | for (int i = 0; i < upack.UUIDNameBlock.Length; i++) |
3858 | { | 3859 | { |
@@ -3870,6 +3871,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
3870 | { | 3871 | { |
3871 | GenericMessagePacket gmpack = (GenericMessagePacket) pack; | 3872 | GenericMessagePacket gmpack = (GenericMessagePacket) pack; |
3872 | if (m_genericPacketHandlers.Count == 0) return false; | 3873 | if (m_genericPacketHandlers.Count == 0) return false; |
3874 | if (gmpack.AgentData.SessionID != SessionId) return false; | ||
3873 | 3875 | ||
3874 | handlerGenericMessage = null; | 3876 | handlerGenericMessage = null; |
3875 | 3877 | ||
@@ -3910,6 +3912,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
3910 | { | 3912 | { |
3911 | 3913 | ||
3912 | ObjectGroupPacket ogpack = (ObjectGroupPacket)Pack; | 3914 | ObjectGroupPacket ogpack = (ObjectGroupPacket)Pack; |
3915 | if (ogpack.AgentData.SessionID != SessionId) return false; | ||
3916 | |||
3913 | handlerObjectGroupRequest = OnObjectGroupRequest; | 3917 | handlerObjectGroupRequest = OnObjectGroupRequest; |
3914 | if (handlerObjectGroupRequest != null) | 3918 | if (handlerObjectGroupRequest != null) |
3915 | { | 3919 | { |
@@ -3924,6 +3928,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
3924 | private bool HandleViewerEffect(IClientAPI sender, Packet Pack) | 3928 | private bool HandleViewerEffect(IClientAPI sender, Packet Pack) |
3925 | { | 3929 | { |
3926 | ViewerEffectPacket viewer = (ViewerEffectPacket)Pack; | 3930 | ViewerEffectPacket viewer = (ViewerEffectPacket)Pack; |
3931 | if (viewer.AgentData.SessionID != SessionId) return false; | ||
3927 | handlerViewerEffect = OnViewerEffect; | 3932 | handlerViewerEffect = OnViewerEffect; |
3928 | if (handlerViewerEffect != null) | 3933 | if (handlerViewerEffect != null) |
3929 | { | 3934 | { |
@@ -3996,6 +4001,11 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
3996 | /// <returns></returns> | 4001 | /// <returns></returns> |
3997 | protected virtual bool Logout(IClientAPI client, Packet packet) | 4002 | protected virtual bool Logout(IClientAPI client, Packet packet) |
3998 | { | 4003 | { |
4004 | if (packet.Type == PacketType.LogoutRequest) | ||
4005 | { | ||
4006 | if (((LogoutRequestPacket)packet).AgentData.SessionID != SessionId) return false; | ||
4007 | } | ||
4008 | |||
3999 | return Logout(client); | 4009 | return Logout(client); |
4000 | } | 4010 | } |
4001 | 4011 | ||
@@ -4032,6 +4042,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
4032 | //m_log.Debug("texture cached: " + packet.ToString()); | 4042 | //m_log.Debug("texture cached: " + packet.ToString()); |
4033 | AgentCachedTexturePacket cachedtex = (AgentCachedTexturePacket)packet; | 4043 | AgentCachedTexturePacket cachedtex = (AgentCachedTexturePacket)packet; |
4034 | AgentCachedTextureResponsePacket cachedresp = (AgentCachedTextureResponsePacket)PacketPool.Instance.GetPacket(PacketType.AgentCachedTextureResponse); | 4044 | AgentCachedTextureResponsePacket cachedresp = (AgentCachedTextureResponsePacket)PacketPool.Instance.GetPacket(PacketType.AgentCachedTextureResponse); |
4045 | |||
4046 | if (cachedtex.AgentData.SessionID != SessionId) return false; | ||
4047 | |||
4035 | // TODO: don't create new blocks if recycling an old packet | 4048 | // TODO: don't create new blocks if recycling an old packet |
4036 | cachedresp.AgentData.AgentID = AgentId; | 4049 | cachedresp.AgentData.AgentID = AgentId; |
4037 | cachedresp.AgentData.SessionID = m_sessionId; | 4050 | cachedresp.AgentData.SessionID = m_sessionId; |
@@ -4057,6 +4070,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
4057 | protected bool MultipleObjUpdate(IClientAPI simClient, Packet packet) | 4070 | protected bool MultipleObjUpdate(IClientAPI simClient, Packet packet) |
4058 | { | 4071 | { |
4059 | MultipleObjectUpdatePacket multipleupdate = (MultipleObjectUpdatePacket)packet; | 4072 | MultipleObjectUpdatePacket multipleupdate = (MultipleObjectUpdatePacket)packet; |
4073 | if (multipleupdate.AgentData.SessionID != SessionId) return false; | ||
4060 | // m_log.Debug("new multi update packet " + multipleupdate.ToString()); | 4074 | // m_log.Debug("new multi update packet " + multipleupdate.ToString()); |
4061 | Scene tScene = (Scene)m_scene; | 4075 | Scene tScene = (Scene)m_scene; |
4062 | 4076 | ||
@@ -5776,7 +5790,16 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
5776 | break; | 5790 | break; |
5777 | case PacketType.ObjectName: | 5791 | case PacketType.ObjectName: |
5778 | ObjectNamePacket objName = (ObjectNamePacket)Pack; | 5792 | ObjectNamePacket objName = (ObjectNamePacket)Pack; |
5779 | 5793 | ||
5794 | #region Packet Session and User Check | ||
5795 | if (m_checkPackets) | ||
5796 | { | ||
5797 | if (objName.AgentData.SessionID != SessionId || | ||
5798 | objName.AgentData.AgentID != AgentId) | ||
5799 | break; | ||
5800 | } | ||
5801 | #endregion | ||
5802 | |||
5780 | handlerObjectName = null; | 5803 | handlerObjectName = null; |
5781 | for (int i = 0; i < objName.ObjectData.Length; i++) | 5804 | for (int i = 0; i < objName.ObjectData.Length; i++) |
5782 | { | 5805 | { |
@@ -6018,6 +6041,15 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
6018 | RequestImagePacket imageRequest = (RequestImagePacket)Pack; | 6041 | RequestImagePacket imageRequest = (RequestImagePacket)Pack; |
6019 | //m_log.Debug("image request: " + Pack.ToString()); | 6042 | //m_log.Debug("image request: " + Pack.ToString()); |
6020 | 6043 | ||
6044 | #region Packet Session and User Check | ||
6045 | if (m_checkPackets) | ||
6046 | { | ||
6047 | if (imageRequest.AgentData.SessionID != SessionId || | ||
6048 | imageRequest.AgentData.AgentID != AgentId) | ||
6049 | break; | ||
6050 | } | ||
6051 | #endregion | ||
6052 | |||
6021 | //handlerTextureRequest = null; | 6053 | //handlerTextureRequest = null; |
6022 | 6054 | ||
6023 | for (int i = 0; i < imageRequest.RequestImage.Length; i++) | 6055 | for (int i = 0; i < imageRequest.RequestImage.Length; i++) |
@@ -6049,6 +6081,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
6049 | // Validate inventory transfers | 6081 | // Validate inventory transfers |
6050 | // Has to be done here, because AssetCache can't do it | 6082 | // Has to be done here, because AssetCache can't do it |
6051 | // | 6083 | // |
6084 | |||
6052 | if (transfer.TransferInfo.SourceType == 3) | 6085 | if (transfer.TransferInfo.SourceType == 3) |
6053 | { | 6086 | { |
6054 | UUID taskID = new UUID(transfer.TransferInfo.Params, 48); | 6087 | UUID taskID = new UUID(transfer.TransferInfo.Params, 48); |
@@ -6140,6 +6173,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
6140 | break; | 6173 | break; |
6141 | case PacketType.AssetUploadRequest: | 6174 | case PacketType.AssetUploadRequest: |
6142 | AssetUploadRequestPacket request = (AssetUploadRequestPacket)Pack; | 6175 | AssetUploadRequestPacket request = (AssetUploadRequestPacket)Pack; |
6176 | |||
6177 | |||
6143 | // m_log.Debug("upload request " + request.ToString()); | 6178 | // m_log.Debug("upload request " + request.ToString()); |
6144 | // m_log.Debug("upload request was for assetid: " + request.AssetBlock.TransactionID.Combine(this.SecureSessionId).ToString()); | 6179 | // m_log.Debug("upload request was for assetid: " + request.AssetBlock.TransactionID.Combine(this.SecureSessionId).ToString()); |
6145 | UUID temp = UUID.Combine(request.AssetBlock.TransactionID, SecureSessionId); | 6180 | UUID temp = UUID.Combine(request.AssetBlock.TransactionID, SecureSessionId); |
@@ -6156,7 +6191,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
6156 | break; | 6191 | break; |
6157 | case PacketType.RequestXfer: | 6192 | case PacketType.RequestXfer: |
6158 | RequestXferPacket xferReq = (RequestXferPacket)Pack; | 6193 | RequestXferPacket xferReq = (RequestXferPacket)Pack; |
6159 | 6194 | ||
6160 | handlerRequestXfer = OnRequestXfer; | 6195 | handlerRequestXfer = OnRequestXfer; |
6161 | 6196 | ||
6162 | if (handlerRequestXfer != null) | 6197 | if (handlerRequestXfer != null) |
@@ -6175,7 +6210,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
6175 | break; | 6210 | break; |
6176 | case PacketType.ConfirmXferPacket: | 6211 | case PacketType.ConfirmXferPacket: |
6177 | ConfirmXferPacketPacket confirmXfer = (ConfirmXferPacketPacket)Pack; | 6212 | ConfirmXferPacketPacket confirmXfer = (ConfirmXferPacketPacket)Pack; |
6178 | 6213 | ||
6179 | handlerConfirmXfer = OnConfirmXfer; | 6214 | handlerConfirmXfer = OnConfirmXfer; |
6180 | if (handlerConfirmXfer != null) | 6215 | if (handlerConfirmXfer != null) |
6181 | { | 6216 | { |
@@ -6194,6 +6229,15 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
6194 | case PacketType.CreateInventoryFolder: | 6229 | case PacketType.CreateInventoryFolder: |
6195 | CreateInventoryFolderPacket invFolder = (CreateInventoryFolderPacket)Pack; | 6230 | CreateInventoryFolderPacket invFolder = (CreateInventoryFolderPacket)Pack; |
6196 | 6231 | ||
6232 | #region Packet Session and User Check | ||
6233 | if (m_checkPackets) | ||
6234 | { | ||
6235 | if (invFolder.AgentData.SessionID != SessionId || | ||
6236 | invFolder.AgentData.AgentID != AgentId) | ||
6237 | break; | ||
6238 | } | ||
6239 | #endregion | ||
6240 | |||
6197 | handlerCreateInventoryFolder = OnCreateNewInventoryFolder; | 6241 | handlerCreateInventoryFolder = OnCreateNewInventoryFolder; |
6198 | if (handlerCreateInventoryFolder != null) | 6242 | if (handlerCreateInventoryFolder != null) |
6199 | { | 6243 | { |
@@ -6208,6 +6252,15 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
6208 | { | 6252 | { |
6209 | UpdateInventoryFolderPacket invFolderx = (UpdateInventoryFolderPacket)Pack; | 6253 | UpdateInventoryFolderPacket invFolderx = (UpdateInventoryFolderPacket)Pack; |
6210 | 6254 | ||
6255 | #region Packet Session and User Check | ||
6256 | if (m_checkPackets) | ||
6257 | { | ||
6258 | if (invFolderx.AgentData.SessionID != SessionId || | ||
6259 | invFolderx.AgentData.AgentID != AgentId) | ||
6260 | break; | ||
6261 | } | ||
6262 | #endregion | ||
6263 | |||
6211 | handlerUpdateInventoryFolder = null; | 6264 | handlerUpdateInventoryFolder = null; |
6212 | 6265 | ||
6213 | for (int i = 0; i < invFolderx.FolderData.Length; i++) | 6266 | for (int i = 0; i < invFolderx.FolderData.Length; i++) |
@@ -6228,6 +6281,15 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
6228 | { | 6281 | { |
6229 | MoveInventoryFolderPacket invFoldery = (MoveInventoryFolderPacket)Pack; | 6282 | MoveInventoryFolderPacket invFoldery = (MoveInventoryFolderPacket)Pack; |
6230 | 6283 | ||
6284 | #region Packet Session and User Check | ||
6285 | if (m_checkPackets) | ||
6286 | { | ||
6287 | if (invFoldery.AgentData.SessionID != SessionId || | ||
6288 | invFoldery.AgentData.AgentID != AgentId) | ||
6289 | break; | ||
6290 | } | ||
6291 | #endregion | ||
6292 | |||
6231 | handlerMoveInventoryFolder = null; | 6293 | handlerMoveInventoryFolder = null; |
6232 | 6294 | ||
6233 | for (int i = 0; i < invFoldery.InventoryData.Length; i++) | 6295 | for (int i = 0; i < invFoldery.InventoryData.Length; i++) |
@@ -6243,6 +6305,15 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
6243 | break; | 6305 | break; |
6244 | case PacketType.CreateInventoryItem: | 6306 | case PacketType.CreateInventoryItem: |
6245 | CreateInventoryItemPacket createItem = (CreateInventoryItemPacket)Pack; | 6307 | CreateInventoryItemPacket createItem = (CreateInventoryItemPacket)Pack; |
6308 | |||
6309 | #region Packet Session and User Check | ||
6310 | if (m_checkPackets) | ||
6311 | { | ||
6312 | if (createItem.AgentData.SessionID != SessionId || | ||
6313 | createItem.AgentData.AgentID != AgentId) | ||
6314 | break; | ||
6315 | } | ||
6316 | #endregion | ||
6246 | 6317 | ||
6247 | handlerCreateNewInventoryItem = OnCreateNewInventoryItem; | 6318 | handlerCreateNewInventoryItem = OnCreateNewInventoryItem; |
6248 | if (handlerCreateNewInventoryItem != null) | 6319 | if (handlerCreateNewInventoryItem != null) |
@@ -6264,6 +6335,15 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
6264 | { | 6335 | { |
6265 | FetchInventoryPacket FetchInventoryx = (FetchInventoryPacket)Pack; | 6336 | FetchInventoryPacket FetchInventoryx = (FetchInventoryPacket)Pack; |
6266 | 6337 | ||
6338 | #region Packet Session and User Check | ||
6339 | if (m_checkPackets) | ||
6340 | { | ||
6341 | if (FetchInventoryx.AgentData.SessionID != SessionId || | ||
6342 | FetchInventoryx.AgentData.AgentID != AgentId) | ||
6343 | break; | ||
6344 | } | ||
6345 | #endregion | ||
6346 | |||
6267 | handlerFetchInventory = null; | 6347 | handlerFetchInventory = null; |
6268 | 6348 | ||
6269 | for (int i = 0; i < FetchInventoryx.InventoryData.Length; i++) | 6349 | for (int i = 0; i < FetchInventoryx.InventoryData.Length; i++) |
@@ -6281,6 +6361,15 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
6281 | case PacketType.FetchInventoryDescendents: | 6361 | case PacketType.FetchInventoryDescendents: |
6282 | FetchInventoryDescendentsPacket Fetch = (FetchInventoryDescendentsPacket)Pack; | 6362 | FetchInventoryDescendentsPacket Fetch = (FetchInventoryDescendentsPacket)Pack; |
6283 | 6363 | ||
6364 | #region Packet Session and User Check | ||
6365 | if (m_checkPackets) | ||
6366 | { | ||
6367 | if (Fetch.AgentData.SessionID != SessionId || | ||
6368 | Fetch.AgentData.AgentID != AgentId) | ||
6369 | break; | ||
6370 | } | ||
6371 | #endregion | ||
6372 | |||
6284 | handlerFetchInventoryDescendents = OnFetchInventoryDescendents; | 6373 | handlerFetchInventoryDescendents = OnFetchInventoryDescendents; |
6285 | if (handlerFetchInventoryDescendents != null) | 6374 | if (handlerFetchInventoryDescendents != null) |
6286 | { | 6375 | { |
@@ -6292,6 +6381,15 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
6292 | case PacketType.PurgeInventoryDescendents: | 6381 | case PacketType.PurgeInventoryDescendents: |
6293 | PurgeInventoryDescendentsPacket Purge = (PurgeInventoryDescendentsPacket)Pack; | 6382 | PurgeInventoryDescendentsPacket Purge = (PurgeInventoryDescendentsPacket)Pack; |
6294 | 6383 | ||
6384 | #region Packet Session and User Check | ||
6385 | if (m_checkPackets) | ||
6386 | { | ||
6387 | if (Purge.AgentData.SessionID != SessionId || | ||
6388 | Purge.AgentData.AgentID != AgentId) | ||
6389 | break; | ||
6390 | } | ||
6391 | #endregion | ||
6392 | |||
6295 | handlerPurgeInventoryDescendents = OnPurgeInventoryDescendents; | 6393 | handlerPurgeInventoryDescendents = OnPurgeInventoryDescendents; |
6296 | if (handlerPurgeInventoryDescendents != null) | 6394 | if (handlerPurgeInventoryDescendents != null) |
6297 | { | 6395 | { |
@@ -6300,6 +6398,16 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
6300 | break; | 6398 | break; |
6301 | case PacketType.UpdateInventoryItem: | 6399 | case PacketType.UpdateInventoryItem: |
6302 | UpdateInventoryItemPacket update = (UpdateInventoryItemPacket)Pack; | 6400 | UpdateInventoryItemPacket update = (UpdateInventoryItemPacket)Pack; |
6401 | |||
6402 | #region Packet Session and User Check | ||
6403 | if (m_checkPackets) | ||
6404 | { | ||
6405 | if (update.AgentData.SessionID != SessionId || | ||
6406 | update.AgentData.AgentID != AgentId) | ||
6407 | break; | ||
6408 | } | ||
6409 | #endregion | ||
6410 | |||
6303 | if (OnUpdateInventoryItem != null) | 6411 | if (OnUpdateInventoryItem != null) |
6304 | { | 6412 | { |
6305 | handlerUpdateInventoryItem = null; | 6413 | handlerUpdateInventoryItem = null; |
@@ -6371,6 +6479,15 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
6371 | case PacketType.CopyInventoryItem: | 6479 | case PacketType.CopyInventoryItem: |
6372 | CopyInventoryItemPacket copyitem = (CopyInventoryItemPacket)Pack; | 6480 | CopyInventoryItemPacket copyitem = (CopyInventoryItemPacket)Pack; |
6373 | 6481 | ||
6482 | #region Packet Session and User Check | ||
6483 | if (m_checkPackets) | ||
6484 | { | ||
6485 | if (copyitem.AgentData.SessionID != SessionId || | ||
6486 | copyitem.AgentData.AgentID != AgentId) | ||
6487 | break; | ||
6488 | } | ||
6489 | #endregion | ||
6490 | |||
6374 | handlerCopyInventoryItem = null; | 6491 | handlerCopyInventoryItem = null; |
6375 | if (OnCopyInventoryItem != null) | 6492 | if (OnCopyInventoryItem != null) |
6376 | { | 6493 | { |
@@ -6388,6 +6505,16 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
6388 | break; | 6505 | break; |
6389 | case PacketType.MoveInventoryItem: | 6506 | case PacketType.MoveInventoryItem: |
6390 | MoveInventoryItemPacket moveitem = (MoveInventoryItemPacket)Pack; | 6507 | MoveInventoryItemPacket moveitem = (MoveInventoryItemPacket)Pack; |
6508 | |||
6509 | #region Packet Session and User Check | ||
6510 | if (m_checkPackets) | ||
6511 | { | ||
6512 | if (moveitem.AgentData.SessionID != SessionId || | ||
6513 | moveitem.AgentData.AgentID != AgentId) | ||
6514 | break; | ||
6515 | } | ||
6516 | #endregion | ||
6517 | |||
6391 | if (OnMoveInventoryItem != null) | 6518 | if (OnMoveInventoryItem != null) |
6392 | { | 6519 | { |
6393 | handlerMoveInventoryItem = null; | 6520 | handlerMoveInventoryItem = null; |
@@ -6404,6 +6531,16 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
6404 | break; | 6531 | break; |
6405 | case PacketType.RemoveInventoryItem: | 6532 | case PacketType.RemoveInventoryItem: |
6406 | RemoveInventoryItemPacket removeItem = (RemoveInventoryItemPacket)Pack; | 6533 | RemoveInventoryItemPacket removeItem = (RemoveInventoryItemPacket)Pack; |
6534 | |||
6535 | #region Packet Session and User Check | ||
6536 | if (m_checkPackets) | ||
6537 | { | ||
6538 | if (removeItem.AgentData.SessionID != SessionId || | ||
6539 | removeItem.AgentData.AgentID != AgentId) | ||
6540 | break; | ||
6541 | } | ||
6542 | #endregion | ||
6543 | |||
6407 | if (OnRemoveInventoryItem != null) | 6544 | if (OnRemoveInventoryItem != null) |
6408 | { | 6545 | { |
6409 | handlerRemoveInventoryItem = null; | 6546 | handlerRemoveInventoryItem = null; |
@@ -6419,6 +6556,16 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
6419 | break; | 6556 | break; |
6420 | case PacketType.RemoveInventoryFolder: | 6557 | case PacketType.RemoveInventoryFolder: |
6421 | RemoveInventoryFolderPacket removeFolder = (RemoveInventoryFolderPacket)Pack; | 6558 | RemoveInventoryFolderPacket removeFolder = (RemoveInventoryFolderPacket)Pack; |
6559 | |||
6560 | #region Packet Session and User Check | ||
6561 | if (m_checkPackets) | ||
6562 | { | ||
6563 | if (removeFolder.AgentData.SessionID != SessionId || | ||
6564 | removeFolder.AgentData.AgentID != AgentId) | ||
6565 | break; | ||
6566 | } | ||
6567 | #endregion | ||
6568 | |||
6422 | if (OnRemoveInventoryFolder != null) | 6569 | if (OnRemoveInventoryFolder != null) |
6423 | { | 6570 | { |
6424 | handlerRemoveInventoryFolder = null; | 6571 | handlerRemoveInventoryFolder = null; |
@@ -6435,6 +6582,14 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
6435 | break; | 6582 | break; |
6436 | case PacketType.RemoveInventoryObjects: | 6583 | case PacketType.RemoveInventoryObjects: |
6437 | RemoveInventoryObjectsPacket removeObject = (RemoveInventoryObjectsPacket)Pack; | 6584 | RemoveInventoryObjectsPacket removeObject = (RemoveInventoryObjectsPacket)Pack; |
6585 | #region Packet Session and User Check | ||
6586 | if (m_checkPackets) | ||
6587 | { | ||
6588 | if (removeObject.AgentData.SessionID != SessionId || | ||
6589 | removeObject.AgentData.AgentID != AgentId) | ||
6590 | break; | ||
6591 | } | ||
6592 | #endregion | ||
6438 | if (OnRemoveInventoryFolder != null) | 6593 | if (OnRemoveInventoryFolder != null) |
6439 | { | 6594 | { |
6440 | handlerRemoveInventoryFolder = null; | 6595 | handlerRemoveInventoryFolder = null; |
@@ -6465,6 +6620,15 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
6465 | case PacketType.RequestTaskInventory: | 6620 | case PacketType.RequestTaskInventory: |
6466 | RequestTaskInventoryPacket requesttask = (RequestTaskInventoryPacket)Pack; | 6621 | RequestTaskInventoryPacket requesttask = (RequestTaskInventoryPacket)Pack; |
6467 | 6622 | ||
6623 | #region Packet Session and User Check | ||
6624 | if (m_checkPackets) | ||
6625 | { | ||
6626 | if (requesttask.AgentData.SessionID != SessionId || | ||
6627 | requesttask.AgentData.AgentID != AgentId) | ||
6628 | break; | ||
6629 | } | ||
6630 | #endregion | ||
6631 | |||
6468 | handlerRequestTaskInventory = OnRequestTaskInventory; | 6632 | handlerRequestTaskInventory = OnRequestTaskInventory; |
6469 | if (handlerRequestTaskInventory != null) | 6633 | if (handlerRequestTaskInventory != null) |
6470 | { | 6634 | { |
@@ -6473,6 +6637,16 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
6473 | break; | 6637 | break; |
6474 | case PacketType.UpdateTaskInventory: | 6638 | case PacketType.UpdateTaskInventory: |
6475 | UpdateTaskInventoryPacket updatetask = (UpdateTaskInventoryPacket)Pack; | 6639 | UpdateTaskInventoryPacket updatetask = (UpdateTaskInventoryPacket)Pack; |
6640 | |||
6641 | #region Packet Session and User Check | ||
6642 | if (m_checkPackets) | ||
6643 | { | ||
6644 | if (updatetask.AgentData.SessionID != SessionId || | ||
6645 | updatetask.AgentData.AgentID != AgentId) | ||
6646 | break; | ||
6647 | } | ||
6648 | #endregion | ||
6649 | |||
6476 | if (OnUpdateTaskInventory != null) | 6650 | if (OnUpdateTaskInventory != null) |
6477 | { | 6651 | { |
6478 | if (updatetask.UpdateData.Key == 0) | 6652 | if (updatetask.UpdateData.Key == 0) |
@@ -6512,6 +6686,15 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
6512 | 6686 | ||
6513 | RemoveTaskInventoryPacket removeTask = (RemoveTaskInventoryPacket)Pack; | 6687 | RemoveTaskInventoryPacket removeTask = (RemoveTaskInventoryPacket)Pack; |
6514 | 6688 | ||
6689 | #region Packet Session and User Check | ||
6690 | if (m_checkPackets) | ||
6691 | { | ||
6692 | if (removeTask.AgentData.SessionID != SessionId || | ||
6693 | removeTask.AgentData.AgentID != AgentId) | ||
6694 | break; | ||
6695 | } | ||
6696 | #endregion | ||
6697 | |||
6515 | handlerRemoveTaskItem = OnRemoveTaskItem; | 6698 | handlerRemoveTaskItem = OnRemoveTaskItem; |
6516 | 6699 | ||
6517 | if (handlerRemoveTaskItem != null) | 6700 | if (handlerRemoveTaskItem != null) |
@@ -6525,6 +6708,15 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
6525 | 6708 | ||
6526 | MoveTaskInventoryPacket moveTaskInventoryPacket = (MoveTaskInventoryPacket)Pack; | 6709 | MoveTaskInventoryPacket moveTaskInventoryPacket = (MoveTaskInventoryPacket)Pack; |
6527 | 6710 | ||
6711 | #region Packet Session and User Check | ||
6712 | if (m_checkPackets) | ||
6713 | { | ||
6714 | if (moveTaskInventoryPacket.AgentData.SessionID != SessionId || | ||
6715 | moveTaskInventoryPacket.AgentData.AgentID != AgentId) | ||
6716 | break; | ||
6717 | } | ||
6718 | #endregion | ||
6719 | |||
6528 | handlerMoveTaskItem = OnMoveTaskItem; | 6720 | handlerMoveTaskItem = OnMoveTaskItem; |
6529 | 6721 | ||
6530 | if (handlerMoveTaskItem != null) | 6722 | if (handlerMoveTaskItem != null) |
@@ -6541,6 +6733,15 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
6541 | //m_log.Debug(Pack.ToString()); | 6733 | //m_log.Debug(Pack.ToString()); |
6542 | RezScriptPacket rezScriptx = (RezScriptPacket)Pack; | 6734 | RezScriptPacket rezScriptx = (RezScriptPacket)Pack; |
6543 | 6735 | ||
6736 | #region Packet Session and User Check | ||
6737 | if (m_checkPackets) | ||
6738 | { | ||
6739 | if (rezScriptx.AgentData.SessionID != SessionId || | ||
6740 | rezScriptx.AgentData.AgentID != AgentId) | ||
6741 | break; | ||
6742 | } | ||
6743 | #endregion | ||
6744 | |||
6544 | handlerRezScript = OnRezScript; | 6745 | handlerRezScript = OnRezScript; |
6545 | InventoryItemBase item = new InventoryItemBase(); | 6746 | InventoryItemBase item = new InventoryItemBase(); |
6546 | item.ID = rezScriptx.InventoryBlock.ItemID; | 6747 | item.ID = rezScriptx.InventoryBlock.ItemID; |
@@ -6575,6 +6776,15 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
6575 | case PacketType.MapBlockRequest: | 6776 | case PacketType.MapBlockRequest: |
6576 | MapBlockRequestPacket MapRequest = (MapBlockRequestPacket)Pack; | 6777 | MapBlockRequestPacket MapRequest = (MapBlockRequestPacket)Pack; |
6577 | 6778 | ||
6779 | #region Packet Session and User Check | ||
6780 | if (m_checkPackets) | ||
6781 | { | ||
6782 | if (MapRequest.AgentData.SessionID != SessionId || | ||
6783 | MapRequest.AgentData.AgentID != AgentId) | ||
6784 | break; | ||
6785 | } | ||
6786 | #endregion | ||
6787 | |||
6578 | handlerRequestMapBlocks = OnRequestMapBlocks; | 6788 | handlerRequestMapBlocks = OnRequestMapBlocks; |
6579 | if (handlerRequestMapBlocks != null) | 6789 | if (handlerRequestMapBlocks != null) |
6580 | { | 6790 | { |
@@ -6584,6 +6794,16 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
6584 | break; | 6794 | break; |
6585 | case PacketType.MapNameRequest: | 6795 | case PacketType.MapNameRequest: |
6586 | MapNameRequestPacket map = (MapNameRequestPacket)Pack; | 6796 | MapNameRequestPacket map = (MapNameRequestPacket)Pack; |
6797 | |||
6798 | #region Packet Session and User Check | ||
6799 | if (m_checkPackets) | ||
6800 | { | ||
6801 | if (map.AgentData.SessionID != SessionId || | ||
6802 | map.AgentData.AgentID != AgentId) | ||
6803 | break; | ||
6804 | } | ||
6805 | #endregion | ||
6806 | |||
6587 | string mapName = Encoding.UTF8.GetString(map.NameData.Name, 0, | 6807 | string mapName = Encoding.UTF8.GetString(map.NameData.Name, 0, |
6588 | map.NameData.Name.Length - 1); | 6808 | map.NameData.Name.Length - 1); |
6589 | handlerMapNameRequest = OnMapNameRequest; | 6809 | handlerMapNameRequest = OnMapNameRequest; |
@@ -6594,6 +6814,16 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
6594 | break; | 6814 | break; |
6595 | case PacketType.TeleportLandmarkRequest: | 6815 | case PacketType.TeleportLandmarkRequest: |
6596 | TeleportLandmarkRequestPacket tpReq = (TeleportLandmarkRequestPacket)Pack; | 6816 | TeleportLandmarkRequestPacket tpReq = (TeleportLandmarkRequestPacket)Pack; |
6817 | |||
6818 | #region Packet Session and User Check | ||
6819 | if (m_checkPackets) | ||
6820 | { | ||
6821 | if (tpReq.Info.SessionID != SessionId || | ||
6822 | tpReq.Info.AgentID != AgentId) | ||
6823 | break; | ||
6824 | } | ||
6825 | #endregion | ||
6826 | |||
6597 | UUID lmid = tpReq.Info.LandmarkID; | 6827 | UUID lmid = tpReq.Info.LandmarkID; |
6598 | AssetLandmark lm; | 6828 | AssetLandmark lm; |
6599 | if (lmid != UUID.Zero) | 6829 | if (lmid != UUID.Zero) |
@@ -6656,6 +6886,15 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
6656 | TeleportLocationRequestPacket tpLocReq = (TeleportLocationRequestPacket)Pack; | 6886 | TeleportLocationRequestPacket tpLocReq = (TeleportLocationRequestPacket)Pack; |
6657 | // m_log.Debug(tpLocReq.ToString()); | 6887 | // m_log.Debug(tpLocReq.ToString()); |
6658 | 6888 | ||
6889 | #region Packet Session and User Check | ||
6890 | if (m_checkPackets) | ||
6891 | { | ||
6892 | if (tpLocReq.AgentData.SessionID != SessionId || | ||
6893 | tpLocReq.AgentData.AgentID != AgentId) | ||
6894 | break; | ||
6895 | } | ||
6896 | #endregion | ||
6897 | |||
6659 | handlerTeleportLocationRequest = OnTeleportLocationRequest; | 6898 | handlerTeleportLocationRequest = OnTeleportLocationRequest; |
6660 | if (handlerTeleportLocationRequest != null) | 6899 | if (handlerTeleportLocationRequest != null) |
6661 | { | 6900 | { |
@@ -6676,6 +6915,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
6676 | 6915 | ||
6677 | case PacketType.UUIDNameRequest: | 6916 | case PacketType.UUIDNameRequest: |
6678 | UUIDNameRequestPacket incoming = (UUIDNameRequestPacket)Pack; | 6917 | UUIDNameRequestPacket incoming = (UUIDNameRequestPacket)Pack; |
6918 | |||
6679 | foreach (UUIDNameRequestPacket.UUIDNameBlockBlock UUIDBlock in incoming.UUIDNameBlock) | 6919 | foreach (UUIDNameRequestPacket.UUIDNameBlockBlock UUIDBlock in incoming.UUIDNameBlock) |
6680 | { | 6920 | { |
6681 | handlerNameRequest = OnNameFromUUIDRequest; | 6921 | handlerNameRequest = OnNameFromUUIDRequest; |
@@ -6701,6 +6941,15 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
6701 | case PacketType.ParcelInfoRequest: | 6941 | case PacketType.ParcelInfoRequest: |
6702 | ParcelInfoRequestPacket pirPack = (ParcelInfoRequestPacket)Pack; | 6942 | ParcelInfoRequestPacket pirPack = (ParcelInfoRequestPacket)Pack; |
6703 | 6943 | ||
6944 | #region Packet Session and User Check | ||
6945 | if (m_checkPackets) | ||
6946 | { | ||
6947 | if (pirPack.AgentData.SessionID != SessionId || | ||
6948 | pirPack.AgentData.AgentID != AgentId) | ||
6949 | break; | ||
6950 | } | ||
6951 | #endregion | ||
6952 | |||
6704 | handlerParcelInfoRequest = OnParcelInfoRequest; | 6953 | handlerParcelInfoRequest = OnParcelInfoRequest; |
6705 | if (handlerParcelInfoRequest != null) | 6954 | if (handlerParcelInfoRequest != null) |
6706 | { | 6955 | { |
@@ -6711,6 +6960,15 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
6711 | case PacketType.ParcelAccessListRequest: | 6960 | case PacketType.ParcelAccessListRequest: |
6712 | ParcelAccessListRequestPacket requestPacket = (ParcelAccessListRequestPacket)Pack; | 6961 | ParcelAccessListRequestPacket requestPacket = (ParcelAccessListRequestPacket)Pack; |
6713 | 6962 | ||
6963 | #region Packet Session and User Check | ||
6964 | if (m_checkPackets) | ||
6965 | { | ||
6966 | if (requestPacket.AgentData.SessionID != SessionId || | ||
6967 | requestPacket.AgentData.AgentID != AgentId) | ||
6968 | break; | ||
6969 | } | ||
6970 | #endregion | ||
6971 | |||
6714 | handlerParcelAccessListRequest = OnParcelAccessListRequest; | 6972 | handlerParcelAccessListRequest = OnParcelAccessListRequest; |
6715 | 6973 | ||
6716 | if (handlerParcelAccessListRequest != null) | 6974 | if (handlerParcelAccessListRequest != null) |
@@ -6723,6 +6981,16 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
6723 | 6981 | ||
6724 | case PacketType.ParcelAccessListUpdate: | 6982 | case PacketType.ParcelAccessListUpdate: |
6725 | ParcelAccessListUpdatePacket updatePacket = (ParcelAccessListUpdatePacket)Pack; | 6983 | ParcelAccessListUpdatePacket updatePacket = (ParcelAccessListUpdatePacket)Pack; |
6984 | |||
6985 | #region Packet Session and User Check | ||
6986 | if (m_checkPackets) | ||
6987 | { | ||
6988 | if (updatePacket.AgentData.SessionID != SessionId || | ||
6989 | updatePacket.AgentData.AgentID != AgentId) | ||
6990 | break; | ||
6991 | } | ||
6992 | #endregion | ||
6993 | |||
6726 | List<ParcelManager.ParcelAccessEntry> entries = new List<ParcelManager.ParcelAccessEntry>(); | 6994 | List<ParcelManager.ParcelAccessEntry> entries = new List<ParcelManager.ParcelAccessEntry>(); |
6727 | foreach (ParcelAccessListUpdatePacket.ListBlock block in updatePacket.List) | 6995 | foreach (ParcelAccessListUpdatePacket.ListBlock block in updatePacket.List) |
6728 | { | 6996 | { |
@@ -6745,6 +7013,15 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
6745 | 7013 | ||
6746 | ParcelPropertiesRequestPacket propertiesRequest = (ParcelPropertiesRequestPacket)Pack; | 7014 | ParcelPropertiesRequestPacket propertiesRequest = (ParcelPropertiesRequestPacket)Pack; |
6747 | 7015 | ||
7016 | #region Packet Session and User Check | ||
7017 | if (m_checkPackets) | ||
7018 | { | ||
7019 | if (propertiesRequest.AgentData.SessionID != SessionId || | ||
7020 | propertiesRequest.AgentData.AgentID != AgentId) | ||
7021 | break; | ||
7022 | } | ||
7023 | #endregion | ||
7024 | |||
6748 | handlerParcelPropertiesRequest = OnParcelPropertiesRequest; | 7025 | handlerParcelPropertiesRequest = OnParcelPropertiesRequest; |
6749 | if (handlerParcelPropertiesRequest != null) | 7026 | if (handlerParcelPropertiesRequest != null) |
6750 | { | 7027 | { |
@@ -6759,6 +7036,15 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
6759 | case PacketType.ParcelDivide: | 7036 | case PacketType.ParcelDivide: |
6760 | ParcelDividePacket landDivide = (ParcelDividePacket)Pack; | 7037 | ParcelDividePacket landDivide = (ParcelDividePacket)Pack; |
6761 | 7038 | ||
7039 | #region Packet Session and User Check | ||
7040 | if (m_checkPackets) | ||
7041 | { | ||
7042 | if (landDivide.AgentData.SessionID != SessionId || | ||
7043 | landDivide.AgentData.AgentID != AgentId) | ||
7044 | break; | ||
7045 | } | ||
7046 | #endregion | ||
7047 | |||
6762 | handlerParcelDivideRequest = OnParcelDivideRequest; | 7048 | handlerParcelDivideRequest = OnParcelDivideRequest; |
6763 | if (handlerParcelDivideRequest != null) | 7049 | if (handlerParcelDivideRequest != null) |
6764 | { | 7050 | { |
@@ -6771,6 +7057,15 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
6771 | case PacketType.ParcelJoin: | 7057 | case PacketType.ParcelJoin: |
6772 | ParcelJoinPacket landJoin = (ParcelJoinPacket)Pack; | 7058 | ParcelJoinPacket landJoin = (ParcelJoinPacket)Pack; |
6773 | 7059 | ||
7060 | #region Packet Session and User Check | ||
7061 | if (m_checkPackets) | ||
7062 | { | ||
7063 | if (landJoin.AgentData.SessionID != SessionId || | ||
7064 | landJoin.AgentData.AgentID != AgentId) | ||
7065 | break; | ||
7066 | } | ||
7067 | #endregion | ||
7068 | |||
6774 | handlerParcelJoinRequest = OnParcelJoinRequest; | 7069 | handlerParcelJoinRequest = OnParcelJoinRequest; |
6775 | 7070 | ||
6776 | if (handlerParcelJoinRequest != null) | 7071 | if (handlerParcelJoinRequest != null) |
@@ -6784,6 +7079,15 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
6784 | case PacketType.ParcelPropertiesUpdate: | 7079 | case PacketType.ParcelPropertiesUpdate: |
6785 | ParcelPropertiesUpdatePacket parcelPropertiesPacket = (ParcelPropertiesUpdatePacket)Pack; | 7080 | ParcelPropertiesUpdatePacket parcelPropertiesPacket = (ParcelPropertiesUpdatePacket)Pack; |
6786 | 7081 | ||
7082 | #region Packet Session and User Check | ||
7083 | if (m_checkPackets) | ||
7084 | { | ||
7085 | if (parcelPropertiesPacket.AgentData.SessionID != SessionId || | ||
7086 | parcelPropertiesPacket.AgentData.AgentID != AgentId) | ||
7087 | break; | ||
7088 | } | ||
7089 | #endregion | ||
7090 | |||
6787 | handlerParcelPropertiesUpdateRequest = OnParcelPropertiesUpdateRequest; | 7091 | handlerParcelPropertiesUpdateRequest = OnParcelPropertiesUpdateRequest; |
6788 | 7092 | ||
6789 | if (handlerParcelPropertiesUpdateRequest != null) | 7093 | if (handlerParcelPropertiesUpdateRequest != null) |
@@ -6813,6 +7117,15 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
6813 | case PacketType.ParcelSelectObjects: | 7117 | case PacketType.ParcelSelectObjects: |
6814 | ParcelSelectObjectsPacket selectPacket = (ParcelSelectObjectsPacket)Pack; | 7118 | ParcelSelectObjectsPacket selectPacket = (ParcelSelectObjectsPacket)Pack; |
6815 | 7119 | ||
7120 | #region Packet Session and User Check | ||
7121 | if (m_checkPackets) | ||
7122 | { | ||
7123 | if (selectPacket.AgentData.SessionID != SessionId || | ||
7124 | selectPacket.AgentData.AgentID != AgentId) | ||
7125 | break; | ||
7126 | } | ||
7127 | #endregion | ||
7128 | |||
6816 | List<UUID> returnIDs = new List<UUID>(); | 7129 | List<UUID> returnIDs = new List<UUID>(); |
6817 | 7130 | ||
6818 | foreach (ParcelSelectObjectsPacket.ReturnIDsBlock rb in | 7131 | foreach (ParcelSelectObjectsPacket.ReturnIDsBlock rb in |
@@ -6833,6 +7146,15 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
6833 | //m_log.Debug(Pack.ToString()); | 7146 | //m_log.Debug(Pack.ToString()); |
6834 | ParcelObjectOwnersRequestPacket reqPacket = (ParcelObjectOwnersRequestPacket)Pack; | 7147 | ParcelObjectOwnersRequestPacket reqPacket = (ParcelObjectOwnersRequestPacket)Pack; |
6835 | 7148 | ||
7149 | #region Packet Session and User Check | ||
7150 | if (m_checkPackets) | ||
7151 | { | ||
7152 | if (reqPacket.AgentData.SessionID != SessionId || | ||
7153 | reqPacket.AgentData.AgentID != AgentId) | ||
7154 | break; | ||
7155 | } | ||
7156 | #endregion | ||
7157 | |||
6836 | handlerParcelObjectOwnerRequest = OnParcelObjectOwnerRequest; | 7158 | handlerParcelObjectOwnerRequest = OnParcelObjectOwnerRequest; |
6837 | 7159 | ||
6838 | if (handlerParcelObjectOwnerRequest != null) | 7160 | if (handlerParcelObjectOwnerRequest != null) |
@@ -6843,6 +7165,15 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
6843 | case PacketType.ParcelGodForceOwner: | 7165 | case PacketType.ParcelGodForceOwner: |
6844 | ParcelGodForceOwnerPacket godForceOwnerPacket = (ParcelGodForceOwnerPacket)Pack; | 7166 | ParcelGodForceOwnerPacket godForceOwnerPacket = (ParcelGodForceOwnerPacket)Pack; |
6845 | 7167 | ||
7168 | #region Packet Session and User Check | ||
7169 | if (m_checkPackets) | ||
7170 | { | ||
7171 | if (godForceOwnerPacket.AgentData.SessionID != SessionId || | ||
7172 | godForceOwnerPacket.AgentData.AgentID != AgentId) | ||
7173 | break; | ||
7174 | } | ||
7175 | #endregion | ||
7176 | |||
6846 | handlerParcelGodForceOwner = OnParcelGodForceOwner; | 7177 | handlerParcelGodForceOwner = OnParcelGodForceOwner; |
6847 | if (handlerParcelGodForceOwner != null) | 7178 | if (handlerParcelGodForceOwner != null) |
6848 | { | 7179 | { |
@@ -6852,6 +7183,15 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
6852 | case PacketType.ParcelRelease: | 7183 | case PacketType.ParcelRelease: |
6853 | ParcelReleasePacket releasePacket = (ParcelReleasePacket)Pack; | 7184 | ParcelReleasePacket releasePacket = (ParcelReleasePacket)Pack; |
6854 | 7185 | ||
7186 | #region Packet Session and User Check | ||
7187 | if (m_checkPackets) | ||
7188 | { | ||
7189 | if (releasePacket.AgentData.SessionID != SessionId || | ||
7190 | releasePacket.AgentData.AgentID != AgentId) | ||
7191 | break; | ||
7192 | } | ||
7193 | #endregion | ||
7194 | |||
6855 | handlerParcelAbandonRequest = OnParcelAbandonRequest; | 7195 | handlerParcelAbandonRequest = OnParcelAbandonRequest; |
6856 | if (handlerParcelAbandonRequest != null) | 7196 | if (handlerParcelAbandonRequest != null) |
6857 | { | 7197 | { |
@@ -6861,6 +7201,15 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
6861 | case PacketType.ParcelReclaim: | 7201 | case PacketType.ParcelReclaim: |
6862 | ParcelReclaimPacket reclaimPacket = (ParcelReclaimPacket)Pack; | 7202 | ParcelReclaimPacket reclaimPacket = (ParcelReclaimPacket)Pack; |
6863 | 7203 | ||
7204 | #region Packet Session and User Check | ||
7205 | if (m_checkPackets) | ||
7206 | { | ||
7207 | if (reclaimPacket.AgentData.SessionID != SessionId || | ||
7208 | reclaimPacket.AgentData.AgentID != AgentId) | ||
7209 | break; | ||
7210 | } | ||
7211 | #endregion | ||
7212 | |||
6864 | handlerParcelReclaim = OnParcelReclaim; | 7213 | handlerParcelReclaim = OnParcelReclaim; |
6865 | if (handlerParcelReclaim != null) | 7214 | if (handlerParcelReclaim != null) |
6866 | { | 7215 | { |
@@ -6872,6 +7221,15 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
6872 | 7221 | ||
6873 | ParcelReturnObjectsPacket parcelReturnObjects = (ParcelReturnObjectsPacket)Pack; | 7222 | ParcelReturnObjectsPacket parcelReturnObjects = (ParcelReturnObjectsPacket)Pack; |
6874 | 7223 | ||
7224 | #region Packet Session and User Check | ||
7225 | if (m_checkPackets) | ||
7226 | { | ||
7227 | if (parcelReturnObjects.AgentData.SessionID != SessionId || | ||
7228 | parcelReturnObjects.AgentData.AgentID != AgentId) | ||
7229 | break; | ||
7230 | } | ||
7231 | #endregion | ||
7232 | |||
6875 | UUID[] puserselectedOwnerIDs = new UUID[parcelReturnObjects.OwnerIDs.Length]; | 7233 | UUID[] puserselectedOwnerIDs = new UUID[parcelReturnObjects.OwnerIDs.Length]; |
6876 | for (int parceliterator = 0; parceliterator < parcelReturnObjects.OwnerIDs.Length; parceliterator++) | 7234 | for (int parceliterator = 0; parceliterator < parcelReturnObjects.OwnerIDs.Length; parceliterator++) |
6877 | puserselectedOwnerIDs[parceliterator] = parcelReturnObjects.OwnerIDs[parceliterator].OwnerID; | 7235 | puserselectedOwnerIDs[parceliterator] = parcelReturnObjects.OwnerIDs[parceliterator].OwnerID; |
@@ -6889,6 +7247,66 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
6889 | } | 7247 | } |
6890 | break; | 7248 | break; |
6891 | 7249 | ||
7250 | case PacketType.ParcelSetOtherCleanTime: | ||
7251 | ParcelSetOtherCleanTimePacket parcelSetOtherCleanTimePacket = (ParcelSetOtherCleanTimePacket)Pack; | ||
7252 | |||
7253 | #region Packet Session and User Check | ||
7254 | if (m_checkPackets) | ||
7255 | { | ||
7256 | if (parcelSetOtherCleanTimePacket.AgentData.SessionID != SessionId || | ||
7257 | parcelSetOtherCleanTimePacket.AgentData.AgentID != AgentId) | ||
7258 | break; | ||
7259 | } | ||
7260 | #endregion | ||
7261 | |||
7262 | handlerParcelSetOtherCleanTime = OnParcelSetOtherCleanTime; | ||
7263 | if (handlerParcelSetOtherCleanTime != null) | ||
7264 | { | ||
7265 | handlerParcelSetOtherCleanTime(this, | ||
7266 | parcelSetOtherCleanTimePacket.ParcelData.LocalID, | ||
7267 | parcelSetOtherCleanTimePacket.ParcelData.OtherCleanTime); | ||
7268 | } | ||
7269 | break; | ||
7270 | |||
7271 | case PacketType.LandStatRequest: | ||
7272 | LandStatRequestPacket lsrp = (LandStatRequestPacket)Pack; | ||
7273 | |||
7274 | #region Packet Session and User Check | ||
7275 | if (m_checkPackets) | ||
7276 | { | ||
7277 | if (lsrp.AgentData.SessionID != SessionId || | ||
7278 | lsrp.AgentData.AgentID != AgentId) | ||
7279 | break; | ||
7280 | } | ||
7281 | #endregion | ||
7282 | |||
7283 | handlerLandStatRequest = OnLandStatRequest; | ||
7284 | if (handlerLandStatRequest != null) | ||
7285 | { | ||
7286 | handlerLandStatRequest(lsrp.RequestData.ParcelLocalID, lsrp.RequestData.ReportType, lsrp.RequestData.RequestFlags, Utils.BytesToString(lsrp.RequestData.Filter), this); | ||
7287 | } | ||
7288 | break; | ||
7289 | |||
7290 | case PacketType.ParcelDwellRequest: | ||
7291 | ParcelDwellRequestPacket dwellrq = | ||
7292 | (ParcelDwellRequestPacket)Pack; | ||
7293 | |||
7294 | #region Packet Session and User Check | ||
7295 | if (m_checkPackets) | ||
7296 | { | ||
7297 | if (dwellrq.AgentData.SessionID != SessionId || | ||
7298 | dwellrq.AgentData.AgentID != AgentId) | ||
7299 | break; | ||
7300 | } | ||
7301 | #endregion | ||
7302 | |||
7303 | handlerParcelDwellRequest = OnParcelDwellRequest; | ||
7304 | if (handlerParcelDwellRequest != null) | ||
7305 | { | ||
7306 | handlerParcelDwellRequest(dwellrq.Data.LocalID, this); | ||
7307 | } | ||
7308 | break; | ||
7309 | |||
6892 | #endregion | 7310 | #endregion |
6893 | 7311 | ||
6894 | #region Estate Packets | 7312 | #region Estate Packets |
@@ -6896,6 +7314,16 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
6896 | case PacketType.EstateOwnerMessage: | 7314 | case PacketType.EstateOwnerMessage: |
6897 | EstateOwnerMessagePacket messagePacket = (EstateOwnerMessagePacket)Pack; | 7315 | EstateOwnerMessagePacket messagePacket = (EstateOwnerMessagePacket)Pack; |
6898 | //m_log.Debug(messagePacket.ToString()); | 7316 | //m_log.Debug(messagePacket.ToString()); |
7317 | |||
7318 | #region Packet Session and User Check | ||
7319 | if (m_checkPackets) | ||
7320 | { | ||
7321 | if (messagePacket.AgentData.SessionID != SessionId || | ||
7322 | messagePacket.AgentData.AgentID != AgentId) | ||
7323 | break; | ||
7324 | } | ||
7325 | #endregion | ||
7326 | |||
6899 | switch (Utils.BytesToString(messagePacket.MethodData.Method)) | 7327 | switch (Utils.BytesToString(messagePacket.MethodData.Method)) |
6900 | { | 7328 | { |
6901 | case "getinfo": | 7329 | case "getinfo": |
@@ -7172,14 +7600,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
7172 | break; | 7600 | break; |
7173 | } | 7601 | } |
7174 | break; | 7602 | break; |
7175 | case PacketType.LandStatRequest: | 7603 | |
7176 | LandStatRequestPacket lsrp = (LandStatRequestPacket)Pack; | ||
7177 | |||
7178 | handlerLandStatRequest = OnLandStatRequest; | ||
7179 | if (handlerLandStatRequest != null) | ||
7180 | { | ||
7181 | handlerLandStatRequest(lsrp.RequestData.ParcelLocalID, lsrp.RequestData.ReportType, lsrp.RequestData.RequestFlags, Utils.BytesToString(lsrp.RequestData.Filter), this); | ||
7182 | } | ||
7183 | //int parcelID, uint reportType, uint requestflags, string filter | 7604 | //int parcelID, uint reportType, uint requestflags, string filter |
7184 | 7605 | ||
7185 | //lsrp.RequestData.ParcelLocalID; | 7606 | //lsrp.RequestData.ParcelLocalID; |
@@ -7190,7 +7611,16 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
7190 | break; | 7611 | break; |
7191 | 7612 | ||
7192 | case PacketType.RequestRegionInfo: | 7613 | case PacketType.RequestRegionInfo: |
7193 | // RequestRegionInfoPacket.AgentDataBlock mPacket = ((RequestRegionInfoPacket)Pack).AgentData; | 7614 | RequestRegionInfoPacket.AgentDataBlock mPacket = ((RequestRegionInfoPacket)Pack).AgentData; |
7615 | |||
7616 | #region Packet Session and User Check | ||
7617 | if (m_checkPackets) | ||
7618 | { | ||
7619 | if (mPacket.SessionID != SessionId || | ||
7620 | mPacket.AgentID != AgentId) | ||
7621 | break; | ||
7622 | } | ||
7623 | #endregion | ||
7194 | 7624 | ||
7195 | handlerRegionInfoRequest = OnRegionInfoRequest; | 7625 | handlerRegionInfoRequest = OnRegionInfoRequest; |
7196 | if (handlerRegionInfoRequest != null) | 7626 | if (handlerRegionInfoRequest != null) |
@@ -7200,7 +7630,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
7200 | break; | 7630 | break; |
7201 | case PacketType.EstateCovenantRequest: | 7631 | case PacketType.EstateCovenantRequest: |
7202 | 7632 | ||
7203 | // EstateCovenantRequestPacket.AgentDataBlock epack = | 7633 | //EstateCovenantRequestPacket.AgentDataBlock epack = |
7204 | // ((EstateCovenantRequestPacket)Pack).AgentData; | 7634 | // ((EstateCovenantRequestPacket)Pack).AgentData; |
7205 | 7635 | ||
7206 | handlerEstateCovenantRequest = OnEstateCovenantRequest; | 7636 | handlerEstateCovenantRequest = OnEstateCovenantRequest; |
@@ -7265,6 +7695,15 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
7265 | case PacketType.MoneyBalanceRequest: | 7695 | case PacketType.MoneyBalanceRequest: |
7266 | MoneyBalanceRequestPacket moneybalancerequestpacket = (MoneyBalanceRequestPacket)Pack; | 7696 | MoneyBalanceRequestPacket moneybalancerequestpacket = (MoneyBalanceRequestPacket)Pack; |
7267 | 7697 | ||
7698 | #region Packet Session and User Check | ||
7699 | if (m_checkPackets) | ||
7700 | { | ||
7701 | if (moneybalancerequestpacket.AgentData.SessionID != SessionId || | ||
7702 | moneybalancerequestpacket.AgentData.AgentID != AgentId) | ||
7703 | break; | ||
7704 | } | ||
7705 | #endregion | ||
7706 | |||
7268 | handlerMoneyBalanceRequest = OnMoneyBalanceRequest; | 7707 | handlerMoneyBalanceRequest = OnMoneyBalanceRequest; |
7269 | 7708 | ||
7270 | if (handlerMoneyBalanceRequest != null) | 7709 | if (handlerMoneyBalanceRequest != null) |
@@ -7275,6 +7714,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
7275 | break; | 7714 | break; |
7276 | case PacketType.EconomyDataRequest: | 7715 | case PacketType.EconomyDataRequest: |
7277 | 7716 | ||
7717 | |||
7278 | handlerEconomoyDataRequest = OnEconomyDataRequest; | 7718 | handlerEconomoyDataRequest = OnEconomyDataRequest; |
7279 | if (handlerEconomoyDataRequest != null) | 7719 | if (handlerEconomoyDataRequest != null) |
7280 | { | 7720 | { |
@@ -7283,6 +7723,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
7283 | break; | 7723 | break; |
7284 | case PacketType.RequestPayPrice: | 7724 | case PacketType.RequestPayPrice: |
7285 | RequestPayPricePacket requestPayPricePacket = (RequestPayPricePacket)Pack; | 7725 | RequestPayPricePacket requestPayPricePacket = (RequestPayPricePacket)Pack; |
7726 | |||
7286 | handlerRequestPayPrice = OnRequestPayPrice; | 7727 | handlerRequestPayPrice = OnRequestPayPrice; |
7287 | if (handlerRequestPayPrice != null) | 7728 | if (handlerRequestPayPrice != null) |
7288 | { | 7729 | { |
@@ -7292,6 +7733,16 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
7292 | 7733 | ||
7293 | case PacketType.ObjectSaleInfo: | 7734 | case PacketType.ObjectSaleInfo: |
7294 | ObjectSaleInfoPacket objectSaleInfoPacket = (ObjectSaleInfoPacket)Pack; | 7735 | ObjectSaleInfoPacket objectSaleInfoPacket = (ObjectSaleInfoPacket)Pack; |
7736 | |||
7737 | #region Packet Session and User Check | ||
7738 | if (m_checkPackets) | ||
7739 | { | ||
7740 | if (objectSaleInfoPacket.AgentData.SessionID != SessionId || | ||
7741 | objectSaleInfoPacket.AgentData.AgentID != AgentId) | ||
7742 | break; | ||
7743 | } | ||
7744 | #endregion | ||
7745 | |||
7295 | handlerObjectSaleInfo = OnObjectSaleInfo; | 7746 | handlerObjectSaleInfo = OnObjectSaleInfo; |
7296 | if (handlerObjectSaleInfo != null) | 7747 | if (handlerObjectSaleInfo != null) |
7297 | { | 7748 | { |
@@ -7310,6 +7761,16 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
7310 | 7761 | ||
7311 | case PacketType.ObjectBuy: | 7762 | case PacketType.ObjectBuy: |
7312 | ObjectBuyPacket objectBuyPacket = (ObjectBuyPacket)Pack; | 7763 | ObjectBuyPacket objectBuyPacket = (ObjectBuyPacket)Pack; |
7764 | |||
7765 | #region Packet Session and User Check | ||
7766 | if (m_checkPackets) | ||
7767 | { | ||
7768 | if (objectBuyPacket.AgentData.SessionID != SessionId || | ||
7769 | objectBuyPacket.AgentData.AgentID != AgentId) | ||
7770 | break; | ||
7771 | } | ||
7772 | #endregion | ||
7773 | |||
7313 | handlerObjectBuy = OnObjectBuy; | 7774 | handlerObjectBuy = OnObjectBuy; |
7314 | 7775 | ||
7315 | if (handlerObjectBuy != null) | 7776 | if (handlerObjectBuy != null) |
@@ -7335,6 +7796,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
7335 | 7796 | ||
7336 | case PacketType.GetScriptRunning: | 7797 | case PacketType.GetScriptRunning: |
7337 | GetScriptRunningPacket scriptRunning = (GetScriptRunningPacket)Pack; | 7798 | GetScriptRunningPacket scriptRunning = (GetScriptRunningPacket)Pack; |
7799 | |||
7338 | handlerGetScriptRunning = OnGetScriptRunning; | 7800 | handlerGetScriptRunning = OnGetScriptRunning; |
7339 | if (handlerGetScriptRunning != null) | 7801 | if (handlerGetScriptRunning != null) |
7340 | { | 7802 | { |
@@ -7344,6 +7806,16 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
7344 | 7806 | ||
7345 | case PacketType.SetScriptRunning: | 7807 | case PacketType.SetScriptRunning: |
7346 | SetScriptRunningPacket setScriptRunning = (SetScriptRunningPacket)Pack; | 7808 | SetScriptRunningPacket setScriptRunning = (SetScriptRunningPacket)Pack; |
7809 | |||
7810 | #region Packet Session and User Check | ||
7811 | if (m_checkPackets) | ||
7812 | { | ||
7813 | if (setScriptRunning.AgentData.SessionID != SessionId || | ||
7814 | setScriptRunning.AgentData.AgentID != AgentId) | ||
7815 | break; | ||
7816 | } | ||
7817 | #endregion | ||
7818 | |||
7347 | handlerSetScriptRunning = OnSetScriptRunning; | 7819 | handlerSetScriptRunning = OnSetScriptRunning; |
7348 | if (handlerSetScriptRunning != null) | 7820 | if (handlerSetScriptRunning != null) |
7349 | { | 7821 | { |
@@ -7353,6 +7825,16 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
7353 | 7825 | ||
7354 | case PacketType.ScriptReset: | 7826 | case PacketType.ScriptReset: |
7355 | ScriptResetPacket scriptResetPacket = (ScriptResetPacket)Pack; | 7827 | ScriptResetPacket scriptResetPacket = (ScriptResetPacket)Pack; |
7828 | |||
7829 | #region Packet Session and User Check | ||
7830 | if (m_checkPackets) | ||
7831 | { | ||
7832 | if (scriptResetPacket.AgentData.SessionID != SessionId || | ||
7833 | scriptResetPacket.AgentData.AgentID != AgentId) | ||
7834 | break; | ||
7835 | } | ||
7836 | #endregion | ||
7837 | |||
7356 | handlerScriptReset = OnScriptReset; | 7838 | handlerScriptReset = OnScriptReset; |
7357 | if (handlerScriptReset != null) | 7839 | if (handlerScriptReset != null) |
7358 | { | 7840 | { |
@@ -7366,6 +7848,16 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
7366 | 7848 | ||
7367 | case PacketType.ActivateGestures: | 7849 | case PacketType.ActivateGestures: |
7368 | ActivateGesturesPacket activateGesturePacket = (ActivateGesturesPacket)Pack; | 7850 | ActivateGesturesPacket activateGesturePacket = (ActivateGesturesPacket)Pack; |
7851 | |||
7852 | #region Packet Session and User Check | ||
7853 | if (m_checkPackets) | ||
7854 | { | ||
7855 | if (activateGesturePacket.AgentData.SessionID != SessionId || | ||
7856 | activateGesturePacket.AgentData.AgentID != AgentId) | ||
7857 | break; | ||
7858 | } | ||
7859 | #endregion | ||
7860 | |||
7369 | handlerActivateGesture = OnActivateGesture; | 7861 | handlerActivateGesture = OnActivateGesture; |
7370 | if (handlerActivateGesture != null) | 7862 | if (handlerActivateGesture != null) |
7371 | { | 7863 | { |
@@ -7379,6 +7871,16 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
7379 | 7871 | ||
7380 | case PacketType.DeactivateGestures: | 7872 | case PacketType.DeactivateGestures: |
7381 | DeactivateGesturesPacket deactivateGesturePacket = (DeactivateGesturesPacket)Pack; | 7873 | DeactivateGesturesPacket deactivateGesturePacket = (DeactivateGesturesPacket)Pack; |
7874 | |||
7875 | #region Packet Session and User Check | ||
7876 | if (m_checkPackets) | ||
7877 | { | ||
7878 | if (deactivateGesturePacket.AgentData.SessionID != SessionId || | ||
7879 | deactivateGesturePacket.AgentData.AgentID != AgentId) | ||
7880 | break; | ||
7881 | } | ||
7882 | #endregion | ||
7883 | |||
7382 | handlerDeactivateGesture = OnDeactivateGesture; | 7884 | handlerDeactivateGesture = OnDeactivateGesture; |
7383 | if (handlerDeactivateGesture != null) | 7885 | if (handlerDeactivateGesture != null) |
7384 | { | 7886 | { |
@@ -7388,6 +7890,15 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
7388 | case PacketType.ObjectOwner: | 7890 | case PacketType.ObjectOwner: |
7389 | ObjectOwnerPacket objectOwnerPacket = (ObjectOwnerPacket)Pack; | 7891 | ObjectOwnerPacket objectOwnerPacket = (ObjectOwnerPacket)Pack; |
7390 | 7892 | ||
7893 | #region Packet Session and User Check | ||
7894 | if (m_checkPackets) | ||
7895 | { | ||
7896 | if (objectOwnerPacket.AgentData.SessionID != SessionId || | ||
7897 | objectOwnerPacket.AgentData.AgentID != AgentId) | ||
7898 | break; | ||
7899 | } | ||
7900 | #endregion | ||
7901 | |||
7391 | List<uint> localIDs = new List<uint>(); | 7902 | List<uint> localIDs = new List<uint>(); |
7392 | 7903 | ||
7393 | foreach (ObjectOwnerPacket.ObjectDataBlock d in objectOwnerPacket.ObjectData) | 7904 | foreach (ObjectOwnerPacket.ObjectDataBlock d in objectOwnerPacket.ObjectData) |
@@ -7423,6 +7934,16 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
7423 | 7934 | ||
7424 | case PacketType.MapItemRequest: | 7935 | case PacketType.MapItemRequest: |
7425 | MapItemRequestPacket mirpk = (MapItemRequestPacket)Pack; | 7936 | MapItemRequestPacket mirpk = (MapItemRequestPacket)Pack; |
7937 | |||
7938 | #region Packet Session and User Check | ||
7939 | if (m_checkPackets) | ||
7940 | { | ||
7941 | if (mirpk.AgentData.SessionID != SessionId || | ||
7942 | mirpk.AgentData.AgentID != AgentId) | ||
7943 | break; | ||
7944 | } | ||
7945 | #endregion | ||
7946 | |||
7426 | //m_log.Debug(mirpk.ToString()); | 7947 | //m_log.Debug(mirpk.ToString()); |
7427 | handlerMapItemRequest = OnMapItemRequest; | 7948 | handlerMapItemRequest = OnMapItemRequest; |
7428 | if (handlerMapItemRequest != null) | 7949 | if (handlerMapItemRequest != null) |
@@ -7433,16 +7954,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
7433 | 7954 | ||
7434 | } | 7955 | } |
7435 | break; | 7956 | break; |
7436 | case PacketType.ParcelDwellRequest: | ||
7437 | ParcelDwellRequestPacket dwellrq = | ||
7438 | (ParcelDwellRequestPacket)Pack; | ||
7439 | 7957 | ||
7440 | handlerParcelDwellRequest = OnParcelDwellRequest; | ||
7441 | if (handlerParcelDwellRequest != null) | ||
7442 | { | ||
7443 | handlerParcelDwellRequest(dwellrq.Data.LocalID, this); | ||
7444 | } | ||
7445 | break; | ||
7446 | case PacketType.TransferAbort: | 7958 | case PacketType.TransferAbort: |
7447 | // TODO: handle this packet | 7959 | // TODO: handle this packet |
7448 | //m_log.Warn("[CLIENT]: unhandled TransferAbort packet"); | 7960 | //m_log.Warn("[CLIENT]: unhandled TransferAbort packet"); |
@@ -7451,6 +7963,15 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
7451 | MuteListRequestPacket muteListRequest = | 7963 | MuteListRequestPacket muteListRequest = |
7452 | (MuteListRequestPacket)Pack; | 7964 | (MuteListRequestPacket)Pack; |
7453 | 7965 | ||
7966 | #region Packet Session and User Check | ||
7967 | if (m_checkPackets) | ||
7968 | { | ||
7969 | if (muteListRequest.AgentData.SessionID != SessionId || | ||
7970 | muteListRequest.AgentData.AgentID != AgentId) | ||
7971 | break; | ||
7972 | } | ||
7973 | #endregion | ||
7974 | |||
7454 | handlerMuteListRequest = OnMuteListRequest; | 7975 | handlerMuteListRequest = OnMuteListRequest; |
7455 | if (handlerMuteListRequest != null) | 7976 | if (handlerMuteListRequest != null) |
7456 | { | 7977 | { |
@@ -7479,6 +8000,15 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
7479 | DirPlacesQueryPacket dirPlacesQueryPacket = (DirPlacesQueryPacket)Pack; | 8000 | DirPlacesQueryPacket dirPlacesQueryPacket = (DirPlacesQueryPacket)Pack; |
7480 | //m_log.Debug(dirPlacesQueryPacket.ToString()); | 8001 | //m_log.Debug(dirPlacesQueryPacket.ToString()); |
7481 | 8002 | ||
8003 | #region Packet Session and User Check | ||
8004 | if (m_checkPackets) | ||
8005 | { | ||
8006 | if (dirPlacesQueryPacket.AgentData.SessionID != SessionId || | ||
8007 | dirPlacesQueryPacket.AgentData.AgentID != AgentId) | ||
8008 | break; | ||
8009 | } | ||
8010 | #endregion | ||
8011 | |||
7482 | handlerDirPlacesQuery = OnDirPlacesQuery; | 8012 | handlerDirPlacesQuery = OnDirPlacesQuery; |
7483 | if (handlerDirPlacesQuery != null) | 8013 | if (handlerDirPlacesQuery != null) |
7484 | { | 8014 | { |
@@ -7495,6 +8025,16 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
7495 | break; | 8025 | break; |
7496 | case PacketType.DirFindQuery: | 8026 | case PacketType.DirFindQuery: |
7497 | DirFindQueryPacket dirFindQueryPacket = (DirFindQueryPacket)Pack; | 8027 | DirFindQueryPacket dirFindQueryPacket = (DirFindQueryPacket)Pack; |
8028 | |||
8029 | #region Packet Session and User Check | ||
8030 | if (m_checkPackets) | ||
8031 | { | ||
8032 | if (dirFindQueryPacket.AgentData.SessionID != SessionId || | ||
8033 | dirFindQueryPacket.AgentData.AgentID != AgentId) | ||
8034 | break; | ||
8035 | } | ||
8036 | #endregion | ||
8037 | |||
7498 | handlerDirFindQuery = OnDirFindQuery; | 8038 | handlerDirFindQuery = OnDirFindQuery; |
7499 | if (handlerDirFindQuery != null) | 8039 | if (handlerDirFindQuery != null) |
7500 | { | 8040 | { |
@@ -7508,6 +8048,16 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
7508 | break; | 8048 | break; |
7509 | case PacketType.DirLandQuery: | 8049 | case PacketType.DirLandQuery: |
7510 | DirLandQueryPacket dirLandQueryPacket = (DirLandQueryPacket)Pack; | 8050 | DirLandQueryPacket dirLandQueryPacket = (DirLandQueryPacket)Pack; |
8051 | |||
8052 | #region Packet Session and User Check | ||
8053 | if (m_checkPackets) | ||
8054 | { | ||
8055 | if (dirLandQueryPacket.AgentData.SessionID != SessionId || | ||
8056 | dirLandQueryPacket.AgentData.AgentID != AgentId) | ||
8057 | break; | ||
8058 | } | ||
8059 | #endregion | ||
8060 | |||
7511 | handlerDirLandQuery = OnDirLandQuery; | 8061 | handlerDirLandQuery = OnDirLandQuery; |
7512 | if (handlerDirLandQuery != null) | 8062 | if (handlerDirLandQuery != null) |
7513 | { | 8063 | { |
@@ -7522,6 +8072,16 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
7522 | break; | 8072 | break; |
7523 | case PacketType.DirPopularQuery: | 8073 | case PacketType.DirPopularQuery: |
7524 | DirPopularQueryPacket dirPopularQueryPacket = (DirPopularQueryPacket)Pack; | 8074 | DirPopularQueryPacket dirPopularQueryPacket = (DirPopularQueryPacket)Pack; |
8075 | |||
8076 | #region Packet Session and User Check | ||
8077 | if (m_checkPackets) | ||
8078 | { | ||
8079 | if (dirPopularQueryPacket.AgentData.SessionID != SessionId || | ||
8080 | dirPopularQueryPacket.AgentData.AgentID != AgentId) | ||
8081 | break; | ||
8082 | } | ||
8083 | #endregion | ||
8084 | |||
7525 | handlerDirPopularQuery = OnDirPopularQuery; | 8085 | handlerDirPopularQuery = OnDirPopularQuery; |
7526 | if (handlerDirPopularQuery != null) | 8086 | if (handlerDirPopularQuery != null) |
7527 | { | 8087 | { |
@@ -7532,6 +8092,16 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
7532 | break; | 8092 | break; |
7533 | case PacketType.DirClassifiedQuery: | 8093 | case PacketType.DirClassifiedQuery: |
7534 | DirClassifiedQueryPacket dirClassifiedQueryPacket = (DirClassifiedQueryPacket)Pack; | 8094 | DirClassifiedQueryPacket dirClassifiedQueryPacket = (DirClassifiedQueryPacket)Pack; |
8095 | |||
8096 | #region Packet Session and User Check | ||
8097 | if (m_checkPackets) | ||
8098 | { | ||
8099 | if (dirClassifiedQueryPacket.AgentData.SessionID != SessionId || | ||
8100 | dirClassifiedQueryPacket.AgentData.AgentID != AgentId) | ||
8101 | break; | ||
8102 | } | ||
8103 | #endregion | ||
8104 | |||
7535 | handlerDirClassifiedQuery = OnDirClassifiedQuery; | 8105 | handlerDirClassifiedQuery = OnDirClassifiedQuery; |
7536 | if (handlerDirClassifiedQuery != null) | 8106 | if (handlerDirClassifiedQuery != null) |
7537 | { | 8107 | { |
@@ -7546,25 +8116,36 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
7546 | break; | 8116 | break; |
7547 | case PacketType.EventInfoRequest: | 8117 | case PacketType.EventInfoRequest: |
7548 | EventInfoRequestPacket eventInfoRequestPacket = (EventInfoRequestPacket)Pack; | 8118 | EventInfoRequestPacket eventInfoRequestPacket = (EventInfoRequestPacket)Pack; |
7549 | if (OnEventInfoRequest != null) | 8119 | |
8120 | #region Packet Session and User Check | ||
8121 | if (m_checkPackets) | ||
7550 | { | 8122 | { |
7551 | OnEventInfoRequest(this, eventInfoRequestPacket.EventData.EventID); | 8123 | if (eventInfoRequestPacket.AgentData.SessionID != SessionId || |
8124 | eventInfoRequestPacket.AgentData.AgentID != AgentId) | ||
8125 | break; | ||
7552 | } | 8126 | } |
7553 | break; | 8127 | #endregion |
7554 | 8128 | ||
7555 | case PacketType.ParcelSetOtherCleanTime: | 8129 | if (OnEventInfoRequest != null) |
7556 | ParcelSetOtherCleanTimePacket parcelSetOtherCleanTimePacket = (ParcelSetOtherCleanTimePacket)Pack; | ||
7557 | handlerParcelSetOtherCleanTime = OnParcelSetOtherCleanTime; | ||
7558 | if (handlerParcelSetOtherCleanTime != null) | ||
7559 | { | 8130 | { |
7560 | handlerParcelSetOtherCleanTime(this, | 8131 | OnEventInfoRequest(this, eventInfoRequestPacket.EventData.EventID); |
7561 | parcelSetOtherCleanTimePacket.ParcelData.LocalID, | ||
7562 | parcelSetOtherCleanTimePacket.ParcelData.OtherCleanTime); | ||
7563 | } | 8132 | } |
7564 | break; | 8133 | break; |
7565 | 8134 | ||
8135 | #region Calling Card | ||
8136 | |||
7566 | case PacketType.OfferCallingCard: | 8137 | case PacketType.OfferCallingCard: |
7567 | OfferCallingCardPacket offerCallingCardPacket = (OfferCallingCardPacket)Pack; | 8138 | OfferCallingCardPacket offerCallingCardPacket = (OfferCallingCardPacket)Pack; |
8139 | |||
8140 | #region Packet Session and User Check | ||
8141 | if (m_checkPackets) | ||
8142 | { | ||
8143 | if (offerCallingCardPacket.AgentData.SessionID != SessionId || | ||
8144 | offerCallingCardPacket.AgentData.AgentID != AgentId) | ||
8145 | break; | ||
8146 | } | ||
8147 | #endregion | ||
8148 | |||
7568 | if (OnOfferCallingCard != null) | 8149 | if (OnOfferCallingCard != null) |
7569 | { | 8150 | { |
7570 | OnOfferCallingCard(this, | 8151 | OnOfferCallingCard(this, |
@@ -7575,6 +8156,16 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
7575 | 8156 | ||
7576 | case PacketType.AcceptCallingCard: | 8157 | case PacketType.AcceptCallingCard: |
7577 | AcceptCallingCardPacket acceptCallingCardPacket = (AcceptCallingCardPacket)Pack; | 8158 | AcceptCallingCardPacket acceptCallingCardPacket = (AcceptCallingCardPacket)Pack; |
8159 | |||
8160 | #region Packet Session and User Check | ||
8161 | if (m_checkPackets) | ||
8162 | { | ||
8163 | if (acceptCallingCardPacket.AgentData.SessionID != SessionId || | ||
8164 | acceptCallingCardPacket.AgentData.AgentID != AgentId) | ||
8165 | break; | ||
8166 | } | ||
8167 | #endregion | ||
8168 | |||
7578 | // according to http://wiki.secondlife.com/wiki/AcceptCallingCard FolderData should | 8169 | // according to http://wiki.secondlife.com/wiki/AcceptCallingCard FolderData should |
7579 | // contain exactly one entry | 8170 | // contain exactly one entry |
7580 | if (OnAcceptCallingCard != null && acceptCallingCardPacket.FolderData.Length > 0) | 8171 | if (OnAcceptCallingCard != null && acceptCallingCardPacket.FolderData.Length > 0) |
@@ -7587,15 +8178,37 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
7587 | 8178 | ||
7588 | case PacketType.DeclineCallingCard: | 8179 | case PacketType.DeclineCallingCard: |
7589 | DeclineCallingCardPacket declineCallingCardPacket = (DeclineCallingCardPacket)Pack; | 8180 | DeclineCallingCardPacket declineCallingCardPacket = (DeclineCallingCardPacket)Pack; |
8181 | |||
8182 | #region Packet Session and User Check | ||
8183 | if (m_checkPackets) | ||
8184 | { | ||
8185 | if (declineCallingCardPacket.AgentData.SessionID != SessionId || | ||
8186 | declineCallingCardPacket.AgentData.AgentID != AgentId) | ||
8187 | break; | ||
8188 | } | ||
8189 | #endregion | ||
8190 | |||
7590 | if (OnDeclineCallingCard != null) | 8191 | if (OnDeclineCallingCard != null) |
7591 | { | 8192 | { |
7592 | OnDeclineCallingCard(this, | 8193 | OnDeclineCallingCard(this, |
7593 | declineCallingCardPacket.TransactionBlock.TransactionID); | 8194 | declineCallingCardPacket.TransactionBlock.TransactionID); |
7594 | } | 8195 | } |
7595 | break; | 8196 | break; |
8197 | #endregion | ||
7596 | 8198 | ||
8199 | #region Groups | ||
7597 | case PacketType.ActivateGroup: | 8200 | case PacketType.ActivateGroup: |
7598 | ActivateGroupPacket activateGroupPacket = (ActivateGroupPacket)Pack; | 8201 | ActivateGroupPacket activateGroupPacket = (ActivateGroupPacket)Pack; |
8202 | |||
8203 | #region Packet Session and User Check | ||
8204 | if (m_checkPackets) | ||
8205 | { | ||
8206 | if (activateGroupPacket.AgentData.SessionID != SessionId || | ||
8207 | activateGroupPacket.AgentData.AgentID != AgentId) | ||
8208 | break; | ||
8209 | } | ||
8210 | #endregion | ||
8211 | |||
7599 | if (m_GroupsModule != null) | 8212 | if (m_GroupsModule != null) |
7600 | { | 8213 | { |
7601 | m_GroupsModule.ActivateGroup(this, activateGroupPacket.AgentData.GroupID); | 8214 | m_GroupsModule.ActivateGroup(this, activateGroupPacket.AgentData.GroupID); |
@@ -7607,6 +8220,15 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
7607 | GroupTitlesRequestPacket groupTitlesRequest = | 8220 | GroupTitlesRequestPacket groupTitlesRequest = |
7608 | (GroupTitlesRequestPacket)Pack; | 8221 | (GroupTitlesRequestPacket)Pack; |
7609 | 8222 | ||
8223 | #region Packet Session and User Check | ||
8224 | if (m_checkPackets) | ||
8225 | { | ||
8226 | if (groupTitlesRequest.AgentData.SessionID != SessionId || | ||
8227 | groupTitlesRequest.AgentData.AgentID != AgentId) | ||
8228 | break; | ||
8229 | } | ||
8230 | #endregion | ||
8231 | |||
7610 | if (m_GroupsModule != null) | 8232 | if (m_GroupsModule != null) |
7611 | { | 8233 | { |
7612 | GroupTitlesReplyPacket groupTitlesReply = (GroupTitlesReplyPacket)PacketPool.Instance.GetPacket(PacketType.GroupTitlesReply); | 8234 | GroupTitlesReplyPacket groupTitlesReply = (GroupTitlesReplyPacket)PacketPool.Instance.GetPacket(PacketType.GroupTitlesReply); |
@@ -7651,6 +8273,15 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
7651 | GroupProfileRequestPacket groupProfileRequest = | 8273 | GroupProfileRequestPacket groupProfileRequest = |
7652 | (GroupProfileRequestPacket)Pack; | 8274 | (GroupProfileRequestPacket)Pack; |
7653 | 8275 | ||
8276 | #region Packet Session and User Check | ||
8277 | if (m_checkPackets) | ||
8278 | { | ||
8279 | if (groupProfileRequest.AgentData.SessionID != SessionId || | ||
8280 | groupProfileRequest.AgentData.AgentID != AgentId) | ||
8281 | break; | ||
8282 | } | ||
8283 | #endregion | ||
8284 | |||
7654 | if (m_GroupsModule != null) | 8285 | if (m_GroupsModule != null) |
7655 | { | 8286 | { |
7656 | GroupProfileReplyPacket groupProfileReply = (GroupProfileReplyPacket)PacketPool.Instance.GetPacket(PacketType.GroupProfileReply); | 8287 | GroupProfileReplyPacket groupProfileReply = (GroupProfileReplyPacket)PacketPool.Instance.GetPacket(PacketType.GroupProfileReply); |
@@ -7687,6 +8318,15 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
7687 | GroupMembersRequestPacket groupMembersRequestPacket = | 8318 | GroupMembersRequestPacket groupMembersRequestPacket = |
7688 | (GroupMembersRequestPacket)Pack; | 8319 | (GroupMembersRequestPacket)Pack; |
7689 | 8320 | ||
8321 | #region Packet Session and User Check | ||
8322 | if (m_checkPackets) | ||
8323 | { | ||
8324 | if (groupMembersRequestPacket.AgentData.SessionID != SessionId || | ||
8325 | groupMembersRequestPacket.AgentData.AgentID != AgentId) | ||
8326 | break; | ||
8327 | } | ||
8328 | #endregion | ||
8329 | |||
7690 | if (m_GroupsModule != null) | 8330 | if (m_GroupsModule != null) |
7691 | { | 8331 | { |
7692 | List<GroupMembersData> members = | 8332 | List<GroupMembersData> members = |
@@ -7737,6 +8377,15 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
7737 | GroupRoleDataRequestPacket groupRolesRequest = | 8377 | GroupRoleDataRequestPacket groupRolesRequest = |
7738 | (GroupRoleDataRequestPacket)Pack; | 8378 | (GroupRoleDataRequestPacket)Pack; |
7739 | 8379 | ||
8380 | #region Packet Session and User Check | ||
8381 | if (m_checkPackets) | ||
8382 | { | ||
8383 | if (groupRolesRequest.AgentData.SessionID != SessionId || | ||
8384 | groupRolesRequest.AgentData.AgentID != AgentId) | ||
8385 | break; | ||
8386 | } | ||
8387 | #endregion | ||
8388 | |||
7740 | if (m_GroupsModule != null) | 8389 | if (m_GroupsModule != null) |
7741 | { | 8390 | { |
7742 | GroupRoleDataReplyPacket groupRolesReply = (GroupRoleDataReplyPacket)PacketPool.Instance.GetPacket(PacketType.GroupRoleDataReply); | 8391 | GroupRoleDataReplyPacket groupRolesReply = (GroupRoleDataReplyPacket)PacketPool.Instance.GetPacket(PacketType.GroupRoleDataReply); |
@@ -7795,6 +8444,15 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
7795 | GroupRoleMembersRequestPacket groupRoleMembersRequest = | 8444 | GroupRoleMembersRequestPacket groupRoleMembersRequest = |
7796 | (GroupRoleMembersRequestPacket)Pack; | 8445 | (GroupRoleMembersRequestPacket)Pack; |
7797 | 8446 | ||
8447 | #region Packet Session and User Check | ||
8448 | if (m_checkPackets) | ||
8449 | { | ||
8450 | if (groupRoleMembersRequest.AgentData.SessionID != SessionId || | ||
8451 | groupRoleMembersRequest.AgentData.AgentID != AgentId) | ||
8452 | break; | ||
8453 | } | ||
8454 | #endregion | ||
8455 | |||
7798 | if (m_GroupsModule != null) | 8456 | if (m_GroupsModule != null) |
7799 | { | 8457 | { |
7800 | GroupRoleMembersReplyPacket groupRoleMembersReply = (GroupRoleMembersReplyPacket)PacketPool.Instance.GetPacket(PacketType.GroupRoleMembersReply); | 8458 | GroupRoleMembersReplyPacket groupRoleMembersReply = (GroupRoleMembersReplyPacket)PacketPool.Instance.GetPacket(PacketType.GroupRoleMembersReply); |
@@ -7838,6 +8496,15 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
7838 | CreateGroupRequestPacket createGroupRequest = | 8496 | CreateGroupRequestPacket createGroupRequest = |
7839 | (CreateGroupRequestPacket)Pack; | 8497 | (CreateGroupRequestPacket)Pack; |
7840 | 8498 | ||
8499 | #region Packet Session and User Check | ||
8500 | if (m_checkPackets) | ||
8501 | { | ||
8502 | if (createGroupRequest.AgentData.SessionID != SessionId || | ||
8503 | createGroupRequest.AgentData.AgentID != AgentId) | ||
8504 | break; | ||
8505 | } | ||
8506 | #endregion | ||
8507 | |||
7841 | if (m_GroupsModule != null) | 8508 | if (m_GroupsModule != null) |
7842 | { | 8509 | { |
7843 | m_GroupsModule.CreateGroup(this, | 8510 | m_GroupsModule.CreateGroup(this, |
@@ -7856,6 +8523,15 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
7856 | UpdateGroupInfoPacket updateGroupInfo = | 8523 | UpdateGroupInfoPacket updateGroupInfo = |
7857 | (UpdateGroupInfoPacket)Pack; | 8524 | (UpdateGroupInfoPacket)Pack; |
7858 | 8525 | ||
8526 | #region Packet Session and User Check | ||
8527 | if (m_checkPackets) | ||
8528 | { | ||
8529 | if (updateGroupInfo.AgentData.SessionID != SessionId || | ||
8530 | updateGroupInfo.AgentData.AgentID != AgentId) | ||
8531 | break; | ||
8532 | } | ||
8533 | #endregion | ||
8534 | |||
7859 | if (m_GroupsModule != null) | 8535 | if (m_GroupsModule != null) |
7860 | { | 8536 | { |
7861 | m_GroupsModule.UpdateGroupInfo(this, | 8537 | m_GroupsModule.UpdateGroupInfo(this, |
@@ -7875,6 +8551,15 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
7875 | SetGroupAcceptNoticesPacket setGroupAcceptNotices = | 8551 | SetGroupAcceptNoticesPacket setGroupAcceptNotices = |
7876 | (SetGroupAcceptNoticesPacket)Pack; | 8552 | (SetGroupAcceptNoticesPacket)Pack; |
7877 | 8553 | ||
8554 | #region Packet Session and User Check | ||
8555 | if (m_checkPackets) | ||
8556 | { | ||
8557 | if (setGroupAcceptNotices.AgentData.SessionID != SessionId || | ||
8558 | setGroupAcceptNotices.AgentData.AgentID != AgentId) | ||
8559 | break; | ||
8560 | } | ||
8561 | #endregion | ||
8562 | |||
7878 | if (m_GroupsModule != null) | 8563 | if (m_GroupsModule != null) |
7879 | { | 8564 | { |
7880 | m_GroupsModule.SetGroupAcceptNotices(this, | 8565 | m_GroupsModule.SetGroupAcceptNotices(this, |
@@ -7889,6 +8574,15 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
7889 | GroupTitleUpdatePacket groupTitleUpdate = | 8574 | GroupTitleUpdatePacket groupTitleUpdate = |
7890 | (GroupTitleUpdatePacket)Pack; | 8575 | (GroupTitleUpdatePacket)Pack; |
7891 | 8576 | ||
8577 | #region Packet Session and User Check | ||
8578 | if (m_checkPackets) | ||
8579 | { | ||
8580 | if (groupTitleUpdate.AgentData.SessionID != SessionId || | ||
8581 | groupTitleUpdate.AgentData.AgentID != AgentId) | ||
8582 | break; | ||
8583 | } | ||
8584 | #endregion | ||
8585 | |||
7892 | if (m_GroupsModule != null) | 8586 | if (m_GroupsModule != null) |
7893 | { | 8587 | { |
7894 | m_GroupsModule.GroupTitleUpdate(this, | 8588 | m_GroupsModule.GroupTitleUpdate(this, |
@@ -7901,6 +8595,15 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
7901 | GroupNoticesListRequestPacket groupNoticesListRequest = | 8595 | GroupNoticesListRequestPacket groupNoticesListRequest = |
7902 | (GroupNoticesListRequestPacket)Pack; | 8596 | (GroupNoticesListRequestPacket)Pack; |
7903 | 8597 | ||
8598 | #region Packet Session and User Check | ||
8599 | if (m_checkPackets) | ||
8600 | { | ||
8601 | if (groupNoticesListRequest.AgentData.SessionID != SessionId || | ||
8602 | groupNoticesListRequest.AgentData.AgentID != AgentId) | ||
8603 | break; | ||
8604 | } | ||
8605 | #endregion | ||
8606 | |||
7904 | if (m_GroupsModule != null) | 8607 | if (m_GroupsModule != null) |
7905 | { | 8608 | { |
7906 | GroupNoticeData[] gn = | 8609 | GroupNoticeData[] gn = |
@@ -7942,6 +8645,15 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
7942 | GroupNoticeRequestPacket groupNoticeRequest = | 8645 | GroupNoticeRequestPacket groupNoticeRequest = |
7943 | (GroupNoticeRequestPacket)Pack; | 8646 | (GroupNoticeRequestPacket)Pack; |
7944 | 8647 | ||
8648 | #region Packet Session and User Check | ||
8649 | if (m_checkPackets) | ||
8650 | { | ||
8651 | if (groupNoticeRequest.AgentData.SessionID != SessionId || | ||
8652 | groupNoticeRequest.AgentData.AgentID != AgentId) | ||
8653 | break; | ||
8654 | } | ||
8655 | #endregion | ||
8656 | |||
7945 | if (m_GroupsModule != null) | 8657 | if (m_GroupsModule != null) |
7946 | { | 8658 | { |
7947 | m_GroupsModule.GroupNoticeRequest(this, | 8659 | m_GroupsModule.GroupNoticeRequest(this, |
@@ -7953,6 +8665,15 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
7953 | GroupRoleUpdatePacket groupRoleUpdate = | 8665 | GroupRoleUpdatePacket groupRoleUpdate = |
7954 | (GroupRoleUpdatePacket)Pack; | 8666 | (GroupRoleUpdatePacket)Pack; |
7955 | 8667 | ||
8668 | #region Packet Session and User Check | ||
8669 | if (m_checkPackets) | ||
8670 | { | ||
8671 | if (groupRoleUpdate.AgentData.SessionID != SessionId || | ||
8672 | groupRoleUpdate.AgentData.AgentID != AgentId) | ||
8673 | break; | ||
8674 | } | ||
8675 | #endregion | ||
8676 | |||
7956 | if (m_GroupsModule != null) | 8677 | if (m_GroupsModule != null) |
7957 | { | 8678 | { |
7958 | foreach (GroupRoleUpdatePacket.RoleDataBlock d in | 8679 | foreach (GroupRoleUpdatePacket.RoleDataBlock d in |
@@ -7974,6 +8695,15 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
7974 | GroupRoleChangesPacket groupRoleChanges = | 8695 | GroupRoleChangesPacket groupRoleChanges = |
7975 | (GroupRoleChangesPacket)Pack; | 8696 | (GroupRoleChangesPacket)Pack; |
7976 | 8697 | ||
8698 | #region Packet Session and User Check | ||
8699 | if (m_checkPackets) | ||
8700 | { | ||
8701 | if (groupRoleChanges.AgentData.SessionID != SessionId || | ||
8702 | groupRoleChanges.AgentData.AgentID != AgentId) | ||
8703 | break; | ||
8704 | } | ||
8705 | #endregion | ||
8706 | |||
7977 | if (m_GroupsModule != null) | 8707 | if (m_GroupsModule != null) |
7978 | { | 8708 | { |
7979 | foreach (GroupRoleChangesPacket.RoleChangeBlock d in | 8709 | foreach (GroupRoleChangesPacket.RoleChangeBlock d in |
@@ -7992,6 +8722,15 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
7992 | JoinGroupRequestPacket joinGroupRequest = | 8722 | JoinGroupRequestPacket joinGroupRequest = |
7993 | (JoinGroupRequestPacket)Pack; | 8723 | (JoinGroupRequestPacket)Pack; |
7994 | 8724 | ||
8725 | #region Packet Session and User Check | ||
8726 | if (m_checkPackets) | ||
8727 | { | ||
8728 | if (joinGroupRequest.AgentData.SessionID != SessionId || | ||
8729 | joinGroupRequest.AgentData.AgentID != AgentId) | ||
8730 | break; | ||
8731 | } | ||
8732 | #endregion | ||
8733 | |||
7995 | if (m_GroupsModule != null) | 8734 | if (m_GroupsModule != null) |
7996 | { | 8735 | { |
7997 | m_GroupsModule.JoinGroupRequest(this, | 8736 | m_GroupsModule.JoinGroupRequest(this, |
@@ -8003,6 +8742,15 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
8003 | LeaveGroupRequestPacket leaveGroupRequest = | 8742 | LeaveGroupRequestPacket leaveGroupRequest = |
8004 | (LeaveGroupRequestPacket)Pack; | 8743 | (LeaveGroupRequestPacket)Pack; |
8005 | 8744 | ||
8745 | #region Packet Session and User Check | ||
8746 | if (m_checkPackets) | ||
8747 | { | ||
8748 | if (leaveGroupRequest.AgentData.SessionID != SessionId || | ||
8749 | leaveGroupRequest.AgentData.AgentID != AgentId) | ||
8750 | break; | ||
8751 | } | ||
8752 | #endregion | ||
8753 | |||
8006 | if (m_GroupsModule != null) | 8754 | if (m_GroupsModule != null) |
8007 | { | 8755 | { |
8008 | m_GroupsModule.LeaveGroupRequest(this, | 8756 | m_GroupsModule.LeaveGroupRequest(this, |
@@ -8014,6 +8762,15 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
8014 | EjectGroupMemberRequestPacket ejectGroupMemberRequest = | 8762 | EjectGroupMemberRequestPacket ejectGroupMemberRequest = |
8015 | (EjectGroupMemberRequestPacket)Pack; | 8763 | (EjectGroupMemberRequestPacket)Pack; |
8016 | 8764 | ||
8765 | #region Packet Session and User Check | ||
8766 | if (m_checkPackets) | ||
8767 | { | ||
8768 | if (ejectGroupMemberRequest.AgentData.SessionID != SessionId || | ||
8769 | ejectGroupMemberRequest.AgentData.AgentID != AgentId) | ||
8770 | break; | ||
8771 | } | ||
8772 | #endregion | ||
8773 | |||
8017 | if (m_GroupsModule != null) | 8774 | if (m_GroupsModule != null) |
8018 | { | 8775 | { |
8019 | foreach (EjectGroupMemberRequestPacket.EjectDataBlock e | 8776 | foreach (EjectGroupMemberRequestPacket.EjectDataBlock e |
@@ -8030,6 +8787,15 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
8030 | InviteGroupRequestPacket inviteGroupRequest = | 8787 | InviteGroupRequestPacket inviteGroupRequest = |
8031 | (InviteGroupRequestPacket)Pack; | 8788 | (InviteGroupRequestPacket)Pack; |
8032 | 8789 | ||
8790 | #region Packet Session and User Check | ||
8791 | if (m_checkPackets) | ||
8792 | { | ||
8793 | if (inviteGroupRequest.AgentData.SessionID != SessionId || | ||
8794 | inviteGroupRequest.AgentData.AgentID != AgentId) | ||
8795 | break; | ||
8796 | } | ||
8797 | #endregion | ||
8798 | |||
8033 | if (m_GroupsModule != null) | 8799 | if (m_GroupsModule != null) |
8034 | { | 8800 | { |
8035 | foreach (InviteGroupRequestPacket.InviteDataBlock b in | 8801 | foreach (InviteGroupRequestPacket.InviteDataBlock b in |
@@ -8042,8 +8808,20 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
8042 | } | 8808 | } |
8043 | } | 8809 | } |
8044 | break; | 8810 | break; |
8811 | |||
8812 | #endregion | ||
8045 | case PacketType.StartLure: | 8813 | case PacketType.StartLure: |
8046 | StartLurePacket startLureRequest = (StartLurePacket)Pack; | 8814 | StartLurePacket startLureRequest = (StartLurePacket)Pack; |
8815 | |||
8816 | #region Packet Session and User Check | ||
8817 | if (m_checkPackets) | ||
8818 | { | ||
8819 | if (startLureRequest.AgentData.SessionID != SessionId || | ||
8820 | startLureRequest.AgentData.AgentID != AgentId) | ||
8821 | break; | ||
8822 | } | ||
8823 | #endregion | ||
8824 | |||
8047 | handlerStartLure = OnStartLure; | 8825 | handlerStartLure = OnStartLure; |
8048 | if (handlerStartLure != null) | 8826 | if (handlerStartLure != null) |
8049 | handlerStartLure(startLureRequest.Info.LureType, | 8827 | handlerStartLure(startLureRequest.Info.LureType, |
@@ -8057,6 +8835,15 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
8057 | TeleportLureRequestPacket teleportLureRequest = | 8835 | TeleportLureRequestPacket teleportLureRequest = |
8058 | (TeleportLureRequestPacket)Pack; | 8836 | (TeleportLureRequestPacket)Pack; |
8059 | 8837 | ||
8838 | #region Packet Session and User Check | ||
8839 | if (m_checkPackets) | ||
8840 | { | ||
8841 | if (teleportLureRequest.Info.SessionID != SessionId || | ||
8842 | teleportLureRequest.Info.AgentID != AgentId) | ||
8843 | break; | ||
8844 | } | ||
8845 | #endregion | ||
8846 | |||
8060 | handlerTeleportLureRequest = OnTeleportLureRequest; | 8847 | handlerTeleportLureRequest = OnTeleportLureRequest; |
8061 | if (handlerTeleportLureRequest != null) | 8848 | if (handlerTeleportLureRequest != null) |
8062 | handlerTeleportLureRequest( | 8849 | handlerTeleportLureRequest( |
@@ -8069,6 +8856,15 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
8069 | ClassifiedInfoRequestPacket classifiedInfoRequest = | 8856 | ClassifiedInfoRequestPacket classifiedInfoRequest = |
8070 | (ClassifiedInfoRequestPacket)Pack; | 8857 | (ClassifiedInfoRequestPacket)Pack; |
8071 | 8858 | ||
8859 | #region Packet Session and User Check | ||
8860 | if (m_checkPackets) | ||
8861 | { | ||
8862 | if (classifiedInfoRequest.AgentData.SessionID != SessionId || | ||
8863 | classifiedInfoRequest.AgentData.AgentID != AgentId) | ||
8864 | break; | ||
8865 | } | ||
8866 | #endregion | ||
8867 | |||
8072 | handlerClassifiedInfoRequest = OnClassifiedInfoRequest; | 8868 | handlerClassifiedInfoRequest = OnClassifiedInfoRequest; |
8073 | if (handlerClassifiedInfoRequest != null) | 8869 | if (handlerClassifiedInfoRequest != null) |
8074 | handlerClassifiedInfoRequest( | 8870 | handlerClassifiedInfoRequest( |
@@ -8080,6 +8876,15 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
8080 | ClassifiedInfoUpdatePacket classifiedInfoUpdate = | 8876 | ClassifiedInfoUpdatePacket classifiedInfoUpdate = |
8081 | (ClassifiedInfoUpdatePacket)Pack; | 8877 | (ClassifiedInfoUpdatePacket)Pack; |
8082 | 8878 | ||
8879 | #region Packet Session and User Check | ||
8880 | if (m_checkPackets) | ||
8881 | { | ||
8882 | if (classifiedInfoUpdate.AgentData.SessionID != SessionId || | ||
8883 | classifiedInfoUpdate.AgentData.AgentID != AgentId) | ||
8884 | break; | ||
8885 | } | ||
8886 | #endregion | ||
8887 | |||
8083 | handlerClassifiedInfoUpdate = OnClassifiedInfoUpdate; | 8888 | handlerClassifiedInfoUpdate = OnClassifiedInfoUpdate; |
8084 | if (handlerClassifiedInfoUpdate != null) | 8889 | if (handlerClassifiedInfoUpdate != null) |
8085 | handlerClassifiedInfoUpdate( | 8890 | handlerClassifiedInfoUpdate( |
@@ -8103,6 +8908,15 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
8103 | ClassifiedDeletePacket classifiedDelete = | 8908 | ClassifiedDeletePacket classifiedDelete = |
8104 | (ClassifiedDeletePacket)Pack; | 8909 | (ClassifiedDeletePacket)Pack; |
8105 | 8910 | ||
8911 | #region Packet Session and User Check | ||
8912 | if (m_checkPackets) | ||
8913 | { | ||
8914 | if (classifiedDelete.AgentData.SessionID != SessionId || | ||
8915 | classifiedDelete.AgentData.AgentID != AgentId) | ||
8916 | break; | ||
8917 | } | ||
8918 | #endregion | ||
8919 | |||
8106 | handlerClassifiedDelete = OnClassifiedDelete; | 8920 | handlerClassifiedDelete = OnClassifiedDelete; |
8107 | if (handlerClassifiedDelete != null) | 8921 | if (handlerClassifiedDelete != null) |
8108 | handlerClassifiedDelete( | 8922 | handlerClassifiedDelete( |
@@ -8114,6 +8928,15 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
8114 | ClassifiedGodDeletePacket classifiedGodDelete = | 8928 | ClassifiedGodDeletePacket classifiedGodDelete = |
8115 | (ClassifiedGodDeletePacket)Pack; | 8929 | (ClassifiedGodDeletePacket)Pack; |
8116 | 8930 | ||
8931 | #region Packet Session and User Check | ||
8932 | if (m_checkPackets) | ||
8933 | { | ||
8934 | if (classifiedGodDelete.AgentData.SessionID != SessionId || | ||
8935 | classifiedGodDelete.AgentData.AgentID != AgentId) | ||
8936 | break; | ||
8937 | } | ||
8938 | #endregion | ||
8939 | |||
8117 | handlerClassifiedGodDelete = OnClassifiedGodDelete; | 8940 | handlerClassifiedGodDelete = OnClassifiedGodDelete; |
8118 | if (handlerClassifiedGodDelete != null) | 8941 | if (handlerClassifiedGodDelete != null) |
8119 | handlerClassifiedGodDelete( | 8942 | handlerClassifiedGodDelete( |
@@ -8125,6 +8948,15 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
8125 | EventGodDeletePacket eventGodDelete = | 8948 | EventGodDeletePacket eventGodDelete = |
8126 | (EventGodDeletePacket)Pack; | 8949 | (EventGodDeletePacket)Pack; |
8127 | 8950 | ||
8951 | #region Packet Session and User Check | ||
8952 | if (m_checkPackets) | ||
8953 | { | ||
8954 | if (eventGodDelete.AgentData.SessionID != SessionId || | ||
8955 | eventGodDelete.AgentData.AgentID != AgentId) | ||
8956 | break; | ||
8957 | } | ||
8958 | #endregion | ||
8959 | |||
8128 | handlerEventGodDelete = OnEventGodDelete; | 8960 | handlerEventGodDelete = OnEventGodDelete; |
8129 | if (handlerEventGodDelete != null) | 8961 | if (handlerEventGodDelete != null) |
8130 | handlerEventGodDelete( | 8962 | handlerEventGodDelete( |
@@ -8141,6 +8973,15 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
8141 | EventNotificationAddRequestPacket eventNotificationAdd = | 8973 | EventNotificationAddRequestPacket eventNotificationAdd = |
8142 | (EventNotificationAddRequestPacket)Pack; | 8974 | (EventNotificationAddRequestPacket)Pack; |
8143 | 8975 | ||
8976 | #region Packet Session and User Check | ||
8977 | if (m_checkPackets) | ||
8978 | { | ||
8979 | if (eventNotificationAdd.AgentData.SessionID != SessionId || | ||
8980 | eventNotificationAdd.AgentData.AgentID != AgentId) | ||
8981 | break; | ||
8982 | } | ||
8983 | #endregion | ||
8984 | |||
8144 | handlerEventNotificationAddRequest = OnEventNotificationAddRequest; | 8985 | handlerEventNotificationAddRequest = OnEventNotificationAddRequest; |
8145 | if (handlerEventNotificationAddRequest != null) | 8986 | if (handlerEventNotificationAddRequest != null) |
8146 | handlerEventNotificationAddRequest( | 8987 | handlerEventNotificationAddRequest( |
@@ -8151,6 +8992,15 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
8151 | EventNotificationRemoveRequestPacket eventNotificationRemove = | 8992 | EventNotificationRemoveRequestPacket eventNotificationRemove = |
8152 | (EventNotificationRemoveRequestPacket)Pack; | 8993 | (EventNotificationRemoveRequestPacket)Pack; |
8153 | 8994 | ||
8995 | #region Packet Session and User Check | ||
8996 | if (m_checkPackets) | ||
8997 | { | ||
8998 | if (eventNotificationRemove.AgentData.SessionID != SessionId || | ||
8999 | eventNotificationRemove.AgentData.AgentID != AgentId) | ||
9000 | break; | ||
9001 | } | ||
9002 | #endregion | ||
9003 | |||
8154 | handlerEventNotificationRemoveRequest = OnEventNotificationRemoveRequest; | 9004 | handlerEventNotificationRemoveRequest = OnEventNotificationRemoveRequest; |
8155 | if (handlerEventNotificationRemoveRequest != null) | 9005 | if (handlerEventNotificationRemoveRequest != null) |
8156 | handlerEventNotificationRemoveRequest( | 9006 | handlerEventNotificationRemoveRequest( |
@@ -8158,6 +9008,17 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
8158 | break; | 9008 | break; |
8159 | 9009 | ||
8160 | case PacketType.RetrieveInstantMessages: | 9010 | case PacketType.RetrieveInstantMessages: |
9011 | RetrieveInstantMessagesPacket rimpInstantMessagePack = (RetrieveInstantMessagesPacket)Pack; | ||
9012 | |||
9013 | #region Packet Session and User Check | ||
9014 | if (m_checkPackets) | ||
9015 | { | ||
9016 | if (rimpInstantMessagePack.AgentData.SessionID != SessionId || | ||
9017 | rimpInstantMessagePack.AgentData.AgentID != AgentId) | ||
9018 | break; | ||
9019 | } | ||
9020 | #endregion | ||
9021 | |||
8161 | handlerRetrieveInstantMessages = OnRetrieveInstantMessages; | 9022 | handlerRetrieveInstantMessages = OnRetrieveInstantMessages; |
8162 | if (handlerRetrieveInstantMessages != null) | 9023 | if (handlerRetrieveInstantMessages != null) |
8163 | handlerRetrieveInstantMessages(this); | 9024 | handlerRetrieveInstantMessages(this); |
@@ -8167,6 +9028,15 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
8167 | PickDeletePacket pickDelete = | 9028 | PickDeletePacket pickDelete = |
8168 | (PickDeletePacket)Pack; | 9029 | (PickDeletePacket)Pack; |
8169 | 9030 | ||
9031 | #region Packet Session and User Check | ||
9032 | if (m_checkPackets) | ||
9033 | { | ||
9034 | if (pickDelete.AgentData.SessionID != SessionId || | ||
9035 | pickDelete.AgentData.AgentID != AgentId) | ||
9036 | break; | ||
9037 | } | ||
9038 | #endregion | ||
9039 | |||
8170 | handlerPickDelete = OnPickDelete; | 9040 | handlerPickDelete = OnPickDelete; |
8171 | if (handlerPickDelete != null) | 9041 | if (handlerPickDelete != null) |
8172 | handlerPickDelete(this, pickDelete.Data.PickID); | 9042 | handlerPickDelete(this, pickDelete.Data.PickID); |
@@ -8175,6 +9045,15 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
8175 | PickGodDeletePacket pickGodDelete = | 9045 | PickGodDeletePacket pickGodDelete = |
8176 | (PickGodDeletePacket)Pack; | 9046 | (PickGodDeletePacket)Pack; |
8177 | 9047 | ||
9048 | #region Packet Session and User Check | ||
9049 | if (m_checkPackets) | ||
9050 | { | ||
9051 | if (pickGodDelete.AgentData.SessionID != SessionId || | ||
9052 | pickGodDelete.AgentData.AgentID != AgentId) | ||
9053 | break; | ||
9054 | } | ||
9055 | #endregion | ||
9056 | |||
8178 | handlerPickGodDelete = OnPickGodDelete; | 9057 | handlerPickGodDelete = OnPickGodDelete; |
8179 | if (handlerPickGodDelete != null) | 9058 | if (handlerPickGodDelete != null) |
8180 | handlerPickGodDelete(this, | 9059 | handlerPickGodDelete(this, |
@@ -8186,6 +9065,15 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
8186 | PickInfoUpdatePacket pickInfoUpdate = | 9065 | PickInfoUpdatePacket pickInfoUpdate = |
8187 | (PickInfoUpdatePacket)Pack; | 9066 | (PickInfoUpdatePacket)Pack; |
8188 | 9067 | ||
9068 | #region Packet Session and User Check | ||
9069 | if (m_checkPackets) | ||
9070 | { | ||
9071 | if (pickInfoUpdate.AgentData.SessionID != SessionId || | ||
9072 | pickInfoUpdate.AgentData.AgentID != AgentId) | ||
9073 | break; | ||
9074 | } | ||
9075 | #endregion | ||
9076 | |||
8189 | handlerPickInfoUpdate = OnPickInfoUpdate; | 9077 | handlerPickInfoUpdate = OnPickInfoUpdate; |
8190 | if (handlerPickInfoUpdate != null) | 9078 | if (handlerPickInfoUpdate != null) |
8191 | handlerPickInfoUpdate(this, | 9079 | handlerPickInfoUpdate(this, |
@@ -8202,6 +9090,15 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
8202 | AvatarNotesUpdatePacket avatarNotesUpdate = | 9090 | AvatarNotesUpdatePacket avatarNotesUpdate = |
8203 | (AvatarNotesUpdatePacket)Pack; | 9091 | (AvatarNotesUpdatePacket)Pack; |
8204 | 9092 | ||
9093 | #region Packet Session and User Check | ||
9094 | if (m_checkPackets) | ||
9095 | { | ||
9096 | if (avatarNotesUpdate.AgentData.SessionID != SessionId || | ||
9097 | avatarNotesUpdate.AgentData.AgentID != AgentId) | ||
9098 | break; | ||
9099 | } | ||
9100 | #endregion | ||
9101 | |||
8205 | handlerAvatarNotesUpdate = OnAvatarNotesUpdate; | 9102 | handlerAvatarNotesUpdate = OnAvatarNotesUpdate; |
8206 | if (handlerAvatarNotesUpdate != null) | 9103 | if (handlerAvatarNotesUpdate != null) |
8207 | handlerAvatarNotesUpdate(this, | 9104 | handlerAvatarNotesUpdate(this, |