Do proper cleanup of USB devices upon removal

Author: cgutman

src/org/cgutman/usbip/service/UsbIpService.java

@@ -440,13 +440,17 @@ public void submitUrbRequest(Socket s, UsbIpSubmitUrb msg) {
 
 		UsbDevice dev = getDevice(msg.devId);
 		if (dev == null) {
-			sendReply(s, reply, ProtoDefs.ST_NA);
+			// The device is gone, so terminate the client
+			cleanupDetachedDevice(msg.devId);
+			server.killClient(s);
 			return;
 		}
 
 		AttachedDeviceContext context = connections.get(msg.devId);
 		if (context == null) {
-			sendReply(s, reply, ProtoDefs.ST_NA);
+			// This should never happen, but kill the connection if it does
+			cleanupDetachedDevice(msg.devId);
+			server.killClient(s);
 			return;
 		}
 
@@ -609,6 +613,7 @@ public boolean attachToDevice(String busId) {
 		// Create a context for this attachment
 		AttachedDeviceContext context = new AttachedDeviceContext();
 		context.devConn = devConn;
+		context.device = dev;
 
 		// Count all endpoints on all intefaces
 		int endpointCount = 0;
@@ -626,40 +631,45 @@ public boolean attachToDevice(String busId) {
 		updateNotification();
 		return true;
 	}
-
-	@Override
-	public void detachFromDevice(String busId) {
-		UsbDevice dev = getDevice(busId);
-		if (dev == null) {
-			return;
-		}
-		
-		AttachedDeviceContext context = connections.get(dev.getDeviceId());
+	
+	private void cleanupDetachedDevice(int deviceId) {
+		AttachedDeviceContext context = connections.get(deviceId);
 		if (context == null) {
 			return;
 		}
 
 		// Clear the this attachment's context
-		connections.remove(dev.getDeviceId());
+		connections.remove(deviceId);
 
 		// Release our claim to the interfaces
-		for (int i = 0; i < dev.getInterfaceCount(); i++) {
-			context.devConn.releaseInterface(dev.getInterface(i));
+		for (int i = 0; i < context.device.getInterfaceCount(); i++) {
+			context.devConn.releaseInterface(context.device.getInterface(i));
 		}
-		
+
 		// Close the connection
 		context.devConn.close();
-		
+
 		updateNotification();
 	}
 
+	@Override
+	public void detachFromDevice(String busId) {
+		UsbDevice dev = getDevice(busId);
+		if (dev == null) {
+			return;
+		}
+		
+		cleanupDetachedDevice(dev.getDeviceId());
+	}
+	
 	class UrbContext {
 		public UsbIpSubmitUrb originalMsg;
 		public UsbIpSubmitUrbReply replyMsg;
 		public ByteBuffer buffer;
 	}
 
 	class AttachedDeviceContext {
+		public UsbDevice device;
 		public UsbDeviceConnection devConn;
 		public ThreadPoolExecutor requestPool;
 	}