mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-26 08:14:38 +01:00
Code Issues Releases Wiki Activity

fix network warnings by using new functions over deprecated

Browse Source
This commit is contained in:
IntelOrca
2015-09-24 18:30:14 +01:00
parent f15ba8ed0f
commit c93c1c738a
2 changed files with 25 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/network/network.cpp
View File

@@ -316,9 +316,17 @@ bool Network::BeginClient(const char* host, unsigned short port)
return false; return false;
} }
char address[64];
if (!network_get_address(address, sizeof(address), host)) {
log_error("Unable to resolve hostname.");
return false;
}
SOCKADDR_IN server_address; SOCKADDR_IN server_address;
if (inet_pton(AF_INET, address, &server_address.sin_addr) != 1) {
return false;
}
server_address.sin_family = AF_INET; server_address.sin_family = AF_INET;
server_address.sin_addr.S_un.S_addr = inet_addr(network_getAddress((char *)host));
server_address.sin_port = htons(port); server_address.sin_port = htons(port);
if (connect(server_socket, (SOCKADDR*)&server_address, sizeof(SOCKADDR_IN)) != 0) { if (connect(server_socket, (SOCKADDR*)&server_address, sizeof(SOCKADDR_IN)) != 0) {
@@ -1057,18 +1065,24 @@ void network_send_gamecmd(uint32 eax, uint32 ebx, uint32 ecx, uint32 edx, uint32
} }
} }
static char *network_getAddress(char *host) static bool network_get_address(char *dst, size_t dstLength, const char *host)
{ {
struct hostent *remoteHost; struct addrinfo *remoteHost;
struct in_addr addr;
remoteHost = gethostbyname(host); if (getaddrinfo(host, NULL, NULL, &remoteHost) != 0) {
if (remoteHost != NULL && remoteHost->h_addrtype == AF_INET && remoteHost->h_addr_list[0] != 0) { // Failed to resolve host name
addr.s_addr = *(u_long *)remoteHost->h_addr_list[0]; return false;
return inet_ntoa(addr);
} }
return host; for (; remoteHost != NULL; remoteHost = remoteHost->ai_next) {
if (remoteHost->ai_family != AF_INET) continue;
struct sockaddr_in *ipv4SockAddr = (struct sockaddr_in*)remoteHost->ai_addr;
return inet_ntop(AF_INET, (const void*)&ipv4SockAddr->sin_addr, dst, dstLength) != NULL;
}
// No IPv4 addresses found for host name
return false;
} }
#else #else

3
src/network/network.h
View File

@@ -46,6 +46,7 @@ extern "C" {
#ifdef _WIN32 #ifdef _WIN32
#include <winsock2.h> #include <winsock2.h>
#include <ws2tcpip.h>
#endif // _WIN32 #endif // _WIN32
enum { enum {
@@ -246,7 +247,7 @@ void network_send_chat(const char* text);
void network_send_gamecmd(uint32 eax, uint32 ebx, uint32 ecx, uint32 edx, uint32 esi, uint32 edi, uint32 ebp, uint8 callback); void network_send_gamecmd(uint32 eax, uint32 ebx, uint32 ecx, uint32 edx, uint32 esi, uint32 edi, uint32 ebp, uint8 callback);
void network_print_error(); void network_print_error();
static char *network_getAddress(char *host); static bool network_get_address(char *dst, size_t dstLength, const char *host);
#ifdef __cplusplus #ifdef __cplusplus
} }