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

Timestamp:

Jun 25, 2024 8:40:19 PM (5 months ago)

Author:

vboxsync

Message:

Devices/Network: code cleanup. bugref:10268

File:

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

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

@@ -184 +184 @@
     {
         Assert(!pSgBuf->pvUser);
-
         RTMemFree(pSgBuf->aSegs[0].pvSeg);
-        RTMemFree(pSgBuf->pvAllocator);
-
         pSgBuf->pvAllocator = NULL;
     }
@@ -205 +202 @@
  * @param   pThis               Pointer to the NAT instance.
  * @param   pSgBuf              The scatter/gather buffer.
+ *
  * @thread  NAT
  */
 static DECLCALLBACK(void) drvNATSendWorker(PDRVNAT pThis, PPDMSCATTERGATHER pSgBuf)
 {
-    LogFlowFunc(("pThis=%p pSgBuf=%p\n", pThis, pSgBuf));
-
     if (pThis->enmLinkState == PDMNETWORKLINKSTATE_UP)
     {
@@ -219 +215 @@
              * A normal frame.
              */
-            LogFlowFunc(("m=%p\n", m));
             slirp_input(pThis->pNATState->pSlirp, (uint8_t const *)pSgBuf->pvAllocator, (int)pSgBuf->cbUsed);
         }
@@ -225 +220 @@
         {
             /*
-             * M_EXT buf, need to segment it.
+             * Large/GSO frame.
              */
 
@@ -254 +249 @@
     }
 
-    LogFlowFunc(("leave\n"));
     drvNATFreeSgBuf(pThis, pSgBuf);
 }
@@ -260 +254 @@
 /**
  * @interface_method_impl{PDMINETWORKUP,pfnBeginXmit}
+ *
+ * @param   pInterface      Pointer to UP network interface.
+ * @param   fOnWorkerThread Unused.
+ *
+ * @returns VBox status code.
+ *
+ * @thread ?
  */
 static DECLCALLBACK(int) drvNATNetworkUp_BeginXmit(PPDMINETWORKUP pInterface, bool fOnWorkerThread)
@@ -277 +278 @@
 /**
  * @interface_method_impl{PDMINETWORKUP,pfnAllocBuf}
+ *
+ * Allocates a scatter/gather buffer for packet/frame handling.
+ *
+ * @param   pInterface  Pointer to UP network interface.
+ * @param   cbMin       Minimum size of buffer to hold packet/frame.
+ * @param   pGso        The GSO context.
+ * @param   ppSgBuf     Pointer to the resulting scatter/gather buffer.
+ *
+ * @returns VBox status code
+ *
+ * @thread ?
  */
 static DECLCALLBACK(int) drvNATNetworkUp_AllocBuf(PPDMINETWORKUP pInterface, size_t cbMin,
@@ -283 +295 @@
     PDRVNAT pThis = RT_FROM_MEMBER(pInterface, DRVNAT, INetworkUp);
     Assert(RTCritSectIsOwner(&pThis->XmitLock));
-
-    LogFlowFunc(("enter\n"));
 
     /*
@@ -367 +377 @@
 /**
  * @interface_method_impl{PDMINETWORKUP,pfnFreeBuf}
+ *
+ * Wrapper function for drvNATFreeSgBuff.
+ *
+ * @param   pInterface  Pointer to UP network interface.
+ * @param   pSgBuf      Pointer to scatter/gather buffer to be freed.
+ *
+ * @thread  ?
  */
 static DECLCALLBACK(int) drvNATNetworkUp_FreeBuf(PPDMINETWORKUP pInterface, PPDMSCATTERGATHER pSgBuf)
@@ -378 +395 @@
 /**
  * @interface_method_impl{PDMINETWORKUP,pfnSendBuf}
+ *
+ * Sends packet/frame out to network (up from guest).
+ *
+ * @param   pInterface      Pointer to UP network interface.
+ * @param   pSgBuf          Pointer to scatter/gather packet/frame buffer.
+ * @param   fOnWorkerThread Unused.
+ *
+ * @thread  ?
  */
 static DECLCALLBACK(int) drvNATNetworkUp_SendBuf(PPDMINETWORKUP pInterface, PPDMSCATTERGATHER pSgBuf, bool fOnWorkerThread)
@@ -386 +411 @@
     Assert(RTCritSectIsOwner(&pThis->XmitLock));
 
-    LogFlowFunc(("enter\n"));
-
     int rc;
     if (pThis->pSlirpThread->enmState == PDMTHREADSTATE_RUNNING)
@@ -397 +420 @@
         {
             drvNATNotifyNATThread(pThis, "drvNATNetworkUp_SendBuf");
-            LogFlowFunc(("leave success\n"));
             return VINF_SUCCESS;
         }
@@ -405 +427 @@
     else
         rc = VERR_NET_DOWN;
+
     drvNATFreeSgBuf(pThis, pSgBuf);
-    LogFlowFunc(("leave rc=%Rrc\n", rc));
     return rc;
 }
@@ -412 +434 @@
 /**
  * @interface_method_impl{PDMINETWORKUP,pfnEndXmit}
+ *
+ * End transmission.
+ *
+ * @param   pInterface  Pointer to UP network interface.
+ *
+ * @thread  ?
  */
 static DECLCALLBACK(void) drvNATNetworkUp_EndXmit(PPDMINETWORKUP pInterface)
@@ -421 +449 @@
 /**
  * Get the NAT thread out of poll/WSAWaitForMultipleEvents
+ *
+ * @param   pThis   Pointer to DRVNAT state for current context.
+ * @param   pszWho  String identifying caller.
+ *
+ * @thread  ?
  */
 static void drvNATNotifyNATThread(PDRVNAT pThis, const char *pszWho)
@@ -430 +463 @@
     size_t cbIgnored;
     rc = RTPipeWrite(pThis->hPipeWrite, "", 1, &cbIgnored);
-#else
-    /* kick WSAWaitForMultipleEvents */
-    rc = WSASetEvent(pThis->hWakeupEvent);
 #endif
     AssertRC(rc);