The HID failure came down to the endpoint type map being indexed by endpoint number without the direction bit. A composite device can have endpoint 1 as both interrupt IN (0x81) and bulk OUT (0x01); the last one read won, so interrupt URBs were submitted as bulk and the kernel rejected them. The device attached and stayed silent. Endpoint data now comes from the raw descriptors read from /dev/bus/usb rather than sysfs, which only ever exposes the active alternate setting — a webcam's isochronous endpoints are invisible there because they only exist after SET_INTERFACE. Two sysfs parsing bugs fell out of that too: the numeric endpoint attributes are hex without a prefix (wMaxPacketSize "0040" was read as 40, not 64), and bInterval was never read at all. Reliability: three places could freeze the whole process. The share path fed io.Pipe from the WebSocket read loop, so one slow USB transfer stalled every tunnel and the keepalives with them. The relay wrote to client sockets while holding the hub lock, so one peer that stopped reading blocked routing and registration for everyone. Control transfers ran inline in the protocol loop behind a 5s timeout. Also fixed: a use-after- free where a discarded URB's memory could be collected while the kernel still owned it, a reap loop that spun at 100% CPU on ioctl errors, a missing attach timeout, a double close(done) panic, and Hash[:8] in the relay's log line, which let a client with a short hash take the server down. Adds mode "both", so one client can offer and consume devices at once. The tunnel and client-left callbacks became multicast for it: as plain fields the second manager to register silently unhooked the first. Tunnel traffic is now AES-256-GCM end to end, on the relay path as well as directly. The key is derived from the three tokens, not from the group hash — the relay is told the hash, so a key derived from it would protect nothing from the one party in the middle. Group IDs are unchanged, so existing setups keep working; only clients configured without the tokens drop to unencrypted, relay-only operation. Peers now try to connect directly, with the relay supplying the public address neither side can determine for itself. Candidates are raced because an unreachable address hangs until timeout rather than refusing. Falling back to the relay is not an error. Platform reach: cross-compiled targets for ARM, MIPS and RISC-V (the Linux client needed no code changes — usbdevfs is not architecture specific), multi-arch Docker images, an Android bridge that accepts devices over SCM_RIGHTS because apps cannot open /dev/bus/usb, and macOS builds via system_profiler enumeration. Adds a Windows KMDF filter driver under driver/windows with its Go side. UNTESTED: it has never been compiled or run, needs the WDK to build and an EV certificate to distribute. Treat it as a starting point. Adds "usb-client diag": says per machine whether sharing and using are possible, what stands in the way, and what fixes it. Reports can be uploaded to a relay to get them off machines that are awkward to copy from. 96 tests, all green under -race. Builds for linux, windows and darwin on amd64 and arm64. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
178 lines
4.1 KiB
Go
178 lines
4.1 KiB
Go
//go:build linux
|
|
|
|
package usbip
|
|
|
|
import (
|
|
"fmt"
|
|
"os"
|
|
"path/filepath"
|
|
"strconv"
|
|
"strings"
|
|
)
|
|
|
|
const vhciBasePath = "/sys/devices/platform/vhci_hcd.0"
|
|
|
|
// VHCIPort represents a virtual USB port on the VHCI controller
|
|
type VHCIPort struct {
|
|
Hub string // "hs" or "ss"
|
|
Port int
|
|
Status int
|
|
Speed int
|
|
DevID uint32
|
|
SocketFD int
|
|
LocalBusID string
|
|
}
|
|
|
|
// VHCI status constants
|
|
const (
|
|
VDevStNull = 0x04
|
|
VDevStNotAssigned = 0x05
|
|
VDevStUsed = 0x06
|
|
VDevStError = 0x07
|
|
)
|
|
|
|
// ReadVHCIStatus reads the current VHCI port status
|
|
func ReadVHCIStatus() ([]VHCIPort, error) {
|
|
// Try status file directly, then status.0, status.1, etc.
|
|
var allPorts []VHCIPort
|
|
|
|
paths := []string{
|
|
filepath.Join(vhciBasePath, "status"),
|
|
}
|
|
|
|
// Check for multi-controller status files
|
|
for i := 0; i < 16; i++ {
|
|
p := filepath.Join(vhciBasePath, fmt.Sprintf("status.%d", i))
|
|
if _, err := os.Stat(p); err == nil {
|
|
paths = append(paths, p)
|
|
} else {
|
|
break
|
|
}
|
|
}
|
|
|
|
for _, path := range paths {
|
|
ports, err := parseStatusFile(path)
|
|
if err != nil {
|
|
continue
|
|
}
|
|
allPorts = append(allPorts, ports...)
|
|
}
|
|
|
|
if len(allPorts) == 0 {
|
|
return nil, fmt.Errorf("vhci-hcd module not loaded or no ports found (check: modprobe vhci-hcd)")
|
|
}
|
|
|
|
return allPorts, nil
|
|
}
|
|
|
|
func parseStatusFile(path string) ([]VHCIPort, error) {
|
|
data, err := os.ReadFile(path)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
lines := strings.Split(strings.TrimSpace(string(data)), "\n")
|
|
var ports []VHCIPort
|
|
|
|
for _, line := range lines {
|
|
line = strings.TrimSpace(line)
|
|
// Skip header lines
|
|
if strings.HasPrefix(line, "hub") || strings.HasPrefix(line, "prt") || line == "" {
|
|
continue
|
|
}
|
|
|
|
fields := strings.Fields(line)
|
|
if len(fields) < 7 {
|
|
continue
|
|
}
|
|
|
|
port := VHCIPort{Hub: fields[0]}
|
|
|
|
if v, err := strconv.Atoi(fields[1]); err == nil {
|
|
port.Port = v
|
|
}
|
|
if v, err := strconv.Atoi(fields[2]); err == nil {
|
|
port.Status = v
|
|
}
|
|
if v, err := strconv.Atoi(fields[3]); err == nil {
|
|
port.Speed = v
|
|
}
|
|
if v, err := strconv.ParseUint(fields[4], 16, 32); err == nil {
|
|
port.DevID = uint32(v)
|
|
}
|
|
if v, err := strconv.Atoi(fields[5]); err == nil {
|
|
port.SocketFD = v
|
|
}
|
|
port.LocalBusID = fields[6]
|
|
|
|
ports = append(ports, port)
|
|
}
|
|
|
|
return ports, nil
|
|
}
|
|
|
|
// FindFreePort finds an available VHCI port for the given speed
|
|
func FindFreePort(speed uint32) (int, error) {
|
|
ports, err := ReadVHCIStatus()
|
|
if err != nil {
|
|
return -1, err
|
|
}
|
|
|
|
// Determine desired hub type based on speed
|
|
wantHub := "hs" // high-speed and below
|
|
if speed >= SpeedSuper {
|
|
wantHub = "ss" // super-speed
|
|
}
|
|
|
|
for _, port := range ports {
|
|
if port.Status == VDevStNull && port.Hub == wantHub {
|
|
return port.Port, nil
|
|
}
|
|
}
|
|
|
|
return -1, fmt.Errorf("no free VHCI port available for hub type %s", wantHub)
|
|
}
|
|
|
|
// AttachDevice writes to the VHCI attach file to create a virtual USB device.
|
|
// sockfd must be a valid TCP socket file descriptor connected to the USB/IP server.
|
|
func AttachDevice(port int, sockfd int, devID uint32, speed uint32) error {
|
|
attachPath := filepath.Join(vhciBasePath, "attach")
|
|
|
|
// Format: "<port> <sockfd> <devid> <speed>"
|
|
data := fmt.Sprintf("%d %d %d %d", port, sockfd, devID, speed)
|
|
|
|
if err := os.WriteFile(attachPath, []byte(data), 0); err != nil {
|
|
return fmt.Errorf("writing to VHCI attach: %w", err)
|
|
}
|
|
|
|
return nil
|
|
}
|
|
|
|
// DetachDevice writes to the VHCI detach file to remove a virtual USB device
|
|
func DetachDevice(port int) error {
|
|
detachPath := filepath.Join(vhciBasePath, "detach")
|
|
|
|
data := fmt.Sprintf("%d", port)
|
|
|
|
if err := os.WriteFile(detachPath, []byte(data), 0); err != nil {
|
|
return fmt.Errorf("writing to VHCI detach: %w", err)
|
|
}
|
|
|
|
return nil
|
|
}
|
|
|
|
// IsVHCIAvailable checks if the vhci-hcd kernel module is loaded
|
|
func IsVHCIAvailable() bool {
|
|
_, err := os.Stat(vhciBasePath)
|
|
return err == nil
|
|
}
|
|
|
|
// VHCIUnavailableError returns an error describing why VHCI is not available,
|
|
// or nil if VHCI is ready to use.
|
|
func VHCIUnavailableError() error {
|
|
if IsVHCIAvailable() {
|
|
return nil
|
|
}
|
|
return fmt.Errorf("vhci-hcd Kernel-Modul nicht geladen (ausfuehren: sudo modprobe vhci-hcd)")
|
|
}
|