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

Init/exit nifm in socketInitialize/socketExit, the user app no longer has to manually handle this when using gethostid/gethostname. Use domains for nifm. Style adjustments in nifm.c.

Browse Source
This commit is contained in:
yellows8 2018-10-23 14:04:58 -04:00
parent 6977cb24f5
commit 318562d13b
2 changed files with 26 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nx/source/runtime/devices/socket.c
View File

@ -121,6 +121,9 @@ Result socketInitialize(const SocketInitConfig *config) {
if(dev != -1) if(dev != -1)
return MAKERESULT(Module_Libnx, LibnxError_AlreadyInitialized); return MAKERESULT(Module_Libnx, LibnxError_AlreadyInitialized);
ret = nifmInitialize();
if(R_FAILED(ret)) return ret;
ret = bsdInitialize(&bcfg); ret = bsdInitialize(&bcfg);
if(R_SUCCEEDED(ret)) if(R_SUCCEEDED(ret))
dev = AddDevice(&g_socketDevoptab); dev = AddDevice(&g_socketDevoptab);
@ -147,6 +150,7 @@ Result socketInitialize(const SocketInitConfig *config) {
void socketExit(void) { void socketExit(void) {
RemoveDevice("soc:"); RemoveDevice("soc:");
bsdExit(); bsdExit();
nifmExit();
} }
Result socketGetLastBsdResult(void) { Result socketGetLastBsdResult(void) {

36
nx/source/services/nifm.c
View File

@ -24,6 +24,8 @@ Result nifmInitialize(void) {
Result rc; Result rc;
rc = smGetService(&g_nifmSrv, "nifm:u"); rc = smGetService(&g_nifmSrv, "nifm:u");
if (R_SUCCEEDED(rc)) rc = serviceConvertToDomain(&g_nifmSrv);
if (R_SUCCEEDED(rc)) { if (R_SUCCEEDED(rc)) {
if (kernelAbove300()) if (kernelAbove300())
rc = _nifmCreateGeneralService(&g_nifmIGS, 0); // What does this parameter do? rc = _nifmCreateGeneralService(&g_nifmIGS, 0); // What does this parameter do?
@ -51,9 +53,9 @@ Result nifmGetCurrentIpAddress(u32* out) {
struct { struct {
u64 magic; u64 magic;
u64 cmd_id; u64 cmd_id;
} * raw; } *raw;
raw = ipcPrepareHeader(&c, sizeof(*raw)); raw = serviceIpcPrepareHeader(&g_nifmIGS, &c, sizeof(*raw));
raw->magic = SFCI_MAGIC; raw->magic = SFCI_MAGIC;
raw->cmd_id = 12; raw->cmd_id = 12;
@ -62,13 +64,15 @@ Result nifmGetCurrentIpAddress(u32* out) {
if (R_SUCCEEDED(rc)) { if (R_SUCCEEDED(rc)) {
IpcParsedCommand r; IpcParsedCommand r;
ipcParse(&r);
struct { struct {
u64 magic; u64 magic;
u64 result; u64 result;
u32 out; u32 out;
}* resp = r.Raw; } *resp;
serviceIpcParse(&g_nifmIGS, &r, sizeof(*resp));
resp = r.Raw;
rc = resp->result; rc = resp->result;
*out = resp->out; *out = resp->out;
@ -86,9 +90,9 @@ static Result _nifmCreateGeneralService(Service* out, u64 in) {
u64 magic; u64 magic;
u64 cmd_id; u64 cmd_id;
u64 param; u64 param;
} PACKED* raw; } PACKED *raw;
raw = ipcPrepareHeader(&c, sizeof(*raw)); raw = serviceIpcPrepareHeader(&g_nifmSrv, &c, sizeof(*raw));
raw->magic = SFCI_MAGIC; raw->magic = SFCI_MAGIC;
raw->cmd_id = 5; raw->cmd_id = 5;
@ -98,17 +102,19 @@ static Result _nifmCreateGeneralService(Service* out, u64 in) {
if (R_SUCCEEDED(rc)) { if (R_SUCCEEDED(rc)) {
IpcParsedCommand r; IpcParsedCommand r;
ipcParse(&r);
struct { struct {
u64 magic; u64 magic;
u64 result; u64 result;
}* resp = r.Raw; } *resp;
serviceIpcParse(&g_nifmSrv, &r, sizeof(*resp));
resp = r.Raw;
rc = resp->result; rc = resp->result;
if (R_SUCCEEDED(rc)) if (R_SUCCEEDED(rc))
serviceCreate(out, r.Handles[0]); serviceCreateSubservice(out, &g_nifmSrv, &r, 0);
} }
return rc; return rc;
@ -121,9 +127,9 @@ static Result _nifmCreateGeneralServiceOld(Service* out) {
struct { struct {
u64 magic; u64 magic;
u64 cmd_id; u64 cmd_id;
} PACKED* raw; } PACKED *raw;
raw = ipcPrepareHeader(&c, sizeof(*raw)); raw = serviceIpcPrepareHeader(&g_nifmSrv, &c, sizeof(*raw));
raw->magic = SFCI_MAGIC; raw->magic = SFCI_MAGIC;
raw->cmd_id = 4; raw->cmd_id = 4;
@ -132,17 +138,19 @@ static Result _nifmCreateGeneralServiceOld(Service* out) {
if (R_SUCCEEDED(rc)) { if (R_SUCCEEDED(rc)) {
IpcParsedCommand r; IpcParsedCommand r;
ipcParse(&r);
struct { struct {
u64 magic; u64 magic;
u64 result; u64 result;
}* resp = r.Raw; } *resp;
serviceIpcParse(&g_nifmSrv, &r, sizeof(*resp));
resp = r.Raw;
rc = resp->result; rc = resp->result;
if (R_SUCCEEDED(rc)) if (R_SUCCEEDED(rc))
serviceCreate(out, r.Handles[0]); serviceCreateSubservice(out, &g_nifmSrv, &r, 0);
} }
return rc; return rc;