StephenDev0/idevice
1
0
Fork 0
mirror of https://github.com/jkcoxson/idevice.git synced 2026-03-02 06:26:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

Use TCP multithreaded handle instead of lifetime handle for FFI

Browse Source
This commit is contained in:
Jackson Coxson
2025-08-15 14:55:36 -06:00
parent e3f7aa8cb0
commit 50896b1dfe
1 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
ffi/src/adapter.rs
View File

@@ -3,12 +3,13 @@
use std::ffi::{CStr, c_char}; use std::ffi::{CStr, c_char};
use std::ptr::null_mut; use std::ptr::null_mut;
use idevice::tcp::stream::AdapterStream; use idevice::tcp::handle::StreamHandle;
use tokio::io::{AsyncReadExt, AsyncWriteExt};
use crate::core_device_proxy::AdapterHandle; use crate::core_device_proxy::AdapterHandle;
use crate::{IdeviceFfiError, RUNTIME, ReadWriteOpaque, ffi_err}; use crate::{IdeviceFfiError, RUNTIME, ReadWriteOpaque, ffi_err};
pub struct AdapterStreamHandle<'a>(pub AdapterStream<'a>); pub struct AdapterStreamHandle(pub StreamHandle);
/// Connects the adapter to a specific port /// Connects the adapter to a specific port
/// ///
@@ -108,15 +109,9 @@ pub unsafe extern "C" fn adapter_close(handle: *mut AdapterStreamHandle) -> *mut
} }
let adapter = unsafe { &mut (*handle).0 }; let adapter = unsafe { &mut (*handle).0 };
let res = RUNTIME.block_on(async move { adapter.close().await }); RUNTIME.block_on(async move { adapter.close() });
match res { null_mut()
Ok(_) => null_mut(),
Err(e) => {
log::error!("Adapter close failed: {e}");
ffi_err!(e)
}
}
} }
/// Sends data through the adapter stream /// Sends data through the adapter stream
@@ -145,7 +140,7 @@ pub unsafe extern "C" fn adapter_send(
let adapter = unsafe { &mut (*handle).0 }; let adapter = unsafe { &mut (*handle).0 };
let data_slice = unsafe { std::slice::from_raw_parts(data, length) }; let data_slice = unsafe { std::slice::from_raw_parts(data, length) };
let res = RUNTIME.block_on(async move { adapter.psh(data_slice).await }); let res = RUNTIME.block_on(async move { adapter.write_all(data_slice).await });
match res { match res {
Ok(_) => null_mut(), Ok(_) => null_mut(),
@@ -183,7 +178,11 @@ pub unsafe extern "C" fn adapter_recv(
} }
let adapter = unsafe { &mut (*handle).0 }; let adapter = unsafe { &mut (*handle).0 };
let res = RUNTIME.block_on(async move { adapter.recv().await }); let res: Result<Vec<u8>, std::io::Error> = RUNTIME.block_on(async move {
let mut buf = [0; 2048];
let res = adapter.read(&mut buf).await?;
Ok(buf[..res].to_vec())
});
match res { match res {
Ok(received_data) => { Ok(received_data) => {