moonlight-stream/Internet-Hosting-Tool
1
0
Fork 0
mirror of https://github.com/moonlight-stream/Internet-Hosting-Tool.git synced 2026-06-18 14:41:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Switch to the new loopback server protocol

Browse Source
This commit is contained in:
Cameron Gutman
2020-07-18 17:12:35 -07:00
parent a9bf4ffd70
commit 74140a8511
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mist/mist.cpp
+7 -5
View File
@@ -26,6 +26,8 @@
#define NATPMP_STATICLIB #define NATPMP_STATICLIB
#include <natpmp.h> #include <natpmp.h>
#define LOOPBACK_SERVER_PORT_OFFSET -10000
static struct port_entry { static struct port_entry {
int proto; int proto;
int port; int port;
@@ -457,7 +459,7 @@ PortTestStatus TestPort(PSOCKADDR_STORAGE addr, int proto, int port, bool withSe
sizeof(SOCKADDR_IN) : sizeof(SOCKADDR_IN6); sizeof(SOCKADDR_IN) : sizeof(SOCKADDR_IN6);
RtlCopyMemory(&sin6, addr, addrLen); RtlCopyMemory(&sin6, addr, addrLen);
sin6.sin6_port = htons(port); sin6.sin6_port = htons(port + (isLoopbackRelay ? LOOPBACK_SERVER_PORT_OFFSET : 0));
if (proto == IPPROTO_TCP) { if (proto == IPPROTO_TCP) {
err = connect(clientSock, (struct sockaddr*)&sin6, addrLen); err = connect(clientSock, (struct sockaddr*)&sin6, addrLen);
@@ -547,7 +549,7 @@ PortTestStatus TestPort(PSOCKADDR_STORAGE addr, int proto, int port, bool withSe
} }
} }
PortTestStatus TestHttpPort(PSOCKADDR_STORAGE addr, int port) PortTestStatus TestHttpPort(PSOCKADDR_STORAGE addr, int port, bool isLoopbackRelay)
{ {
HINTERNET hSession = nullptr; HINTERNET hSession = nullptr;
HINTERNET hConnection = nullptr; HINTERNET hConnection = nullptr;
@@ -584,7 +586,7 @@ PortTestStatus TestHttpPort(PSOCKADDR_STORAGE addr, int port)
wcscat_s(urlEscapedAddr, L"]"); wcscat_s(urlEscapedAddr, L"]");
} }
hConnection = WinHttpConnect(hSession, urlEscapedAddr, port, NULL); hConnection = WinHttpConnect(hSession, urlEscapedAddr, port + (isLoopbackRelay ? LOOPBACK_SERVER_PORT_OFFSET : 0), NULL);
if (hConnection == nullptr) { if (hConnection == nullptr) {
fprintf(LOG_OUT, "WinHttpConnect() failed: %d\n", GetLastError()); fprintf(LOG_OUT, "WinHttpConnect() failed: %d\n", GetLastError());
result = PortTestError; result = PortTestError;
@@ -666,7 +668,7 @@ bool TestAllPorts(PSOCKADDR_STORAGE addr, char* portMsg, int portMsgLen, bool is
// TestHttpPort() can take significantly longer to timeout than TestPort(), // TestHttpPort() can take significantly longer to timeout than TestPort(),
// so we only do this test if we believe we're likely to get a response. // so we only do this test if we believe we're likely to get a response.
fprintf(LOG_OUT, "Testing TCP %d with HTTP traffic...", k_Ports[i].port); fprintf(LOG_OUT, "Testing TCP %d with HTTP traffic...", k_Ports[i].port);
status = TestHttpPort(addr, k_Ports[i].port); status = TestHttpPort(addr, k_Ports[i].port, isLoopbackRelay);
} }
if (status != PortTestOk) { if (status != PortTestOk) {
@@ -1290,7 +1292,7 @@ int main(int argc, char* argv[])
hint.ai_family = AF_UNSPEC; hint.ai_family = AF_UNSPEC;
hint.ai_flags = AI_ADDRCONFIG; hint.ai_flags = AI_ADDRCONFIG;
err = getaddrinfo("loopback.moonlight-stream.org", NULL, &hint, &result); err = getaddrinfo("loopback-v2.moonlight-stream.org", NULL, &hint, &result);
if (err != 0 || result == NULL) { if (err != 0 || result == NULL) {
fprintf(LOG_OUT, "getaddrinfo() failed: %d\n", err); fprintf(LOG_OUT, "getaddrinfo() failed: %d\n", err);
} }