mirror of
https://github.com/Atmosphere-NX/Atmosphere.git
synced 2024-12-25 03:36:02 +00:00
c7026b9094
* Implement NCM * Modernize ncm_main * Remove unnecessary smExit * Give access to svcCallSecureMonitor * Stack size bump * Fix incorrect setup for NandUser's content storage entry * Fix a potential data abort when flushing the placeholder accessor cache * Fix HasFile and HasDirectory * Use r+b, not w+b * Misc fixes * errno begone * Fixed more stdio error handling * More main fixes * Various command improvements * Make dispatch tables great again * Fix logic inversion * Fixed content path generation * Bump heap size, fix CleanupAllPlaceHolder * Various fixes. Note: This contains debug stuff which will be removed later. I was getting tired of having to cherrypick tiny changes * Fixed placeholder/content deletion * Fixed incorrect content manager destruction * Prevent automatic placeholder creation on open * Fixed List implementation. Also lots of debug logging. * Removed debug code * Added a scope guard for WritePlaceHolder * Manually prevent placeholder/content appending * Revert "Removed debug code" This reverts commitd6ff261fcc
. * Always cache placeholder file. Switch to ftell for preventing appending * Universally use EnsureEnabled * Abstract away file writing logic * Misc cleanup * Refactor placeholder cacheing * Remove debug code (again) * Revert "Remove debug code (again)" This reverts commit168447d80e
. * Misc changes * Fixed file modes * Fixed ContentId/PlaceHolderId alignment * Improved type safety * Fixed reinitialization * Fixed doubleup on path creation * Remove debug code * Fixed 1.0.0 booting * Correct amount of add on content * Correct main thread stack size * lr: Introducing registered data * Reorder stratosphere Makefile * Move results to libstrat * lr: Cleanup lr_redirection * lr: lr_manager tweaks * lr: Imrpoved path handling and adjust ResolveAddOnContentPath order * lr: Organise types * Add eof newlines * lr: Eliminate unnecessary vars * lr: Unnecessary vars 2 electric boogaloo * lr: Various helpers * lr: RegisteredLocationResolver helpers * ncm: Move ncm_types to libstrat * ncm: Misc cleanup * Implement NCM * Modernize ncm_main * Remove unnecessary smExit * Give access to svcCallSecureMonitor * Stack size bump * Fix incorrect setup for NandUser's content storage entry * Fix a potential data abort when flushing the placeholder accessor cache * Fix HasFile and HasDirectory * Use r+b, not w+b * Misc fixes * errno begone * Fixed more stdio error handling * More main fixes * Various command improvements * Make dispatch tables great again * Fix logic inversion * Fixed content path generation * Bump heap size, fix CleanupAllPlaceHolder * Various fixes. Note: This contains debug stuff which will be removed later. I was getting tired of having to cherrypick tiny changes * Fixed placeholder/content deletion * Fixed incorrect content manager destruction * Prevent automatic placeholder creation on open * Fixed List implementation. Also lots of debug logging. * Removed debug code * Added a scope guard for WritePlaceHolder * Manually prevent placeholder/content appending * Revert "Removed debug code" This reverts commitd6ff261fcc
. * Always cache placeholder file. Switch to ftell for preventing appending * Universally use EnsureEnabled * Abstract away file writing logic * Misc cleanup * Refactor placeholder cacheing * Remove debug code (again) * Revert "Remove debug code (again)" This reverts commit168447d80e
. * Misc changes * Fixed file modes * Fixed ContentId/PlaceHolderId alignment * Improved type safety * Fixed reinitialization * Fixed doubleup on path creation * Remove debug code * Fixed 1.0.0 booting * Correct amount of add on content * Correct main thread stack size * lr: Introducing registered data * Reorder stratosphere Makefile * Move results to libstrat * lr: Cleanup lr_redirection * lr: lr_manager tweaks * lr: Imrpoved path handling and adjust ResolveAddOnContentPath order * lr: Organise types * Add eof newlines * lr: Eliminate unnecessary vars * lr: Unnecessary vars 2 electric boogaloo * lr: Various helpers * lr: RegisteredLocationResolver helpers * ncm: Move ncm_types to libstrat * ncm: Misc cleanup * Updated AddOnContentLocationResolver and RegisteredLocationResolver to 9.0.0 * Finished updating lr to 9.0.0 * Updated NCM to 9.0.0 * Fix libstrat includes * Fixed application launching * title_id_2 -> owner_tid * Updated to new-ipc * Change to using pure virtuals * Title Id -> Program Id * Fixed compilation against master * std::scoped_lock<> -> std::scoped_lock * Adopted R_UNLESS and R_CONVERT * Prefix namespace to Results * Adopt std::numeric_limits * Fixed incorrect error handling in ReadFile * Adopted AMS_ABORT_UNLESS * Adopt util::GenerateUuid() * Syntax improvements * ncm_types: Address review * Address more review comments * Updated copyrights * Address more feedback * More feedback addressed * More changes * Move dispatch tables out of interface files * Addressed remaining comments * lr: move into libstratosphere * ncm: Fix logic inversion * lr: Add comments * lr: Remove whitespace * ncm: Start addressing feedback * ncm: Cleanup InitializeContentManager * lr: support client-side usage * lr_service -> lr_api * ncm: Begin refactoring content manager * ncm: More content manager improvements * ncm: Content manager mount improvements * ldr: use lr bindings * lr bindings usage: minor fixes * ncm/lr: Pointer placement * ncm: placeholder accessor cleanup * ncm: minor fixes * ncm: refactor rights cache * ncm: content meta database cleanup * ncm: move content meta database impl out of interface file * ncm: Use const ContentMetaKey & * ncm: fix other non-const ContentMetaKey references * ncm: content meta database cleanup * ncm: content storage fixes for 2.0.0 * ncm: add missing end of file newlines * ncm: implement ContentMetaReader * ncm: client-side api * ncm: trim trailing spaces * ncm: FS_MAX_PATH-1 -> fs::EntryNameLengthMax * ncm: Use PathString and Path * fs: implement accessor wrappers for ncm * fs: implement user fs wrappers * fs: add MountSdCard * ncm: move to content manager impl * ncm: fix up main * kvdb: use fs:: * fs: Add wrappers needed for ncm * ncm: use fs bindings, other refactoring * ncm: minor fixes * fsa: fix ReadFile without size output * fs: add substorage, rom path tool * ncm: fix dangling fsdev usage * fs: fix bug in Commit * fs: fixed incorrect mode check * fs: implement Mount(System)Data * ncm: don't delete hos * results: add R_SUCCEED_IF * ams-except-ncm: use R_SUCCEED_IF * ncm: added comments * ncm: fix api definitions * ncm: use R_SUCCEED_IF * pm: think of the savings * ncm: employ kernel strats * ncm: Nintendo has 5 MiB of heap. Give ourselves 4 to be safe, pending analysis * ncm: refactor IDs, split types header into many headers * ams.mitm: use fs bindings instead of stdio * fs: SystemData uses SystemDataId * ncm: improve meta-db accuracy * ncm: inline getlatestkey * fs: improve UnsupportedOperation results * fs: modernize mount utils * ams: misc fixes for merge-errors * fs: improve unsupportedoperation results * git subrepo pull emummc subrepo: subdir: "emummc" merged: "d12dd546" upstream: origin: "https://github.com/m4xw/emuMMC" branch: "develop" commit: "d12dd546" git-subrepo: version: "0.4.1" origin: "???" commit: "???" * util: add boundedmap * ncm: minor style fixes * ncm: don't unmount if mounting fails * lr: bug fixes * ncm: implement ncm.for-initialize + ncm.for-safemode * lr: ncm::ProgramId::Invalid -> ncm::InvalidProgramId * ncm: fix open directory mode on 1.0.0 * ncm: fix fs use, implement more of < 4.0.0 for-initialize/safemode * ncm: implement packagedcontent -> content for building metadb * ncm: fix save data flag management * ncm: address some review suggestions (thanks @leoetlino!) * updater: use fs bindings * fs: implement MountCode * fs: prefer make_unique to operator new * ncm: implement remaining ContentMetaDatabaseBuilder functionality Co-authored-by: Michael Scire <SciresM@gmail.com>
315 lines
12 KiB
C++
315 lines
12 KiB
C++
/*
|
|
* Copyright (c) 2018-2020 Atmosphère-NX
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify it
|
|
* under the terms and conditions of the GNU General Public License,
|
|
* version 2, as published by the Free Software Foundation.
|
|
*
|
|
* This program is distributed in the hope it will be useful, but WITHOUT
|
|
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
|
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
|
|
* more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
*/
|
|
#pragma once
|
|
#include <stratosphere/ncm/ncm_content_meta_id.hpp>
|
|
#include <stratosphere/ncm/ncm_content_meta_key.hpp>
|
|
#include <stratosphere/ncm/ncm_content_info.hpp>
|
|
#include <stratosphere/ncm/ncm_content_info_data.hpp>
|
|
#include <stratosphere/ncm/ncm_storage_id.hpp>
|
|
|
|
namespace ams::ncm {
|
|
|
|
enum ContentMetaAttribute : u8 {
|
|
ContentMetaAttribute_None = (0 << 0),
|
|
ContentMetaAttribute_IncludesExFatDriver = (1 << 0),
|
|
ContentMetaAttribute_Rebootless = (1 << 1),
|
|
};
|
|
|
|
struct ContentMetaInfo {
|
|
u64 id;
|
|
u32 version;
|
|
ContentMetaType type;
|
|
u8 attributes;
|
|
u8 padding[2];
|
|
|
|
static constexpr ContentMetaInfo Make(u64 id, u32 version, ContentMetaType type, u8 attributes) {
|
|
return {
|
|
.id = id,
|
|
.version = version,
|
|
.type = type,
|
|
.attributes = attributes,
|
|
};
|
|
}
|
|
|
|
constexpr ContentMetaKey ToKey() {
|
|
return ContentMetaKey::Make(this->id, this->version, this->type);
|
|
}
|
|
};
|
|
|
|
static_assert(sizeof(ContentMetaInfo) == 0x10);
|
|
|
|
struct ContentMetaHeader {
|
|
u16 extended_header_size;
|
|
u16 content_count;
|
|
u16 content_meta_count;
|
|
u8 attributes;
|
|
StorageId storage_id;
|
|
};
|
|
|
|
static_assert(sizeof(ContentMetaHeader) == 0x8);
|
|
|
|
struct PackagedContentMetaHeader {
|
|
u64 id;
|
|
u32 version;
|
|
ContentMetaType type;
|
|
u8 reserved_0D;
|
|
u16 extended_header_size;
|
|
u16 content_count;
|
|
u16 content_meta_count;
|
|
u8 attributes;
|
|
u8 storage_id;
|
|
ContentInstallType install_type;
|
|
u8 reserved_17;
|
|
u32 required_download_system_version;
|
|
u8 reserved_1C[4];
|
|
};
|
|
static_assert(sizeof(PackagedContentMetaHeader) == 0x20);
|
|
static_assert(OFFSETOF(PackagedContentMetaHeader, reserved_0D) == 0x0D);
|
|
static_assert(OFFSETOF(PackagedContentMetaHeader, reserved_17) == 0x17);
|
|
static_assert(OFFSETOF(PackagedContentMetaHeader, reserved_1C) == 0x1C);
|
|
|
|
struct ApplicationMetaExtendedHeader {
|
|
PatchId patch_id;
|
|
u32 required_system_version;
|
|
u32 required_application_version;
|
|
};
|
|
|
|
struct PatchMetaExtendedHeader {
|
|
ApplicationId application_id;
|
|
u32 required_system_version;
|
|
u32 extended_data_size;
|
|
u8 reserved[0x8];
|
|
};
|
|
|
|
struct AddOnContentMetaExtendedHeader {
|
|
ApplicationId application_id;
|
|
u32 required_application_version;
|
|
u32 padding;
|
|
};
|
|
|
|
struct DeltaMetaExtendedHeader {
|
|
ApplicationId application_id;
|
|
u32 extended_data_size;
|
|
u32 padding;
|
|
};
|
|
|
|
template<typename ContentMetaHeaderType, typename ContentInfoType>
|
|
class ContentMetaAccessor {
|
|
public:
|
|
using HeaderType = ContentMetaHeaderType;
|
|
using InfoType = ContentInfoType;
|
|
private:
|
|
void *data;
|
|
const size_t size;
|
|
bool is_header_valid;
|
|
private:
|
|
static size_t GetExtendedHeaderSize(ContentMetaType type) {
|
|
switch (type) {
|
|
case ContentMetaType::Application: return sizeof(ApplicationMetaExtendedHeader);
|
|
case ContentMetaType::Patch: return sizeof(PatchMetaExtendedHeader);
|
|
case ContentMetaType::AddOnContent: return sizeof(AddOnContentMetaExtendedHeader);
|
|
case ContentMetaType::Delta: return sizeof(DeltaMetaExtendedHeader);
|
|
default: return 0;
|
|
}
|
|
}
|
|
protected:
|
|
constexpr ContentMetaAccessor(const void *d, size_t sz) : data(const_cast<void *>(d)), size(sz), is_header_valid(true) { /* ... */ }
|
|
constexpr ContentMetaAccessor(void *d, size_t sz) : data(d), size(sz), is_header_valid(false) { /* ... */ }
|
|
|
|
template<class NewHeaderType, class NewInfoType>
|
|
static constexpr size_t CalculateSizeImpl(size_t ext_header_size, size_t content_count, size_t content_meta_count, size_t extended_data_size, bool has_digest) {
|
|
return sizeof(NewHeaderType) + ext_header_size + content_count * sizeof(NewInfoType) + content_meta_count * sizeof(ContentMetaInfo) + extended_data_size + (has_digest ? sizeof(Digest) : 0);
|
|
}
|
|
|
|
static constexpr size_t CalculateSize(ContentMetaType type, size_t content_count, size_t content_meta_count, size_t extended_data_size, bool has_digest = false) {
|
|
return CalculateSizeImpl<ContentMetaHeaderType, ContentInfoType>(GetExtendedHeaderSize(type), content_count, content_meta_count, extended_data_size, has_digest);
|
|
}
|
|
|
|
uintptr_t GetExtendedHeaderAddress() const {
|
|
return reinterpret_cast<uintptr_t>(this->data) + sizeof(HeaderType);
|
|
}
|
|
|
|
uintptr_t GetContentInfoStartAddress() const {
|
|
return this->GetExtendedHeaderAddress() + this->GetExtendedHeaderSize();
|
|
}
|
|
|
|
uintptr_t GetContentInfoAddress(size_t i) const {
|
|
return this->GetContentInfoStartAddress() + i * sizeof(InfoType);
|
|
}
|
|
|
|
uintptr_t GetContentMetaInfoStartAddress() const {
|
|
return this->GetContentInfoAddress(this->GetContentCount());
|
|
}
|
|
|
|
uintptr_t GetContentMetaInfoAddress(size_t i) const {
|
|
return this->GetContentMetaInfoStartAddress() + i * sizeof(ContentMetaInfo);
|
|
}
|
|
|
|
uintptr_t GetExtendedDataAddress() const {
|
|
return this->GetContentMetaInfoAddress(this->GetContentMetaCount());
|
|
}
|
|
|
|
uintptr_t GetDigestAddress() const {
|
|
return this->GetExtendedDataAddress() + this->GetExtendedDataSize();
|
|
}
|
|
|
|
InfoType *GetWritableContentInfo(size_t i) const {
|
|
AMS_ABORT_UNLESS(i < this->GetContentCount());
|
|
|
|
return reinterpret_cast<InfoType *>(this->GetContentInfoAddress(i));
|
|
}
|
|
|
|
InfoType *GetWritableContentInfo(ContentType type) const {
|
|
InfoType *found = nullptr;
|
|
for (size_t i = 0; i < this->GetContentCount(); i++) {
|
|
/* We want to find the info with the lowest id offset and the correct type. */
|
|
InfoType *info = this->GetWritableContentInfo(i);
|
|
if (info->GetType() == type && (found == nullptr || info->GetIdOffset() < found->GetIdOffset())) {
|
|
found = info;
|
|
}
|
|
}
|
|
return found;
|
|
}
|
|
|
|
InfoType *GetWritableContentInfo(ContentType type, u8 id_ofs) const {
|
|
for (size_t i = 0; i < this->GetContentCount(); i++) {
|
|
/* We want to find the info with the correct id offset and the correct type. */
|
|
if (InfoType *info = this->GetWritableContentInfo(i); info->GetType() == type && info->GetIdOffset() == id_ofs) {
|
|
return info;
|
|
}
|
|
}
|
|
return nullptr;
|
|
}
|
|
|
|
public:
|
|
const void *GetData() const {
|
|
return this->data;
|
|
}
|
|
|
|
size_t GetSize() const {
|
|
return this->size;
|
|
}
|
|
|
|
const HeaderType *GetHeader() const {
|
|
AMS_ABORT_UNLESS(this->is_header_valid);
|
|
return static_cast<const HeaderType *>(this->data);
|
|
}
|
|
|
|
ContentMetaKey GetKey() const {
|
|
auto header = this->GetHeader();
|
|
return ContentMetaKey::Make(header->id, header->version, header->type, header->install_type);
|
|
}
|
|
|
|
size_t GetExtendedHeaderSize() const {
|
|
return this->GetHeader()->extended_header_size;
|
|
}
|
|
|
|
template<typename ExtendedHeaderType>
|
|
const ExtendedHeaderType *GetExtendedHeader() const {
|
|
return reinterpret_cast<const ExtendedHeaderType *>(this->GetExtendedHeaderAddress());
|
|
}
|
|
|
|
size_t GetContentCount() const {
|
|
return this->GetHeader()->content_count;
|
|
}
|
|
|
|
const InfoType *GetContentInfo(size_t i) const {
|
|
AMS_ABORT_UNLESS(i < this->GetContentCount());
|
|
|
|
return this->GetWritableContentInfo(i);
|
|
}
|
|
|
|
const InfoType *GetContentInfo(ContentType type) const {
|
|
return this->GetWritableContentInfo(type);
|
|
}
|
|
|
|
const InfoType *GetContentInfo(ContentType type, u8 id_ofs) const {
|
|
return this->GetWritableContentInfo(type, id_ofs);
|
|
}
|
|
|
|
size_t GetContentMetaCount() const {
|
|
return this->GetHeader()->content_meta_count;
|
|
}
|
|
|
|
const ContentMetaInfo *GetContentMetaInfo(size_t i) const {
|
|
AMS_ABORT_UNLESS(i < this->GetContentMetaCount());
|
|
|
|
return reinterpret_cast<const ContentMetaInfo *>(this->GetContentMetaInfoAddress(i));
|
|
}
|
|
|
|
size_t GetExtendedDataSize() const {
|
|
switch (this->GetHeader()->type) {
|
|
case ContentMetaType::Patch: return this->GetExtendedHeader<PatchMetaExtendedHeader>()->extended_data_size;
|
|
case ContentMetaType::Delta: return this->GetExtendedHeader<DeltaMetaExtendedHeader>()->extended_data_size;
|
|
default: return 0;
|
|
}
|
|
}
|
|
|
|
const void *GetExtendedData() const {
|
|
return reinterpret_cast<const void *>(this->GetExtendedDataAddress());
|
|
}
|
|
|
|
const Digest *GetDigest() const {
|
|
return reinterpret_cast<Digest *>(this->GetDigestAddress());
|
|
}
|
|
|
|
bool HasContent(const ContentId &id) const {
|
|
for (size_t i = 0; i < this->GetContentCount(); i++) {
|
|
if (id == this->GetContentInfo(i)->GetId()) {
|
|
return true;
|
|
}
|
|
}
|
|
return false;
|
|
}
|
|
|
|
std::optional<ApplicationId> GetApplicationId(const ContentMetaKey &key) const {
|
|
switch (key.type) {
|
|
case ContentMetaType::Application: return ApplicationId{ key.id };
|
|
case ContentMetaType::Patch: return this->GetExtendedHeader<PatchMetaExtendedHeader>()->application_id;
|
|
case ContentMetaType::AddOnContent: return this->GetExtendedHeader<AddOnContentMetaExtendedHeader>()->application_id;
|
|
case ContentMetaType::Delta: return this->GetExtendedHeader<DeltaMetaExtendedHeader>()->application_id;
|
|
default: return std::nullopt;
|
|
}
|
|
}
|
|
|
|
std::optional<ApplicationId> GetApplicationId() const {
|
|
return this->GetApplicationId(this->GetKey());
|
|
}
|
|
};
|
|
|
|
class ContentMetaReader : public ContentMetaAccessor<ContentMetaHeader, ContentInfo> {
|
|
public:
|
|
constexpr ContentMetaReader(const void *data, size_t size) : ContentMetaAccessor(data, size) { /* ... */ }
|
|
|
|
using ContentMetaAccessor::CalculateSize;
|
|
};
|
|
|
|
class PackagedContentMetaReader : public ContentMetaAccessor<PackagedContentMetaHeader, PackagedContentInfo> {
|
|
public:
|
|
constexpr PackagedContentMetaReader(const void *data, size_t size) : ContentMetaAccessor(data, size) { /* ... */ }
|
|
|
|
size_t CalculateConvertContentMetaSize() const;
|
|
|
|
void ConvertToContentMeta(void *dst, size_t size, const ContentInfo &meta);
|
|
|
|
size_t CountDeltaFragments() const;
|
|
|
|
static constexpr size_t CalculateSize(ContentMetaType type, size_t content_count, size_t content_meta_count, size_t extended_data_size) {
|
|
return ContentMetaAccessor::CalculateSize(type, content_count, content_meta_count, extended_data_size, true);
|
|
}
|
|
};
|
|
|
|
}
|