Changeset 107225 in vbox for trunk/src/VBox/Devices

Timestamp:

Dec 4, 2024 1:23:29 PM (5 months ago)

Author:

vboxsync

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

166229

Message:

NAT: Slightly adjusted polling loop.

File:

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

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

@@ -40 +40 @@
 # define inet_aton(x, y) inet_pton(2, x, y)
 # define AF_INET6 23
-# define poll WSAPoll
 #endif
 
@@ -749 +748 @@
         drvNAT_UpdateTimeout(&uTimeout, pThis);
 
+#ifdef RT_OS_WINDOWS
+        int cChangedFDs = WSAPoll(pThis->pNATState->polls, pThis->pNATState->nsock, uTimeout /* timeout */);
+        /* Note: This must be called IMMEDIATELY after WSAPoll. */
+        int error = WSAGetLastError();
+#else
         int cChangedFDs = poll(pThis->pNATState->polls, pThis->pNATState->nsock, uTimeout /* timeout */);
-#ifdef RT_OS_WINDOWS
-        /* Note: This must be called IMMEDIATELY after poll/WSAPoll. */
-        int error = WSAGetLastError();
 #endif
-
         if (cChangedFDs < 0)
         {
@@ -778 +778 @@
         slirp_pollfds_poll(pThis->pNATState->pSlirp, cChangedFDs < 0, drvNAT_GetREventsCb /* SlirpGetREventsCb */, pThis /* opaque */);
 
-#ifdef RT_OS_WINDOWS
-        if (pThis->pNATState->polls[0].revents & (POLLIN))
-#else
-        if (pThis->pNATState->polls[0].revents & (POLLRDNORM|POLLPRI|POLLRDBAND))
-#endif
+        if (pThis->pNATState->polls[0].revents & (POLLRDNORM|POLLPRI|POLLRDBAND))   /* POLLPRI won't be seen with WSAPoll. */
         {
             /* drain the pipe
@@ -800 +796 @@
             ASMAtomicSubU64(&pThis->cbWakeupNotifs, cbRead);
         }
-
 
         /* process _all_ outstanding requests but don't wait */