Changeset 10031 in vbox for trunk

Timestamp:

Jun 30, 2008 5:00:39 PM (17 years ago)

Author:

vboxsync

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

32514

Message:

VBoxNetFlt - work in progress.

Location:

trunk

Files:

• include/VBox/intnet.h (modified) (9 diffs)
• src/VBox/Devices/Network/SrvIntNetR0.cpp (modified) (11 diffs)

trunk/include/VBox/intnet.h

@@ -362 +362 @@
     DECLR0CALLBACKMEMBER(bool, pfnRecvWire,(PINTNETTRUNKSWPORT pIfPort, PINTNETSG pSG));
 
+    /**
+     * This is called by the pfnSendToHost and pfnSendToWire code when they are
+     * done with a SG.
+     *
+     * It may be called after they return if the frame was pushed in an
+     * async manner.
+     *
+     * @param   pIfPort     Pointer to this structure.
+     * @param   pSG         Pointer to the (scatter /) gather structure.
+     *
+     * @remarks Will grab the network semaphore.
+     */
+    DECLR0CALLBACKMEMBER(void, pfnSGRelease,(PINTNETTRUNKIFPORT pIfPort, PINTNETSG pSG));
+
     /** Structure version number. (INTNETTRUNKSWPORT_VERSION) */
     uint32_t u32VersionEnd;
@@ -389 +403 @@
      *
      * @param   pIfPort     Pointer to this structure.
+     *
+     * @remarks The caller may own any locks.
      */
     DECLR0CALLBACKMEMBER(void, pfnRetain,(PINTNETTRUNKIFPORT pIfPort));
@@ -395 +411 @@
      * Releases the object.
      *
-     * This must be called for every pfnRetain call. Where possible, it
-     * should be executed without holding any locks unless the caller
-     * is certain it is not going to trigger the destructor.
-     *
-     * @param   pIfPort     Pointer to this structure.
+     * This must be called for every pfnRetain call.
+     *
+     *
+     * @param   pIfPort     Pointer to this structure.
+     *
+     * @remarks Where possible, it should be executed without holding any locks
+     *          unless the caller is certain it is not going to trigger the destructor.
      */
     DECLR0CALLBACKMEMBER(void, pfnRelease,(PINTNETTRUNKIFPORT pIfPort));
@@ -410 +428 @@
      *
      * @param   pIfPort     Pointer to this structure.
+     *
+     * @remarks Called without holding any locks.
      */
     DECLR0CALLBACKMEMBER(void, pfnDisconnectAndRelease,(PINTNETTRUNKIFPORT pIfPort));
@@ -421 +441 @@
      * the interface from the internal network, however, this might be done immediately
      * before disconnecting and may leave an incoming frame waiting on the internal network
-     * semaphore.
+     * semaphore. So, after the final suspend a pfnWaitForIdle is always called to make sure
+     * the interface is idle before pfnDisconnectAndRelease is called.
      *
      * @returns The previous state.
@@ -444 +465 @@
      *                      an indefinite wait.
      *
-     * @remarks Will not grab any semaphores.
+     * @remarks Called while *not* owning any semaphores. Will not grab anything.
      */
     DECLR0CALLBACKMEMBER(bool, pfnWaitForIdle,(PINTNETTRUNKIFPORT pIfPort, uint32_t cMillies));
@@ -467 +488 @@
      * Tests whether the host is operating the interface is promiscuous mode.
      *
-     * The default behavior of internal networking 'switch' is to 'autodetect'
-     * promiscuous mode on the trunk port, which is where this method is used.
-     * For security reasons this default my of course be overridden so that the
+     * The default behavior of the internal networking 'switch' is to 'autodetect'
+     * promiscuous mode on the trunk port, which is when this method is used.
+     * For security reasons this default may of course be overridden so that the
      * host cannot sniff at what's going on.
      *
@@ -498 +519 @@
      *                      allocating and copying.
      *
-     * @remarks Called while owning the network semaphore?
+     * @remarks Called while owning the network semaphore.
+     *          (Works on darwin, but may have to be relaxed later on other hosts.)
      *
      * @remarks TAP and NAT will use this interface for all their traffic, see pfnIsHostMac.
@@ -519 +541 @@
      *                      allocating and copying.
      *
-     * @remarks Called while owning the network semaphore?
+     * @remarks Called while owning the network semaphore.
+     *          (Works on darwin, but may have to be relaxed later on other hosts.)
      *
      * @remarks TAP and NAT will call pfnSGRelease and return successfully.
      */
     DECLR0CALLBACKMEMBER(int, pfnSendToWire,(PINTNETTRUNKIFPORT pIfPort, PINTNETSG pSG));
-
-    /**
-     * This is called by the pfnSendToHost and pfnSendToWire code when they are
-     * done with a SG.
-     *
-     * It may be called after they return if the frame was pushed in an
-     * async manner.
-     *
-     * @param   pIfPort     Pointer to this structure.
-     * @param   pSG         Pointer to the (scatter /) gather structure.
-     *
-     * @remarks Will grab the network semaphore.
-     */
-    DECLR0CALLBACKMEMBER(void, pfnSGRelease,(PINTNETTRUNKIFPORT pIfPort, PINTNETSG pSG));
 
     /** Structure version number. (INTNETTRUNKIFPORT_VERSION) */

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

@@ -82 +82 @@
     /** The SUPR0 object id. */
     void                   *pvObj;
-} INTNETIF, *PINTNETIF;
+} INTNETIF;
+typedef INTNETIF *PINTNETIF;
 
 
@@ -108 +109 @@
     /** The network name. */
     char                    szName[INTNET_MAX_NETWORK_NAME];
-} INTNETNETWORK, *PINTNETNETWORK;
+} INTNETNETWORK;
+typedef INTNETNETWORK *PINTNETNETWORK;
 
 
@@ -117 +119 @@
 {
     /** Pointer to the object we're a handle for. */
-    PINTNETIF       pIF;
+    PINTNETIF               pIF;
     /** Index to the next free entry. */
-    uintptr_t       iNext;
-} INTNETHTE, *PINTNETHTE;
+    uintptr_t               iNext;
+} INTNETHTE;
+typedef INTNETHTE *PINTNETHTE;
 
 
@@ -129 +132 @@
 {
     /** Pointer to the handle table. */
-    PINTNETHTE          paEntries;
+    PINTNETHTE              paEntries;
     /** The number of allocated handles. */
-    uint32_t            cAllocated;
+    uint32_t                cAllocated;
     /** The index of the first free handle entry.
-     * ~0U means empty list. */
-    uint32_t volatile   iHead;
+     * UINT32_MAX means empty list. */
+    uint32_t volatile       iHead;
     /** The index of the last free handle entry.
-     * ~0U means empty list. */
-    uint32_t volatile   iTail;
-} INTNETHT, *PINTNETHT;
+     * UINT32_MAX means empty list. */
+    uint32_t volatile       iTail;
+} INTNETHT;
+typedef INTNETHT *PINTNETHT;
 
 
@@ -181 +185 @@
     if (    i < pHT->cAllocated
         &&  pHT->paEntries[i].iNext >= INTNET_HANDLE_MAX
-        &&  pHT->paEntries[i].iNext != ~0U)
+        &&  pHT->paEntries[i].iNext != UINT32_MAX)
         pIF = pHT->paEntries[i].pIF;
 
@@ -214 +218 @@
          */
         uint32_t i = pHT->iHead;
-        if (i != ~0U)
+        if (i != UINT32_MAX)
         {
             pHT->iHead = pHT->paEntries[i].iNext;
-            if (pHT->iHead == ~0U)
-                pHT->iTail = ~0U;
+            if (pHT->iHead == UINT32_MAX)
+                pHT->iTail = UINT32_MAX;
 
             pHT->paEntries[i].pIF = pIF;
@@ -253 +257 @@
             i = pHT->cAllocated;
             uint32_t iTail = pHT->iTail;
-            if (iTail == ~0U)
+            if (iTail == UINT32_MAX)
                 pHT->iHead = iTail = i++;
             while (i < cNew)
@@ -260 +264 @@
                 iTail = i++;
             }
-            paNew[iTail].iNext = ~0U;
+            paNew[iTail].iNext = UINT32_MAX;
             pHT->iTail = iTail;
 
@@ -297 +301 @@
          * Insert at the end of the free list.
          */
-        pHT->paEntries[i].iNext = ~0U;
+        pHT->paEntries[i].iNext = UINT32_MAX;
         const uint32_t iTail = pHT->iTail;
-        if (iTail != ~0U)
+        if (iTail != UINT32_MAX)
             pHT->paEntries[iTail].iNext = i;
         else
@@ -446 +450 @@
     PDMMAC  MacDst;
     PDMMAC  MacSrc;
-} INTNETETHERHDR, *PINTNETETHERHDR;
+} INTNETETHERHDR;
 #pragma pack()
+typedef INTNETETHERHDR *PINTNETETHERHDR;
 
 
@@ -1558 +1563 @@
         //pIntNet->IfHandles.paEntries    = NULL;
         //pIntNet->IfHandles.cAllocated   = 0;
-        pIntNet->IfHandles.iHead        = ~0U;
-        pIntNet->IfHandles.iTail        = ~0U;
+        pIntNet->IfHandles.iHead        = UINT32_MAX;
+        pIntNet->IfHandles.iTail        = UINT32_MAX;
 
         rc = RTSemFastMutexCreate(&pIntNet->FastMutex);