Changeset 34716 in vbox

Timestamp:

Dec 3, 2010 11:33:04 PM (14 years ago)

Author:

vboxsync

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

68519

Message:

Main/linux/USB: more thorough checks for the different USB probing methods

File:

• trunk/src/VBox/Main/linux/USBGetDevices.cpp (modified) (13 diffs)

trunk/src/VBox/Main/linux/USBGetDevices.cpp

@@ -48 +48 @@
 
 #include <dirent.h>
+#include <dlfcn.h>
 #include <errno.h>
 #include <fcntl.h>
@@ -473 +474 @@
 
 /** Just a worker for USBProxyServiceLinux::getDevices that avoids some code duplication. */
-static int addDeviceToChain(PUSBDEVICE pDev, PUSBDEVICE *ppFirst, PUSBDEVICE **pppNext, const char *pcszUsbfsRoot, int rc)
+static int addDeviceToChain(PUSBDEVICE pDev, PUSBDEVICE *ppFirst, PUSBDEVICE **pppNext, const char *pcszUsbfsRoot, bool testfs, int rc)
 {
     /* usbDeterminState requires the address. */
@@ -483 +484 @@
         {
             pDevNew->enmState = usbDeterminState(pDevNew);
-            if (pDevNew->enmState != USBDEVICESTATE_UNSUPPORTED)
+            if (pDevNew->enmState != USBDEVICESTATE_UNSUPPORTED || testfs)
             {
                 if (*pppNext)
@@ -526 +527 @@
 
 /**
- * USBProxyService::getDevices() implementation for usbfs.
- */
-static PUSBDEVICE getDevicesFromUsbfs(const char *pcszUsbfsRoot)
+ * USBProxyService::getDevices() implementation for usbfs.  The @a testfs flag
+ * tells the function to return information about unsupported devices as well.
+ * This is used as a sanity test to check that a devices file is really what
+ * we expect.
+ */
+static PUSBDEVICE getDevicesFromUsbfs(const char *pcszUsbfsRoot, bool testfs)
 {
     PUSBDEVICE pFirst = NULL;
@@ -593 +597 @@
                     AssertMsg(cHits >= 3 || cHits == 0, ("cHits=%d\n", cHits));
                     if (cHits >= 3)
-                        rc = addDeviceToChain(&Dev, &pFirst, &ppNext, pcszUsbfsRoot, rc);
+                        rc = addDeviceToChain(&Dev, &pFirst, &ppNext, pcszUsbfsRoot, testfs, rc);
                     else
                         deviceFreeMembers(&Dev);
@@ -786 +790 @@
         AssertMsg(cHits >= 3 || cHits == 0, ("cHits=%d\n", cHits));
         if (cHits >= 3)
-            rc = addDeviceToChain(&Dev, &pFirst, &ppNext, pcszUsbfsRoot, rc);
+            rc = addDeviceToChain(&Dev, &pFirst, &ppNext, pcszUsbfsRoot, testfs, rc);
 
         /*
@@ -1343 +1347 @@
  * USBProxyService::getDevices() implementation for sysfs.
  */
-static PUSBDEVICE getDevicesFromSysfs(const char *pcszDevicesRoot)
+static PUSBDEVICE getDevicesFromSysfs(const char *pcszDevicesRoot, bool testfs)
 {
 #ifdef VBOX_USB_WITH_SYSFS
@@ -1367 +1371 @@
         }
         if (   RT_SUCCESS(rc)
-            && Dev->enmState != USBDEVICESTATE_UNSUPPORTED
+            && (   Dev->enmState != USBDEVICESTATE_UNSUPPORTED
+                || testfs)
             && Dev->pszAddress != NULL
            )
@@ -1394 +1399 @@
 }
 
+/** Is inotify available and working on this system?  This is a requirement
+ * for using USB with sysfs */
+/** @todo test the "inotify in glibc but not in the kernel" case. */
+static bool inotifyAvailable(void)
+{
+    int (*inotify_init)(void);
+
+    *(void **)(&inotify_init) = dlsym(RTLD_DEFAULT, "inotify_init");
+    if (!inotify_init)
+        return false;
+    int fd = inotify_init();
+    if (fd == -1)
+        return false;
+    close(fd);
+    return true;
+}
+
 PCUSBDEVTREELOCATION USBProxyLinuxGetDeviceRoot(bool fPreferSysfs)
 {
@@ -1399 +1421 @@
     PCUSBDEVTREELOCATION pcBestSysfs = NULL;
 
+    bool fHaveInotify = inotifyAvailable();
     for (unsigned i = 0; i < RT_ELEMENTS(s_aTreeLocations); ++i)
         if (!s_aTreeLocations[i].fUseSysfs)
@@ -1406 +1429 @@
                 PUSBDEVICE pDevices;
 
-                pDevices = getDevicesFromUsbfs(s_aTreeLocations[i].szDevicesRoot);
+                pDevices = getDevicesFromUsbfs(s_aTreeLocations[i].szDevicesRoot,
+                                               true);
                 if (pDevices)
                 {
@@ -1416 +1440 @@
         else
         {
-            if (   !pcBestSysfs
+            if (   fHaveInotify
+                && !pcBestSysfs
                 && RTPathExists(s_aTreeLocations[i].szDevicesRoot))
-                pcBestSysfs = &s_aTreeLocations[i];
+            {
+                PUSBDEVICE pDevices;
+
+                pDevices = getDevicesFromSysfs(s_aTreeLocations[i].szDevicesRoot,
+                                               true);
+                if (pDevices)
+                {
+                    pcBestSysfs = &s_aTreeLocations[i];
+                    deviceListFree(&pDevices);
+                }
+            }
         }
     if (pcBestUsbfs && !fPreferSysfs)
@@ -1430 +1465 @@
 {
     if (!fUseSysfs)
-        return getDevicesFromUsbfs(pcszDevicesRoot);
+        return getDevicesFromUsbfs(pcszDevicesRoot, false);
     else
-        return getDevicesFromSysfs(pcszDevicesRoot);
-}
+        return getDevicesFromSysfs(pcszDevicesRoot, false);
+}