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

Switched TransferRequest (UDP packet handler) to sync. The permissions checks may block, so they get a FireAndForget. Everything else is non-blocking.

cpu-performance
Diva Canto 2013-07-11 09:44:48 -07:00
parent 9173130fde
commit 3b48b6a792
1 changed files with 126 additions and 110 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

86
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
View File

@ -5374,7 +5374,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
AddLocalPacketHandler(PacketType.ObjectClickAction, HandleObjectClickAction, false);
AddLocalPacketHandler(PacketType.ObjectMaterial, HandleObjectMaterial, false);
AddLocalPacketHandler(PacketType.RequestImage, HandleRequestImage, false);
AddLocalPacketHandler(PacketType.TransferRequest, HandleTransferRequest);
AddLocalPacketHandler(PacketType.TransferRequest, HandleTransferRequest, false);
AddLocalPacketHandler(PacketType.AssetUploadRequest, HandleAssetUploadRequest);
AddLocalPacketHandler(PacketType.RequestXfer, HandleRequestXfer);
AddLocalPacketHandler(PacketType.SendXferPacket, HandleSendXferPacket);
@ -7751,23 +7751,47 @@ namespace OpenSim.Region.ClientStack.LindenUDP
//m_log.Debug("ClientView.ProcessPackets.cs:ProcessInPacket() - Got transfer request");
TransferRequestPacket transfer = (TransferRequestPacket)Pack;
UUID taskID = UUID.Zero;
if (transfer.TransferInfo.SourceType == (int)SourceType.SimInventoryItem)
{
if (!(((Scene)m_scene).Permissions.BypassPermissions()))
{
// We're spawning a thread because the permissions check can block this thread
Util.FireAndForget(delegate
{
// This requests the asset if needed
HandleSimInventoryTransferRequestWithPermsCheck(sender, transfer);
});
return true;
}
}
else if (transfer.TransferInfo.SourceType == (int)SourceType.SimEstate)
{
//TransferRequestPacket does not include covenant uuid?
//get scene covenant uuid
taskID = m_scene.RegionInfo.RegionSettings.Covenant;
}
// This is non-blocking
MakeAssetRequest(transfer, taskID);
return true;
}
private void HandleSimInventoryTransferRequestWithPermsCheck(IClientAPI sender, TransferRequestPacket transfer)
{
UUID taskID = new UUID(transfer.TransferInfo.Params, 48);
UUID itemID = new UUID(transfer.TransferInfo.Params, 64);
UUID requestID = new UUID(transfer.TransferInfo.Params, 80);
//m_log.DebugFormat(
// "[CLIENT]: Got request for asset {0} from item {1} in prim {2} by {3}",
// requestID, itemID, taskID, Name);
//m_log.Debug("Transfer Request: " + transfer.ToString());
// Validate inventory transfers
// Has to be done here, because AssetCache can't do it
//
UUID taskID = UUID.Zero;
if (transfer.TransferInfo.SourceType == (int)SourceType.SimInventoryItem)
{
taskID = new UUID(transfer.TransferInfo.Params, 48);
UUID itemID = new UUID(transfer.TransferInfo.Params, 64);
UUID requestID = new UUID(transfer.TransferInfo.Params, 80);
// m_log.DebugFormat(
// "[CLIENT]: Got request for asset {0} from item {1} in prim {2} by {3}",
// requestID, itemID, taskID, Name);
if (!(((Scene)m_scene).Permissions.BypassPermissions()))
{
if (taskID != UUID.Zero) // Prim
{
SceneObjectPart part = ((Scene)m_scene).GetSceneObjectPart(taskID);
@ -7777,7 +7801,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
m_log.WarnFormat(
"[CLIENT]: {0} requested asset {1} from item {2} in prim {3} but prim does not exist",
Name, requestID, itemID, taskID);
return true;
return;
}
TaskInventoryItem tii = part.Inventory.GetInventoryItem(itemID);
@ -7786,18 +7810,18 @@ namespace OpenSim.Region.ClientStack.LindenUDP
m_log.WarnFormat(
"[CLIENT]: {0} requested asset {1} from item {2} in prim {3} but item does not exist",
Name, requestID, itemID, taskID);
return true;
return;
}
if (tii.Type == (int)AssetType.LSLText)
{
if (!((Scene)m_scene).Permissions.CanEditScript(itemID, taskID, AgentId))
return true;
return;
}
else if (tii.Type == (int)AssetType.Notecard)
{
if (!((Scene)m_scene).Permissions.CanEditNotecard(itemID, taskID, AgentId))
return true;
return;
}
else
{
@ -7808,7 +7832,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
m_log.WarnFormat(
"[CLIENT]: {0} requested asset {1} from item {2} in prim {3} but the prim is owned by {4}",
Name, requestID, itemID, taskID, part.OwnerID);
return true;
return;
}
if ((part.OwnerMask & (uint)PermissionMask.Modify) == 0)
@ -7816,7 +7840,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
m_log.WarnFormat(
"[CLIENT]: {0} requested asset {1} from item {2} in prim {3} but modify permissions are not set",
Name, requestID, itemID, taskID);
return true;
return;
}
if (tii.OwnerID != AgentId)
@ -7824,7 +7848,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
m_log.WarnFormat(
"[CLIENT]: {0} requested asset {1} from item {2} in prim {3} but the item is owned by {4}",
Name, requestID, itemID, taskID, tii.OwnerID);
return true;
return;
}
if ((
@ -7834,7 +7858,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
m_log.WarnFormat(
"[CLIENT]: {0} requested asset {1} from item {2} in prim {3} but item permissions are not modify/copy/transfer",
Name, requestID, itemID, taskID);
return true;
return;
}
if (tii.AssetID != requestID)
@ -7842,7 +7866,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
m_log.WarnFormat(
"[CLIENT]: {0} requested asset {1} from item {2} in prim {3} but this does not match item's asset {4}",
Name, requestID, itemID, taskID, tii.AssetID);
return true;
return;
}
}
}
@ -7852,28 +7876,20 @@ namespace OpenSim.Region.ClientStack.LindenUDP
if (invAccess != null)
{
if (!invAccess.CanGetAgentInventoryItem(this, itemID, requestID))
return false;
return;
}
else
{
return false;
return;
}
}
}
}
else
if (transfer.TransferInfo.SourceType == (int)SourceType.SimEstate)
{
//TransferRequestPacket does not include covenant uuid?
//get scene covenant uuid
taskID = m_scene.RegionInfo.RegionSettings.Covenant;
}
// Permissions out of the way, let's request the asset
MakeAssetRequest(transfer, taskID);
return true;
}
private bool HandleAssetUploadRequest(IClientAPI sender, Packet Pack)
{
AssetUploadRequestPacket request = (AssetUploadRequestPacket)Pack;