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

Timestamp:

Jul 22, 2008 11:07:38 AM (17 years ago)

Author:

vboxsync

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

33584

Message:

intnet: Push the session down to all the INTNETR0* apis.

Location:

trunk/src/VBox/Devices/Network/testcase

Files:

• tstIntNet-1.cpp (modified) (4 diffs)
• tstIntNetR0.cpp (modified) (14 diffs)

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

@@ -583 +583 @@
         { "--duration",     'd', RTGETOPT_REQ_UINT32 },
         { "--file",         'f', RTGETOPT_REQ_STRING },
+        { "--interface",    'i', RTGETOPT_REQ_STRING },
         { "--network",      'n', RTGETOPT_REQ_STRING },
         { "--promiscuous",  'p', RTGETOPT_REQ_NOTHING },
@@ -590 +591 @@
         { "--text-file",    't', RTGETOPT_REQ_STRING },
         { "--xmit-test",    'x', RTGETOPT_REQ_NOTHING },
+        { "--help",         'h', RTGETOPT_REQ_NOTHING },
+        { "--?",            '?', RTGETOPT_REQ_NOTHING },
     };
 
@@ -697 +700 @@
             case '?':
             case 'h':
-                RTPrintf("syntax: tstIntNet-1 [-pSt] [-d <secs>] [-f <file>] [-r <size>] [-s <size>]\n");
+                RTPrintf("syntax: tstIntNet-1 [-pStx-] [-d <secs>] [-f <file>] [-r <size>] [-s <size>]\n");
                 return 1;
 
@@ -703 +706 @@
                 if (RT_SUCCESS(ch))
                     RTPrintf("tstIntNetR0: invalid argument (%#x): %s\n", ch, Value.psz);
+                else if (Value.pDef)
+                    RTPrintf("tstIntNetR0: invalid argument: %Rrc - %s\n", ch, Value.pDef->pszLong);
                 else
-                    RTPrintf("tstIntNetR0: invalid argument: %Rrc - \n", ch, Value.pDef->pszLong);
+                    RTPrintf("tstIntNetR0: invalid argument: %Rrc - %s\n", ch, argv[iArg]);
                 return 1;
         }

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

@@ -102 +102 @@
 struct TESTFRAME
 {
-    uint16_t    au16[6];
-} g_TestFrame0 = { { /* dst:*/ 0xffff, 0xffff, 0xffff, /*src:*/0x8086, 0, 0} },
-  g_TestFrame1 = { { /* dst:*/0, 0, 0,                /*src:*/0x8086, 0, 1} };
+    uint16_t    au16[7];
+} g_TestFrame0 = { { /* dst:*/ 0xffff, 0xffff, 0xffff, /*src:*/0x8086, 0, 0, 0x0800 } },
+  g_TestFrame1 = { { /* dst:*/ 0, 0, 0,                /*src:*/0x8086, 0, 1, 0x0800 } };
 
 
@@ -240 +240 @@
         *puFrame = iFrame;
 #if 0
-        int rc = INTNETR0IfSend(pArgs->pIntNet, pArgs->hIf, abBuf, cb);
+        int rc = INTNETR0IfSend(pArgs->pIntNet, pArgs->hIf, g_pSession, abBuf, cb);
 #else
         INTNETSG Sg;
@@ -246 +246 @@
         int rc = intnetR0RingWriteFrame(pArgs->pBuf, &pArgs->pBuf->Send, &Sg);
         if (RT_SUCCESS(rc))
-            rc = INTNETR0IfSend(pArgs->pIntNet, pArgs->hIf, NULL, 0);
+            rc = INTNETR0IfSend(pArgs->pIntNet, pArgs->hIf, g_pSession, NULL, 0);
 #endif
         if (VBOX_FAILURE(rc))
@@ -265 +265 @@
     for (unsigned c = 0; c < 20; c++)
     {
-        int rc = INTNETR0IfSend(pArgs->pIntNet, pArgs->hIf, abBuf, sizeof(PDMMAC) * 2 + sizeof(unsigned) * 4);
+        int rc = INTNETR0IfSend(pArgs->pIntNet, pArgs->hIf, g_pSession, abBuf, sizeof(PDMMAC) * 2 + sizeof(unsigned) * 4);
         if (VBOX_FAILURE(rc))
         {
@@ -297 +297 @@
          * Wait for data.
          */
-        int rc = INTNETR0IfWait(pArgs->pIntNet, pArgs->hIf, RT_INDEFINITE_WAIT);
+        int rc = INTNETR0IfWait(pArgs->pIntNet, pArgs->hIf, g_pSession, RT_INDEFINITE_WAIT);
         switch (rc)
         {
@@ -467 +467 @@
                      * Test basic waiting.
                      */
-                    rc = INTNETR0IfWait(pIntNet, hIf0, 1);
+                    rc = INTNETR0IfWait(pIntNet, hIf0, g_pSession, 1);
                     if (rc != VERR_TIMEOUT)
                     {
@@ -473 +473 @@
                         g_cErrors++;
                     }
-                    rc = INTNETR0IfWait(pIntNet, hIf1, 0);
+                    rc = INTNETR0IfWait(pIntNet, hIf1, g_pSession, 0);
                     if (rc != VERR_TIMEOUT)
                     {
@@ -483 +483 @@
                      * Send and receive.
                      */
-                    rc = INTNETR0IfSend(pIntNet, hIf0, &g_TestFrame0, sizeof(g_TestFrame0));
+                    rc = INTNETR0IfSend(pIntNet, hIf0, g_pSession, &g_TestFrame0, sizeof(g_TestFrame0));
                     if (VBOX_SUCCESS(rc))
                     {
-                        rc = INTNETR0IfWait(pIntNet, hIf0, 1);
+                        rc = INTNETR0IfWait(pIntNet, hIf0, g_pSession, 1);
                         if (rc != VERR_TIMEOUT)
                         {
@@ -492 +492 @@
                             g_cErrors++;
                         }
-                        rc = INTNETR0IfWait(pIntNet, hIf1, 0);
+                        rc = INTNETR0IfWait(pIntNet, hIf1, g_pSession, 0);
                         if (rc == VINF_SUCCESS)
                         {
@@ -521 +521 @@
                              * Send a packet from If1 just to set its MAC address.
                              */
-                            rc = INTNETR0IfSend(pIntNet, hIf1, &g_TestFrame1, sizeof(g_TestFrame1));
+                            rc = INTNETR0IfSend(pIntNet, hIf1, g_pSession, &g_TestFrame1, sizeof(g_TestFrame1));
                             if (VBOX_FAILURE(rc))
                             {
@@ -627 +627 @@
                                         }
 
-                                        rc = INTNETR0IfClose(pIntNet, hIf0);
+                                        rc = INTNETR0IfClose(pIntNet, hIf0, g_pSession);
                                         if (VBOX_SUCCESS(rc))
                                         {
@@ -639 +639 @@
                                         }
 
-                                        rc = INTNETR0IfClose(pIntNet, hIf1);
+                                        rc = INTNETR0IfClose(pIntNet, hIf1, g_pSession);
                                         if (VBOX_SUCCESS(rc))
                                         {
@@ -700 +700 @@
 
                 if (hIf1 != INTNET_HANDLE_INVALID)
-                    rc = INTNETR0IfClose(pIntNet, hIf1);
+                    rc = INTNETR0IfClose(pIntNet, hIf1, g_pSession);
             }
             else
@@ -709 +709 @@
 
             if (hIf0 != INTNET_HANDLE_INVALID)
-                rc = INTNETR0IfClose(pIntNet, hIf0);
+                rc = INTNETR0IfClose(pIntNet, hIf0, g_pSession);
         }
         else