Split serverloop into sync and async version

Author: oysteintveit-nordicsemi

Cargo.toml

@@ -15,6 +15,8 @@ log = "0.4.17"
 num-traits = "0.2.15"
 num-derive = "0.3.3"
 rusb = "0.9.1"
+async-trait = "0.1.73"
+async-scoped = { version = "0.7.1", features = ["use-tokio"] }
 
 [dev-dependencies]
 tokio = { version = "1.22.0", features = ["full"] }

examples/cdc_acm_serial.rs

@@ -3,13 +3,15 @@ use std::net::*;
 use std::sync::{Arc, Mutex};
 use std::time::Duration;
 
+use usbip::server::*;
+
 #[tokio::main]
 async fn main() {
     env_logger::init();
     let handler =
         Arc::new(Mutex::new(Box::new(usbip::cdc::UsbCdcAcmHandler::new())
             as Box<dyn usbip::UsbInterfaceHandler + Send>));
-    let server = Arc::new(usbip::UsbIpServer::new_simulated(vec![
+    let server = SyncUsbIpServer::new_simulated(vec![
         usbip::UsbDevice::new(0).with_interface(
             usbip::ClassCode::CDC as u8,
             usbip::cdc::CDC_ACM_SUBCLASS,
@@ -18,9 +20,9 @@ async fn main() {
             usbip::cdc::UsbCdcAcmHandler::endpoints(),
             handler.clone(),
         ),
-    ]));
+    ]);
     let addr = SocketAddr::new(IpAddr::V4(Ipv4Addr::new(0, 0, 0, 0)), 3240);
-    tokio::spawn(usbip::server(addr, server));
+    tokio::spawn(server.serve(addr));
 
     loop {
         // sleep 1s

examples/hid_keyboard.rs

@@ -3,14 +3,16 @@ use std::net::*;
 use std::sync::{Arc, Mutex};
 use std::time::Duration;
 
+use usbip::server::*;
+
 #[tokio::main]
 async fn main() {
     env_logger::init();
     let handler = Arc::new(Mutex::new(
         Box::new(usbip::hid::UsbHidKeyboardHandler::new_keyboard())
             as Box<dyn usbip::UsbInterfaceHandler + Send>,
     ));
-    let server = Arc::new(usbip::UsbIpServer::new_simulated(vec![
+    let server = SyncUsbIpServer::new_simulated(vec![
         usbip::UsbDevice::new(0).with_interface(
             usbip::ClassCode::HID as u8,
             0x00,
@@ -24,9 +26,9 @@ async fn main() {
             }],
             handler.clone(),
         ),
-    ]));
+    ]);
     let addr = SocketAddr::new(IpAddr::V4(Ipv4Addr::new(0, 0, 0, 0)), 3240);
-    tokio::spawn(usbip::server(addr, server));
+    tokio::spawn(server.serve(addr));
 
     loop {
         // sleep 1s

examples/host.rs

@@ -1,13 +1,15 @@
 use std::net::*;
-use std::sync::Arc;
+
 use std::time::Duration;
 
+use usbip::server::*;
+
 #[tokio::main]
 async fn main() {
     env_logger::init();
-    let server = Arc::new(usbip::UsbIpServer::new_from_host());
+    let server = usbip::server::SyncUsbIpServer::new_from_host();
     let addr = SocketAddr::new(IpAddr::V4(Ipv4Addr::new(0, 0, 0, 0)), 3240);
-    tokio::spawn(usbip::server(addr, server));
+    tokio::spawn(server.serve(addr));
 
     loop {
         // sleep 1s