Changeset 108820 in vbox for trunk/src

Timestamp:

Apr 1, 2025 10:39:09 PM (2 weeks ago)

Author:

vboxsync

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

168266

Message:

NAT/libslirp: fixed assert/order bug. bugref:10268

File:

• trunk/src/VBox/Devices/Network/DrvNATlibslirp.cpp (modified) (2 diffs)

trunk/src/VBox/Devices/Network/DrvNATlibslirp.cpp

@@ -739 +739 @@
 #ifdef RT_OS_WINDOWS
     drvNAT_AddPollCb(pThis->ahWakeupSockPair[1], SLIRP_POLL_IN | SLIRP_POLL_HUP, pThis);
+
+    /* HACK ALERT: while Windows socket handling is weird, do this explicitly. */
     pThis->pNATState->polls[0].fd = pThis->ahWakeupSockPair[1];
 #else
@@ -1786 +1788 @@
     rc = RTWinSocketPair(AF_INET, SOCK_DGRAM, 0, pThis->ahWakeupSockPair);
     AssertRCReturn(rc, rc);
+
+    uint32_t hReadFd = 0;
+    uint32_t hWriteFd = 0;
+
+    rc = libslirp_wrap_RTHandleTableAlloc(pThis->ahWakeupSockPair[0], &hReadFd);
+    AssertRCReturn(rc, rc);
+
+    rc = libslirp_wrap_RTHandleTableAlloc(pThis->ahWakeupSockPair[1], &hWriteFd);
+    AssertRCReturn(rc, rc);
+
+    Log4Func(("Created wakeup socket pair.\nSocket details - read:%d, write%d\n \
+               Handle details - read:%d, write%d\n", pThis->ahWakeupSockPair[0],
+               pThis->ahWakeupSockPair[1], hReadFd, hWriteFd));
+
+    /**
+     * @todo r=jack: should probably use the internal handles up in the io
+     * thread. Will fix (or just update libslirp and this translation stuff
+     * might go away).
+     */
 #else
     /* Create the control pipe. */