Don't switch altsetting to itself

xairy · Oct 24, 2023 · b21a3a1 · b21a3a1
1 parent b0ccd74
commit b21a3a1
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 10 deletions.
diff --git a/host-raw-gadget.cpp b/host-raw-gadget.cpp
@@ -315,7 +315,7 @@ void log_event(struct usb_raw_event *event) {
 		log_control_request((struct usb_ctrlrequest *)&event->data[0]);
 		break;
 	default:
-		printf("event: unknown, length: %u\n", event->length);
+		printf("event: unknown (%d), length: %u\n", (int)event->type, event->length);
 	}
 }
 

diff --git a/proxy.cpp b/proxy.cpp
@@ -456,15 +456,18 @@ void ep0_loop(int fd) {
 
 				struct raw_gadget_altsetting *alt = &iface->altsettings[desired_altsetting];
 
-				printf("Changing interface/altsetting\n");
-
-				terminate_eps(fd, host_device_desc.current_config,
-					desired_interface, iface->current_altsetting);
-				set_interface_alt_setting(alt->interface.bInterfaceNumber,
-					alt->interface.bAlternateSetting);
-				process_eps(fd, host_device_desc.current_config,
-					desired_interface, desired_altsetting);
-				iface->current_altsetting = desired_altsetting;
+				if (desired_altsetting == iface->current_altsetting)
+					printf("Interface/altsetting already set\n");
+				else {
+					printf("Changing interface/altsetting\n");
+					terminate_eps(fd, host_device_desc.current_config,
+						desired_interface, iface->current_altsetting);
+					set_interface_alt_setting(alt->interface.bInterfaceNumber,
+						alt->interface.bAlternateSetting);
+					process_eps(fd, host_device_desc.current_config,
+						desired_interface, desired_altsetting);
+					iface->current_altsetting = desired_altsetting;
+				}
 			}
 			else {
 				if (injection_enabled) {