From 48667ea678f1aa8c8768e229bce14767165ad806 Mon Sep 17 00:00:00 2001 From: lizzie Date: Wed, 1 Jul 2026 19:26:55 +0000 Subject: [PATCH] fixup stuffs for windows --- src/core/internal_network/network.cpp | 20 +++++++++++++++----- src/core/internal_network/socket_proxy.cpp | 15 +++++++++++++++ 2 files changed, 30 insertions(+), 5 deletions(-) diff --git a/src/core/internal_network/network.cpp b/src/core/internal_network/network.cpp index 30b1e2c14b..2b4bdc828a 100644 --- a/src/core/internal_network/network.cpp +++ b/src/core/internal_network/network.cpp @@ -952,11 +952,6 @@ Errno Socket::SetSockOpt(SOCKET fd_so, int option, T value) { } Errno Socket::Initialize(Domain domain, Type type, Protocol protocol) { - if (type == Type::STREAM && protocol == Protocol::UDP) { - LOG_WARNING(Network, "Using IPPROTO_UDP with SOCK_STREAM"); - type = Type::DGRAM; - } - fd = socket(TranslateDomainToNative(domain), TranslateTypeToNative(type), TranslateProtocolToNative(protocol)); if (fd != INVALID_SOCKET) return Errno::SUCCESS; @@ -1217,15 +1212,30 @@ Errno Socket::SetRcvTimeo(u32 value) { } Errno Socket::SetReusePort(u32 value) { +#ifdef SO_REUSEPORT return SetSockOpt(fd, SO_REUSEPORT, value); +#else + LOG_WARNING(Network, "(stubbed)"); + return Errno::SUCCESS; +#endif } Errno Socket::SetTimeStamp(u32 value) { +#ifdef SO_TIMESTAMP return SetSockOpt(fd, SO_TIMESTAMP, value); +#else + LOG_WARNING(Network, "(stubbed)"); + return Errno::SUCCESS; +#endif } Errno Socket::SetAcceptFilter(u32 value) { +#ifdef SO_ACCEPTFILTER return SetSockOpt(fd, SO_ACCEPTFILTER, value); +#else + LOG_WARNING(Network, "(stubbed)"); + return Errno::SUCCESS; +#endif } Errno Socket::SetNonBlock(bool enable) { diff --git a/src/core/internal_network/socket_proxy.cpp b/src/core/internal_network/socket_proxy.cpp index da54b68acd..c5aeb2e99b 100644 --- a/src/core/internal_network/socket_proxy.cpp +++ b/src/core/internal_network/socket_proxy.cpp @@ -288,15 +288,30 @@ Errno ProxySocket::SetRcvTimeo(u32 value) { } Errno ProxySocket::SetReusePort(u32 value) { +#ifdef SO_REUSEPORT return SetSockOpt(fd, SO_REUSEPORT, value); +#else + LOG_WARNING(Network, "(stubbed)"); + return Errno::SUCCESS; +#endif } Errno ProxySocket::SetTimeStamp(u32 value) { +#ifdef SO_TIMESTAMP return SetSockOpt(fd, SO_TIMESTAMP, value); +#else + LOG_WARNING(Network, "(stubbed)"); + return Errno::SUCCESS; +#endif } Errno ProxySocket::SetAcceptFilter(u32 value) { +#ifdef SO_ACCEPTFILTER return SetSockOpt(fd, SO_ACCEPTFILTER, value); +#else + LOG_WARNING(Network, "(stubbed)"); + return Errno::SUCCESS; +#endif } Errno ProxySocket::SetNonBlock(bool enable) {