Changeset 106678 in vbox for trunk/src/VBox/Devices/Network

Timestamp:

Oct 25, 2024 7:36:01 AM (4 months ago)

Author:

vboxsync

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

165547

Message:

Devices/Network: fix stray typo, fix nat notify pipe draining. bugref:10268

File:

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

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

@@ -778 +778 @@
             size_t cbRead;
             uint64_t cbWakeupNotifs = ASMAtomicReadU64(&pThis->cbWakeupNotifs);
-
-            if (cbWakeupNotifs > 1024)
-            {
-                RTPipeRead(pThis->hPipeRead, &ch, 1024, &cbRead);
-                ASMAtomicSubU64(&pThis->cbWakeupNotifs, 1024);
-            }
-            else
-            {
-                RTPipeRead(pThis->hPipeRead, &ch, cbWakeupNotifs, &cbRead);
-                ASMAtomicSubU64(&pThis->cbWakeupNotifs, cbRead);
-            }
+            RTPipeRead(pThis->hPipeRead, &ch[0], RT_MIN(cbWakeupNotifs, 1024), &cbRead);
+            ASMAtomicSubU64(&pThis->cbWakeupNotifs, cbRead);
         }
 
@@ -800 +791 @@
         slirp_pollfds_fill(pThis->pNATState->pSlirp, &msTimeout, drvNAT_AddPollCb /* SlirpAddPollCb */, pThis /* opaque */);
         drvNAT_UpdateTimeout(&msTimeout, pThis);
-.h
+
         int cChangedFDs = WSAPoll(pThis->pNATState->polls, pThis->pNATState->nsock, msTimeout /* timeout */);
         int error = WSAGetLastError();
@@ -820 +811 @@
             size_t cbRead;
             uint64_t cbWakeupNotifs = ASMAtomicReadU64(&pThis->cbWakeupNotifs);
-
-            if (cbWakeupNotifs > 1024)
-            {
-                cbRead = recv(pThis->pWakeupSockPair[1], &ch, 1024, NULL);
-                ASMAtomicSubU64(&pThis->cbWakeupNotifs, 1024);
-            }
-            else
-            {
-                cbRead = recv(pThis->pWakeupSockPair[1], &ch, cbWakeupNotifs, NULL);
-                ASMAtomicSubU64(&pThis->cbWakeupNotifs, cbRead);
-            }
+            cbRead = recv(pThis->pWakeupSockPair[1], &ch[0], RT_MIN(cbWakeupNotifs, 1024), NULL);
+            ASMAtomicSubU64(&pThis->cbWakeupNotifs, cbRead);
         }