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

Moved web applet-exit handling into a dedicated func, which can optionally handle reading the applet reply storage. Added out param to webWifiShow for the applet reply data.

Browse Source
This commit is contained in:
yellows8 2019-02-18 22:32:18 -05:00
parent f392dc0ce2
commit e2f05654dd
2 changed files with 28 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
nx/include/switch/applets/web.h
View File

@ -16,6 +16,11 @@ typedef struct {
u32 unk_x514; u32 unk_x514;
} PACKED WebWifiPageArg; } PACKED WebWifiPageArg;
typedef struct {
u32 unk_x0;
Result res;
} PACKED WebWifiReturnValue;
typedef struct { typedef struct {
WebWifiPageArg arg; WebWifiPageArg arg;
} WebWifiConfig; } WebWifiConfig;
@ -33,6 +38,7 @@ void webWifiCreate(WebWifiConfig* config, const char* conntest_url, const char*
/** /**
* @brief Launches WifiWebAuthApplet with the specified config and waits for it to exit. * @brief Launches WifiWebAuthApplet with the specified config and waits for it to exit.
* @param config WebWifiConfig object. * @param config WebWifiConfig object.
* @param out Optional output applet reply data, can be NULL.
*/ */
Result webWifiShow(WebWifiConfig* config); Result webWifiShow(WebWifiConfig* config, WebWifiReturnValue *out);

31
nx/source/applets/web.c
View File

@ -6,6 +6,25 @@
#include "applets/libapplet.h" #include "applets/libapplet.h"
#include "applets/web.h" #include "applets/web.h"
static Result _webHandleExit(AppletHolder* holder, void* reply_buffer, size_t reply_size) {
Result rc=0;
size_t transfer_size=0;
appletHolderJoin(holder);
LibAppletExitReason reason = appletHolderGetExitReason(holder);
if (reason == LibAppletExitReason_Canceled || reason == LibAppletExitReason_Abnormal || reason == LibAppletExitReason_Unexpected) {
rc = MAKERESULT(Module_Libnx, LibnxError_LibAppletBadExit);
}
if (R_SUCCEEDED(rc) && reply_buffer && reply_size) {
rc = libappletPopOutData(holder, reply_buffer, reply_size, &transfer_size);
if (R_SUCCEEDED(rc) && transfer_size != reply_size) rc = MAKERESULT(Module_Libnx, LibnxError_BadInput);
}
return rc;
}
void webWifiCreate(WebWifiConfig* config, const char* conntest_url, const char* initial_url, u128 userID, u32 unk) { void webWifiCreate(WebWifiConfig* config, const char* conntest_url, const char* initial_url, u128 userID, u32 unk) {
memset(config, 0, sizeof(WebWifiConfig)); memset(config, 0, sizeof(WebWifiConfig));
@ -18,7 +37,7 @@ void webWifiCreate(WebWifiConfig* config, const char* conntest_url, const char*
config->arg.unk_x514 = unk; config->arg.unk_x514 = unk;
} }
Result webWifiShow(WebWifiConfig* config) { Result webWifiShow(WebWifiConfig* config, WebWifiReturnValue *out) {
Result rc = 0; Result rc = 0;
AppletHolder holder; AppletHolder holder;
@ -33,15 +52,7 @@ Result webWifiShow(WebWifiConfig* config) {
if (R_SUCCEEDED(rc)) rc = appletHolderStart(&holder); if (R_SUCCEEDED(rc)) rc = appletHolderStart(&holder);
if (R_SUCCEEDED(rc)) { if (R_SUCCEEDED(rc)) rc = _webHandleExit(&holder, out, sizeof(*out));
appletHolderJoin(&holder);
LibAppletExitReason reason = appletHolderGetExitReason(&holder);
if (reason == LibAppletExitReason_Canceled || reason == LibAppletExitReason_Abnormal || reason == LibAppletExitReason_Unexpected) {
rc = MAKERESULT(Module_Libnx, LibnxError_LibAppletBadExit);
}
}
appletHolderClose(&holder); appletHolderClose(&holder);