2026-09-27 10:41:26

Signed-off-by: lizzie <lizzie@eden-emu.dev>

src/core/internal_network/network.cpp

@@ -1227,6 +1227,7 @@ std::pair<s32, Errno> Socket::RecvFrom(int flags, std::span<u8> message, Network
     socklen_t* const p_addrlen = addr ? &addrlen : nullptr;
     sockaddr* const p_addr_in = addr ? reinterpret_cast<sockaddr*>(&addr_in) : nullptr;
 
+    auto const native_flags = TranslateMsgOptToNative(flags);
     auto const result = recvfrom(fd, reinterpret_cast<char*>(message.data()), int(message.size()), native_flags, p_addr_in, p_addrlen);
     if (result != SOCKET_ERROR) {
         if (addr) {

src/core/internal_network/socket_icmp.h

@@ -44,7 +44,6 @@ public:
     std::pair<Errno, Errno> GetPendingError() override;
     bool IsOpened() const override;
     void HandleProxyPacket(const ProxyPacket& packet) override;
-
     bool GetNonBlock() override;
     Errno SetNonBlock(bool enable) override;
 

src/core/internal_network/socket_proxy.h

@@ -22,45 +22,25 @@ public:
     ~ProxySocket() override;
 
     void HandleProxyPacket(const ProxyPacket& packet) override;
-
     Errno Initialize(Domain domain, Type type, Protocol socket_protocol) override;
-
     Errno Close() override;
-
     std::pair<AcceptResult, Errno> Accept() override;
-
     Errno Connect(Network::SockAddrIn addr_in) override;
-
     std::pair<Network::SockAddrIn, Errno> GetPeerName() override;
-
     std::pair<Network::SockAddrIn, Errno> GetSockName() override;
-
     Errno Bind(Network::SockAddrIn addr) override;
-
     Errno Listen(s32 backlog) override;
-
     Errno Shutdown(ShutdownHow how) override;
-
     std::pair<s32, Errno> Recv(int flags, std::span<u8> message) override;
-
     std::pair<s32, Errno> RecvFrom(int flags, std::span<u8> message, Network::SockAddrIn* addr) override;
-
-    std::pair<s32, Errno> ReceivePacket(int flags, std::span<u8> message, Network::SockAddrIn* addr,
-                                        std::size_t max_length);
-
+    std::pair<s32, Errno> ReceivePacket(int flags, std::span<u8> message, Network::SockAddrIn* addr, std::size_t max_length);
     std::pair<s32, Errno> Send(std::span<const u8> message, int flags) override;
-
     void SendPacket(ProxyPacket& packet);
-
-    std::pair<s32, Errno> SendTo(u32 flags, std::span<const u8> message,
-                                 const Network::SockAddrIn* addr) override;
-
+    std::pair<s32, Errno> SendTo(u32 flags, std::span<const u8> message, const Network::SockAddrIn* addr) override;
+    bool GetNonBlock() override;
     Errno SetNonBlock(bool enable) override;
-
     Errno SetSockOpt(Network::SocketLevel level, Network::OptName option, std::span<const u8> value) override;
-
     std::pair<Errno, Errno> GetPendingError() override;
-
     bool IsOpened() const override;
 
 private:

src/core/internal_network/sockets.h

@@ -77,41 +77,24 @@ public:
     Socket(Socket&& rhs) noexcept;
 
     Errno Initialize(Domain domain, Type type, Protocol protocol) override;
-
     Errno Close() override;
-
     std::pair<AcceptResult, Errno> Accept() override;
-
     Errno Connect(Network::SockAddrIn addr_in) override;
-
     std::pair<Network::SockAddrIn, Errno> GetPeerName() override;
-
     std::pair<Network::SockAddrIn, Errno> GetSockName() override;
-
     Errno Bind(Network::SockAddrIn addr) override;
-
     Errno Listen(s32 backlog) override;
-
     Errno Shutdown(ShutdownHow how) override;
-
     std::pair<s32, Errno> Recv(int flags, std::span<u8> message) override;
-
     std::pair<s32, Errno> RecvFrom(int flags, std::span<u8> message, Network::SockAddrIn* addr) override;
-
     std::pair<s32, Errno> Send(std::span<const u8> message, int flags) override;
-
     std::pair<s32, Errno> SendTo(u32 flags, std::span<const u8> message, const Network::SockAddrIn* addr) override;
-
+    bool GetNonBlock() override;
     Errno SetNonBlock(bool enable) override;
-
     Errno SetSockOpt(Network::SocketLevel level, Network::OptName option, std::span<const u8> value) override;
-
     std::pair<Errno, Errno> GetPendingError() override;
-
     Errno GetSockOpt(Network::SocketLevel level, Network::OptName optname, std::span<u8> value);
-
     bool IsOpened() const override;
-
     void HandleProxyPacket(const ProxyPacket& packet) override;
 
 private: