From 2ff5c451d06b7db512d960590c643aadd3bbff86 Mon Sep 17 00:00:00 2001 From: Sepalani Date: Tue, 2 Jun 2015 20:15:05 +0200 Subject: [PATCH] Cleanup IOCTL_SO_INETATON --- .../Core/IPC_HLE/WII_IPC_HLE_Device_net.cpp | 23 ++++++++----------- 1 file changed, 9 insertions(+), 14 deletions(-) diff --git a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_net.cpp b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_net.cpp index 269f96fd2a..fb425d6123 100644 --- a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_net.cpp +++ b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_net.cpp @@ -921,21 +921,16 @@ IPCCommandResult CWII_IPC_HLE_Device_net_ip_top::IOCtl(u32 _CommandAddress) std::string hostname = Memory::GetString(BufferIn); struct hostent* remoteHost = gethostbyname(hostname.c_str()); - if (remoteHost == nullptr) - { - INFO_LOG(WII_IPC_NET, "IOCTL_SO_INETATON = %d " - "%s, BufferIn: (%08x, %i), BufferOut: (%08x, %i), IP Found: NULL", -1, - hostname.c_str(), BufferIn, BufferInSize, BufferOut, BufferOutSize); - ReturnValue = 0; - } - else - { + if (remoteHost != nullptr) Memory::Write_U32(Common::swap32(*(u32*)remoteHost->h_addr_list[0]), BufferOut); - INFO_LOG(WII_IPC_NET, "IOCTL_SO_INETATON = %d " - "%s, BufferIn: (%08x, %i), BufferOut: (%08x, %i), IP Found: %08X", remoteHost->h_addr_list[0] == nullptr ? -1 : 0, - hostname.c_str(), BufferIn, BufferInSize, BufferOut, BufferOutSize, Common::swap32(*(u32*)remoteHost->h_addr_list[0])); - ReturnValue = remoteHost->h_addr_list[0] == nullptr ? 0 : 1; - } + + INFO_LOG(WII_IPC_NET, "IOCTL_SO_INETATON = %d " + "%s, BufferIn: (%08x, %i), BufferOut: (%08x, %i), IP Found: %08X", + (remoteHost == nullptr || remoteHost->h_addr_list[0] == nullptr) ? -1 : 0, + hostname.c_str(), BufferIn, BufferInSize, BufferOut, BufferOutSize, + remoteHost == nullptr ? -1 : Common::swap32(*(u32*)remoteHost->h_addr_list[0])); + + ReturnValue = (remoteHost == nullptr || remoteHost->h_addr_list[0] == nullptr) ? 0 : 1; break; }