diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs | 285 |
1 files changed, 6 insertions, 279 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs b/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs index 7945d5e..2f1b9aa 100644 --- a/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs +++ b/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs | |||
@@ -81,7 +81,6 @@ namespace OpenSim.Region.ClientStack.Linden | |||
81 | private IAssetService m_assetService; | 81 | private IAssetService m_assetService; |
82 | private bool m_dumpAssetsToFile; | 82 | private bool m_dumpAssetsToFile; |
83 | private string m_regionName; | 83 | private string m_regionName; |
84 | private object m_fetchLock = new Object(); | ||
85 | 84 | ||
86 | public BunchOfCaps(Scene scene, Caps caps) | 85 | public BunchOfCaps(Scene scene, Caps caps) |
87 | { | 86 | { |
@@ -211,8 +210,12 @@ namespace OpenSim.Region.ClientStack.Linden | |||
211 | return string.Empty; | 210 | return string.Empty; |
212 | } | 211 | } |
213 | 212 | ||
214 | // WARNING: Add the external too | 213 | Hashtable caps = m_HostCapsObj.CapsHandlers.CapsDetails; |
215 | string result = LLSDHelpers.SerialiseLLSDReply(m_HostCapsObj.CapsHandlers.CapsDetails); | 214 | // Add the external too |
215 | foreach (KeyValuePair<string, string> kvp in m_HostCapsObj.ExternalCapsHandlers) | ||
216 | caps[kvp.Key] = kvp.Value; | ||
217 | |||
218 | string result = LLSDHelpers.SerialiseLLSDReply(caps); | ||
216 | 219 | ||
217 | //m_log.DebugFormat("[CAPS] CapsRequest {0}", result); | 220 | //m_log.DebugFormat("[CAPS] CapsRequest {0}", result); |
218 | 221 | ||
@@ -505,283 +508,7 @@ namespace OpenSim.Region.ClientStack.Linden | |||
505 | } | 508 | } |
506 | } | 509 | } |
507 | 510 | ||
508 | /// <summary> | ||
509 | /// Processes a fetch inventory request and sends the reply | ||
510 | |||
511 | /// </summary> | ||
512 | /// <param name="request"></param> | ||
513 | /// <param name="path"></param> | ||
514 | /// <param name="param"></param> | ||
515 | /// <returns></returns> | ||
516 | // Request is like: | ||
517 | //<llsd> | ||
518 | // <map><key>folders</key> | ||
519 | // <array> | ||
520 | // <map> | ||
521 | // <key>fetch-folders</key><boolean>1</boolean><key>fetch-items</key><boolean>1</boolean><key>folder-id</key><uuid>8e1e3a30-b9bf-11dc-95ff-0800200c9a66</uuid><key>owner-id</key><uuid>11111111-1111-0000-0000-000100bba000</uuid><key>sort-order</key><integer>1</integer> | ||
522 | // </map> | ||
523 | // </array> | ||
524 | // </map> | ||
525 | //</llsd> | ||
526 | // | ||
527 | // multiple fetch-folder maps are allowed within the larger folders map. | ||
528 | public string FetchInventoryRequest(string request, string path, string param) | ||
529 | { | ||
530 | // string unmodifiedRequest = request.ToString(); | ||
531 | |||
532 | //m_log.DebugFormat("[AGENT INVENTORY]: Received CAPS fetch inventory request {0}", unmodifiedRequest); | ||
533 | m_log.Debug("[CAPS]: Inventory Request in region: " + m_regionName); | ||
534 | |||
535 | Hashtable hash = new Hashtable(); | ||
536 | try | ||
537 | { | ||
538 | hash = (Hashtable)LLSD.LLSDDeserialize(Utils.StringToBytes(request)); | ||
539 | } | ||
540 | catch (LLSD.LLSDParseException pe) | ||
541 | { | ||
542 | m_log.Error("[AGENT INVENTORY]: Fetch error: " + pe.Message); | ||
543 | m_log.Error("Request: " + request.ToString()); | ||
544 | } | ||
545 | |||
546 | ArrayList foldersrequested = (ArrayList)hash["folders"]; | ||
547 | |||
548 | string response = ""; | ||
549 | |||
550 | for (int i = 0; i < foldersrequested.Count; i++) | ||
551 | { | ||
552 | string inventoryitemstr = ""; | ||
553 | Hashtable inventoryhash = (Hashtable)foldersrequested[i]; | ||
554 | |||
555 | LLSDFetchInventoryDescendents llsdRequest = new LLSDFetchInventoryDescendents(); | ||
556 | LLSDHelpers.DeserialiseOSDMap(inventoryhash, llsdRequest); | ||
557 | LLSDInventoryDescendents reply = FetchInventoryReply(llsdRequest); | ||
558 | |||
559 | inventoryitemstr = LLSDHelpers.SerialiseLLSDReply(reply); | ||
560 | inventoryitemstr = inventoryitemstr.Replace("<llsd><map><key>folders</key><array>", ""); | ||
561 | inventoryitemstr = inventoryitemstr.Replace("</array></map></llsd>", ""); | ||
562 | |||
563 | response += inventoryitemstr; | ||
564 | } | ||
565 | |||
566 | if (response.Length == 0) | ||
567 | { | ||
568 | // Ter-guess: If requests fail a lot, the client seems to stop requesting descendants. | ||
569 | // Therefore, I'm concluding that the client only has so many threads available to do requests | ||
570 | // and when a thread stalls.. is stays stalled. | ||
571 | // Therefore we need to return something valid | ||
572 | response = "<llsd><map><key>folders</key><array /></map></llsd>"; | ||
573 | } | ||
574 | else | ||
575 | { | ||
576 | response = "<llsd><map><key>folders</key><array>" + response + "</array></map></llsd>"; | ||
577 | } | ||
578 | |||
579 | //m_log.DebugFormat("[AGENT INVENTORY]: Replying to CAPS fetch inventory request with following xml"); | ||
580 | //m_log.Debug(Util.GetFormattedXml(response)); | ||
581 | |||
582 | return response; | ||
583 | } | ||
584 | |||
585 | public string FetchInventoryDescendentsRequest(string request, string path, string param, OSHttpRequest httpRequest, OSHttpResponse httpResponse) | ||
586 | { | ||
587 | // nasty temporary hack here, the linden client falsely | ||
588 | // identifies the uuid 00000000-0000-0000-0000-000000000000 | ||
589 | // as a string which breaks us | ||
590 | // | ||
591 | // correctly mark it as a uuid | ||
592 | // | ||
593 | request = request.Replace("<string>00000000-0000-0000-0000-000000000000</string>", "<uuid>00000000-0000-0000-0000-000000000000</uuid>"); | ||
594 | |||
595 | // another hack <integer>1</integer> results in a | ||
596 | // System.ArgumentException: Object type System.Int32 cannot | ||
597 | // be converted to target type: System.Boolean | ||
598 | // | ||
599 | request = request.Replace("<key>fetch_folders</key><integer>0</integer>", "<key>fetch_folders</key><boolean>0</boolean>"); | ||
600 | request = request.Replace("<key>fetch_folders</key><integer>1</integer>", "<key>fetch_folders</key><boolean>1</boolean>"); | ||
601 | |||
602 | Hashtable hash = new Hashtable(); | ||
603 | try | ||
604 | { | ||
605 | hash = (Hashtable)LLSD.LLSDDeserialize(Utils.StringToBytes(request)); | ||
606 | } | ||
607 | catch (LLSD.LLSDParseException pe) | ||
608 | { | ||
609 | m_log.Error("[AGENT INVENTORY]: Fetch error: " + pe.Message); | ||
610 | m_log.Error("Request: " + request.ToString()); | ||
611 | } | ||
612 | |||
613 | ArrayList foldersrequested = (ArrayList)hash["folders"]; | ||
614 | |||
615 | string response = ""; | ||
616 | lock (m_fetchLock) | ||
617 | { | ||
618 | for (int i = 0; i < foldersrequested.Count; i++) | ||
619 | { | ||
620 | string inventoryitemstr = ""; | ||
621 | Hashtable inventoryhash = (Hashtable)foldersrequested[i]; | ||
622 | |||
623 | LLSDFetchInventoryDescendents llsdRequest = new LLSDFetchInventoryDescendents(); | ||
624 | |||
625 | try | ||
626 | { | ||
627 | LLSDHelpers.DeserialiseOSDMap(inventoryhash, llsdRequest); | ||
628 | } | ||
629 | catch (Exception e) | ||
630 | { | ||
631 | m_log.Debug("[CAPS]: caught exception doing OSD deserialize" + e); | ||
632 | } | ||
633 | LLSDInventoryDescendents reply = FetchInventoryReply(llsdRequest); | ||
634 | |||
635 | inventoryitemstr = LLSDHelpers.SerialiseLLSDReply(reply); | ||
636 | inventoryitemstr = inventoryitemstr.Replace("<llsd><map><key>folders</key><array>", ""); | ||
637 | inventoryitemstr = inventoryitemstr.Replace("</array></map></llsd>", ""); | ||
638 | |||
639 | response += inventoryitemstr; | ||
640 | } | ||
641 | |||
642 | |||
643 | if (response.Length == 0) | ||
644 | { | ||
645 | // Ter-guess: If requests fail a lot, the client seems to stop requesting descendants. | ||
646 | // Therefore, I'm concluding that the client only has so many threads available to do requests | ||
647 | // and when a thread stalls.. is stays stalled. | ||
648 | // Therefore we need to return something valid | ||
649 | response = "<llsd><map><key>folders</key><array /></map></llsd>"; | ||
650 | } | ||
651 | else | ||
652 | { | ||
653 | response = "<llsd><map><key>folders</key><array>" + response + "</array></map></llsd>"; | ||
654 | } | ||
655 | |||
656 | //m_log.DebugFormat("[CAPS]: Replying to CAPS fetch inventory request with following xml"); | ||
657 | //m_log.Debug("[CAPS] "+response); | ||
658 | |||
659 | } | ||
660 | return response; | ||
661 | } | ||
662 | |||
663 | |||
664 | |||
665 | /// <summary> | ||
666 | /// Construct an LLSD reply packet to a CAPS inventory request | ||
667 | /// </summary> | ||
668 | /// <param name="invFetch"></param> | ||
669 | /// <returns></returns> | ||
670 | private LLSDInventoryDescendents FetchInventoryReply(LLSDFetchInventoryDescendents invFetch) | ||
671 | { | ||
672 | LLSDInventoryDescendents reply = new LLSDInventoryDescendents(); | ||
673 | LLSDInventoryFolderContents contents = new LLSDInventoryFolderContents(); | ||
674 | contents.agent_id = m_HostCapsObj.AgentID; | ||
675 | contents.owner_id = invFetch.owner_id; | ||
676 | contents.folder_id = invFetch.folder_id; | ||
677 | |||
678 | reply.folders.Array.Add(contents); | ||
679 | InventoryCollection inv = new InventoryCollection(); | ||
680 | inv.Folders = new List<InventoryFolderBase>(); | ||
681 | inv.Items = new List<InventoryItemBase>(); | ||
682 | int version = 0; | ||
683 | if (CAPSFetchInventoryDescendents != null) | ||
684 | { | ||
685 | inv = CAPSFetchInventoryDescendents(m_HostCapsObj.AgentID, invFetch.folder_id, invFetch.owner_id, invFetch.fetch_folders, invFetch.fetch_items, invFetch.sort_order, out version); | ||
686 | } | ||
687 | |||
688 | if (inv.Folders != null) | ||
689 | { | ||
690 | foreach (InventoryFolderBase invFolder in inv.Folders) | ||
691 | { | ||
692 | contents.categories.Array.Add(ConvertInventoryFolder(invFolder)); | ||
693 | } | ||
694 | } | ||
695 | |||
696 | if (inv.Items != null) | ||
697 | { | ||
698 | foreach (InventoryItemBase invItem in inv.Items) | ||
699 | { | ||
700 | contents.items.Array.Add(ConvertInventoryItem(invItem)); | ||
701 | } | ||
702 | } | ||
703 | |||
704 | contents.descendents = contents.items.Array.Count + contents.categories.Array.Count; | ||
705 | contents.version = version; | ||
706 | |||
707 | return reply; | ||
708 | } | ||
709 | |||
710 | /// <summary> | ||
711 | /// Convert an internal inventory folder object into an LLSD object. | ||
712 | /// </summary> | ||
713 | /// <param name="invFolder"></param> | ||
714 | /// <returns></returns> | ||
715 | private LLSDInventoryFolder ConvertInventoryFolder(InventoryFolderBase invFolder) | ||
716 | { | ||
717 | LLSDInventoryFolder llsdFolder = new LLSDInventoryFolder(); | ||
718 | llsdFolder.folder_id = invFolder.ID; | ||
719 | llsdFolder.parent_id = invFolder.ParentID; | ||
720 | llsdFolder.name = invFolder.Name; | ||
721 | if (invFolder.Type < 0 || invFolder.Type >= TaskInventoryItem.Types.Length) | ||
722 | llsdFolder.type = "-1"; | ||
723 | else | ||
724 | llsdFolder.type = TaskInventoryItem.Types[invFolder.Type]; | ||
725 | llsdFolder.preferred_type = "-1"; | ||
726 | |||
727 | return llsdFolder; | ||
728 | } | ||
729 | |||
730 | /// <summary> | ||
731 | /// Convert an internal inventory item object into an LLSD object. | ||
732 | /// </summary> | ||
733 | /// <param name="invItem"></param> | ||
734 | /// <returns></returns> | ||
735 | private LLSDInventoryItem ConvertInventoryItem(InventoryItemBase invItem) | ||
736 | { | ||
737 | LLSDInventoryItem llsdItem = new LLSDInventoryItem(); | ||
738 | llsdItem.asset_id = invItem.AssetID; | ||
739 | llsdItem.created_at = invItem.CreationDate; | ||
740 | llsdItem.desc = invItem.Description; | ||
741 | llsdItem.flags = (int)invItem.Flags; | ||
742 | llsdItem.item_id = invItem.ID; | ||
743 | llsdItem.name = invItem.Name; | ||
744 | llsdItem.parent_id = invItem.Folder; | ||
745 | try | ||
746 | { | ||
747 | // TODO reevaluate after upgrade to libomv >= r2566. Probably should use UtilsConversions. | ||
748 | llsdItem.type = TaskInventoryItem.Types[invItem.AssetType]; | ||
749 | llsdItem.inv_type = TaskInventoryItem.InvTypes[invItem.InvType]; | ||
750 | } | ||
751 | catch (Exception e) | ||
752 | { | ||
753 | m_log.Error("[CAPS]: Problem setting asset/inventory type while converting inventory item " + invItem.Name + " to LLSD:", e); | ||
754 | } | ||
755 | llsdItem.permissions = new LLSDPermissions(); | ||
756 | llsdItem.permissions.creator_id = invItem.CreatorIdAsUuid; | ||
757 | llsdItem.permissions.base_mask = (int)invItem.CurrentPermissions; | ||
758 | llsdItem.permissions.everyone_mask = (int)invItem.EveryOnePermissions; | ||
759 | llsdItem.permissions.group_id = invItem.GroupID; | ||
760 | llsdItem.permissions.group_mask = (int)invItem.GroupPermissions; | ||
761 | llsdItem.permissions.is_owner_group = invItem.GroupOwned; | ||
762 | llsdItem.permissions.next_owner_mask = (int)invItem.NextPermissions; | ||
763 | llsdItem.permissions.owner_id = m_HostCapsObj.AgentID; | ||
764 | llsdItem.permissions.owner_mask = (int)invItem.CurrentPermissions; | ||
765 | llsdItem.sale_info = new LLSDSaleInfo(); | ||
766 | llsdItem.sale_info.sale_price = invItem.SalePrice; | ||
767 | switch (invItem.SaleType) | ||
768 | { | ||
769 | default: | ||
770 | llsdItem.sale_info.sale_type = "not"; | ||
771 | break; | ||
772 | case 1: | ||
773 | llsdItem.sale_info.sale_type = "original"; | ||
774 | break; | ||
775 | case 2: | ||
776 | llsdItem.sale_info.sale_type = "copy"; | ||
777 | break; | ||
778 | case 3: | ||
779 | llsdItem.sale_info.sale_type = "contents"; | ||
780 | break; | ||
781 | } | ||
782 | 511 | ||
783 | return llsdItem; | ||
784 | } | ||
785 | 512 | ||
786 | /// <summary> | 513 | /// <summary> |
787 | /// | 514 | /// |