mirrors/Atmosphere
1
0
Fork 0
mirror of https://github.com/Atmosphere-NX/Atmosphere.git synced 2025-05-31 23:08:22 -04:00
Code Issues Projects Releases Packages Wiki Activity

htcs: fixes, echo server is now fully functional

Browse source
This commit is contained in:
Michael Scire 2021-02-21 14:31:28 -08:00 • committed by SciresM
parent 72de4d85f3
commit 0ec54ed492
8 changed files with 33 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

14
libraries/libstratosphere/source/htcs/impl/htcs_manager.cpp
View file

@ -45,7 +45,7 @@ namespace ams::htcs::impl {
/* Set output. */
if (R_SUCCEEDED(result)) {
*out_err = err;
if (out_err == 0) {
if (err == 0) {
*out_desc = desc;
} else {
*out_desc = -1;
@ -77,7 +77,7 @@ namespace ams::htcs::impl {
/* Set output. */
if (R_SUCCEEDED(result)) {
*out_err = err;
if (out_err == 0) {
if (err == 0) {
*out_res = 0;
} else {
*out_res = -1;
@ -96,7 +96,7 @@ namespace ams::htcs::impl {
/* Set output. */
if (R_SUCCEEDED(result)) {
*out_err = err;
if (out_err == 0) {
if (err == 0) {
*out_res = 0;
} else {
*out_res = -1;
@ -115,7 +115,7 @@ namespace ams::htcs::impl {
/* Set output. */
if (R_SUCCEEDED(result)) {
*out_err = err;
if (out_err == 0) {
if (err == 0) {
*out_res = 0;
} else {
*out_res = -1;
@ -135,7 +135,7 @@ namespace ams::htcs::impl {
/* Set output. */
if (R_SUCCEEDED(result)) {
*out_err = err;
if (out_err == 0) {
if (err == 0) {
*out_size = recv_size;
} else {
*out_size = -1;
@ -155,7 +155,7 @@ namespace ams::htcs::impl {
/* Set output. */
if (R_SUCCEEDED(result)) {
*out_err = err;
if (out_err == 0) {
if (err == 0) {
*out_size = send_size;
} else {
*out_size = -1;
@ -174,7 +174,7 @@ namespace ams::htcs::impl {
/* Set output. */
if (R_SUCCEEDED(result)) {
*out_err = err;
if (out_err == 0) {
if (err == 0) {
*out_res = 0;
} else {
*out_res = -1;

10
libraries/libstratosphere/source/htcs/impl/htcs_service.cpp
View file

@ -259,7 +259,7 @@ namespace ams::htcs::impl {
Result HtcsService::SendSmallContinue(s64 *out_size, const char *buffer, s64 buffer_size, u32 task_id, s32 desc) {
/* Verify the task. */
R_TRY(m_rpc_client->VerifyTaskIdWitHandle<rpc::SendSmallTask>(task_id, desc));
R_TRY(m_rpc_client->VerifyTaskIdWithHandle<rpc::SendSmallTask>(task_id, desc));
/* Continue the task. */
R_TRY(m_rpc_client->SendContinue<rpc::SendSmallTask>(task_id, buffer, buffer_size));
@ -293,7 +293,7 @@ namespace ams::htcs::impl {
Result HtcsService::SendContinue(s64 *out_size, const char *buffer, s64 buffer_size, u32 task_id, s32 desc) {
/* Verify the task. */
R_TRY(m_rpc_client->VerifyTaskIdWitHandle<rpc::SendTask>(task_id, desc));
R_TRY(m_rpc_client->VerifyTaskIdWithHandle<rpc::SendTask>(task_id, desc));
/* Wait for the task to notify. */
m_rpc_client->WaitNotification<rpc::SendTask>(task_id);
@ -307,12 +307,14 @@ namespace ams::htcs::impl {
R_TRY(m_data_channel_manager->Send(buffer, buffer_size, task_id));
}
/* Set output. */
*out_size = buffer_size;
return ResultSuccess();
}
Result HtcsService::SendResults(s32 *out_err, s64 *out_size, u32 task_id, s32 desc) {
/* Verify the task. */
R_TRY(m_rpc_client->VerifyTaskIdWitHandle<rpc::SendTask>(task_id, desc));
R_TRY(m_rpc_client->VerifyTaskIdWithHandle<rpc::SendTask>(task_id, desc));
/* Finish the task. */
htcs::SocketError err;
@ -337,7 +339,7 @@ namespace ams::htcs::impl {
Result HtcsService::ReceiveResults(s32 *out_err, s64 *out_size, char *buffer, s64 buffer_size, u32 task_id, s32 desc) {
/* Verify the task. */
R_TRY(m_rpc_client->VerifyTaskIdWitHandle<rpc::ReceiveTask>(task_id, desc));
R_TRY(m_rpc_client->VerifyTaskIdWithHandle<rpc::ReceiveTask>(task_id, desc));
/* Get the result. */
htcs::SocketError err;