VERY experimental Nintendo Switch 2 emulator
C++
[core/hle/services/sockets] allow 'valid' range from [16,255] for IPv4 (#3491)
lizziee875a3196b5f
diff --git a/src/core/hle/service/sockets/bsd.cpp b/src/core/hle/service/sockets/bsd.cppindex fd758d4915..c26f1796cc 100644--- a/src/core/hle/service/sockets/bsd.cpp+++ b/src/core/hle/service/sockets/bsd.cpp@@ -629,7 +629,7 @@ Errno BSD::BindImpl(s32 fd, std::span<const u8> addr) {if (!IsFileDescriptorValid(fd)) {return Errno::BADF;}- ASSERT(addr.size() == sizeof(SockAddrIn));+ ASSERT(addr.size() >= 16);auto addr_in = GetValue<SockAddrIn>(addr);return Translate(file_descriptors[fd]->socket->Bind(Translate(addr_in)));@@ -640,7 +640,7 @@ Errno BSD::ConnectImpl(s32 fd, std::span<const u8> addr) {return Errno::BADF;}- UNIMPLEMENTED_IF(addr.size() != sizeof(SockAddrIn));+ ASSERT(addr.size() >= 16);auto addr_in = GetValue<SockAddrIn>(addr);const Errno result = Translate(file_descriptors[fd]->socket->Connect(Translate(addr_in)));@@ -874,7 +874,7 @@ std::pair<s32, Errno> BSD::RecvFromImpl(s32 fd, u32 flags, std::vector<u8>& messif (ret < 0) {addr.clear();} else {- ASSERT(addr.size() == sizeof(SockAddrIn));+ ASSERT(addr.size() >= 16);const SockAddrIn result = Translate(addr_in);PutValue(addr, result);}@@ -899,7 +899,7 @@ std::pair<s32, Errno> BSD::SendToImpl(s32 fd, u32 flags, std::span<const u8> mesNetwork::SockAddrIn addr_in;Network::SockAddrIn* p_addr_in = nullptr;if (!addr.empty()) {- ASSERT(addr.size() == sizeof(SockAddrIn));+ ASSERT(addr.size() >= 16);auto guest_addr_in = GetValue<SockAddrIn>(addr);addr_in = Translate(guest_addr_in);p_addr_in = &addr_in;diff --git a/src/core/hle/service/sockets/sfdnsres.cpp b/src/core/hle/service/sockets/sfdnsres.cppindex f9f0ee56eb..9cd60ac240 100644--- a/src/core/hle/service/sockets/sfdnsres.cpp+++ b/src/core/hle/service/sockets/sfdnsres.cpp@@ -238,7 +238,7 @@ static std::vector<u8> SerializeAddrInfo(const std::vector<Network::AddrInfo>& vAppend<u32_be>(data, static_cast<u32>(Translate(addrinfo.family))); // ai_familyAppend<u32_be>(data, static_cast<u32>(Translate(addrinfo.socket_type))); // ai_socktypeAppend<u32_be>(data, static_cast<u32>(Translate(addrinfo.protocol))); // ai_protocol- Append<u32_be>(data, sizeof(SockAddrIn)); // ai_addrlen+ Append<u32_be>(data, 16); // ai_addrlen// ^ *not* sizeof(SerializedSockAddrIn), not that it matters since they're the same size// ai_addr:diff --git a/src/core/hle/service/sockets/sockets.h b/src/core/hle/service/sockets/sockets.hindex b72bf53c16..7992d9822c 100644--- a/src/core/hle/service/sockets/sockets.h+++ b/src/core/hle/service/sockets/sockets.h@@ -110,8 +110,9 @@ struct SockAddrIn {u8 family;u16 portno;std::array<u8, 4> ip;- std::array<u8, 8> zeroes;+ std::array<u8, 248> zeroes;};+static_assert(sizeof(SockAddrIn) == 0x100);enum class PollEvents : u16 {// Using Pascal case because IN is a macro on Windows.diff --git a/src/core/hle/service/sockets/sockets_translate.cpp b/src/core/hle/service/sockets/sockets_translate.cppindex ea12977f62..6b93adb5ce 100644--- a/src/core/hle/service/sockets/sockets_translate.cpp+++ b/src/core/hle/service/sockets/sockets_translate.cpp@@ -265,13 +265,9 @@ PollEvents Translate(Network::PollEvents flags) {}Network::SockAddrIn Translate(SockAddrIn value) {- if (value.len != 0 && value.len != sizeof(value) && value.len != 6) {- LOG_WARNING(Service, "Unexpected SockAddrIn len={}, expected 0, {}, or 6",- value.len, sizeof(value));- }-+ // All lengths are valid, from [0 upto 256]return {- .family = Translate(static_cast<Domain>(value.family)),+ .family = Translate(Domain(value.family)),.ip = value.ip,.portno = static_cast<u16>(value.portno >> 8 | value.portno << 8),};@@ -279,7 +275,7 @@ Network::SockAddrIn Translate(SockAddrIn value) {SockAddrIn Translate(Network::SockAddrIn value) {return {- .len = sizeof(SockAddrIn),+ .len = 16,.family = static_cast<u8>(Translate(value.family)),.portno = static_cast<u16>(value.portno >> 8 | value.portno << 8),.ip = value.ip,