mika/libnx
1
0
Fork 0
mirror of https://github.com/switchbrew/libnx.git synced 2025-06-21 12:32:40 +02:00
Code Issues Packages Projects Releases Wiki Activity

lr: fix 9.x RedirectApplication* commands (#326)

Browse Source 
* lr: fix 9.x RedirectApplication* commands

* lr: correct LegalInformation->ApplicationLegalInformation
This commit is contained in:
SciresM 2019-09-13 03:34:21 -07:00 committed by fincs
parent 9d632b856d
commit c55383c973
2 changed files with 84 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
nx/include/switch/services/lr.h
View File

@ -31,10 +31,10 @@ Result lrLrRedirectProgramPath(LrLocationResolver* lr, u64 tid, const char *path
Result lrLrResolveApplicationControlPath(LrLocationResolver* lr, u64 tid, char *out);
Result lrLrResolveApplicationHtmlDocumentPath(LrLocationResolver* lr, u64 tid, char *out);
Result lrLrResolveDataPath(LrLocationResolver* lr, u64 tid, char *out);
Result lrLrRedirectApplicationControlPath(LrLocationResolver* lr, u64 tid, const char *path);
Result lrLrRedirectApplicationHtmlDocumentPath(LrLocationResolver* lr, u64 tid, const char *path);
Result lrLrResolveLegalInformationPath(LrLocationResolver* lr, u64 tid, char *out);
Result lrLrRedirectLegalInformationPath(LrLocationResolver* lr, u64 tid, const char *path);
Result lrLrRedirectApplicationControlPath(LrLocationResolver* lr, u64 tid, u64 tid2, const char *path);
Result lrLrRedirectApplicationHtmlDocumentPath(LrLocationResolver* lr, u64 tid, u64 tid2, const char *path);
Result lrLrResolveApplicationLegalInformationPath(LrLocationResolver* lr, u64 tid, char *out);
Result lrLrRedirectApplicationLegalInformationPath(LrLocationResolver* lr, u64 tid, u64 tid2, const char *path);
Result lrLrRefresh(LrLocationResolver* lr);
// IRegisteredLocationResolver

114
nx/source/services/lr.c
View File

@ -7,17 +7,18 @@
#include "services/lr.h"
#include "services/fs.h"
#include "services/sm.h"
#include "runtime/hosversion.h"
static Service g_managerSrv;
static u64 g_managerRefCnt;
Result lrInitialize(void) {
atomicIncrement64(&g_managerRefCnt);
if (serviceIsActive(&g_managerSrv)) {
return 0;
}
return smGetService(&g_managerSrv, "lr");
}
@ -34,19 +35,19 @@ Service* lrGetServiceSession(void) {
Result lrOpenLocationResolver(FsStorageId storage, LrLocationResolver* out) {
IpcCommand c;
ipcInitialize(&c);
struct {
u64 magic;
u64 cmd_id;
u32 storage_id; // Actually u8
} *raw;
raw = ipcPrepareHeader(&c, sizeof(*raw));
raw->magic = SFCI_MAGIC;
raw->cmd_id = 0;
raw->storage_id = (u32)storage;
Result rc = serviceIpcDispatch(&g_managerSrv);
if (R_SUCCEEDED(rc)) {
IpcParsedCommand r;
@ -63,24 +64,24 @@ Result lrOpenLocationResolver(FsStorageId storage, LrLocationResolver* out) {
serviceCreate(&out->s, r.Handles[0]);
}
}
return rc;
}
Result lrOpenRegisteredLocationResolver(LrRegisteredLocationResolver* out) {
IpcCommand c;
ipcInitialize(&c);
struct {
u64 magic;
u64 cmd_id;
} *raw;
raw = ipcPrepareHeader(&c, sizeof(*raw));
raw->magic = SFCI_MAGIC;
raw->cmd_id = 1;
Result rc = serviceIpcDispatch(&g_managerSrv);
if (R_SUCCEEDED(rc)) {
IpcParsedCommand r;
@ -97,11 +98,11 @@ Result lrOpenRegisteredLocationResolver(LrRegisteredLocationResolver* out) {
serviceCreate(&out->s, r.Handles[0]);
}
}
return rc;
}
/*
/*
All the LocationResolver/RegisteredLocationResolver "Resolve" commands have a common API.
This is a helper function to perform the work for those funcs, given a command ID.
*/
@ -110,18 +111,18 @@ static Result _lrResolvePath(Service* s, u64 cmd_id, u64 tid, char *out) {
IpcCommand c;
ipcInitialize(&c);
ipcAddRecvStatic(&c, out_path, FS_MAX_PATH, 0);
struct {
u64 magic;
u64 cmd_id;
u64 tid;
} *raw;
raw = ipcPrepareHeader(&c, sizeof(*raw));
raw->magic = SFCI_MAGIC;
raw->cmd_id = cmd_id;
raw->tid = tid;
Result rc = serviceIpcDispatch(s);
if (R_SUCCEEDED(rc)) {
@ -139,11 +140,11 @@ static Result _lrResolvePath(Service* s, u64 cmd_id, u64 tid, char *out) {
strncpy(out, out_path, FS_MAX_PATH);
}
}
return rc;
}
/*
/*
All the LocationResolver/RegisteredLocationResolver "Redirect" commands have a common API.
This is a helper function to perform the work for those funcs, given a command ID.
*/
@ -152,18 +153,18 @@ static Result _lrRedirectPath(Service* s, u64 cmd_id, u64 tid, const char *path)
IpcCommand c;
ipcInitialize(&c);
ipcAddSendStatic(&c, send_path, FS_MAX_PATH, 0);
struct {
u64 magic;
u64 cmd_id;
u64 tid;
} *raw;
raw = ipcPrepareHeader(&c, sizeof(*raw));
raw->magic = SFCI_MAGIC;
raw->cmd_id = cmd_id;
raw->tid = tid;
strncpy(send_path, path, FS_MAX_PATH);
Result rc = serviceIpcDispatch(s);
@ -178,10 +179,55 @@ static Result _lrRedirectPath(Service* s, u64 cmd_id, u64 tid, const char *path)
rc = resp->result;
}
return rc;
}
/*
In 9.0.0, "RedirectApplication" commands began taking in a second tid argument.
This is a helper function to perform the work for those funcs, given a command ID.
*/
static Result _lrRedirectApplicationPath(Service* s, u64 cmd_id, u64 tid, u64 tid2, const char *path) {
// On < 9.0.0, call the original redirection helper.
if (hosversionBefore(9,0,0)) {
return _lrRedirectPath(s, cmd_id, tid, path);
}
char send_path[FS_MAX_PATH+1] = {0};
IpcCommand c;
ipcInitialize(&c);
ipcAddSendStatic(&c, send_path, FS_MAX_PATH, 0);
struct {
u64 magic;
u64 cmd_id;
u64 tid;
u64 tid2;
} *raw;
raw = ipcPrepareHeader(&c, sizeof(*raw));
raw->magic = SFCI_MAGIC;
raw->cmd_id = cmd_id;
raw->tid = tid;
raw->tid = tid2;
strncpy(send_path, path, FS_MAX_PATH);
Result rc = serviceIpcDispatch(s);
if (R_SUCCEEDED(rc)) {
IpcParsedCommand r;
ipcParse(&r);
struct {
u64 magic;
u64 result;
} *resp = r.Raw;
rc = resp->result;
}
return rc;
}
Result lrLrResolveProgramPath(LrLocationResolver* lr, u64 tid, char *out) {
return _lrResolvePath(&lr->s, 0, tid, out);
@ -203,36 +249,36 @@ Result lrLrResolveDataPath(LrLocationResolver* lr, u64 tid, char *out) {
return _lrResolvePath(&lr->s, 4, tid, out);
}
Result lrLrRedirectApplicationControlPath(LrLocationResolver* lr, u64 tid, const char *path) {
return _lrRedirectPath(&lr->s, 5, tid, path);
Result lrLrRedirectApplicationControlPath(LrLocationResolver* lr, u64 tid, u64 tid2, const char *path) {
return _lrRedirectApplicationPath(&lr->s, 5, tid, tid2, path);
}
Result lrLrRedirectApplicationHtmlDocumentPath(LrLocationResolver* lr, u64 tid, const char *path) {
return _lrRedirectPath(&lr->s, 6, tid, path);
Result lrLrRedirectApplicationHtmlDocumentPath(LrLocationResolver* lr, u64 tid, u64 tid2, const char *path) {
return _lrRedirectApplicationPath(&lr->s, 6, tid, tid2, path);
}
Result lrLrResolveLegalInformationPath(LrLocationResolver* lr, u64 tid, char *out) {
Result lrLrResolveApplicationLegalInformationPath(LrLocationResolver* lr, u64 tid, char *out) {
return _lrResolvePath(&lr->s, 7, tid, out);
}
Result lrLrRedirectLegalInformationPath(LrLocationResolver* lr, u64 tid, const char *path) {
return _lrRedirectPath(&lr->s, 8, tid, path);
Result lrLrRedirectApplicationLegalInformationPath(LrLocationResolver* lr, u64 tid, u64 tid2, const char *path) {
return _lrRedirectApplicationPath(&lr->s, 8, tid, tid2, path);
}
Result lrLrRefresh(LrLocationResolver* lr) {
IpcCommand c;
ipcInitialize(&c);
struct {
u64 magic;
u64 cmd_id;
} *raw;
raw = ipcPrepareHeader(&c, sizeof(*raw));
raw->magic = SFCI_MAGIC;
raw->cmd_id = 9;
Result rc = serviceIpcDispatch(&lr->s);
if (R_SUCCEEDED(rc)) {
IpcParsedCommand r;
@ -245,7 +291,7 @@ Result lrLrRefresh(LrLocationResolver* lr) {
rc = resp->result;
}
return rc;
}