diff options
author | bunnei <bunneidev@gmail.com> | 2016-01-05 19:52:25 +0100 |
---|---|---|
committer | bunnei <bunneidev@gmail.com> | 2016-01-05 19:52:25 +0100 |
commit | 848effe9c3aa19b48687c7297db3b71ddb42366a (patch) | |
tree | 7fc173f0d69179ab3aac49837db8e04406ab3024 /src | |
parent | Merge pull request #1339 from archshift/cmake-2015 (diff) | |
parent | HLE/Sockets: Fixed the buffer offset in recvfrom. (diff) | |
download | yuzu-848effe9c3aa19b48687c7297db3b71ddb42366a.tar yuzu-848effe9c3aa19b48687c7297db3b71ddb42366a.tar.gz yuzu-848effe9c3aa19b48687c7297db3b71ddb42366a.tar.bz2 yuzu-848effe9c3aa19b48687c7297db3b71ddb42366a.tar.lz yuzu-848effe9c3aa19b48687c7297db3b71ddb42366a.tar.xz yuzu-848effe9c3aa19b48687c7297db3b71ddb42366a.tar.zst yuzu-848effe9c3aa19b48687c7297db3b71ddb42366a.zip |
Diffstat (limited to 'src')
-rw-r--r-- | src/core/hle/service/soc_u.cpp | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/src/core/hle/service/soc_u.cpp b/src/core/hle/service/soc_u.cpp index 633b66fe2..822b093f4 100644 --- a/src/core/hle/service/soc_u.cpp +++ b/src/core/hle/service/soc_u.cpp @@ -552,13 +552,23 @@ static void RecvFrom(Service::Interface* self) { u32 flags = cmd_buffer[3]; socklen_t addr_len = static_cast<socklen_t>(cmd_buffer[4]); - u8* output_buff = Memory::GetPointer(cmd_buffer[0x104 >> 2]); + struct + { + u32 output_buffer_descriptor; + u32 output_buffer_addr; + u32 address_buffer_descriptor; + u32 output_src_address_buffer; + } buffer_parameters; + + std::memcpy(&buffer_parameters, &cmd_buffer[64], sizeof(buffer_parameters)); + + u8* output_buff = Memory::GetPointer(buffer_parameters.output_buffer_addr); sockaddr src_addr; socklen_t src_addr_len = sizeof(src_addr); int ret = ::recvfrom(socket_handle, (char*)output_buff, len, flags, &src_addr, &src_addr_len); - if (cmd_buffer[0x1A0 >> 2] != 0) { - CTRSockAddr* ctr_src_addr = reinterpret_cast<CTRSockAddr*>(Memory::GetPointer(cmd_buffer[0x1A0 >> 2])); + if (buffer_parameters.output_src_address_buffer != 0) { + CTRSockAddr* ctr_src_addr = reinterpret_cast<CTRSockAddr*>(Memory::GetPointer(buffer_parameters.output_src_address_buffer)); *ctr_src_addr = CTRSockAddr::FromPlatform(src_addr); } |