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

Use looping data collection for all XPC reads

Browse Source
This commit is contained in:
Jackson Coxson
2025-07-18 23:46:05 -06:00
parent 660b459f89
commit 31b4849b17
1 changed files with 9 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
idevice/src/xpc/mod.rs
View File

@@ -8,8 +8,8 @@ use crate::{IdeviceError, ReadWrite};
mod format; mod format;
mod http2; mod http2;
pub use format::XPCMessage; use format::XPCFlag;
use format::{XPCFlag, XPCObject}; pub use format::{Dictionary, XPCMessage, XPCObject};
const ROOT_CHANNEL: u32 = 1; const ROOT_CHANNEL: u32 = 1;
const REPLY_CHANNEL: u32 = 3; const REPLY_CHANNEL: u32 = 3;
@@ -67,21 +67,17 @@ impl<R: ReadWrite> RemoteXpcClient<R> {
} }
pub async fn recv(&mut self) -> Result<plist::Value, IdeviceError> { pub async fn recv(&mut self) -> Result<plist::Value, IdeviceError> {
loop { self.recv_from_channel(REPLY_CHANNEL).await
let msg = self.h2_client.read(REPLY_CHANNEL).await?;
let msg = XPCMessage::decode(&msg)?;
if let Some(msg) = msg.message {
return Ok(msg.to_plist());
}
self.reply_id += 1;
}
} }
pub async fn recv_root(&mut self) -> Result<plist::Value, IdeviceError> { pub async fn recv_root(&mut self) -> Result<plist::Value, IdeviceError> {
self.recv_from_channel(ROOT_CHANNEL).await
}
async fn recv_from_channel(&mut self, channel: u32) -> Result<plist::Value, IdeviceError> {
let mut msg_buffer = Vec::new(); let mut msg_buffer = Vec::new();
loop { loop {
msg_buffer.extend(self.h2_client.read(ROOT_CHANNEL).await?); msg_buffer.extend(self.h2_client.read(channel).await?);
let msg = match XPCMessage::decode(&msg_buffer) { let msg = match XPCMessage::decode(&msg_buffer) {
Ok(m) => m, Ok(m) => m,
Err(IdeviceError::PacketSizeMismatch) => continue, Err(IdeviceError::PacketSizeMismatch) => continue,
@@ -109,7 +105,7 @@ impl<R: ReadWrite> RemoteXpcClient<R> {
pub async fn send_object( pub async fn send_object(
&mut self, &mut self,
msg: plist::Value, msg: impl Into<XPCObject>,
expect_reply: bool, expect_reply: bool,
) -> Result<(), IdeviceError> { ) -> Result<(), IdeviceError> {
let msg: XPCObject = msg.into(); let msg: XPCObject = msg.into();