Handle non-blocking tcp connections on windows

n42n · Dec 9, 2024 · 54e3687 · 54e3687
1 parent 3e72976
commit 54e3687
Showing 1 changed file with 25 additions and 2 deletions.
diff --git a/src/edge_utils.c b/src/edge_utils.c
@@ -381,12 +381,35 @@ void supernode_connect (struct n3n_runtime_data *eee) {
 
         fill_sockaddr((struct sockaddr*)&sn_sock, sizeof(sn_sock), &eee->curr_sn->sock);
 
-        if((connect(eee->sock, (struct sockaddr*)&(sn_sock), sizeof(struct sockaddr)) < 0)
-           && (errno != EINPROGRESS)) {
+        int result = connect(
+            eee->sock,
+            (struct sockaddr*)&(sn_sock),
+            sizeof(struct sockaddr)
+        );
+
+#ifndef _WIN32
+        if((result == -1) && (errno != EINPROGRESS)) {
             traceEvent(TRACE_INFO, "Error connecting TCP: %i", errno);
+            closesocket(eee->sock);
+            mainloop_unregister_fd(eee->sock);
             eee->sock = -1;
             return;
         }
+#else
+        // Oh Windows, this just seems needlessly incompatible
+        int wsaerr = WSAGetLastError();
+        if((result == -1) && (wsaerr != WSAEWOULDBLOCK)) {
+            traceEvent(
+                TRACE_INFO,
+                "Error connecting TCP: WSAGetLastError %i",
+                wsaerr
+            );
+            closesocket(eee->sock);
+            mainloop_unregister_fd(eee->sock);
+            eee->sock = -1;
+            return;
+        }
+#endif
     }
 
     if(eee->conf.tos) {