Mirror/rayhunter
1
0
Fork 0
mirror of https://github.com/EFForg/rayhunter.git synced 2026-05-21 15:24:47 -07:00
Code Issues Packages Projects Releases Wiki Activity

fix(serial): use tokio's timeout with USB bulk in/out

Browse Source 
Replace futures_lite::future::block_on (which will block indefinitely) with
tokio::time::timeout to restore the original behaviour of this utility, where
communication over USB interface bulk endpoints times out after 1 second.
This commit is contained in:
oopsbagel
2025-03-20 17:40:50 -07:00
committed by Will Greenberg
parent e841e22774
commit 9af8e006b0
2 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
serial/Cargo.toml
View File

@@ -6,5 +6,5 @@ edition = "2021"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[dependencies] [dependencies]
futures-lite = "2.6.0"
nusb = "0.1.13" nusb = "0.1.13"
tokio = { version = "1.44.1", features = ["macros", "rt", "time"] }

20
serial/src/main.rs
View File

@@ -10,11 +10,11 @@
use std::str; use std::str;
use std::time::Duration; use std::time::Duration;
use futures_lite::future::block_on;
use nusb::transfer::{Control, ControlType, Recipient, RequestBuffer}; use nusb::transfer::{Control, ControlType, Recipient, RequestBuffer};
use nusb::{Device, Interface}; use nusb::{Device, Interface};
fn main() { #[tokio::main(flavor = "current_thread")]
async fn main() {
let args: Vec<String> = std::env::args().collect(); let args: Vec<String> = std::env::args().collect();
if args.len() != 2 { if args.len() != 2 {
@@ -26,7 +26,7 @@ fn main() {
enable_command_mode(); enable_command_mode();
} else { } else {
match open_orbic() { match open_orbic() {
Some(interface) => send_command(interface, &args[1]), Some(interface) => send_command(interface, &args[1]).await,
None => panic!("No Orbic device found"), None => panic!("No Orbic device found"),
} }
} }
@@ -34,7 +34,7 @@ fn main() {
/// Sends an AT command to the usb device over the serial port /// Sends an AT command to the usb device over the serial port
/// ///
/// First establish a USB handle and context by calling `open_orbic(<T>) /// First establish a USB handle and context by calling `open_orbic(<T>)
fn send_command(interface: Interface, command: &str) { async fn send_command(interface: Interface, command: &str) {
let mut data = String::new(); let mut data = String::new();
data.push_str("\r\n"); data.push_str("\r\n");
data.push_str(command); data.push_str(command);
@@ -56,17 +56,23 @@ fn send_command(interface: Interface, command: &str) {
.expect("Failed to send control request"); .expect("Failed to send control request");
// Send the command // Send the command
block_on(interface.bulk_out(0x2, data.as_bytes().to_vec())) tokio::time::timeout(timeout, interface.bulk_out(0x2, data.as_bytes().to_vec()))
.await
.expect("Timed out writing command")
.into_result() .into_result()
.expect("Failed to write command"); .expect("Failed to write command");
// Consume the echoed command // Consume the echoed command
block_on(interface.bulk_in(0x82, RequestBuffer::new(256))) tokio::time::timeout(timeout, interface.bulk_in(0x82, RequestBuffer::new(256)))
.await
.expect("Timed out reading submitted command")
.into_result() .into_result()
.expect("Failed to read submitted command"); .expect("Failed to read submitted command");
// Read the actual response // Read the actual response
let response = block_on(interface.bulk_in(0x82, RequestBuffer::new(256))) let response = tokio::time::timeout(timeout, interface.bulk_in(0x82, RequestBuffer::new(256)))
.await
.expect("Timed out reading response")
.into_result() .into_result()
.expect("Failed to read response"); .expect("Failed to read response");