moonlight-stream/moonlight-common-c
1
0
Fork 0
mirror of https://github.com/moonlight-stream/moonlight-common-c.git synced 2025-08-18 01:15:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move resolveHostName() into PlatformSockets.c

Browse Source
This commit is contained in:
Cameron Gutman 2018-10-26 17:02:45 -07:00
parent 558ba488e8
commit 9396f6c528
3 changed files with 56 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
src/Connection.c
View File

@ -162,60 +162,6 @@ static void ClInternalConnectionTerminated(long errorCode)
PltCloseThread(&terminationCallbackThread);
}
static int resolveHostName(const char* host)
{
#ifndef __vita__
struct addrinfo hints, *res;
int err;
// We must first try IPv4-only because GFE doesn't listen on IPv6,
// so we'll only want to use an IPv6 address if it's the only address we have.
// For NAT64 networks, the IPv4 address resolution will fail but the IPv6 address
// will give us working connectivity to the host. All other networks will use IPv4
// addresses.
memset(&hints, 0, sizeof(hints));
hints.ai_family = AF_INET;
hints.ai_flags = AI_ADDRCONFIG;
err = getaddrinfo(host, NULL, &hints, &res);
if (err != 0 || res == NULL) {
memset(&hints, 0, sizeof(hints));
hints.ai_family = AF_UNSPEC;
hints.ai_flags = AI_ADDRCONFIG;
err = getaddrinfo(host, NULL, &hints, &res);
if (err != 0) {
Limelog("getaddrinfo() failed: %d\n", err);
return err;
}
if (res == NULL) {
Limelog("getaddrinfo() returned success without addresses\n");
return -1;
}
}
// Use the first address in the list
memcpy(&RemoteAddr, res->ai_addr, res->ai_addrlen);
RemoteAddrLen = res->ai_addrlen;
freeaddrinfo(res);
return 0;
#else
struct hostent *phost = gethostbyname(host);
if (!phost) {
Limelog("gethostbyname() failed for host %s\n", host);
return -1;
}
struct sockaddr_in tmp = {0};
tmp.sin_len = sizeof(tmp);
tmp.sin_family = SCE_NET_AF_INET;
memcpy(&tmp.sin_addr, phost->h_addr, phost->h_length);
memcpy(&RemoteAddr, &tmp, sizeof(tmp));
RemoteAddrLen = sizeof(tmp);
return 0;
#endif
}
// Starts the connection to the streaming machine
int LiStartConnection(PSERVER_INFORMATION serverInfo, PSTREAM_CONFIGURATION streamConfig, PCONNECTION_LISTENER_CALLBACKS clCallbacks,
PDECODER_RENDERER_CALLBACKS drCallbacks, PAUDIO_RENDERER_CALLBACKS arCallbacks, void* renderContext, int drFlags,
@ -267,7 +213,7 @@ int LiStartConnection(PSERVER_INFORMATION serverInfo, PSTREAM_CONFIGURATION stre
Limelog("Resolving host name...");
ListenerCallbacks.stageStarting(STAGE_NAME_RESOLUTION);
err = resolveHostName(serverInfo->address);
err = resolveHostName(serverInfo->address, &RemoteAddr, &RemoteAddrLen);
if (err != 0) {
Limelog("failed: %d\n", err);
ListenerCallbacks.stageFailed(STAGE_NAME_RESOLUTION, err);

54
src/PlatformSockets.c
View File

@ -282,6 +282,60 @@ int enableNoDelay(SOCKET s) {
return 0;
}
int resolveHostName(const char* host, struct sockaddr_storage* addr, SOCKADDR_LEN* addrLen)
{
#ifndef __vita__
struct addrinfo hints, *res;
int err;
// We must first try IPv4-only because GFE doesn't listen on IPv6,
// so we'll only want to use an IPv6 address if it's the only address we have.
// For NAT64 networks, the IPv4 address resolution will fail but the IPv6 address
// will give us working connectivity to the host. All other networks will use IPv4
// addresses.
memset(&hints, 0, sizeof(hints));
hints.ai_family = AF_INET;
hints.ai_flags = AI_ADDRCONFIG;
err = getaddrinfo(host, NULL, &hints, &res);
if (err != 0 || res == NULL) {
memset(&hints, 0, sizeof(hints));
hints.ai_family = AF_UNSPEC;
hints.ai_flags = AI_ADDRCONFIG;
err = getaddrinfo(host, NULL, &hints, &res);
if (err != 0) {
Limelog("getaddrinfo() failed: %d\n", err);
return err;
}
if (res == NULL) {
Limelog("getaddrinfo() returned success without addresses\n");
return -1;
}
}
// Use the first address in the list
memcpy(addr, res->ai_addr, res->ai_addrlen);
*addrLen = res->ai_addrlen;
freeaddrinfo(res);
return 0;
#else
struct hostent *phost = gethostbyname(host);
if (!phost) {
Limelog("gethostbyname() failed for host %s\n", host);
return -1;
}
struct sockaddr_in tmp = {0};
tmp.sin_len = sizeof(tmp);
tmp.sin_family = SCE_NET_AF_INET;
memcpy(&tmp.sin_addr, phost->h_addr, phost->h_length);
memcpy(addr, &tmp, sizeof(tmp));
*addrLen = sizeof(tmp);
return 0;
#endif
}
int initializePlatformSockets(void) {
#if defined(LC_WINDOWS)
WSADATA data;

1
src/PlatformSockets.h
View File

@ -72,6 +72,7 @@ typedef socklen_t SOCKADDR_LEN;
#define URLSAFESTRING_LEN (INET6_ADDRSTRLEN+2)
void addrToUrlSafeString(struct sockaddr_storage* addr, char* string);
int resolveHostName(const char* host, struct sockaddr_storage* addr, SOCKADDR_LEN* addrLen);
SOCKET connectTcpSocket(struct sockaddr_storage* dstaddr, SOCKADDR_LEN addrlen, unsigned short port, int timeoutSec);
SOCKET bindUdpSocket(int addrfamily, int bufferSize);
int enableNoDelay(SOCKET s);