Changeset 36958 in vbox for trunk/src/VBox/RDP

Timestamp:

May 4, 2011 2:50:32 PM (14 years ago)

Author:

vboxsync

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

71554

Message:

Main/linux/USB: better permissions checking and code cleanup

File:

• trunk/src/VBox/RDP/client/vrdp/rdpusb.c (modified) (1 diff)

trunk/src/VBox/RDP/client/vrdp/rdpusb.c

@@ -888 +888 @@
 rdpusb_init(void)
 {
-        PCUSBDEVTREELOCATION pcLocation = USBProxyLinuxGetDeviceRoot(false);
-        g_fUseSysfs       = pcLocation->fUseSysfs;
-        g_pcszDevicesRoot = pcLocation->szDevicesRoot;
+    /** @todo re-use the proxy service code */
+        if (USBProxyLinuxCheckDeviceRoot("/dev/vboxusb", true))
+        {
+            g_fUseSysfs       = true;
+            g_pcszDevicesRoot = "/dev/vboxusb";
+        }
+        else
+        {
+            g_fUseSysfs       = false;
+            g_pcszDevicesRoot = "/proc/bus/usb";
+        }
         rdpusb_channel =
                 channel_register("vrdpusb", CHANNEL_OPTION_INITIALIZED | CHANNEL_OPTION_ENCRYPT_RDP,