Make progress to Windows build of remote connection code

.github/workflows/build-msys2.yml

@@ -33,9 +33,11 @@ jobs:
             ffmpeg:p
             fftw:p
             hidapi:p
+            json-c:p
             lcms2:p
             libdovi:p
             meson:p
+            miniupnpc:p
             nasm:p
             ninja:p
             openssl:p

.github/workflows/build-windows.yml

@@ -144,6 +144,7 @@ jobs:
           -DCHIAKI_ENABLE_STEAM_SHORTCUT=OFF `
           -DCHIAKI_GUI_ENABLE_SDL_GAMECONTROLLER=ON `
           -DCHIAKI_ENABLE_STEAMDECK_NATIVE=OFF `
+          -DCHIAKI_USE_SYSTEM_CURL `
           -DPYTHON_EXECUTABLE="${{ env.pythonLocation }}\python.exe" `
           -DCMAKE_PREFIX_PATH="${{ github.workspace }}\${{ env.dep_folder }};${{ env.VULKAN_SDK }}"
 

lib/CMakeLists.txt

@@ -122,7 +122,7 @@ add_dependencies(chiaki-lib chiaki-pb)
 set_target_properties(chiaki-lib PROPERTIES OUTPUT_NAME chiaki)
 
 if(WIN32)
-	target_link_libraries(chiaki-lib wsock32 ws2_32 bcrypt)
+	target_link_libraries(chiaki-lib wsock32 ws2_32 bcrypt iphlpapi)
 endif()
 
 target_include_directories(chiaki-lib PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/include")

lib/include/chiaki/sock.h

@@ -20,6 +20,7 @@ typedef SOCKET chiaki_socket_t;
 #define CHIAKI_SOCKET_ERROR_FMT "%d"
 #define CHIAKI_SOCKET_ERROR_VALUE (WSAGetLastError())
 #define CHIAKI_SOCKET_EINPROGRESS (WSAGetLastError() == WSAEWOULDBLOCK)
+#define SOCKET_BUF_TYPE (char*)
 #else
 #include <unistd.h>
 #include <errno.h>
@@ -30,6 +31,7 @@ typedef int chiaki_socket_t;
 #define CHIAKI_SOCKET_ERROR_FMT "%s"
 #define CHIAKI_SOCKET_ERROR_VALUE (strerror(errno))
 #define CHIAKI_SOCKET_EINPROGRESS (errno == EINPROGRESS)
+#define SOCKET_BUF_TYPE (void *)
 #endif
 
 CHIAKI_EXPORT ChiakiErrorCode chiaki_socket_set_nonblock(chiaki_socket_t sock, bool nonblock);

lib/src/remote/rudp.c

@@ -5,7 +5,6 @@
 #include <chiaki/remote/rudpsendbuffer.h>
 
 #include <math.h>
-#include <arpa/inet.h>
 #include <string.h>
 #include <assert.h>
 
@@ -337,7 +336,7 @@ CHIAKI_EXPORT ChiakiErrorCode chiaki_rudp_send_raw(RudpInstance *rudp, uint8_t *
     {
         return CHIAKI_ERR_DISCONNECTED;
     }
-	int sent = send(rudp->sock, buf, buf_size, 0);
+	int sent = send(rudp->sock, SOCKET_BUF_TYPE buf, buf_size, 0);
 	if(sent < 0)
 	{
 #ifdef _WIN32
@@ -362,7 +361,7 @@ CHIAKI_EXPORT ChiakiErrorCode chiaki_rudp_recv(RudpInstance *rudp, size_t buf_si
 		return err;
 	}
 
-	int received_sz = recv(rudp->sock, buf, buf_size, 0);
+	int received_sz = recv(rudp->sock, SOCKET_BUF_TYPE buf, buf_size, 0);
 	if(received_sz <= 8)
 	{
 		if(received_sz < 0)

lib/src/remote/rudpsendbuffer.c

@@ -8,7 +8,6 @@
 #include <string.h>
 #include <assert.h>
 #include <stdio.h>
-#include <arpa/inet.h>
 
 #define RUDP_DATA_RESEND_TIMEOUT_MS 200
 #define RUDP_DATA_RESEND_WAKEUP_TIMEOUT_MS (RUDP_DATA_RESEND_TIMEOUT_MS/2)

lib/src/remote/stun.h

@@ -2,9 +2,15 @@
 #include <stdlib.h>
 #include <string.h>
 #include <time.h>
+
+#ifdef _WIN32
+#include <ws2tcpip.h>
+#else
+#include <unistd.h>
 #include <sys/socket.h>
 #include <netdb.h>
 #include <arpa/inet.h>
+#endif
 
 #include <chiaki/log.h>
 #include <chiaki/sock.h>
@@ -88,7 +94,7 @@ static bool stun_get_external_address_from_server(ChiakiLog *log, StunServer *se
 {
     chiaki_socket_t sock = socket(AF_INET, SOCK_DGRAM, 0);
     if (sock < 0) {
-        CHIAKI_LOGE(log, "remote/stun.h: Failed to create socket, error was '%s'", strerror(errno));
+        CHIAKI_LOGE(log, "remote/stun.h: Failed to create socket, error was " CHIAKI_SOCKET_ERROR_FMT, CHIAKI_SOCKET_ERROR_VALUE);
         return false;
     }
 
@@ -99,8 +105,8 @@ static bool stun_get_external_address_from_server(ChiakiLog *log, StunServer *se
     local_addr.sin_addr.s_addr = htonl(INADDR_ANY);
 
     if (bind(sock, (struct sockaddr *)&local_addr, sizeof(local_addr)) < 0) {
-        CHIAKI_LOGE(log, "remote/stun.h: Failed to bind socket to local address, error was '%s'", strerror(errno));
-        close(sock);
+        CHIAKI_LOGE(log, "remote/stun.h: Failed to bind socket to local address, error was " CHIAKI_SOCKET_ERROR_FMT, CHIAKI_SOCKET_ERROR_VALUE);
+        CHIAKI_SOCKET_CLOSE(sock);
         return false;
     }
 
@@ -111,8 +117,8 @@ static bool stun_get_external_address_from_server(ChiakiLog *log, StunServer *se
     hints.ai_family = AF_INET;
     hints.ai_socktype = SOCK_DGRAM;
     if (getaddrinfo(server->host, NULL, &hints, &resolved) != 0) {
-        CHIAKI_LOGE(log, "remote/stun.h: Failed to resolve STUN server '%s', error was '%s'", server->host, strerror(errno));
-        close(sock);
+        CHIAKI_LOGE(log, "remote/stun.h: Failed to resolve STUN server '%s', error was " CHIAKI_SOCKET_ERROR_FMT, server->host, CHIAKI_SOCKET_ERROR_VALUE);
+        CHIAKI_SOCKET_CLOSE(sock);
         return false;
     }
 
@@ -128,27 +134,33 @@ static bool stun_get_external_address_from_server(ChiakiLog *log, StunServer *se
 
     //uint8_t* transaction_id = &binding_req[8];
 
-    ssize_t sent = sendto(sock, binding_req, sizeof(binding_req), 0, (struct sockaddr*)server_addr, sizeof(struct sockaddr_in));
+    ssize_t sent = sendto(sock, SOCKET_BUF_TYPE binding_req, sizeof(binding_req), 0, (struct sockaddr*)server_addr, sizeof(struct sockaddr_in));
     if (sent != sizeof(binding_req)) {
-        CHIAKI_LOGE(log, "remote/stun.h: Failed to send STUN request, error was '%s'", strerror(errno));
-        close(sock);
+        CHIAKI_LOGE(log, "remote/stun.h: Failed to send STUN request, error was " CHIAKI_SOCKET_ERROR_FMT, CHIAKI_SOCKET_ERROR_VALUE);
+        CHIAKI_SOCKET_CLOSE(sock);
         return false;
     }
 
+#ifdef _WIN32
+    char timeout[20] = {0};
+    sprintf(timeout, "%d", STUN_REPLY_TIMEOUT_SEC * 1000);
+    if (setsockopt(sock, SOL_SOCKET, SO_RCVTIMEO, timeout, sizeof(timeout)) < 0) {
+#else
     struct timeval timeout;
     timeout.tv_sec = STUN_REPLY_TIMEOUT_SEC;
     timeout.tv_usec = 0;
     if (setsockopt(sock, SOL_SOCKET, SO_RCVTIMEO, &timeout, sizeof(timeout)) < 0) {
-        CHIAKI_LOGE(log, "remote/stun.h: Failed to set socket timeout, error was '%s'", strerror(errno));
-        close(sock);
+#endif
+        CHIAKI_LOGE(log, "remote/stun.h: Failed to set socket timeout, error was " CHIAKI_SOCKET_ERROR_FMT, CHIAKI_SOCKET_ERROR_VALUE);
+        CHIAKI_SOCKET_CLOSE(sock);
         return false;
     }
 
     uint8_t binding_resp[256];
-    ssize_t received = recvfrom(sock, binding_resp, sizeof(binding_resp), 0, NULL, NULL);
-    close(sock);
+    ssize_t received = recvfrom(sock, SOCKET_BUF_TYPE binding_resp, sizeof(binding_resp), 0, NULL, NULL);
+    CHIAKI_SOCKET_CLOSE(sock);
     if (received < 0) {
-        CHIAKI_LOGE(log, "remote/stun.h: Failed to receive STUN response, error was '%s'", strerror(errno));
+        CHIAKI_LOGE(log, "remote/stun.h: Failed to receive STUN response, error was " CHIAKI_SOCKET_ERROR_FMT, CHIAKI_SOCKET_ERROR_VALUE);
         return false;
     }
 

lib/src/utils.h

@@ -90,7 +90,7 @@ static inline int sendto_broadcast(ChiakiLog *log, chiaki_socket_t s, const void
 		return r;
 	}
 #endif
-	return sendto(s, msg, len, flags, to, tolen);
+	return sendto(s, SOCKET_BUF_TYPE msg, len, flags, to, tolen);
 }
 
 static inline void xor_bytes(uint8_t *dst, uint8_t *src, size_t sz)

vcpkg.json

@@ -1,12 +1,21 @@
 {
     "name": "chiaki4deck",
-    "version": "1.6.3",
+    "version": "1.7.0",
     "dependencies": [
       "pkgconf",
+      {
+        "name": "curl",
+        "features": [
+          "ssl",
+          "websockets"
+        ]
+      },
       "sdl2",
       "protobuf",
       "openssl",
       "hidapi",
+      "json-c",
+      "miniupnpc",
       "opus",
       "fftw3",
       "lcms",