Changeset 10031 in vbox for trunk/src/VBox

Timestamp:

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

Author:

vboxsync

Message:

VBoxNetFlt - work in progress.

File:

• trunk/src/VBox/Devices/Network/SrvIntNetR0.cpp (modified) (11 diffs)

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);