prettifying

jsonrpc.go

@@ -479,17 +479,15 @@ func rpcSetUsbEmulationState(enabled bool) error {
 }
 
 func rpcSetUsbConfig(usbConfig UsbConfig) error {
-	log.Printf("[jsonrpc.go:rpcSetUsbConfig] called")
-
 	LoadConfig()
 	config.UsbConfig = usbConfig
 
-	err2 := UpdateGadgetConfig()
+	err := UpdateGadgetConfig()
-	if err2 != nil {
+	if err != nil {
-		return fmt.Errorf("failed to write gadget config: %w", err2)
+		return fmt.Errorf("failed to write gadget config: %w", err)
 	}
 
-	err := SaveConfig()
+	err = SaveConfig()
 	if err != nil {
 		return fmt.Errorf("failed to save usb config: %w", err)
 	}

ui/src/components/sidebar/settings.tsx

@@ -28,11 +28,11 @@ import { useRevalidator } from "react-router-dom";
 import { ShieldCheckIcon } from "@heroicons/react/20/solid";
 
 export function SettingsItem({
-                               title,
+  title,
-                               description,
+  description,
-                               children,
+  children,
-                               className,
+  className,
-                             }: {
+}: {
   title: string;
   description: string | React.ReactNode;
   children?: React.ReactNode;
@@ -103,6 +103,12 @@ export default function SettingsSidebar() {
   } | null>(null);
 
   const [usbEmulationEnabled, setUsbEmulationEnabled] = useState(false);
+  const getUsbEmulationState = useCallback(() => {
+    send("getUsbEmulationState", {}, resp => {
+      if ("error" in resp) return;
+      setUsbEmulationEnabled(resp.result as boolean);
+    });
+  }, [send]);
 
   const [usbConfig, setUsbConfig] = useState({
     usb_product_id: '',
@@ -112,13 +118,6 @@ export default function SettingsSidebar() {
     usb_name: '',
   })
 
-  const getUsbEmulationState = useCallback(() => {
-    send("getUsbEmulationState", {}, resp => {
-      if ("error" in resp) return;
-      setUsbEmulationEnabled(resp.result as boolean);
-    });
-  }, [send]);
-
   const handleUsbEmulationToggle = useCallback(
       (enabled: boolean) => {
         send("setUsbEmulationState", { enabled: enabled }, resp => {
@@ -225,7 +224,7 @@ export default function SettingsSidebar() {
         return;
       }
     });
-  }, [send, usbConfig]);
+  }, [send]);
 
   const handleSSHKeyChange = (newKey: string) => {
     setSSHKey(newKey);

usb.go

@@ -3,7 +3,6 @@ package kvm
 import (
 	"errors"
 	"fmt"
-	gadget "github.com/openstadia/go-usb-gadget"
 	"log"
 	"os"
 	"os/exec"
@@ -12,6 +11,8 @@ import (
 	"strings"
 	"sync"
 	"time"
+
+	gadget "github.com/openstadia/go-usb-gadget"
 )
 
 const configFSPath = "/sys/kernel/config"
@@ -19,6 +20,19 @@ const gadgetPath = "/sys/kernel/config/usb_gadget"
 const kvmGadgetPath = "/sys/kernel/config/usb_gadget/jetkvm"
 const configC1Path = "/sys/kernel/config/usb_gadget/jetkvm/configs/c.1"
 
+func mountConfigFS() error {
+	_, err := os.Stat(gadgetPath)
+	if os.IsNotExist(err) {
+		err = exec.Command("mount", "-t", "configfs", "none", configFSPath).Run()
+		if err != nil {
+			return fmt.Errorf("failed to mount configfs: %w", err)
+		}
+	} else {
+		return fmt.Errorf("unable to access usb gadget path: %w", err)
+	}
+	return nil
+}
+
 func init() {
 	_ = os.MkdirAll(imagesFolder, 0755)
 	udcs := gadget.GetUdcs()
@@ -72,7 +86,7 @@ func UpdateGadgetConfig() error {
 		return err
 	}
 
-	log.Printf("Successfully updated string attributes: %s", strAttrs)
+	log.Printf("Successfully updated usb string attributes: %s", strAttrs)
 
 	err = rebindUsb()
 	if err != nil {
@@ -82,22 +96,6 @@ func UpdateGadgetConfig() error {
 	return nil
 }
 
-func mountConfigFS() error {
-	logger.Infof("Checking for gadgetPath: %s ...", gadgetPath)
-	_, err := os.Stat(gadgetPath)
-	if os.IsNotExist(err) {
-		logger.Infof("running mount command...")
-		err = exec.Command("mount", "-t", "configfs", "none", configFSPath).Run()
-		if err != nil {
-			return fmt.Errorf("failed to mount configfs: %w", err)
-		}
-	} else {
-		return fmt.Errorf("unable to access usb gadget path: %w", err)
-	}
-	logger.Infof("Successfully mounted usb gadget at %s", gadgetPath)
-	return nil
-}
-
 func writeGadgetAttrs(basePath string, attrs [][]string) error {
 	for _, item := range attrs {
 		filePath := filepath.Join(basePath, item[0])
@@ -119,35 +117,30 @@ func writeGadgetConfig() error {
 		return err
 	}
 
-	LoadConfig()
+	err = writeGadgetAttrs(kvmGadgetPath, [][]string{
-	gadgetAttrs := [][]string{
+		{"bcdUSB", "0x0200"},   //USB 2.0
-		{"bcdUSB", "0x0200"}, //USB 2.0
+		{"idVendor", "0x1d6b"}, //The Linux Foundation
-		{"idVendor", config.UsbConfig.UsbVendorId},
+		{"idProduct", "0104"},  //Multifunction Composite Gadget¬
-		{"idProduct", config.UsbConfig.UsbProductId},
 		{"bcdDevice", "0100"},
-	}
+	})
-	err = writeGadgetAttrs(kvmGadgetPath, gadgetAttrs)
 	if err != nil {
 		return err
 	}
 
-	logger.Infof("Successfully wrote gadget attributes: %s", gadgetAttrs)
 	gadgetStringsPath := filepath.Join(kvmGadgetPath, "strings", "0x409")
 	err = os.MkdirAll(gadgetStringsPath, 0755)
 	if err != nil {
 		return err
 	}
 
-	strAttrs := [][]string{
+	err = writeGadgetAttrs(gadgetStringsPath, [][]string{
-		{"serialnumber", config.UsbConfig.UsbSerialNumber},
+		{"serialnumber", GetDeviceID()},
-		{"manufacturer", config.UsbConfig.UsbManufacturer},
+		{"manufacturer", "JetKVM"},
-		{"product", config.UsbConfig.UsbName},
+		{"product", "JetKVM USB Emulation Device"},
-	}
+	})
-	err = writeGadgetAttrs(gadgetStringsPath, strAttrs)
 	if err != nil {
 		return err
 	}
-	logger.Infof("Successfully wrote string attributes: %s", strAttrs)
 
 	configC1StringsPath := path.Join(configC1Path, "strings", "0x409")
 	err = os.MkdirAll(configC1StringsPath, 0755)
@@ -261,27 +254,11 @@ func writeGadgetConfig() error {
 }
 
 func rebindUsb() error {
-	unbindErr := unbindUsb()
-	if unbindErr != nil {
-		return unbindErr
-	}
-	bindErr := bindUsb()
-	if bindErr != nil {
-		return bindErr
-	}
-	return nil
-}
-
-func unbindUsb() error {
 	err := os.WriteFile("/sys/bus/platform/drivers/dwc3/unbind", []byte(udc), 0644)
 	if err != nil {
 		return err
 	}
-	return nil
+	err = os.WriteFile("/sys/bus/platform/drivers/dwc3/bind", []byte(udc), 0644)
-}
-
-func bindUsb() error {
-	err := os.WriteFile("/sys/bus/platform/drivers/dwc3/bind", []byte(udc), 0644)
 	if err != nil {
 		return err
 	}