Changeset 11157 in vbox for trunk/src/VBox/Devices/Network/testcase

Timestamp:

Aug 5, 2008 11:08:37 PM (17 years ago)

Author:

vboxsync

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

34148

Message:

Replaced PDMMAC by RTMAC.

Location:

trunk/src/VBox/Devices/Network/testcase

Files:

• tstIntNet-1.cpp (modified) (6 diffs)
• tstIntNetR0.cpp (modified) (5 diffs)

trunk/src/VBox/Devices/Network/testcase/tstIntNet-1.cpp

@@ -183 +183 @@
     Assert(pRingBuf);
     Assert(pvFrame);
-    Assert(cbFrame >= sizeof(PDMMAC) * 2);
+    Assert(cbFrame >= sizeof(RTMAC) * 2);
     uint32_t offWrite = pRingBuf->offWrite;
     Assert(offWrite == RT_ALIGN_32(offWrite, sizeof(INTNETHDR)));
@@ -331 +331 @@
  * @param   pFileText       The file to write a textual packet summary to (optional).
  */
-static void doXmitTest(INTNETIFHANDLE hIf, PSUPDRVSESSION pSession, PINTNETBUF pBuf, PCPDMMAC pSrcMac, PRTSTREAM pFileRaw, PRTSTREAM pFileText)
+static void doXmitTest(INTNETIFHANDLE hIf, PSUPDRVSESSION pSession, PINTNETBUF pBuf, PCRTMAC pSrcMac, PRTSTREAM pFileRaw, PRTSTREAM pFileText)
 {
     uint8_t abFrame[4096];
@@ -346 +346 @@
     pDhcpMsg->Op = 1; /* request */
     pDhcpMsg->HType = 1; /* ethernet */
-    pDhcpMsg->HLen = sizeof(PDMMAC);
+    pDhcpMsg->HLen = sizeof(RTMAC);
     pDhcpMsg->Hops = 0;
     pDhcpMsg->XID = g_DhcpXID = RTRandU32();
@@ -432 +432 @@
  */
 static void doPacketSniffing(INTNETIFHANDLE hIf, PSUPDRVSESSION pSession, PINTNETBUF pBuf, uint32_t cMillies,
-                             PRTSTREAM pFileRaw, PRTSTREAM pFileText, PCPDMMAC pSrcMac)
+                             PRTSTREAM pFileRaw, PRTSTREAM pFileText, PCRTMAC pSrcMac)
 {
     /*
@@ -498 +498 @@
                         if (    pDhcpMsg->Op == 2 /* boot reply */
                             &&  pDhcpMsg->HType == 1 /* ethernet */
-                            &&  pDhcpMsg->HLen == sizeof(PDMMAC)
+                            &&  pDhcpMsg->HLen == sizeof(RTMAC)
                             &&  (pDhcpMsg->XID == g_DhcpXID || !g_DhcpXID)
                             &&  !memcmp(&pDhcpMsg->CHAddr[0], pSrcMac, sizeof(*pSrcMac)))
@@ -581 +581 @@
     PRTSTREAM   pFileText = g_pStdOut;
     bool        fXmitTest = false;
-    PDMMAC      SrcMac;
+    RTMAC       SrcMac;
     SrcMac.au8[0] = 0x08;
     SrcMac.au8[1] = 0x03;

trunk/src/VBox/Devices/Network/testcase/tstIntNetR0.cpp

@@ -211 +211 @@
     PINTNETBUF pBuf;
     INTNETIFHANDLE hIf;
-    PDMMAC Mac;
+    RTMAC Mac;
     uint64_t u64Start;
     uint64_t u64End;
@@ -231 +231 @@
      */
     uint8_t abBuf[4096] = {0};
-    PPDMMAC pMacSrc = (PPDMMAC)&abBuf[0];
-    PPDMMAC pMacDst = pMacSrc + 1;
+    PRTMAC pMacSrc = (PRTMAC)&abBuf[0];
+    PRTMAC pMacDst = pMacSrc + 1;
     *pMacSrc = pArgs->Mac;
     *pMacDst = pArgs->Mac;
@@ -270 +270 @@
     for (unsigned c = 0; c < 20; c++)
     {
-        int rc = INTNETR0IfSend(pArgs->pIntNet, pArgs->hIf, g_pSession, abBuf, sizeof(PDMMAC) * 2 + sizeof(unsigned) * 4);
+        int rc = INTNETR0IfSend(pArgs->pIntNet, pArgs->hIf, g_pSession, abBuf, sizeof(RTMAC) * 2 + sizeof(unsigned) * 4);
         if (VBOX_FAILURE(rc))
         {
@@ -327 +327 @@
             uint8_t abBuf[16384];
             unsigned cb = intnetR0RingReadFrame(pArgs->pBuf, &pArgs->pBuf->Recv, abBuf);
-            unsigned *puFrame = (unsigned *)&abBuf[sizeof(PDMMAC) * 2];
+            unsigned *puFrame = (unsigned *)&abBuf[sizeof(RTMAC) * 2];
 
             /* check for termination frame. */
-            if (    cb == sizeof(PDMMAC) * 2 + sizeof(unsigned) * 4
+            if (    cb == sizeof(RTMAC) * 2 + sizeof(unsigned) * 4
                 &&  puFrame[0] == 0xffffdead
                 &&  puFrame[1] == 0xffffdead
@@ -343 +343 @@
 
             /* validate frame header */
-            PPDMMAC pMacSrc = (PPDMMAC)&abBuf[0];
-            PPDMMAC pMacDst = pMacSrc + 1;
+            PRTMAC pMacSrc = (PRTMAC)&abBuf[0];
+            PRTMAC pMacDst = pMacSrc + 1;
             if (    pMacDst->au16[0] != 0x8086
                 ||  pMacDst->au16[1] != 0