Add USB/IP support for macOS

Author: nekohasekai

adapter/usbip.go

@@ -9,7 +9,7 @@ import (
 )
 
 type USBIPDynamicServer interface {
-	AddDevice(info usbip.DynamicDeviceInfo, transport usbip.DeviceTransport) (string, error)
+	AddDevice(info usbip.ProvidedDeviceInfo, transport usbip.DeviceTransport) (string, error)
 	RemoveDevice(busID string)
 	SubscribeDevices(ctx context.Context, listener func([]usbip.ControlDeviceInfo))
 }

cmd/internal/build_libbox/main.go

@@ -63,7 +63,7 @@ func init() {
 	sharedFlags = append(sharedFlags, "-ldflags", "-X github.com/sagernet/sing-box/constant.Version="+currentTag+" -X internal/godebug.defaultGODEBUG=multipathtcp=0 -s -w -buildid=  -checklinkname=0")
 	debugFlags = append(debugFlags, "-ldflags", "-X github.com/sagernet/sing-box/constant.Version="+currentTag+" -X internal/godebug.defaultGODEBUG=multipathtcp=0 -checklinkname=0")
 
-	sharedTags = append(sharedTags, "with_gvisor", "with_quic", "with_wireguard", "with_utls", "with_naive_outbound", "with_clash_api", "badlinkname", "tfogo_checklinkname0")
+	sharedTags = append(sharedTags, "with_gvisor", "with_quic", "with_wireguard", "with_utls", "with_naive_outbound", "with_clash_api", "with_usbip", "badlinkname", "tfogo_checklinkname0")
 	darwinTags = append(darwinTags, "with_dhcp", "grpcnotrace")
 	// memcTags = append(memcTags, "with_tailscale")
 	sharedTags = append(sharedTags, "with_tailscale", "ts_omit_logtail", "ts_omit_ssh", "ts_omit_drive", "ts_omit_taildrop", "ts_omit_webclient", "ts_omit_doctor", "ts_omit_capture", "ts_omit_kube", "ts_omit_aws", "ts_omit_synology", "ts_omit_bird")

daemon/started_service_usbip.go

@@ -287,30 +287,41 @@ func addUSBDevice(ctx context.Context, serviceManager adapter.ServiceManager, se
 		ctx:      ctx,
 		pending:  make(map[uint64]chan *USBURBResponse),
 	}
-	busID, err := provider.AddDevice(usbip.DynamicDeviceInfo{
-		BusID:              descriptor.GetDeviceId(),
-		BusNum:             descriptor.GetBusNum(),
-		DevNum:             descriptor.GetDevNum(),
-		Speed:              descriptor.GetSpeed(),
-		VendorID:           uint16(descriptor.GetVendorId()),
-		ProductID:          uint16(descriptor.GetProductId()),
-		BCDDevice:          uint16(descriptor.GetBcdDevice()),
-		DeviceClass:        uint8(descriptor.GetDeviceClass()),
-		DeviceSubClass:     uint8(descriptor.GetDeviceSubClass()),
-		DeviceProtocol:     uint8(descriptor.GetDeviceProtocol()),
-		ConfigurationValue: uint8(descriptor.GetConfigurationValue()),
-		NumConfigurations:  uint8(descriptor.GetNumConfigurations()),
-		Interfaces:         usbInterfacesFromProto(descriptor.GetInterfaces()),
-		Serial:             descriptor.GetSerial(),
-		Product:            descriptor.GetProduct(),
-	}, device)
+	entry := usbDeviceEntryFromDescriptor(descriptor)
+	busID, err := provider.AddDevice(usbip.ProvidedDeviceInfo{Entry: entry}, device)
 	if err != nil {
 		return nil, err
 	}
 	device.busID = busID
 	return device, nil
 }
 
+func usbDeviceEntryFromDescriptor(descriptor *USBDeviceDescriptor) usbip.DeviceEntry {
+	deviceID := descriptor.GetDeviceId()
+	interfaces := usbInterfacesFromProto(descriptor.GetInterfaces())
+	info := usbip.DeviceInfoTruncated{
+		BusNum:              descriptor.GetBusNum(),
+		DevNum:              descriptor.GetDevNum(),
+		Speed:               descriptor.GetSpeed(),
+		IDVendor:            uint16(descriptor.GetVendorId()),
+		IDProduct:           uint16(descriptor.GetProductId()),
+		BCDDevice:           uint16(descriptor.GetBcdDevice()),
+		BDeviceClass:        uint8(descriptor.GetDeviceClass()),
+		BDeviceSubClass:     uint8(descriptor.GetDeviceSubClass()),
+		BDeviceProtocol:     uint8(descriptor.GetDeviceProtocol()),
+		BConfigurationValue: uint8(descriptor.GetConfigurationValue()),
+		BNumConfigurations:  uint8(descriptor.GetNumConfigurations()),
+		BNumInterfaces:      uint8(len(interfaces)),
+	}
+	copy(info.BusID[:], deviceID)
+	return usbip.DeviceEntry{
+		Info:       info,
+		Interfaces: interfaces,
+		Serial:     descriptor.GetSerial(),
+		Product:    descriptor.GetProduct(),
+	}
+}
+
 // sing-usbip calls Submit concurrently across endpoints for a single device.
 type usbProvidedDevice struct {
 	deviceID string

experimental/libbox/command_types_usbip_local.go

@@ -0,0 +1,46 @@
+package libbox
+
+type USBLocalDeviceInfo struct {
+	StableID           string
+	BusID              string
+	Backend            int32
+	BusNum             int32
+	DevNum             int32
+	Speed              int32
+	VendorID           int32
+	ProductID          int32
+	BCDDevice          int32
+	DeviceClass        int32
+	DeviceSubClass     int32
+	DeviceProtocol     int32
+	ConfigurationValue int32
+	NumConfigurations  int32
+	Serial             string
+	Product            string
+
+	interfaces []*USBSharedDeviceInterface
+}
+
+func (d *USBLocalDeviceInfo) Interfaces() USBSharedDeviceInterfaceIterator {
+	return newIterator(d.interfaces)
+}
+
+type USBLocalDeviceInfoIterator interface {
+	Next() *USBLocalDeviceInfo
+	HasNext() bool
+}
+
+type USBLocalProvidedDevice struct {
+	ServerTag     string
+	DeviceID      string
+	LocalDeviceID string
+	Label         string
+	VendorID      int32
+	ProductID     int32
+}
+
+type USBLocalProviderHandler interface {
+	OnDeviceError(serverTag string, deviceID string, message string)
+	OnSessionError(serverTag string, message string)
+	OnLocalDevicesChanged()
+}