Changeset 108816 in vbox for trunk/src

Timestamp:

Apr 1, 2025 8:30:27 PM (2 weeks ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

168262

Message:

NAT/libslirp: fixed handle table leak which was causing disconnects on windows during high or sustained network traffic. bugref:10268

Location:

trunk/src/libs/libslirp-4.8.0/src

Files:

• nathandletable.c (modified) (2 diffs)
• nathandletable.h (modified) (1 diff)
• util.c (modified) (1 diff)

trunk/src/libs/libslirp-4.8.0/src/nathandletable.c

@@ -49 +49 @@
     }
 
-    Log6Func(("Looking up %d on %p\n", fd, (void *)pNATHandleTable));
     SOCKET s = (SOCKET)RTHandleTableLookup(*pNATHandleTable, fd);
+    Log6Func(("Looked up %d on %p and returned %d\n", fd, (void *)pNATHandleTable, s));
     return s;
 }
@@ -63 +63 @@
     }
 
-    Log6Func(("Creating sock %llu on %p\n", uSocket, (void *)pNATHandleTable));
-    return RTHandleTableAlloc(*pNATHandleTable, (void *)uSocket, pHandle);
+    int ret = RTHandleTableAlloc(*pNATHandleTable, (void *)uSocket, pHandle);
+    Log6Func(("Creating sock %llu on %p with handle %d\n", uSocket, (void *)pNATHandleTable, *pHandle));
+    return ret;
+}
+
+int libslirp_wrap_RTHandleTableFree(int fd)
+{
+    if (pNATHandleTable == NULL)
+        return VERR_INVALID_PARAMETER;
+
+    void *ret = RTHandleTableFree(*pNATHandleTable, fd);
+    Log6Func(("Freeing sock %d on %p\n", fd, (void *)pNATHandleTable));
+    if (ret)
+        return VINF_SUCCESS;
+
+    return VERR_INVALID_PARAMETER;
 }
 

trunk/src/libs/libslirp-4.8.0/src/nathandletable.h

@@ -59 +59 @@
 extern PRTHANDLETABLE pNATHandleTable;
 
+/**
+ * Looks up a SOCKET handle by the integer handle used by libslirp.
+ *
+ * @returns actual SOCKET handle used by Windows
+ * @param   fd            Integer handle used internally by libslirp.
+ */
 SOCKET libslirp_wrap_RTHandleTableLookup(int fd);
 
-int libslirp_wrap_RTHandleTableAlloc(SOCKET, uint32_t *);
+/**
+ * Allocates an integer handle from a SOCKET handle for use libslirp.
+ *
+ * @returns VBox status code
+ * @param   s            SOCKET handle from Windows.
+ *                       Typically from a socket() call.
+ * @param   h            Return param. Integer handle from table.
+ */
+int libslirp_wrap_RTHandleTableAlloc(SOCKET s, uint32_t *h);
+
+/**
+ * Frees entry from lookup table.
+ *
+ * @returns VBox status code
+ * @param   fd            Integer handle used internally by libslirp.
+ */
+int libslirp_wrap_RTHandleTableFree(int fd);
 
 #ifdef __cplusplus

trunk/src/libs/libslirp-4.8.0/src/util.c

@@ -199 +199 @@
 
     ret = closesocket(s);
+
+    if (ret == SOCKET_ERROR)
+    {
+        int iError = WSAGetLastError();
+        LogFunc(("SOCKET CLOSE ERROR: Handle %d, discovered to be SOCKET %d, \
+                failed to close with error: %d\n", fd, s, iError));
+        return ret;
+    }
+
+    ret = libslirp_wrap_RTHandleTableFree(fd);
+    if (!RT_SUCCESS(ret))
+    {
+        Log3Func(("Handle free error: Handle %d which was really %d", fd, s));
+        return VERR_INVALID_PARAMETER;
+    }
 #else
     ret = closesocket(fd);
-#endif
-    if (ret < 0) {
-        errno = socket_error();
-    }
+    if (ret < 0) {
+        errno = socket_error();
+    }
+#endif
     return ret;
 }