archive/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-07-03 21:41:26 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

np_handler: fix warning: check socket in discover_ip_address

Browse source
This commit is contained in:
Megamouse 2023-06-12 03:48:10 +02:00
parent cedfb95f9b
commit d28e3c4f08
4 changed files with 28 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
rpcs3/Emu/Cell/lv2/sys_net/lv2_socket_native.cpp
View file

@ -75,7 +75,11 @@ s32 lv2_socket_native::create_socket()
auto socket_res = ::socket(native_domain, native_type, native_proto); auto socket_res = ::socket(native_domain, native_type, native_proto);
#ifdef _WIN32
if (socket_res == INVALID_SOCKET)
#else
if (socket_res == -1) if (socket_res == -1)
#endif
{ {
return -get_last_error(false); return -get_last_error(false);
} }

4
rpcs3/Emu/Cell/lv2/sys_net/nt_p2p_port.cpp
View file

@ -47,7 +47,11 @@ nt_p2p_port::nt_p2p_port(u16 port)
// Creates and bind P2P Socket // Creates and bind P2P Socket
p2p_socket = ::socket(AF_INET, SOCK_DGRAM, IPPROTO_IP); p2p_socket = ::socket(AF_INET, SOCK_DGRAM, IPPROTO_IP);
#ifdef _WIN32
if (p2p_socket == INVALID_SOCKET)
#else
if (p2p_socket == -1) if (p2p_socket == -1)
#endif
fmt::throw_exception("Failed to create DGRAM socket for P2P socket: %s!", get_last_error(true)); fmt::throw_exception("Failed to create DGRAM socket for P2P socket: %s!", get_last_error(true));
#ifdef _WIN32 #ifdef _WIN32

11
rpcs3/Emu/NP/np_handler.cpp
View file

@ -476,6 +476,15 @@ namespace np
bool np_handler::discover_ip_address() bool np_handler::discover_ip_address()
{ {
auto sockfd = socket(AF_INET, SOCK_DGRAM, 0); auto sockfd = socket(AF_INET, SOCK_DGRAM, 0);
#ifdef _WIN32
if (sockfd == INVALID_SOCKET)
#else
if (sockfd == -1)
#endif
{
nph_log.error("Creating socket to discover local ip failed: %d", get_native_error());
return false;
}
auto close_socket = [&]() auto close_socket = [&]()
{ {
@ -499,7 +508,7 @@ namespace np
return false; // offline return false; // offline
} }
sockaddr_in client_addr; sockaddr_in client_addr{};
socklen_t client_addr_size = sizeof(client_addr); socklen_t client_addr_size = sizeof(client_addr);
if (getsockname(sockfd, reinterpret_cast<struct sockaddr*>(&client_addr), &client_addr_size) != 0) if (getsockname(sockfd, reinterpret_cast<struct sockaddr*>(&client_addr), &client_addr_size) != 0)
{ {

10
rpcs3/Emu/NP/rpcn_client.cpp
View file

@ -770,6 +770,16 @@ namespace rpcn
addr_rpcn_udp.sin_port = std::bit_cast<u16, be_t<u16>>(3657); // htons addr_rpcn_udp.sin_port = std::bit_cast<u16, be_t<u16>>(3657); // htons
sockfd = socket(AF_INET, SOCK_STREAM, 0); sockfd = socket(AF_INET, SOCK_STREAM, 0);
#ifdef _WIN32
if (sockfd == INVALID_SOCKET)
#else
if (sockfd == -1)
#endif
{
rpcn_log.error("connect: Failed to connect to RPCN server!");
state = rpcn_state::failure_connect;
return false;
}
if (::connect(sockfd, reinterpret_cast<struct sockaddr*>(&addr_rpcn), sizeof(addr_rpcn)) != 0) if (::connect(sockfd, reinterpret_cast<struct sockaddr*>(&addr_rpcn), sizeof(addr_rpcn)) != 0)
{ {