Changeset 86822 in vbox for trunk/src

Timestamp:

Nov 6, 2020 12:46:48 PM (4 years ago)

Author:

vboxsync

Message:

VBoxNetDHCP: Fixed incorrect VBoxNetDhcpd::ifPump return condition (don't return on VERR_INTERRUPT). Inlined ifWait since it was only used from ifPump. bugref:9787

File:

• trunk/src/VBox/NetworkServices/Dhcpd/VBoxNetDhcpd.cpp (modified) (9 diffs)

trunk/src/VBox/NetworkServices/Dhcpd/VBoxNetDhcpd.cpp

@@ -139 +139 @@
     int ifActivate();
 
-    int ifWait(uint32_t cMillies = RT_INDEFINITE_WAIT);
     int ifProcessInput();
     int ifFlush();
@@ -378 +377 @@
 
 
+/**
+ * Process incoming packages forever.
+ *
+ * @note This function normally never returns, given that the process is
+ *       typically just killed when shutting down a network.
+ */
 void VBoxNetDhcpd::ifPump()
 {
     for (;;)
     {
-        int rc = ifWait();
-        if (   rc != VERR_INTERRUPTED
-#if 0 /* we wait indefinitely */
-            && rc != VERR_TIMEOUT
-#endif
-            )
+        /*
+         * Wait for input:
+         */
+        INTNETIFWAITREQ WaitReq;
+        WaitReq.Hdr.u32Magic = SUPVMMR0REQHDR_MAGIC;
+        WaitReq.Hdr.cbReq = sizeof(WaitReq);
+        WaitReq.pSession = m_pSession;
+        WaitReq.hIf = m_hIf;
+        WaitReq.cMillies = RT_INDEFINITE_WAIT;
+        int rc = CALL_VMMR0(VMMR0_DO_INTNET_IF_WAIT, WaitReq);
+
+        /*
+         * Process any pending input before we wait again:
+         */
+        if (   RT_SUCCESS(rc)
+            || rc == VERR_INTERRUPTED
+            || rc == VERR_TIMEOUT /* paranoia */)
             ifProcessInput();
         else
@@ -398 +414 @@
 
 
-int VBoxNetDhcpd::ifWait(uint32_t cMillies)
-{
-    AssertReturn(m_pSession != NIL_RTR0PTR, VERR_GENERAL_FAILURE);
-    AssertReturn(m_hIf != INTNET_HANDLE_INVALID, VERR_GENERAL_FAILURE);
-
-    INTNETIFWAITREQ WaitReq;
-    int rc;
-
-    WaitReq.Hdr.u32Magic = SUPVMMR0REQHDR_MAGIC;
-    WaitReq.Hdr.cbReq = sizeof(WaitReq);
-    WaitReq.pSession = m_pSession;
-    WaitReq.hIf = m_hIf;
-
-    WaitReq.cMillies = cMillies;
-
-    rc = CALL_VMMR0(VMMR0_DO_INTNET_IF_WAIT, WaitReq);
-    return rc;
-}
-
-
 int VBoxNetDhcpd::ifProcessInput()
 {
@@ -424 +420 @@
     AssertReturn(m_pIfBuf != NULL, VERR_GENERAL_FAILURE);
 
-    for (PCINTNETHDR pHdr;
-         (pHdr = IntNetRingGetNextFrameToRead(&m_pIfBuf->Recv)) != NULL;
-         IntNetRingSkipFrame(&m_pIfBuf->Recv))
+    PCINTNETHDR pHdr = IntNetRingGetNextFrameToRead(&m_pIfBuf->Recv);
+    while (pHdr)
     {
         const uint8_t u8Type = pHdr->u8Type;
@@ -441 +436 @@
         else if (u8Type == INTNETHDR_TYPE_GSO)
         {
-            PCPDMNETWORKGSO pGso;
             size_t cbGso = pHdr->cbFrame;
             size_t cbFrame = cbGso - sizeof(PDMNETWORKGSO);
 
-            pGso = IntNetHdrGetGsoContext(pHdr, m_pIfBuf);
-            if (!PDMNetGsoIsValid(pGso, cbGso, cbFrame))
-                continue;
-
-            const uint32_t cSegs = PDMNetGsoCalcSegmentCount(pGso, cbFrame);
-            for (uint32_t i = 0; i < cSegs; ++i)
+            PCPDMNETWORKGSO pGso = IntNetHdrGetGsoContext(pHdr, m_pIfBuf);
+            if (PDMNetGsoIsValid(pGso, cbGso, cbFrame))
             {
-                uint8_t abHdrScratch[256];
-                pvSegFrame = PDMNetGsoCarveSegmentQD(pGso, (uint8_t *)(pGso + 1), cbFrame,
-                                                     abHdrScratch,
-                                                     i, cSegs,
-                                                     &cbSegFrame);
-                ifInput(pvSegFrame, (uint32_t)cbFrame);
+                const uint32_t cSegs = PDMNetGsoCalcSegmentCount(pGso, cbFrame);
+                for (uint32_t i = 0; i < cSegs; ++i)
+                {
+                    uint8_t abHdrScratch[256];
+                    pvSegFrame = PDMNetGsoCarveSegmentQD(pGso, (uint8_t *)(pGso + 1), cbFrame,
+                                                         abHdrScratch,
+                                                         i, cSegs,
+                                                         &cbSegFrame);
+                    ifInput(pvSegFrame, (uint32_t)cbFrame);
+                }
             }
         }
+
+        /* Advance: */
+        IntNetRingSkipFrame(&m_pIfBuf->Recv);
+        pHdr = IntNetRingGetNextFrameToRead(&m_pIfBuf->Recv);
     }
 
@@ -491 +489 @@
     struct pbuf *q = p;
     uint8_t *pbChunk = (uint8_t *)pvFrame;
-    do {
+    do
+    {
         uint8_t *payload = (uint8_t *)q->payload;
         size_t len = q->len;
@@ -517 +516 @@
 err_t VBoxNetDhcpd::netifLinkOutput(pbuf *pPBuf)
 {
+    if (pPBuf->tot_len < sizeof(struct eth_hdr)) /* includes ETH_PAD_SIZE */
+        return ERR_ARG;
+
     PINTNETHDR pHdr;
     void *pvFrame;
-    u16_t cbFrame;
-    int rc;
-
-    if (pPBuf->tot_len < sizeof(struct eth_hdr)) /* includes ETH_PAD_SIZE */
-        return ERR_ARG;
-
-    cbFrame = pPBuf->tot_len - ETH_PAD_SIZE;
-    rc = IntNetRingAllocateFrame(&m_pIfBuf->Send, cbFrame, &pHdr, &pvFrame);
+    u16_t cbFrame = pPBuf->tot_len - ETH_PAD_SIZE;
+    int rc = IntNetRingAllocateFrame(&m_pIfBuf->Send, cbFrame, &pHdr, &pvFrame);
     if (RT_FAILURE(rc))
         return ERR_MEM;
@@ -541 +537 @@
 {
     INTNETIFSENDREQ SendReq;
-    int rc;
 
     SendReq.Hdr.u32Magic = SUPVMMR0REQHDR_MAGIC;
@@ -549 +544 @@
     SendReq.hIf = m_hIf;
 
-    rc = CALL_VMMR0(VMMR0_DO_INTNET_IF_SEND, SendReq);
-    return rc;
+    return CALL_VMMR0(VMMR0_DO_INTNET_IF_SEND, SendReq);
 }