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

Return unknown device type for unknown network prefix

Browse Source
This commit is contained in:
Jackson Coxson
2025-03-08 19:35:18 -07:00
parent 291bbd60aa
commit 4eeab8f498
1 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -8,7 +8,7 @@ use std::{
#[cfg(not(unix))] #[cfg(not(unix))]
use std::net::SocketAddrV4; use std::net::SocketAddrV4;
use log::debug; use log::{debug, warn};
use tokio::io::{AsyncReadExt, AsyncWriteExt}; use tokio::io::{AsyncReadExt, AsyncWriteExt};
use crate::{ use crate::{
@@ -129,21 +129,25 @@ impl UsbmuxdConnection {
if let Some(addr) = dev.properties.network_address { if let Some(addr) = dev.properties.network_address {
let addr = &Into::<Vec<u8>>::into(addr); let addr = &Into::<Vec<u8>>::into(addr);
if addr.len() < 8 { if addr.len() < 8 {
warn!("Device address bytes len < 8");
return Err(IdeviceError::UnexpectedResponse); return Err(IdeviceError::UnexpectedResponse);
} }
let addr = match addr[0] { match addr[0] {
0x02 => { 0x02 => {
// ipv4 // ipv4
IpAddr::V4(Ipv4Addr::new(addr[4], addr[5], addr[6], addr[7])) Connection::Network(IpAddr::V4(Ipv4Addr::new(
addr[4], addr[5], addr[6], addr[7],
)))
} }
0x1E => { 0x1E => {
// ipv6 // ipv6
if addr.len() < 24 { if addr.len() < 24 {
warn!("IPv6 address is less than 24 bytes");
return Err(IdeviceError::UnexpectedResponse); return Err(IdeviceError::UnexpectedResponse);
} }
IpAddr::V6(Ipv6Addr::new( Connection::Network(IpAddr::V6(Ipv6Addr::new(
u16::from_be_bytes([addr[8], addr[9]]), u16::from_be_bytes([addr[8], addr[9]]),
u16::from_be_bytes([addr[10], addr[11]]), u16::from_be_bytes([addr[10], addr[11]]),
u16::from_be_bytes([addr[12], addr[13]]), u16::from_be_bytes([addr[12], addr[13]]),
@@ -152,20 +156,22 @@ impl UsbmuxdConnection {
u16::from_be_bytes([addr[18], addr[19]]), u16::from_be_bytes([addr[18], addr[19]]),
u16::from_be_bytes([addr[20], addr[21]]), u16::from_be_bytes([addr[20], addr[21]]),
u16::from_be_bytes([addr[22], addr[23]]), u16::from_be_bytes([addr[22], addr[23]]),
)) )))
} }
_ => { _ => {
return Err(IdeviceError::UnexpectedResponse); warn!("Unknown IP address protocol: {:02X}", addr[0]);
Connection::Unknown(format!("Network {:02X}", addr[0]))
} }
}; }
Connection::Network(addr)
} else { } else {
warn!("Device is network attached, but has no network info");
return Err(IdeviceError::UnexpectedResponse); return Err(IdeviceError::UnexpectedResponse);
} }
} }
"USB" => Connection::Usb, "USB" => Connection::Usb,
_ => Connection::Unknown(dev.properties.connection_type), _ => Connection::Unknown(dev.properties.connection_type),
}; };
debug!("Connection type: {connection_type:?}");
devs.push(UsbmuxdDevice { devs.push(UsbmuxdDevice {
connection_type, connection_type,
udid: dev.properties.serial_number, udid: dev.properties.serial_number,