citra/citra-canary
1
0
Fork 0
mirror of https://github.com/citra-emu/citra-canary.git synced 2024-12-22 23:05:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4114 from namkazt/soc_recv_from_other

Browse source 
Implement soc - RecvFromOther
This commit is contained in:
Weiyi Wang 2018-09-21 12:33:12 -04:00 committed by GitHub
parent 59982c5479 a8af14ad12
commit e9ed1c98da
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 44 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
src/core/hle/service/soc_u.cpp
View file

@ -566,6 +566,48 @@ void SOC_U::SendTo(Kernel::HLERequestContext& ctx) {
rb.Push(ret);
}
void SOC_U::RecvFromOther(Kernel::HLERequestContext& ctx) {
IPC::RequestParser rp(ctx, 0x7, 4, 4);
u32 socket_handle = rp.Pop<u32>();
u32 len = rp.Pop<u32>();
u32 flags = rp.Pop<u32>();
u32 addr_len = rp.Pop<u32>();
rp.PopPID();
auto& buffer = rp.PopMappedBuffer();
CTRSockAddr ctr_src_addr;
std::vector<u8> output_buff(len);
std::vector<u8> addr_buff(sizeof(ctr_src_addr));
sockaddr src_addr;
socklen_t src_addr_len = sizeof(src_addr);
s32 ret = -1;
if (addr_len > 0) {
ret = ::recvfrom(socket_handle, reinterpret_cast<char*>(output_buff.data()), len, flags,
&src_addr, &src_addr_len);
if (ret >= 0 && src_addr_len > 0) {
ctr_src_addr = CTRSockAddr::FromPlatform(src_addr);
std::memcpy(addr_buff.data(), &ctr_src_addr, sizeof(ctr_src_addr));
}
} else {
ret = ::recvfrom(socket_handle, reinterpret_cast<char*>(output_buff.data()), len, flags,
NULL, 0);
addr_buff.resize(0);
}
if (ret == SOCKET_ERROR_VALUE) {
ret = TranslateError(GET_ERRNO);
} else {
buffer.Write(output_buff.data(), 0, ret);
}
IPC::RequestBuilder rb = rp.MakeBuilder(2, 4);
rb.Push(RESULT_SUCCESS);
rb.Push(ret);
rb.PushStaticBuffer(addr_buff, 0);
rb.PushMappedBuffer(buffer);
}
void SOC_U::RecvFrom(Kernel::HLERequestContext& ctx) {
// TODO(Subv): Calling this function on a blocking socket will block the emu thread,
// preventing graceful shutdown when closing the emulator, this can be fixed by always
@ -817,7 +859,7 @@ SOC_U::SOC_U() : ServiceFramework("soc:U") {
{0x00040082, &SOC_U::Accept, "Accept"},
{0x00050084, &SOC_U::Bind, "Bind"},
{0x00060084, &SOC_U::Connect, "Connect"},
{0x00070104, nullptr, "recvfrom_other"},
{0x00070104, &SOC_U::RecvFromOther, "recvfrom_other"},
{0x00080102, &SOC_U::RecvFrom, "RecvFrom"},
{0x00090106, nullptr, "sendto_other"},
{0x000A0106, &SOC_U::SendTo, "SendTo"},

1
src/core/hle/service/soc_u.h
View file

@ -30,6 +30,7 @@ private:
void GetHostId(Kernel::HLERequestContext& ctx);
void Close(Kernel::HLERequestContext& ctx);
void SendTo(Kernel::HLERequestContext& ctx);
void RecvFromOther(Kernel::HLERequestContext& ctx);
void RecvFrom(Kernel::HLERequestContext& ctx);
void Poll(Kernel::HLERequestContext& ctx);
void GetSockName(Kernel::HLERequestContext& ctx);