mirrors/Atmosphere
1
0
Fork 0
mirror of https://github.com/Atmosphere-NX/Atmosphere.git synced 2025-04-20 03:24:51 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

ams_mitm: address requested stylistic changes

Browse source
This commit is contained in:
ndeadly 2022-07-11 16:38:31 +02:00
parent 9e6b52660c
commit 9034fcc6fa
5 changed files with 80 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
libraries/libstratosphere/include/stratosphere/settings/settings_types.hpp
View file

@ -235,4 +235,34 @@ namespace ams::settings {
return !(lhs <= rhs);
}
struct BluetoothDevicesSettings : public sf::LargeData {
u8 address[0x6];
char name[0x20];
u8 class_of_device[0x3];
u8 link_key[0x10];
u8 link_key_present;
u16 version;
u32 trusted_services;
u16 vid;
u16 pid;
u8 sub_class;
u8 attribute_mask;
u16 descriptor_length;
u8 descriptor[0x80];
u8 key_type;
u8 device_type;
u16 brr_size;
u8 brr[0x9];
union {
u8 reserved[0x12B];
struct {
u8 padding;
char name2[0xF9];
};
};
};
static_assert(sizeof(BluetoothDevicesSettings) == sizeof(::SetSysBluetoothDevicesSettings));
}

65
stratosphere/ams_mitm/source/set_mitm/setsys_mitm_service.cpp
View file

@ -24,6 +24,8 @@ namespace ams::mitm::settings {
namespace {
constexpr const char ExternalBluetoothDatabasePath[] = "@Sdcard:/atmosphere/bluetooth_devices.db";
constinit os::SdkMutex g_firmware_version_lock;
constinit bool g_cached_firmware_version;
constinit settings::FirmwareVersion g_firmware_version;
@ -88,24 +90,22 @@ namespace ams::mitm::settings {
R_SUCCEED();
}
const char *g_external_bluetooth_db_location = "@Sdcard:/atmosphere/bluetooth_devices.db";
bool ExternalBluetoothDatabaseEnabled(void) {
bool ExternalBluetoothDatabaseEnabled() {
u8 en = 0;
settings::fwdbg::GetSettingsItemValue(std::addressof(en), sizeof(en), "atmosphere", "enable_external_bluetooth_db");
return en;
}
bool HasExternalBluetoothDatabase(void) {
bool HasExternalBluetoothDatabase() {
bool file_exists;
R_ABORT_UNLESS(fs::HasFile(std::addressof(file_exists), g_external_bluetooth_db_location));
R_ABORT_UNLESS(fs::HasFile(std::addressof(file_exists), ExternalBluetoothDatabasePath));
return file_exists;
}
Result ReadExternalBluetoothDatabase(SetSysBluetoothDevicesSettings *db, size_t db_max_size, size_t *entries_read) {
Result ReadExternalBluetoothDatabase(s32 *entries_read, SetSysBluetoothDevicesSettings *db, size_t db_max_size) {
/* Open external database file. */
fs::FileHandle file;
R_TRY(fs::OpenFile(std::addressof(file), g_external_bluetooth_db_location, fs::OpenMode_Read));
R_TRY(fs::OpenFile(std::addressof(file), ExternalBluetoothDatabasePath, fs::OpenMode_Read));
ON_SCOPE_EXIT { fs::CloseFile(file); };
/* Read number of database entries stored in external database. */
@ -114,21 +114,23 @@ namespace ams::mitm::settings {
u64 db_offset = sizeof(total_entries);
if (total_entries > db_max_size) {
/* Cap number of database entries read to size of database on this firmware */
/* Cap number of database entries read to size of database on this firmware. */
total_entries = db_max_size;
/* Pairings are stored from least to most recent. Add offset to skip the older entries that won't fit */
/* Pairings are stored from least to most recent. Add offset to skip the older entries that won't fit. */
db_offset += (total_entries - db_max_size) * sizeof(SetSysBluetoothDevicesSettings);
}
/* Read database entries. */
R_TRY(fs::ReadFile(file, db_offset, db, total_entries * sizeof(SetSysBluetoothDevicesSettings)));
/* Convert to old database format if running on a firmware below 13.0.0 */
/* Convert to old database format if running on a firmware below 13.0.0. */
if (hos::GetVersion() < hos::Version_13_0_0) {
for (u32 i = 0; i < total_entries; ++i) {
for (size_t i = 0; i < total_entries; ++i) {
/* Copy as many chars from currently used name field as we can fit in the original one. */
util::SNPrintf(db[i].name.name, sizeof(db[i].name), "%s", db[i].name2);
//std::memcpy(std::addressof(db[i].name), db[i].name2, sizeof(db[i].name));
/* Clear the current name field. */
std::memset(db[i].name2, 0, sizeof(db[i].name2));
}
}
@ -138,12 +140,15 @@ namespace ams::mitm::settings {
return ResultSuccess();
}
Result WriteExternalBluetoothDatabase(const SetSysBluetoothDevicesSettings *db, size_t total_entries) {
Result StoreExternalBluetoothDatabase(const SetSysBluetoothDevicesSettings *db, size_t total_entries) {
/* Open external database file. */
fs::FileHandle file;
R_TRY(fs::OpenFile(std::addressof(file), g_external_bluetooth_db_location, fs::OpenMode_Write | fs::OpenMode_AllowAppend));
R_TRY(fs::OpenFile(std::addressof(file), ExternalBluetoothDatabasePath, fs::OpenMode_Write));
ON_SCOPE_EXIT { fs::CloseFile(file); };
/* Set file size to accomodate all database entries */
R_TRY(fs::SetFileSize(file, sizeof(total_entries) + total_entries * sizeof(SetSysBluetoothDevicesSettings)));
/* Write number of database entries. */
R_TRY(fs::WriteFile(file, 0, std::addressof(total_entries), sizeof(total_entries), fs::WriteOption::None));
@ -152,17 +157,24 @@ namespace ams::mitm::settings {
if (hos::GetVersion() < hos::Version_13_0_0) {
/* Convert to new database format if running on a firmware below 13.0.0 */
auto tmp_entry = std::make_unique<SetSysBluetoothDevicesSettings>();
for (u32 i = 0; i < total_entries; ++i) {
for (size_t i = 0; i < total_entries; ++i) {
/* Take a copy of the current database entry. */
std::memcpy(tmp_entry.get(), std::addressof(db[i]), sizeof(SetSysBluetoothDevicesSettings));
//std::memcpy(tmp_entry->name2, std::addressof(tmp_entry->name), sizeof(tmp_entry->name));
/* Copy the name field from the original location to the currently used one. */
util::SNPrintf(tmp_entry->name2, sizeof(tmp_entry->name2), "%s", db[i].name.name);
/* Clear the original name field. */
std::memset(std::addressof(tmp_entry->name), 0, sizeof(tmp_entry->name));
/* Write the converted database entry. */
R_TRY(fs::WriteFile(file, db_offset, tmp_entry.get(), sizeof(SetSysBluetoothDevicesSettings), fs::WriteOption::None));
/* Increment offset to the next database entry. */
db_offset += sizeof(SetSysBluetoothDevicesSettings);
}
fs::FlushFile(file);
}
else {
} else {
R_TRY(fs::WriteFile(file, db_offset, db, total_entries * sizeof(SetSysBluetoothDevicesSettings), fs::WriteOption::Flush));
}
@ -190,14 +202,16 @@ namespace ams::mitm::settings {
/* Create the external database if it doesn't exist. */
if (!HasExternalBluetoothDatabase()) {
R_TRY(fs::CreateFile(g_external_bluetooth_db_location, 0));
R_TRY(fs::CreateFile(ExternalBluetoothDatabasePath, 0));
}
/* Backup local database to sd card. */
R_TRY(WriteExternalBluetoothDatabase(settings.GetPointer(), settings.GetSize()));
R_TRY(StoreExternalBluetoothDatabase(settings.GetPointer(), settings.GetSize()));
/* Also allow the updated database to be stored to system save as usual. */
return sm::mitm::ResultShouldForwardToSession();
R_TRY(setsysSetBluetoothDevicesSettingsFwd(m_forward_service.get(), settings.GetPointer(), settings.GetSize()));
return ResultSuccess();
}
Result SetSysMitmService::GetBluetoothDevicesSettings(sf::Out<s32> out_count, const sf::OutMapAliasArray<SetSysBluetoothDevicesSettings> &out) {
@ -209,14 +223,13 @@ namespace ams::mitm::settings {
R_TRY(setsysGetBluetoothDevicesSettingsFwd(m_forward_service.get(), out_count.GetPointer(), out.GetPointer(), out.GetSize()));
/* Create the external database file. */
R_TRY(fs::CreateFile(g_external_bluetooth_db_location, 0));
R_TRY(fs::CreateFile(ExternalBluetoothDatabasePath, 0));
/* Backup local database to sd card. */
R_TRY(WriteExternalBluetoothDatabase(out.GetPointer(), out_count.GetValue()));
}
else {
R_TRY(StoreExternalBluetoothDatabase(out.GetPointer(), out_count.GetValue()));
} else {
/* Read the external database from sd card. */
R_TRY(ReadExternalBluetoothDatabase(out.GetPointer(), out.GetSize(), reinterpret_cast<size_t*>(out_count.GetPointer())));
R_TRY(ReadExternalBluetoothDatabase(out_count.GetPointer(), out.GetPointer(), out.GetSize()));
}
return ResultSuccess();

9
stratosphere/ams_mitm/source/set_mitm/setsys_shim.c
View file

@ -15,9 +15,16 @@
*/
#include "setsys_shim.h"
Result setsysSetBluetoothDevicesSettingsFwd(Service *s, const SetSysBluetoothDevicesSettings *settings, s32 count) {
return serviceDispatch(s, 11,
.buffer_attrs = { SfBufferAttr_HipcMapAlias | SfBufferAttr_In },
.buffers = { { settings, count * sizeof(SetSysBluetoothDevicesSettings) } },
);
}
Result setsysGetBluetoothDevicesSettingsFwd(Service *s, s32 *total_out, SetSysBluetoothDevicesSettings *settings, s32 count) {
return serviceDispatchOut(s, 12, *total_out,
.buffer_attrs = { SfBufferAttr_HipcMapAlias | SfBufferAttr_Out },
.buffers = { { settings, count*sizeof(SetSysBluetoothDevicesSettings) } },
.buffers = { { settings, count * sizeof(SetSysBluetoothDevicesSettings) } },
);
}

1
stratosphere/ams_mitm/source/set_mitm/setsys_shim.h
View file

@ -12,6 +12,7 @@ extern "C" {
#endif
/* Forwarding shims. */
Result setsysSetBluetoothDevicesSettingsFwd(Service *s, const SetSysBluetoothDevicesSettings *settings, s32 count);
Result setsysGetBluetoothDevicesSettingsFwd(Service *s, s32 *total_out, SetSysBluetoothDevicesSettings *settings, s32 count);
#ifdef __cplusplus

5
stratosphere/ams_mitm/source/set_mitm/settings_sd_kvs.cpp
View file

@ -393,9 +393,8 @@ namespace ams::settings::fwdbg {
/* 0 = Disabled, 1 = Enabled */
R_ABORT_UNLESS(ParseSettingsItemValue("atmosphere", "enable_log_manager", "u8!0x0"));
/* Controls whether the bluetooth pairing database is redirected to sd card for synchronization between sysnand and/or multiple emummcs. */
/* Note that in firmware 13.0.0 the database size was doubled to 20 entries. Booting to a pre-13.0.0 firmware will cause the */
/* database to be truncated to 10 entries. */
/* Controls whether the bluetooth pairing database is redirected to the SD card (shared across sysmmc/all emummcs) */
/* NOTE: On <13.0.0, the database size was 10 instead of 20; booting pre-13.0.0 will truncate the database. */
/* 0 = Disabled, 1 = Enabled */
R_ABORT_UNLESS(ParseSettingsItemValue("atmosphere", "enable_external_bluetooth_db", "u8!0x0"));