nold/Atmosphere
1
0
Fork 0
mirror of https://github.com/Atmosphere-NX/Atmosphere synced 2024-11-10 07:06:34 +00:00
Code Issues Projects Releases Packages Wiki Activity

Implementation cleanup

Browse source
This commit is contained in:
Michael Scire 2019-06-20 23:34:59 -07:00
parent e86e1588e3
commit 2357bc70a7
6 changed files with 136 additions and 120 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
stratosphere/sm/source/sm_dmnt_service.hpp
View file

@ -21,15 +21,15 @@
namespace sts::sm {
/* Command IDs. */
enum DmntServiceCmd {
Dmnt_Cmd_AtmosphereGetRecord = 65000,
Dmnt_Cmd_AtmosphereListRecords = 65001,
Dmnt_Cmd_AtmosphereGetRecordSize = 65002,
};
/* Service definition. */
class DmntService final : public IServiceObject {
protected:
/* Command IDs. */
enum class CommandId {
AtmosphereGetRecord = 65000,
AtmosphereListRecords = 65001,
AtmosphereGetRecordSize = 65002,
};
private:
/* Actual commands. */
virtual Result AtmosphereGetRecord(Out<ServiceRecord> record, ServiceName service);
@ -37,9 +37,9 @@ namespace sts::sm {
virtual void AtmosphereGetRecordSize(Out<u64> record_size);
public:
DEFINE_SERVICE_DISPATCH_TABLE {
MakeServiceCommandMeta<Dmnt_Cmd_AtmosphereGetRecord, &DmntService::AtmosphereGetRecord>(),
MakeServiceCommandMeta<Dmnt_Cmd_AtmosphereListRecords, &DmntService::AtmosphereListRecords>(),
MakeServiceCommandMeta<Dmnt_Cmd_AtmosphereGetRecordSize, &DmntService::AtmosphereGetRecordSize>(),
MakeServiceCommandMeta<CommandId::AtmosphereGetRecord, &DmntService::AtmosphereGetRecord>(),
MakeServiceCommandMeta<CommandId::AtmosphereListRecords, &DmntService::AtmosphereListRecords>(),
MakeServiceCommandMeta<CommandId::AtmosphereGetRecordSize, &DmntService::AtmosphereGetRecordSize>(),
};
};

5
stratosphere/sm/source/sm_main.cpp
View file

@ -77,10 +77,7 @@ void __appExit(void) {
int main(int argc, char **argv)
{
/* Initialize service manager. */
sts::sm::InitializeRegistrationLists();
/* TODO: What's a good timeout value to use here? */
/* Create service waitable manager. */
static auto s_server_manager = WaitableManager(1);
/* Create sm:, (and thus allow things to register to it). */

26
stratosphere/sm/source/sm_manager_service.hpp
View file

@ -21,17 +21,17 @@
namespace sts::sm {
/* Command IDs. */
enum ManagerServiceCmd {
Manager_Cmd_RegisterProcess = 0,
Manager_Cmd_UnregisterProcess = 1,
Manager_Cmd_AtmosphereEndInitDefers = 65000,
Manager_Cmd_AtmosphereHasMitm = 65001,
};
/* Service definition. */
class ManagerService final : public IServiceObject {
protected:
/* Command IDs. */
enum class CommandId {
RegisterProcess = 0,
UnregisterProcess = 1,
AtmosphereEndInitDefers = 65000,
AtmosphereHasMitm = 65001,
};
private:
/* Actual commands. */
virtual Result RegisterProcess(u64 pid, InBuffer<u8> acid_sac, InBuffer<u8> aci0_sac);
@ -40,11 +40,11 @@ namespace sts::sm {
virtual void AtmosphereHasMitm(Out<bool> out, ServiceName service);
public:
DEFINE_SERVICE_DISPATCH_TABLE {
MakeServiceCommandMeta<Manager_Cmd_RegisterProcess, &ManagerService::RegisterProcess>(),
MakeServiceCommandMeta<Manager_Cmd_UnregisterProcess, &ManagerService::UnregisterProcess>(),
MakeServiceCommandMeta<CommandId::RegisterProcess, &ManagerService::RegisterProcess>(),
MakeServiceCommandMeta<CommandId::UnregisterProcess, &ManagerService::UnregisterProcess>(),
MakeServiceCommandMeta<Manager_Cmd_AtmosphereEndInitDefers, &ManagerService::AtmosphereEndInitDefers>(),
MakeServiceCommandMeta<Manager_Cmd_AtmosphereHasMitm, &ManagerService::AtmosphereHasMitm>(),
MakeServiceCommandMeta<CommandId::AtmosphereEndInitDefers, &ManagerService::AtmosphereEndInitDefers>(),
MakeServiceCommandMeta<CommandId::AtmosphereHasMitm, &ManagerService::AtmosphereHasMitm>(),
};
};

160
stratosphere/sm/source/sm_service_manager.cpp
View file

@ -33,6 +33,16 @@ namespace sts::sm {
u64 pid;
size_t access_control_size;
u8 access_control[AccessControlSizeMax];
ProcessInfo() {
this->Free();
}
void Free() {
this->pid = InvalidProcessId;
this->access_control_size = 0;
std::memset(this->access_control, 0, sizeof(this->access_control));
}
};
struct ServiceInfo {
@ -53,19 +63,73 @@ namespace sts::sm {
bool mitm_waiting_ack;
u64 mitm_waiting_ack_pid;
Handle mitm_fwd_sess_h;
ServiceInfo() {
this->Free();
}
void Free() {
/* Close any open handles. */
if (this->port_h != INVALID_HANDLE) {
svcCloseHandle(this->port_h);
}
if (this->mitm_port_h != INVALID_HANDLE) {
svcCloseHandle(this->mitm_port_h);
}
if (this->mitm_query_h != INVALID_HANDLE) {
svcCloseHandle(this->mitm_query_h);
}
/* Reset all members. */
this->name = InvalidServiceName;
this->owner_pid = InvalidProcessId;
this->port_h = INVALID_HANDLE;
this->max_sessions = 0;
this->is_light = false;
this->mitm_pid = InvalidProcessId;
this->mitm_port_h = INVALID_HANDLE;
this->mitm_query_h = INVALID_HANDLE;
this->mitm_waiting_ack = false;
this->mitm_waiting_ack_pid = InvalidProcessId;
this->mitm_fwd_sess_h = INVALID_HANDLE;
}
void FreeMitm() {
/* Close mitm handles. */
if (this->mitm_port_h != INVALID_HANDLE) {
svcCloseHandle(this->mitm_port_h);
}
if (this->mitm_query_h != INVALID_HANDLE) {
svcCloseHandle(this->mitm_query_h);
}
/* Reset mitm members. */
this->mitm_pid = InvalidProcessId;
this->mitm_port_h = INVALID_HANDLE;
this->mitm_query_h = INVALID_HANDLE;
}
void AcknowledgeMitmSession(u64 *out_pid, Handle *out_hnd) {
/* Copy to output. */
*out_pid = this->mitm_waiting_ack_pid;
*out_hnd = this->mitm_fwd_sess_h;
this->mitm_waiting_ack = false;
this->mitm_waiting_ack_pid = InvalidProcessId;
this->mitm_fwd_sess_h = INVALID_HANDLE;
}
};
class AccessControlEntry {
private:
const u8 *entry;
size_t size;
size_t capacity;
public:
AccessControlEntry(const void *e, size_t sz) : entry(reinterpret_cast<const u8 *>(e)), size(sz) {
AccessControlEntry(const void *e, size_t c) : entry(reinterpret_cast<const u8 *>(e)), capacity(c) {
/* ... */
}
AccessControlEntry GetNextEntry() const {
return AccessControlEntry(this->entry + this->GetSize(), this->size - this->GetSize());
return AccessControlEntry(this->entry + this->GetSize(), this->capacity - this->GetSize());
}
size_t GetSize() const {
@ -90,12 +154,12 @@ namespace sts::sm {
bool IsValid() const {
/* Validate that we can access data. */
if (this->entry == nullptr || this->size == 0) {
if (this->entry == nullptr || this->capacity == 0) {
return false;
}
/* Validate that the size is correct. */
return this->GetSize() <= this->size;
return this->GetSize() <= this->capacity;
}
};
@ -109,11 +173,15 @@ namespace sts::sm {
public:
InitialProcessIdLimits() {
if (GetRuntimeFirmwareVersion() >= FirmwareVersion_500) {
/* On 5.0.0+, we can get precise limits from the kernel. */
/* On 5.0.0+, we can get precise limits from svcGetSystemInfo. */
R_ASSERT(svcGetSystemInfo(&this->min, 2, 0, 0));
R_ASSERT(svcGetSystemInfo(&this->max, 2, 0, 1));
} else if (GetRuntimeFirmwareVersion() >= FirmwareVersion_400) {
/* On 4.0.0-4.1.0, we can get the precise limits from normal svcGetInfo. */
R_ASSERT(svcGetInfo(&this->min, 19, 0, 0));
R_ASSERT(svcGetInfo(&this->max, 19, 0, 1));
} else {
/* On < 5.0.0, we just use hardcoded extents. */
/* On < 4.0.0, we just use hardcoded extents. */
this->min = InitialProcessIdMin;
this->max = InitialProcessIdMax;
}
@ -152,11 +220,6 @@ namespace sts::sm {
return GetProcessInfo(InvalidProcessId);
}
void FreeProcessInfo(ProcessInfo *process_info) {
std::memset(process_info, 0, sizeof(*process_info));
process_info->pid = InvalidProcessId;
}
bool HasProcessInfo(u64 pid) {
return GetProcessInfo(pid) != nullptr;
}
@ -174,6 +237,10 @@ namespace sts::sm {
return GetServiceInfo(InvalidServiceName);
}
bool HasServiceInfo(ServiceName service) {
return GetServiceInfo(service) != nullptr;
}
void GetServiceInfoRecord(ServiceRecord *out_record, const ServiceInfo *service_info) {
out_record->service = service_info->name;
out_record->owner_pid = service_info->owner_pid;
@ -184,26 +251,6 @@ namespace sts::sm {
out_record->mitm_waiting_ack = service_info->mitm_waiting_ack;
}
void FreeServiceInfo(ServiceInfo *service_info) {
if (service_info->port_h != INVALID_HANDLE) {
svcCloseHandle(service_info->port_h);
}
if (service_info->mitm_port_h != INVALID_HANDLE) {
svcCloseHandle(service_info->mitm_port_h);
}
if (service_info->mitm_query_h != INVALID_HANDLE) {
svcCloseHandle(service_info->mitm_query_h);
}
std::memset(service_info, 0, sizeof(*service_info));
service_info->owner_pid = InvalidProcessId;
service_info->mitm_pid = InvalidProcessId;
service_info->mitm_waiting_ack_pid = InvalidProcessId;
}
bool HasServiceInfo(ServiceName service) {
return GetServiceInfo(service) != nullptr;
}
Result ValidateAccessControl(AccessControlEntry access_control, ServiceName service, bool is_host, bool is_wildcard) {
/* Iterate over all entries in the access control, checking to see if we have a match. */
while (access_control.IsValid()) {
@ -244,12 +291,11 @@ namespace sts::sm {
}
/* Get name length. */
size_t name_len = 1;
while (name_len < sizeof(service)) {
size_t name_len;
for (name_len = 1; name_len < sizeof(service); name_len++) {
if (service.name[name_len] == 0) {
break;
}
name_len++;
}
/* Names must be all-zero after they end. */
@ -332,19 +378,15 @@ namespace sts::sm {
Result GetServiceHandleImpl(Handle *out, ServiceInfo *service_info, u64 pid) {
/* Clear handle output. */
*out = 0;
*out = INVALID_HANDLE;
/* If not mitm'd or mitm service is requesting, get normal session. */
if (!IsValidProcessId(service_info->mitm_pid) || service_info->mitm_pid == pid) {
return svcConnectToPort(out, service_info->port_h);
}
/* We're mitm'd. */
if (R_FAILED(GetMitmServiceHandleImpl(out, service_info, pid))) {
/* If the Mitm service is dead, just give a normal session. */
return svcConnectToPort(out, service_info->port_h);
}
/* We're mitm'd. Assert, because mitm service host dead is an error state. */
R_ASSERT(GetMitmServiceHandleImpl(out, service_info, pid));
return ResultSuccess;
}
@ -384,18 +426,6 @@ namespace sts::sm {
}
}
/* Initialization. */
void InitializeRegistrationLists() {
/* Free all services. */
for (size_t i = 0; i < ServiceCountMax; i++) {
FreeServiceInfo(&g_service_list[i]);
}
/* Free all processes. */
for (size_t i = 0; i < ProcessCountMax; i++) {
FreeProcessInfo(&g_process_list[i]);
}
}
/* Process management. */
Result RegisterProcess(u64 pid, const void *acid_sac, size_t acid_sac_size, const void *aci0_sac, size_t aci0_sac_size) {
/* Check that access control will fit in the ServiceInfo. */
@ -429,7 +459,7 @@ namespace sts::sm {
return ResultSmInvalidClient;
}
FreeProcessInfo(proc);
proc->Free();
return ResultSuccess;
}
@ -530,7 +560,7 @@ namespace sts::sm {
}
/* Unregister the service. */
FreeServiceInfo(service_info);
service_info->Free();
return ResultSuccess;
}
@ -571,8 +601,8 @@ namespace sts::sm {
}
/* Always clear output. */
*out = 0;
*out_query = 0;
*out = INVALID_HANDLE;
*out_query = INVALID_HANDLE;
/* Create mitm handles. */
Handle hnd = 0;
@ -617,9 +647,7 @@ namespace sts::sm {
}
/* Free Mitm session info. */
svcCloseHandle(service_info->mitm_port_h);
svcCloseHandle(service_info->mitm_query_h);
service_info->mitm_pid = InvalidProcessId;
service_info->FreeMitm();
return ResultSuccess;
}
@ -646,14 +674,8 @@ namespace sts::sm {
return ResultSmNotAllowed;
}
/* Copy to output. */
*out_pid = service_info->mitm_waiting_ack_pid;
*out_hnd = service_info->mitm_fwd_sess_h;
/* Clear pending acknowledgement. */
service_info->mitm_fwd_sess_h = 0;
service_info->mitm_waiting_ack_pid = 0;
service_info->mitm_waiting_ack = false;
/* Acknowledge. */
service_info->AcknowledgeMitmSession(out_pid, out_hnd);
return ResultSuccess;
}

3
stratosphere/sm/source/sm_service_manager.hpp
View file

@ -20,9 +20,6 @@
namespace sts::sm {
/* Initialization. */
void InitializeRegistrationLists();
/* Process management. */
Result RegisterProcess(u64 pid, const void *acid_sac, size_t acid_sac_size, const void *aci0_sac, size_t aci0_sac_size);
Result UnregisterProcess(u64 pid);

42
stratosphere/sm/source/sm_user_service.hpp
View file

@ -21,21 +21,21 @@
namespace sts::sm {
/* Command IDs. */
enum UserServiceCmd {
User_Cmd_Initialize = 0,
User_Cmd_GetService = 1,
User_Cmd_RegisterService = 2,
User_Cmd_UnregisterService = 3,
User_Cmd_AtmosphereInstallMitm = 65000,
User_Cmd_AtmosphereUninstallMitm = 65001,
User_Cmd_AtmosphereAssociatePidTidForMitm = 65002,
User_Cmd_AtmosphereAcknowledgeMitmSession = 65003,
};
/* Service definition. */
class UserService final : public IServiceObject {
protected:
/* Command IDs. */
enum class CommandId {
Initialize = 0,
GetService = 1,
RegisterService = 2,
UnregisterService = 3,
AtmosphereInstallMitm = 65000,
AtmosphereUninstallMitm = 65001,
AtmosphereAssociatePidTidForMitm = 65002,
AtmosphereAcknowledgeMitmSession = 65003,
};
private:
u64 pid = InvalidProcessId;
bool has_initialized = false;
@ -55,15 +55,15 @@ namespace sts::sm {
virtual Result AtmosphereAcknowledgeMitmSession(Out<u64> client_pid, Out<MovedHandle> fwd_h, ServiceName service);
public:
DEFINE_SERVICE_DISPATCH_TABLE {
MakeServiceCommandMeta<User_Cmd_Initialize, &UserService::Initialize>(),
MakeServiceCommandMeta<User_Cmd_GetService, &UserService::GetService>(),
MakeServiceCommandMeta<User_Cmd_RegisterService, &UserService::RegisterService>(),
MakeServiceCommandMeta<User_Cmd_UnregisterService, &UserService::UnregisterService>(),
MakeServiceCommandMeta<CommandId::Initialize, &UserService::Initialize>(),
MakeServiceCommandMeta<CommandId::GetService, &UserService::GetService>(),
MakeServiceCommandMeta<CommandId::RegisterService, &UserService::RegisterService>(),
MakeServiceCommandMeta<CommandId::UnregisterService, &UserService::UnregisterService>(),
MakeServiceCommandMeta<User_Cmd_AtmosphereInstallMitm, &UserService::AtmosphereInstallMitm>(),
MakeServiceCommandMeta<User_Cmd_AtmosphereUninstallMitm, &UserService::AtmosphereUninstallMitm>(),
MakeServiceCommandMeta<User_Cmd_AtmosphereAssociatePidTidForMitm, &UserService::AtmosphereAssociatePidTidForMitm>(),
MakeServiceCommandMeta<User_Cmd_AtmosphereAcknowledgeMitmSession, &UserService::AtmosphereAcknowledgeMitmSession>(),
MakeServiceCommandMeta<CommandId::AtmosphereInstallMitm, &UserService::AtmosphereInstallMitm>(),
MakeServiceCommandMeta<CommandId::AtmosphereUninstallMitm, &UserService::AtmosphereUninstallMitm>(),
MakeServiceCommandMeta<CommandId::AtmosphereAssociatePidTidForMitm, &UserService::AtmosphereAssociatePidTidForMitm>(),
MakeServiceCommandMeta<CommandId::AtmosphereAcknowledgeMitmSession, &UserService::AtmosphereAcknowledgeMitmSession>(),
};
};