From 45768779d9ff5eb2e7f6b806722ded1b8bca01bd Mon Sep 17 00:00:00 2001 From: UnknownShadow200 Date: Sat, 5 Jun 2021 12:01:49 +1000 Subject: [PATCH 1/3] Add support for connecting to hostnames --- src/LScreens.c | 4 +-- src/Platform_Posix.c | 28 +++++++++++++++- src/Platform_WinApi.c | 76 ++++++++++++++++++++++++++++++------------- 3 files changed, 82 insertions(+), 26 deletions(-) diff --git a/src/LScreens.c b/src/LScreens.c index d4e36157b..a9755b23a 100644 --- a/src/LScreens.c +++ b/src/LScreens.c @@ -534,8 +534,7 @@ static void DirectConnectScreen_Load(struct DirectConnectScreen* s) { } static void DirectConnectScreen_StartClient(void* w, int idx) { - static const cc_string loopbackIp = String_FromConst("127.0.0.1"); - static const cc_string defMppass = String_FromConst("(none)"); + static const cc_string defMppass = String_FromConst("(none)"); const cc_string* user = &DirectConnectScreen_Instance.iptUsername.text; const cc_string* addr = &DirectConnectScreen_Instance.iptAddress.text; const cc_string* mppass = &DirectConnectScreen_Instance.iptMppass.text; @@ -550,7 +549,6 @@ static void DirectConnectScreen_StartClient(void* w, int idx) { ip = String_UNSAFE_Substring(addr, 0, index); port = String_UNSAFE_SubstringAt(addr, index + 1); - if (String_CaselessEqualsConst(&ip, "localhost")) ip = loopbackIp; if (!user->length) { DirectConnectScreen_SetStatus("&eUsername required"); return; diff --git a/src/Platform_Posix.c b/src/Platform_Posix.c index 3b2e7043d..a899f6f83 100644 --- a/src/Platform_Posix.c +++ b/src/Platform_Posix.c @@ -459,6 +459,32 @@ cc_result Socket_GetError(cc_socket s, cc_result* result) { return getsockopt(s, SOL_SOCKET, SO_ERROR, result, &resultSize); } +static int ParseHost(void* dst, const char* host, int port, int* addrSize) { + struct addrinfo hints = { 0 }; + struct addrinfo* result; + struct addrinfo* cur; + int family = 0, res; + + hints.ai_family = AF_INET; + hints.ai_socktype = SOCK_STREAM; + hints.ai_protocol = IPPROTO_TCP; + + res = getaddrinfo(host, NULL, &hints, &result); + if (res) return 0; + + for (cur = result; cur; cur = cur->ai_next) { + if (cur->ai_family != AF_INET) continue; + family = AF_INET; + + Mem_Copy(dst, cur->ai_addr, cur->ai_addrlen); + *addrSize = cur->ai_addrlen; + break; + } + + freeaddrinfo(result); + return family; +} + static int ParseAddress(void* dst, const cc_string* address, int port, int* addrSize) { struct sockaddr_in* addr4 = (struct sockaddr_in* )dst; struct sockaddr_in6* addr6 = (struct sockaddr_in6*)dst; @@ -477,7 +503,7 @@ static int ParseAddress(void* dst, const cc_string* address, int port, int* addr *addrSize = sizeof(struct sockaddr_in6); return AF_INET6; } - return 0; + return ParseHost(dst, str, port, addrSize); } int Socket_ValidAddress(const cc_string* address) { diff --git a/src/Platform_WinApi.c b/src/Platform_WinApi.c index a16ec61c6..d3cd9aff7 100644 --- a/src/Platform_WinApi.c +++ b/src/Platform_WinApi.c @@ -379,7 +379,55 @@ void Platform_LoadSysFonts(void) { /*########################################################################################################################* *---------------------------------------------------------Socket----------------------------------------------------------* *#########################################################################################################################*/ -static INT (WSAAPI *_WSAStringToAddressW)(LPWSTR addressString, INT addressFamily, LPVOID lpProtocolInfo, LPVOID address, LPINT addressLength); +static INT (WSAAPI *_WSAStringToAddressW)(LPWSTR addressString, INT addressFamily, LPVOID protocolInfo, LPVOID address, LPINT addressLength); +static INT (WSAAPI *_getaddrinfo)(PCSTR nodeName, PCSTR serviceName, const ADDRINFOA* hints, ADDRINFOA** result); +static void (WSAAPI *_freeaddrinfo)(ADDRINFOA* addrInfo); + +static void LoadWinsockFuncs(void) { + static const struct DynamicLibSym funcs[] = { + DynamicLib_Sym(WSAStringToAddressW), DynamicLib_Sym(getaddrinfo), + DynamicLib_Sym(freeaddrinfo), + }; + + static const cc_string winsock32 = String_FromConst("WS2_32.DLL"); + LoadDynamicFuncs(&winsock32, funcs, Array_Elems(funcs)); +} + +cc_result Socket_Available(cc_socket s, int* available) { + return ioctlsocket(s, FIONREAD, available); +} + +cc_result Socket_GetError(cc_socket s, cc_result* result) { + socklen_t resultSize = sizeof(cc_result); + return getsockopt(s, SOL_SOCKET, SO_ERROR, result, &resultSize); +} + +static int ParseHost(void* dst, WCHAR* host, int port) { + ADDRINFOA hints = { 0 }; + ADDRINFOA* result; + ADDRINFOA* cur; + int family = 0, res; + + hints.ai_family = AF_INET; + hints.ai_socktype = SOCK_STREAM; + hints.ai_protocol = IPPROTO_TCP; + + Platform_Utf16ToAnsi(host); + res = _getaddrinfo((char*)host, NULL, &hints, &result); + if (res) return 0; + + for (cur = result; cur; cur = cur->ai_next) { + if (cur->ai_family != AF_INET) continue; + family = AF_INET; + + Mem_Copy(dst, cur->ai_addr, cur->ai_addrlen); + ((SOCKADDR_IN*)dst)->sin_port = htons(port); + break; + } + + _freeaddrinfo(result); + return family; +} static int FallbackParseAddress(SOCKADDR_IN* dst, const cc_string* ip, int port) { cc_uint8* addr; @@ -397,24 +445,6 @@ static int FallbackParseAddress(SOCKADDR_IN* dst, const cc_string* ip, int port) return AF_INET; } -static void LoadWinsockFuncs(void) { - static const struct DynamicLibSym funcs[1] = { - DynamicLib_Sym(WSAStringToAddressW) - }; - - static const cc_string winsock32 = String_FromConst("WS2_32.DLL"); - LoadDynamicFuncs(&winsock32, funcs, Array_Elems(funcs)); -} - -cc_result Socket_Available(cc_socket s, int* available) { - return ioctlsocket(s, FIONREAD, available); -} - -cc_result Socket_GetError(cc_socket s, cc_result* result) { - socklen_t resultSize = sizeof(cc_result); - return getsockopt(s, SOL_SOCKET, SO_ERROR, result, &resultSize); -} - static int Socket_ParseAddress(void* dst, const cc_string* address, int port) { SOCKADDR_IN* addr4 = (SOCKADDR_IN*)dst; SOCKADDR_IN6* addr6 = (SOCKADDR_IN6*)dst; @@ -436,7 +466,9 @@ static int Socket_ParseAddress(void* dst, const cc_string* address, int port) { addr6->sin6_port = htons(port); return AF_INET6; } - return 0; + + if (!_getaddrinfo) return 0; + return ParseHost(dst, str, port); } int Socket_ValidAddress(const cc_string* address) { @@ -720,7 +752,7 @@ static BOOL (WINAPI *_AttachConsole)(DWORD processId); static BOOL (WINAPI *_IsDebuggerPresent)(void); static void LoadKernelFuncs(void) { - static const struct DynamicLibSym funcs[2] = { + static const struct DynamicLibSym funcs[] = { DynamicLib_Sym(AttachConsole), DynamicLib_Sym(IsDebuggerPresent) }; @@ -778,7 +810,7 @@ static BOOL (WINAPI *_CryptProtectData )(DATA_BLOB* dataIn, PCWSTR dataDescr, P static BOOL (WINAPI *_CryptUnprotectData)(DATA_BLOB* dataIn, PWSTR* dataDescr, PVOID entropy, PVOID reserved, PVOID promptStruct, DWORD flags, DATA_BLOB* dataOut); static void LoadCryptFuncs(void) { - static const struct DynamicLibSym funcs[2] = { + static const struct DynamicLibSym funcs[] = { DynamicLib_Sym(CryptProtectData), DynamicLib_Sym(CryptUnprotectData) }; From b07356963c5ecabdab91d9f022cb1ef23eb8270f Mon Sep 17 00:00:00 2001 From: UnknownShadow200 Date: Sun, 6 Jun 2021 11:09:06 +1000 Subject: [PATCH 2/3] fix for old windows versions --- src/Platform_WinApi.c | 83 +++++++++++++++++++------------------------ 1 file changed, 36 insertions(+), 47 deletions(-) diff --git a/src/Platform_WinApi.c b/src/Platform_WinApi.c index d3cd9aff7..877111c5a 100644 --- a/src/Platform_WinApi.c +++ b/src/Platform_WinApi.c @@ -380,17 +380,38 @@ void Platform_LoadSysFonts(void) { *---------------------------------------------------------Socket----------------------------------------------------------* *#########################################################################################################################*/ static INT (WSAAPI *_WSAStringToAddressW)(LPWSTR addressString, INT addressFamily, LPVOID protocolInfo, LPVOID address, LPINT addressLength); -static INT (WSAAPI *_getaddrinfo)(PCSTR nodeName, PCSTR serviceName, const ADDRINFOA* hints, ADDRINFOA** result); -static void (WSAAPI *_freeaddrinfo)(ADDRINFOA* addrInfo); + +static INT WSAAPI FallbackParseAddress(LPWSTR addressString, INT addressFamily, LPVOID protocolInfo, LPVOID address, LPINT addressLength) { + SOCKADDR_IN* addr4 = (SOCKADDR_IN*)address; + cc_uint8* addr = (cc_uint8*)&addr4->sin_addr; + cc_string ip, parts[4 + 1]; + WCHAR tmp[NATIVE_STR_LEN]; + + Mem_Copy(tmp, addressString, sizeof(tmp)); + Platform_Utf16ToAnsi(tmp); + ip = String_FromReadonly((char*)tmp); + + /* 4+1 in case user tries '1.1.1.1.1' */ + if (String_UNSAFE_Split(&ip, '.', parts, 4 + 1) != 4) + return ERR_INVALID_ARGUMENT; + + if (!Convert_ParseUInt8(&parts[0], &addr[0]) || !Convert_ParseUInt8(&parts[1], &addr[1]) || + !Convert_ParseUInt8(&parts[2], &addr[2]) || !Convert_ParseUInt8(&parts[3], &addr[3])) + return ERR_INVALID_ARGUMENT; + + addr4->sin_family = AF_INET; + return 0; +} static void LoadWinsockFuncs(void) { static const struct DynamicLibSym funcs[] = { - DynamicLib_Sym(WSAStringToAddressW), DynamicLib_Sym(getaddrinfo), - DynamicLib_Sym(freeaddrinfo), + DynamicLib_Sym(WSAStringToAddressW) }; static const cc_string winsock32 = String_FromConst("WS2_32.DLL"); LoadDynamicFuncs(&winsock32, funcs, Array_Elems(funcs)); + /* Fallback for older OS versions which lack WSAStringToAddressW */ + if (!_WSAStringToAddressW) _WSAStringToAddressW = FallbackParseAddress; } cc_result Socket_Available(cc_socket s, int* available) { @@ -398,50 +419,24 @@ cc_result Socket_Available(cc_socket s, int* available) { } cc_result Socket_GetError(cc_socket s, cc_result* result) { - socklen_t resultSize = sizeof(cc_result); + int resultSize = sizeof(cc_result); return getsockopt(s, SOL_SOCKET, SO_ERROR, result, &resultSize); } static int ParseHost(void* dst, WCHAR* host, int port) { - ADDRINFOA hints = { 0 }; - ADDRINFOA* result; - ADDRINFOA* cur; - int family = 0, res; - - hints.ai_family = AF_INET; - hints.ai_socktype = SOCK_STREAM; - hints.ai_protocol = IPPROTO_TCP; + SOCKADDR_IN* addr4 = (SOCKADDR_IN*)dst; + struct hostent* res; Platform_Utf16ToAnsi(host); - res = _getaddrinfo((char*)host, NULL, &hints, &result); - if (res) return 0; + res = gethostbyname((char*)host); + if (!res || res->h_addrtype != AF_INET) return 0; - for (cur = result; cur; cur = cur->ai_next) { - if (cur->ai_family != AF_INET) continue; - family = AF_INET; + /* Must have at least one IPv4 address */ + if (!res->h_addr_list[0]) return 0; - Mem_Copy(dst, cur->ai_addr, cur->ai_addrlen); - ((SOCKADDR_IN*)dst)->sin_port = htons(port); - break; - } - - _freeaddrinfo(result); - return family; -} - -static int FallbackParseAddress(SOCKADDR_IN* dst, const cc_string* ip, int port) { - cc_uint8* addr; - cc_string parts[4 + 1]; - /* +1 in case user tries '1.1.1.1.1' */ - if (String_UNSAFE_Split(ip, '.', parts, 4 + 1) != 4) return 0; - addr = (cc_uint8*)&dst->sin_addr; - - if (!Convert_ParseUInt8(&parts[0], &addr[0]) || !Convert_ParseUInt8(&parts[1], &addr[1]) || - !Convert_ParseUInt8(&parts[2], &addr[2]) || !Convert_ParseUInt8(&parts[3], &addr[3])) - return 0; - - dst->sin_family = AF_INET; - dst->sin_port = htons(port); + addr4->sin_family = AF_INET; + addr4->sin_port = htons(port); + addr4->sin_addr = *(IN_ADDR*)res->h_addr_list[0]; return AF_INET; } @@ -452,12 +447,8 @@ static int Socket_ParseAddress(void* dst, const cc_string* address, int port) { DWORD size; Platform_EncodeUtf16(str, address); - /* Fallback for older OS versions which lack WSAStringToAddressW */ - if (!_WSAStringToAddressW) - return FallbackParseAddress(addr4, address, port); - size = sizeof(*addr4); - if (!_WSAStringToAddressW(str, AF_INET, NULL, (SOCKADDR*)addr4, &size)) { + if (!_WSAStringToAddressW(str, AF_INET, NULL, addr4, &size)) { addr4->sin_port = htons(port); return AF_INET; } @@ -466,8 +457,6 @@ static int Socket_ParseAddress(void* dst, const cc_string* address, int port) { addr6->sin6_port = htons(port); return AF_INET6; } - - if (!_getaddrinfo) return 0; return ParseHost(dst, str, port); } From 207395e5cd8fa996e2074337386d2c956b4091b1 Mon Sep 17 00:00:00 2001 From: UnknownShadow200 Date: Sun, 6 Jun 2021 22:33:45 +1000 Subject: [PATCH 3/3] fix mac/linux, ipv6 might be broken but hopefully not --- src/Platform_Posix.c | 54 ++++++++++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 25 deletions(-) diff --git a/src/Platform_Posix.c b/src/Platform_Posix.c index a899f6f83..6b7b1b914 100644 --- a/src/Platform_Posix.c +++ b/src/Platform_Posix.c @@ -29,6 +29,7 @@ #include #include #include +#include #define Socket__Error() errno static char* defaultDirectory; @@ -450,6 +451,13 @@ void Platform_LoadSysFonts(void) { /*########################################################################################################################* *---------------------------------------------------------Socket----------------------------------------------------------* *#########################################################################################################################*/ +union SocketAddress { + struct sockaddr_storage total; + struct sockaddr raw; + struct sockaddr_in v4; + struct sockaddr_in6 v6; +}; + cc_result Socket_Available(cc_socket s, int* available) { return ioctl(s, FIONREAD, available); } @@ -459,7 +467,7 @@ cc_result Socket_GetError(cc_socket s, cc_result* result) { return getsockopt(s, SOL_SOCKET, SO_ERROR, result, &resultSize); } -static int ParseHost(void* dst, const char* host, int port, int* addrSize) { +static int ParseHost(union SocketAddress* addr, const char* host) { struct addrinfo hints = { 0 }; struct addrinfo* result; struct addrinfo* cur; @@ -476,8 +484,7 @@ static int ParseHost(void* dst, const char* host, int port, int* addrSize) { if (cur->ai_family != AF_INET) continue; family = AF_INET; - Mem_Copy(dst, cur->ai_addr, cur->ai_addrlen); - *addrSize = cur->ai_addrlen; + Mem_Copy(addr, cur->ai_addr, cur->ai_addrlen); break; } @@ -485,47 +492,44 @@ static int ParseHost(void* dst, const char* host, int port, int* addrSize) { return family; } -static int ParseAddress(void* dst, const cc_string* address, int port, int* addrSize) { - struct sockaddr_in* addr4 = (struct sockaddr_in* )dst; - struct sockaddr_in6* addr6 = (struct sockaddr_in6*)dst; +static int ParseAddress(union SocketAddress* addr, const cc_string* address) { char str[NATIVE_STR_LEN]; Platform_EncodeUtf8(str, address); - if (inet_pton(AF_INET, str, &addr4->sin_addr) > 0) { - addr4->sin_family = AF_INET; - addr4->sin_port = htons(port); - *addrSize = sizeof(struct sockaddr_in); - return AF_INET; - } - if (inet_pton(AF_INET6, str, &addr6->sin6_addr) > 0) { - addr6->sin6_family = AF_INET6; - addr6->sin6_port = htons(port); - *addrSize = sizeof(struct sockaddr_in6); - return AF_INET6; - } - return ParseHost(dst, str, port, addrSize); + if (inet_pton(AF_INET, str, &addr->v4.sin_addr) > 0) return AF_INET; + if (inet_pton(AF_INET6, str, &addr->v6.sin6_addr) > 0) return AF_INET6; + return ParseHost(addr, str); } int Socket_ValidAddress(const cc_string* address) { - struct sockaddr_storage addr; - int addrSize; - return ParseAddress(&addr, address, 0, &addrSize); + union SocketAddress addr; + return ParseAddress(&addr, address); } cc_result Socket_Connect(cc_socket* s, const cc_string* address, int port) { int family, addrSize, blocking_raw = -1; /* non-blocking mode */ - struct sockaddr_storage addr; + union SocketAddress addr; cc_result res; *s = -1; - if (!(family = ParseAddress(&addr, address, port, &addrSize))) + if (!(family = ParseAddress(&addr, address))) return ERR_INVALID_ARGUMENT; *s = socket(family, SOCK_STREAM, IPPROTO_TCP); if (*s == -1) return errno; ioctl(*s, FIONBIO, &blocking_raw); - res = connect(*s, &addr, addrSize); + if (family == AF_INET6) { + addr.v6.sin6_family = AF_INET6; + addr.v6.sin6_port = htons(port); + addrSize = sizeof(addr.v6); + } else if (family == AF_INET) { + addr.v4.sin_family = AF_INET; + addr.v4.sin_port = htons(port); + addrSize = sizeof(addr.v4); + } + + res = connect(*s, &addr.raw, addrSize); return res == -1 ? errno : 0; }