Changeset 60493 in vbox for trunk

Timestamp:

Apr 14, 2016 1:45:31 PM (9 years ago)

Author:

vboxsync

Message:

ValidationKit/usb: More fixes for the server and client side

Location:

trunk/src/VBox/ValidationKit

Files:

• tests/usb/tdUsb1.py (modified) (2 diffs)
• tests/usb/usbgadget2.py (modified) (10 diffs)
• utils/usb/UsbTestService.cpp (modified) (1 diff)
• utils/usb/UsbTestServiceGadgetCfg.cpp (modified) (8 diffs)
• utils/usb/UsbTestServiceGadgetClassTest.cpp (modified) (1 diff)
• utils/usb/UsbTestServiceGadgetHostUsbIp.cpp (modified) (4 diffs)

trunk/src/VBox/ValidationKit/tests/usb/tdUsb1.py

@@ -295 +295 @@
         if fRc is True:
             reporter.log('Connect succeeded');
-            self.oVBox.host.addUSBDeviceSource('USBIP', sGadgetHost, sGadgetHost, [], []);
+            self.oVBox.host.addUSBDeviceSource('USBIP', sGadgetHost, sGadgetHost + (':%s' % oUsbGadget.getUsbIpPort()), [], []);
 
             # Create device filter
@@ -341 +341 @@
         if fRc is True:
             reporter.log('Connect succeeded');
-            self.oVBox.host.addUSBDeviceSource('USBIP', sGadgetHost, sGadgetHost, [], []);
+            self.oVBox.host.addUSBDeviceSource('USBIP', sGadgetHost, sGadgetHost + ':' + oUsbGadget.getUsbIpPort(), [], []);
 
             # Create device filter

trunk/src/VBox/ValidationKit/tests/usb/usbgadget2.py

@@ -416 +416 @@
                         return None;
                     abPayload.extend(u32ToByteArray(o));
+                elif isinstance(o, types.IntType):
+                    if o < 0 or o > 0xffffffff:
+                        reporter.fatal('sendMsg: uint32_t payload is out of range: %s' % (hex(o)));
+                        return None;
+                    abPayload.extend(u32ToByteArray(o));
                 elif isinstance(o, array.array):
                     abPayload.extend(o);
@@ -627 +632 @@
         if sOpcode == "ACK":
             return True;
-        return (sOpcode, getSZ(abPayload, 0, sOpcode));
+        return (sOpcode, getSZ(abPayload, 16, sOpcode));
 
     def recvAckLogged(self, sCommand, fNoDataOk = False):
@@ -659 +664 @@
         if sOpcode == "FALSE":
             return False;
-        reporter.maybeErr(self.fErr, 'recvAckLogged: %s response was %s: %s' % (sCommand, sOpcode, getSZ(abPayload, 0, sOpcode)));
+        reporter.maybeErr(self.fErr, 'recvAckLogged: %s response was %s: %s' % (sCommand, sOpcode, getSZ(abPayload, 16, sOpcode)));
         return None;
 
@@ -721 +726 @@
         sHostname = socket.gethostname().lower();
         cbFill = 68 - len(sHostname) - 1;
-        rc = self.sendMsg("HOWDY", (long((1 << 16) | 0), long(0x1), long(len(sHostname)), sHostname, zeroByteArray(cbFill)));
+        rc = self.sendMsg("HOWDY", ((1 << 16) | 0, 0x1, len(sHostname), sHostname, zeroByteArray(cbFill)));
         if rc is True:
             rc = self.recvAckLogged("HOWDY", self.fTryConnect);
@@ -746 +751 @@
     def taskGadgetCreate(self, iGadgetType, iGadgetAccess):
         """Creates a new gadget on UTS"""
-        fRc = self.sendMsg("GDGTCRT", (iGadgetType, iGadgetAccess, 0));
+        fRc = self.sendMsg("GDGTCRT", (iGadgetType, iGadgetAccess, 0, 0));
         if fRc is True:
             fRc = self.recvAckLogged("GDGTCRT");
@@ -842 +847 @@
         """
         return self.startTask(cMsTimeout, fIgnoreErrors, "GadgetCreate", self.taskGadgetCreate, \
-                              (long(iGadgetType), long(iGadgetAccess)));
+                              (iGadgetType, iGadgetAccess));
 
     def syncGadgetCreate(self, iGadgetType, iGadgetAccess, cMsTimeout = 30000, fIgnoreErrors = False):
@@ -857 +862 @@
         """
         return self.startTask(cMsTimeout, fIgnoreErrors, "GadgetDestroy", self.taskGadgetDestroy, \
-                              (long(iGadgetId), ));
+                              (iGadgetId, ));
 
     def syncGadgetDestroy(self, iGadgetId, cMsTimeout = 30000, fIgnoreErrors = False):
@@ -1327 +1332 @@
         fRc = False;
         if sImpersonation == g_ksGadgetImpersonationTest:
-            fRc = self.oUtsSession.syncGadgetCreate(g_kiGadgetTypeTest);
+            fRc = self.oUtsSession.syncGadgetCreate(g_kiGadgetTypeTest, g_kiGadgetAccessUsbIp);
         else:
             reporter.log('Invalid or unsupported impersonation');
@@ -1358 +1363 @@
                 print 'connect: waitForTask -> %s, result %s' % (fDone, self.oUtsSession.getResult());
                 if fDone is True and self.oUtsSession.isSuccess():
-                    fRc = True;
+                    # Parse the reply.
+                    _, _, abPayload = self.oUtsSession.getLastReply();
+
+                    if getU32(abPayload, 20) is g_kiGadgetAccessUsbIp:
+                        fRc = True;
+                        self.iUsbIpPort = getU32(abPayload, 24);
+                    else:
+                        reporter.log('Gadget doesn\'t support access over USB/IP despite being requested');
+                        fRc = False;
                 else:
                     fRc = False;
@@ -1376 +1389 @@
 
         self._clearImpersonation();
-        self._cleanupGadget();
         if self.oUtsSession is not None:
             fRc = self.oUtsSession.syncDisconnect();

trunk/src/VBox/ValidationKit/utils/usb/UsbTestService.cpp

@@ -566 +566 @@
     else
         rc = utsReplyBadSize(pClient, pPktHdr, sizeof(UTSPKTHDR));
-    g_pTransport->pfnNotifyBye(pClient->pTransportClient);
     return rc;
 }

trunk/src/VBox/ValidationKit/utils/usb/UsbTestServiceGadgetCfg.cpp

@@ -171 +171 @@
     if (   !pCfgItem
         || pCfgItem->Val.enmType == UTSGADGETCFGTYPE_UINT8)
+    {
         *pu8 = pCfgItem ? pCfgItem->Val.u.u8 : u8Def;
+        rc = VINF_SUCCESS;
+    }
 
     return rc;
@@ -206 +209 @@
     if (   !pCfgItem
         || pCfgItem->Val.enmType == UTSGADGETCFGTYPE_UINT16)
+    {
         *pu16 = pCfgItem ? pCfgItem->Val.u.u16 : u16Def;
+        rc = VINF_SUCCESS;
+    }
 
     return rc;
@@ -241 +247 @@
     if (   !pCfgItem
         || pCfgItem->Val.enmType == UTSGADGETCFGTYPE_UINT32)
+    {
         *pu32 = pCfgItem ? pCfgItem->Val.u.u32 : u32Def;
+        rc = VINF_SUCCESS;
+    }
 
     return rc;
@@ -276 +285 @@
     if (   !pCfgItem
         || pCfgItem->Val.enmType == UTSGADGETCFGTYPE_UINT64)
+    {
         *pu64 = pCfgItem ? pCfgItem->Val.u.u64 : u64Def;
+        rc = VINF_SUCCESS;
+    }
 
     return rc;
@@ -311 +323 @@
     if (   !pCfgItem
         || pCfgItem->Val.enmType == UTSGADGETCFGTYPE_INT8)
+    {
         *pi8 = pCfgItem ? pCfgItem->Val.u.i8 : i8Def;
+        rc = VINF_SUCCESS;
+    }
 
     return rc;
@@ -346 +361 @@
     if (   !pCfgItem
         || pCfgItem->Val.enmType == UTSGADGETCFGTYPE_INT16)
+    {
         *pi16 = pCfgItem ? pCfgItem->Val.u.i16 : i16Def;
+        rc = VINF_SUCCESS;
+    }
 
     return rc;
@@ -381 +399 @@
     if (   !pCfgItem
         || pCfgItem->Val.enmType == UTSGADGETCFGTYPE_INT32)
+    {
         *pi32 = pCfgItem ? pCfgItem->Val.u.i32 : i32Def;
+        rc = VINF_SUCCESS;
+    }
 
     return rc;
@@ -416 +437 @@
     if (   !pCfgItem
         || pCfgItem->Val.enmType == UTSGADGETCFGTYPE_INT64)
+    {
         *pi64 = pCfgItem ? pCfgItem->Val.u.i64 : i64Def;
-
-    return rc;
-}
-
+        rc = VINF_SUCCESS;
+    }
+
+    return rc;
+}
+

trunk/src/VBox/ValidationKit/utils/usb/UsbTestServiceGadgetClassTest.cpp

@@ -184 +184 @@
     if (cbStr <= sizeof(aszPathFunc) - 1)
     {
-        cbStr = RTStrPrintf(&aszPathCfg[0], sizeof(aszPathCfg), "%s/configs/%s",
-                            pClass->pszGadgetPath, pszCfg);
+        cbStr = RTStrPrintf(&aszPathCfg[0], sizeof(aszPathCfg), "%s/configs/%s/%s",
+                            pClass->pszGadgetPath, pszCfg, pszFunc);
         if (cbStr <= sizeof(aszPathCfg) - 1)
             rc = RTSymlinkCreate(&aszPathCfg[0], &aszPathFunc[0], RTSYMLINKTYPE_DIR, 0);

trunk/src/VBox/ValidationKit/utils/usb/UsbTestServiceGadgetHostUsbIp.cpp

@@ -29 +29 @@
 #include <iprt/process.h>
 #include <iprt/string.h>
+#include <iprt/thread.h>
+#include <iprt/time.h>
 #include <iprt/types.h>
 
@@ -98 +100 @@
 
     rc = utsGadgetCfgQueryU16Def(paCfg, "UsbIp/Port", &uPort, UTS_GADGET_HOST_USBIP_PORT_DEF);
-    if (RT_FAILURE(rc))
+    if (RT_SUCCESS(rc))
     {
         /* Make sure the kernel drivers are loaded. */
@@ -107 +109 @@
             if (RT_SUCCESS(rc))
             {
-                char aszPort[10];
-                char aszPidFile[64];
-                const char *apszArgv[6];
-
-                RTStrPrintf(aszPort, RT_ELEMENTS(aszPort), "%u", uPort);
-                RTStrPrintf(aszPidFile, RT_ELEMENTS(aszPidFile), "/var/run/usbipd-%u.pid", uPort);
-                /* Start the USB/IP server process. */
-                apszArgv[0] = "usbipd";
-                apszArgv[1] = "--tcp-port";
-                apszArgv[2] = aszPort;
-                apszArgv[3] = "--pid";
-                apszArgv[4] = aszPidFile;
-                apszArgv[5] = NULL;
-                rc = RTProcCreate("usbipd", apszArgv, RTENV_DEFAULT, RTPROC_FLAGS_SEARCH_PATH, &pIf->hProcUsbIp);
+                rc = utsGadgetHostUsbIpLoadModule("libcomposite");
                 if (RT_SUCCESS(rc))
                 {
-                    /* We are done setting it up at the moment. */
+                    char aszPort[10];
+                    char aszPidFile[64];
+                    const char *apszArgv[6];
+
+                    RTStrPrintf(aszPort, RT_ELEMENTS(aszPort), "%u", uPort);
+                    RTStrPrintf(aszPidFile, RT_ELEMENTS(aszPidFile), "/var/run/usbipd-%u.pid", uPort);
+                    /* Start the USB/IP server process. */
+                    apszArgv[0] = "usbipd";
+                    apszArgv[1] = "--tcp-port";
+                    apszArgv[2] = aszPort;
+                    apszArgv[3] = "--pid";
+                    apszArgv[4] = aszPidFile;
+                    apszArgv[5] = NULL;
+                    rc = RTProcCreate("usbipd", apszArgv, RTENV_DEFAULT, RTPROC_FLAGS_SEARCH_PATH, &pIf->hProcUsbIp);
+                    if (RT_SUCCESS(rc))
+                    {
+                        /* Wait for a bit to make sure the server started up successfully. */
+                        uint64_t tsStart = RTTimeMilliTS();
+                        do
+                        {
+                            RTPROCSTATUS ProcSts;
+                            rc = RTProcWait(pIf->hProcUsbIp, RTPROCWAIT_FLAGS_NOBLOCK, &ProcSts);
+                            if (rc != VERR_PROCESS_RUNNING)
+                            {
+                                rc = VERR_INVALID_HANDLE;
+                                break;
+                            }
+                            RTThreadSleep(1);
+                            rc = VINF_SUCCESS;
+                        } while (RTTimeMilliTS() - tsStart < 2 * 1000); /* 2 seconds. */
+                    }
                 }
             }
@@ -138 +157 @@
 static DECLCALLBACK(void) utsGadgetHostUsbIpTerm(PUTSGADGETHOSTTYPEINT pIf)
 {
-    /* Kill the process. */
+    /* Kill the process and wait for it to terminate. */
     RTProcTerminate(pIf->hProcUsbIp);
+
+    RTPROCSTATUS ProcSts;
+    RTProcWait(pIf->hProcUsbIp, RTPROCWAIT_FLAGS_BLOCK, &ProcSts);
 }