From 32e4d88aa9ea0afb74373ad41f9fa303019cf5db Mon Sep 17 00:00:00 2001 From: Jordan Woyak Date: Sat, 7 Feb 2026 23:51:13 -0600 Subject: [PATCH] AMMediaboard: Improve connect() and bind() logging. --- Source/Core/Core/HW/DVD/AMMediaboard.cpp | 26 +++++++++++++----------- 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/Source/Core/Core/HW/DVD/AMMediaboard.cpp b/Source/Core/Core/HW/DVD/AMMediaboard.cpp index 4ceca81925..2092d7cf65 100644 --- a/Source/Core/Core/HW/DVD/AMMediaboard.cpp +++ b/Source/Core/Core/HW/DVD/AMMediaboard.cpp @@ -689,6 +689,10 @@ static s32 NetDIMMConnect(GuestSocket guest_socket, const GuestSocketAddress& gu connect(host_socket, reinterpret_cast(&addr), sizeof(addr)); const int err = WSAGetLastError(); + INFO_LOG_FMT(AMMEDIABOARD_NET, "NetDIMMConnect: connect( {}({}), ({},{}:{}) ):{} ({})", + host_socket, u32(guest_socket), addr.sin_family, inet_ntoa(addr.sin_addr), + Common::swap16(addr.sin_port), connect_result, err); + if (connect_result == 0) [[unlikely]] { // Immediate success. @@ -860,10 +864,6 @@ static void AMMBCommandConnect(u32 parameter_offset, u32 network_buffer_base) const int ret = NetDIMMConnect(guest_socket, addr); - INFO_LOG_FMT(AMMEDIABOARD_NET, "GC-AM: connect( {}, ({},{},{}:{}), {} ):{}", u32(guest_socket), - addr.struct_size, addr.ip_family, Common::IPAddressToString(addr.ip_address), - ntohs(addr.port), len, ret); - s_media_buffer[1] = s_media_buffer[8]; s_media_buffer_32[1] = ret; } @@ -1314,7 +1314,8 @@ u32 ExecuteCommand(std::array& dicmd_buf, u32* diimm_buf, u32 address, u break; case AMMBCommand::Bind: { - const auto host_socket = GetHostSocket(GuestSocket(s_media_buffer_32[2])); + const auto guest_socket = GuestSocket(s_media_buffer_32[2]); + const auto host_socket = GetHostSocket(guest_socket); const u32 addr_offset = s_media_buffer_32[3]; const u32 len = s_media_buffer_32[4]; @@ -1366,10 +1367,15 @@ u32 ExecuteCommand(std::array& dicmd_buf, u32* diimm_buf, u32 address, u .sin_addr = std::bit_cast(guest_addr.ip_address), }; - const int ret = bind(host_socket, reinterpret_cast(&addr), sizeof(addr)); + const int bind_result = + bind(host_socket, reinterpret_cast(&addr), sizeof(addr)); const int err = WSAGetLastError(); - if (ret < 0) + INFO_LOG_FMT(AMMEDIABOARD_NET, "GC-AM: bind( {}({}), ({},{}:{}) ):{} ({})", host_socket, + u32(guest_socket), addr.sin_family, inet_ntoa(addr.sin_addr), + Common::swap16(addr.sin_port), bind_result, err); + + if (bind_result < 0) { const auto err_msg = Common::DecodeNetworkError(err); PanicAlertFmt("Failed to bind socket (error {}: {})", err, err_msg); @@ -1377,11 +1383,7 @@ u32 ExecuteCommand(std::array& dicmd_buf, u32* diimm_buf, u32 address, u err_msg); } - INFO_LOG_FMT(AMMEDIABOARD_NET, "GC-AM: bind( {}, ({},{:08x}:{}), {} ):{} ({})", host_socket, - addr.sin_family, addr.sin_addr.s_addr, Common::swap16(addr.sin_port), len, ret, - err); - - s_media_buffer_32[1] = ret; + s_media_buffer_32[1] = bind_result; s_last_error = SSC_SUCCESS; break; }