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

Timestamp:

Jun 27, 2024 8:26:21 PM (7 months ago)

Author:

vboxsync

Message:

Devices/Network: clean up code and comments. bugref:10268

Location:

trunk/src/VBox/Devices/Network

Files:

• DrvNATlibslirp.cpp (modified) (8 diffs)
• DrvNATlibslirp.h (modified) (2 diffs)

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

@@ -779 +779 @@
  *
  * @returns VBox status code.
- * @param   pDevIns     The pcnet device instance.
+ * @param   pDrvIns     The pcnet device instance.
  * @param   pThread     The send thread.
  *
@@ -791 +791 @@
     drvNATNotifyNATThread(pThis, "drvNATAsyncIoWakeup");
     return VINF_SUCCESS;
-}
-
-/** @todo r=jack: do we need? */
-static DECLCALLBACK(int) drvNATHostResThread(PPDMDRVINS pDrvIns, PPDMTHREAD pThread)
-{
-    PDRVNAT pThis = PDMINS_2_DATA(pDrvIns, PDRVNAT);
-
-    if (pThread->enmState == PDMTHREADSTATE_INITIALIZING)
-        return VINF_SUCCESS;
-
-    while (pThread->enmState == PDMTHREADSTATE_RUNNING)
-    {
-        RTReqQueueProcess(pThis->hHostResQueue, RT_INDEFINITE_WAIT);
-    }
-
-    return VINF_SUCCESS;
-}
-
-static DECLCALLBACK(int) drvNATReqQueueInterrupt()
-{
-    /*
-     * RTReqQueueProcess loops until request returns a warning or info
-     * status code (other than VINF_SUCCESS).
-     */
-    return VINF_INTERRUPTED;
-}
-
-static DECLCALLBACK(int) drvNATHostResWakeup(PPDMDRVINS pDrvIns, PPDMTHREAD pThread)
-{
-    RT_NOREF(pThread);
-    PDRVNAT pThis = PDMINS_2_DATA(pDrvIns, PDRVNAT);
-    Assert(pThis != NULL);
-
-    int rc;
-    rc = RTReqQueueCallEx(pThis->hHostResQueue, NULL /*ppReq*/, 0 /*cMillies*/,
-                          RTREQFLAGS_IPRT_STATUS | RTREQFLAGS_NO_WAIT,
-                          (PFNRT)drvNATReqQueueInterrupt, 0);
-    return rc;
 }
 
@@ -847 +809 @@
 /**
  * Info handler.
+ *
+ * @param   pDrvIns     The PDM driver context.
+ * @param   pHlp        ....
+ * @param   pszArgs     Unused.
+ *
+ * @thread  any
  */
 static DECLCALLBACK(void) drvNATInfo(PPDMDRVINS pDrvIns, PCDBGFINFOHLP pHlp, const char *pszArgs)
@@ -1173 +1141 @@
     }
 
-    RTReqQueueDestroy(pThis->hHostResQueue);
-    pThis->hHostResQueue = NIL_RTREQQUEUE;
-
     RTReqQueueDestroy(pThis->hSlirpReqQueue);
     pThis->hSlirpReqQueue = NIL_RTREQQUEUE;
@@ -1249 +1214 @@
     pThis->hSlirpReqQueue               = NIL_RTREQQUEUE;
     pThis->hUrgRecvReqQueue             = NIL_RTREQQUEUE;
-    pThis->hHostResQueue                = NIL_RTREQQUEUE;
     pThis->EventRecv                    = NIL_RTSEMEVENT;
     pThis->EventUrgRecv                 = NIL_RTSEMEVENT;
@@ -1308 +1272 @@
     int fDNSProxy = 0;
     GET_S32(rc, pDrvIns, pCfg, "DNSProxy", fDNSProxy);
-    int fUseHostResolver = 0;
-    GET_S32(rc, pDrvIns, pCfg, "UseHostResolver", fUseHostResolver);
     int MTU = 1500;
     GET_S32(rc, pDrvIns, pCfg, "SlirpMTU", MTU);
@@ -1403 +1365 @@
     pSlirpCfg->vdhcp_start = vdhcp_start;
     pSlirpCfg->vnameserver = vnameserver;
+    pSlirpCfg->if_mtu = MTU;
 
 #ifndef RT_OS_WINDOWS
@@ -1463 +1426 @@
     rc = PDMDrvHlpThreadCreate(pDrvIns, &pThis->pUrgRecvThread, pThis, drvNATUrgRecv,
                                 drvNATUrgRecvWakeup, 256 * _1K, RTTHREADTYPE_IO, "NATURGRX");
-    AssertRCReturn(rc, rc);
-
-    rc = RTReqQueueCreate(&pThis->hHostResQueue);
-    AssertRCReturn(rc, rc);
-
-    rc = PDMDrvHlpThreadCreate(pThis->pDrvIns, &pThis->pHostResThread,
-                                pThis, drvNATHostResThread, drvNATHostResWakeup,
-                                128 * _1K, RTTHREADTYPE_IO, "HOSTRES");
     AssertRCReturn(rc, rc);
 

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

@@ -301 +301 @@
     RTCRITSECT              XmitLock;
 
-    /** Request queue for the async host resolver. */
-    RTREQQUEUE               hHostResQueue;
-    /** Async host resolver thread. */
-    PPDMTHREAD               pHostResThread;
-
 #ifdef RT_OS_DARWIN
     /* Handle of the DNS watcher runloop source. */
@@ -332 +327 @@
 static DECLCALLBACK(int) drvNATAsyncIoThread(PPDMDRVINS, PPDMTHREAD);
 static DECLCALLBACK(int) drvNATAsyncIoWakeup(PPDMDRVINS, PPDMTHREAD);
-static DECLCALLBACK(int) drvNATHostResThread(PPDMDRVINS, PPDMTHREAD);
-static DECLCALLBACK(int) drvNATReqQueueInterrupt();
-static DECLCALLBACK(int) drvNATHostResWakeup(PPDMDRVINS, PPDMTHREAD);
 static DECLCALLBACK(void *) drvNATQueryInterface(PPDMIBASE, const char *);
 static DECLCALLBACK(void) drvNATInfo(PPDMDRVINS, PCDBGFINFOHLP, const char *);