From a49d885e400c3d87a7dcb6c40cef72f043ce60b1 Mon Sep 17 00:00:00 2001 From: lizzie Date: Wed, 19 Aug 2026 03:17:06 +0000 Subject: [PATCH] fixups --- src/core/hle/service/sockets/bsd.cpp | 6 +++--- src/core/internal_network/network.cpp | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/core/hle/service/sockets/bsd.cpp b/src/core/hle/service/sockets/bsd.cpp index 669d048cf1..36a7e5e5ee 100644 --- a/src/core/hle/service/sockets/bsd.cpp +++ b/src/core/hle/service/sockets/bsd.cpp @@ -524,7 +524,7 @@ void BSD::ExecuteWork(HLERequestContext& ctx, Work work) { std::pair BSD::SocketImpl(Network::Domain domain, Network::Type type, Network::Protocol protocol) { // user bsd:u has restrictions on SOCK_SEQPACKET and SOCK_RAW - LOG_DEBUG(Network, "domain={},type,protocol={}", u32(domain), u32(type), u32(protocol)); + LOG_DEBUG(Network, "domain={},type={},protocol={}", u32(domain), u32(type), u32(protocol)); if (is_user && (type == Network::Type::SEQPACKET || type == Network::Type::RAW)) { if (type == Network::Type::RAW && domain == Network::Domain::INET && protocol == Network::Protocol::ICMP) { // fine, can use on bsd:s and bsd:u @@ -570,8 +570,8 @@ std::pair BSD::SocketImpl(Network::Domain domain, Network:: #if defined(__unix__) && !defined(__APPLE__) // ...only unix has this issue it seems, ICMP works otherwise fine on win - if (bsd_errno != Network::Errno::E_SUCCESS - && (protocol == Network::Protocol::ICMP || protocol == Network::Protocol::ICMPV6)) { + if ((protocol == Network::Protocol::ICMP || protocol == Network::Protocol::ICMPV6) + && bsd_errno != Network::Errno::E_SUCCESS) { LOG_WARNING(Network, "Using ICMP emulated socket"); descriptor.socket = std::make_shared(); descriptor.socket->fd = fd; diff --git a/src/core/internal_network/network.cpp b/src/core/internal_network/network.cpp index bfd4f42c45..2fad9938d7 100644 --- a/src/core/internal_network/network.cpp +++ b/src/core/internal_network/network.cpp @@ -1127,6 +1127,7 @@ std::pair Socket::Accept() { Errno Socket::Connect(Network::SockAddrIn addr_in) { auto const host_addr_in = TranslateFromSockAddrIn(addr_in); + LOG_INFO(Network, "len={}, family={} - {}.{}.{}.{}:{}", addr_in.len, addr_in.family, addr_in.ip[0], addr_in.ip[1], addr_in.ip[2], addr_in.ip[3], addr_in.portno); if (EnableNonBlock(fd, false)) { if (connect(fd, reinterpret_cast(&host_addr_in), sizeof(host_addr_in)) != SOCKET_ERROR) { if (EnableNonBlock(fd, true)) {