From 2014a5778273eef450bf3a48530d703750487a18 Mon Sep 17 00:00:00 2001 From: lizzie Date: Sun, 27 Sep 2026 10:41:26 +0000 Subject: [PATCH] 2026-09-27 10:41:26 Signed-off-by: lizzie --- src/core/internal_network/network.cpp | 1 + src/core/internal_network/socket_icmp.h | 1 - src/core/internal_network/socket_proxy.h | 26 +++--------------------- src/core/internal_network/sockets.h | 19 +---------------- 4 files changed, 5 insertions(+), 42 deletions(-) diff --git a/src/core/internal_network/network.cpp b/src/core/internal_network/network.cpp index 798fd7fd12..e87b6a3c63 100644 --- a/src/core/internal_network/network.cpp +++ b/src/core/internal_network/network.cpp @@ -1227,6 +1227,7 @@ std::pair Socket::RecvFrom(int flags, std::span message, Network socklen_t* const p_addrlen = addr ? &addrlen : nullptr; sockaddr* const p_addr_in = addr ? reinterpret_cast(&addr_in) : nullptr; + auto const native_flags = TranslateMsgOptToNative(flags); auto const result = recvfrom(fd, reinterpret_cast(message.data()), int(message.size()), native_flags, p_addr_in, p_addrlen); if (result != SOCKET_ERROR) { if (addr) { diff --git a/src/core/internal_network/socket_icmp.h b/src/core/internal_network/socket_icmp.h index 6f537df04b..20f5792603 100644 --- a/src/core/internal_network/socket_icmp.h +++ b/src/core/internal_network/socket_icmp.h @@ -44,7 +44,6 @@ public: std::pair GetPendingError() override; bool IsOpened() const override; void HandleProxyPacket(const ProxyPacket& packet) override; - bool GetNonBlock() override; Errno SetNonBlock(bool enable) override; diff --git a/src/core/internal_network/socket_proxy.h b/src/core/internal_network/socket_proxy.h index c0167e944a..236df491b8 100644 --- a/src/core/internal_network/socket_proxy.h +++ b/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 Accept() override; - Errno Connect(Network::SockAddrIn addr_in) override; - std::pair GetPeerName() override; - std::pair GetSockName() override; - Errno Bind(Network::SockAddrIn addr) override; - Errno Listen(s32 backlog) override; - Errno Shutdown(ShutdownHow how) override; - std::pair Recv(int flags, std::span message) override; - std::pair RecvFrom(int flags, std::span message, Network::SockAddrIn* addr) override; - - std::pair ReceivePacket(int flags, std::span message, Network::SockAddrIn* addr, - std::size_t max_length); - + std::pair ReceivePacket(int flags, std::span message, Network::SockAddrIn* addr, std::size_t max_length); std::pair Send(std::span message, int flags) override; - void SendPacket(ProxyPacket& packet); - - std::pair SendTo(u32 flags, std::span message, - const Network::SockAddrIn* addr) override; - + std::pair SendTo(u32 flags, std::span message, const Network::SockAddrIn* addr) override; + bool GetNonBlock() override; Errno SetNonBlock(bool enable) override; - Errno SetSockOpt(Network::SocketLevel level, Network::OptName option, std::span value) override; - std::pair GetPendingError() override; - bool IsOpened() const override; private: diff --git a/src/core/internal_network/sockets.h b/src/core/internal_network/sockets.h index 76f54d3d3a..80de1f6f25 100644 --- a/src/core/internal_network/sockets.h +++ b/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 Accept() override; - Errno Connect(Network::SockAddrIn addr_in) override; - std::pair GetPeerName() override; - std::pair GetSockName() override; - Errno Bind(Network::SockAddrIn addr) override; - Errno Listen(s32 backlog) override; - Errno Shutdown(ShutdownHow how) override; - std::pair Recv(int flags, std::span message) override; - std::pair RecvFrom(int flags, std::span message, Network::SockAddrIn* addr) override; - std::pair Send(std::span message, int flags) override; - std::pair SendTo(u32 flags, std::span message, const Network::SockAddrIn* addr) override; - + bool GetNonBlock() override; Errno SetNonBlock(bool enable) override; - Errno SetSockOpt(Network::SocketLevel level, Network::OptName option, std::span value) override; - std::pair GetPendingError() override; - Errno GetSockOpt(Network::SocketLevel level, Network::OptName optname, std::span value); - bool IsOpened() const override; - void HandleProxyPacket(const ProxyPacket& packet) override; private: