From f25da81af5572bce5795f50fb32f4c775dfd15c3 Mon Sep 17 00:00:00 2001 From: Jackson Coxson Date: Sat, 5 Apr 2025 14:30:47 -0600 Subject: [PATCH] Unify service naming across crates --- ffi/src/lib.rs | 2 +- ffi/src/{lockdownd.rs => lockdown.rs} | 2 +- ffi/src/mounter.rs | 2 +- ffi/src/sbservices.rs | 2 +- idevice/src/afc/mod.rs | 2 +- idevice/src/core_device_proxy/mod.rs | 2 +- idevice/src/heartbeat.rs | 2 +- idevice/src/installation_proxy.rs | 2 +- idevice/src/lib.rs | 8 ++++---- idevice/src/{lockdownd.rs => lockdown.rs} | 0 idevice/src/misagent.rs | 2 +- idevice/src/{mounter.rs => mobile_image_mounter.rs} | 2 +- idevice/src/{sbservices/mod.rs => springboardservices.rs} | 2 +- tools/src/ideviceinfo.rs | 2 +- tools/src/mounter.rs | 3 ++- 15 files changed, 18 insertions(+), 17 deletions(-) rename ffi/src/{lockdownd.rs => lockdown.rs} (99%) rename idevice/src/{lockdownd.rs => lockdown.rs} (100%) rename idevice/src/{mounter.rs => mobile_image_mounter.rs} (99%) rename idevice/src/{sbservices/mod.rs => springboardservices.rs} (95%) diff --git a/ffi/src/lib.rs b/ffi/src/lib.rs index 74d908e..8714d63 100644 --- a/ffi/src/lib.rs +++ b/ffi/src/lib.rs @@ -7,7 +7,7 @@ mod errors; pub mod heartbeat; pub mod installation_proxy; pub mod location_simulation; -pub mod lockdownd; +pub mod lockdown; pub mod logging; pub mod mounter; mod pairing_file; diff --git a/ffi/src/lockdownd.rs b/ffi/src/lockdown.rs similarity index 99% rename from ffi/src/lockdownd.rs rename to ffi/src/lockdown.rs index bb67fba..c7e2577 100644 --- a/ffi/src/lockdownd.rs +++ b/ffi/src/lockdown.rs @@ -2,7 +2,7 @@ use std::ffi::c_void; -use idevice::{IdeviceError, IdeviceService, lockdownd::LockdowndClient}; +use idevice::{IdeviceError, IdeviceService, lockdown::LockdowndClient}; use crate::{ IdeviceErrorCode, IdeviceHandle, IdevicePairingFile, RUNTIME, diff --git a/ffi/src/mounter.rs b/ffi/src/mounter.rs index 1f1d7ac..4100418 100644 --- a/ffi/src/mounter.rs +++ b/ffi/src/mounter.rs @@ -2,7 +2,7 @@ use std::ffi::c_void; -use idevice::{IdeviceError, IdeviceService, mounter::ImageMounter}; +use idevice::{IdeviceError, IdeviceService, mobile_image_mounter::ImageMounter}; use plist::Value; use crate::{ diff --git a/ffi/src/sbservices.rs b/ffi/src/sbservices.rs index 542c8cf..657c4d2 100644 --- a/ffi/src/sbservices.rs +++ b/ffi/src/sbservices.rs @@ -1,6 +1,6 @@ use std::ffi::{CStr, c_void}; -use idevice::{IdeviceError, IdeviceService, sbservices::SpringBoardServicesClient}; +use idevice::{IdeviceError, IdeviceService, springboardservices::SpringBoardServicesClient}; use crate::{ IdeviceErrorCode, IdeviceHandle, RUNTIME, diff --git a/idevice/src/afc/mod.rs b/idevice/src/afc/mod.rs index 18109a0..fc0864e 100644 --- a/idevice/src/afc/mod.rs +++ b/idevice/src/afc/mod.rs @@ -7,7 +7,7 @@ use log::warn; use opcode::AfcOpcode; use packet::{AfcPacket, AfcPacketHeader}; -use crate::{lockdownd::LockdowndClient, Idevice, IdeviceError, IdeviceService}; +use crate::{lockdown::LockdowndClient, Idevice, IdeviceError, IdeviceService}; pub mod errors; pub mod opcode; diff --git a/idevice/src/core_device_proxy/mod.rs b/idevice/src/core_device_proxy/mod.rs index aed7381..1dd309f 100644 --- a/idevice/src/core_device_proxy/mod.rs +++ b/idevice/src/core_device_proxy/mod.rs @@ -1,6 +1,6 @@ // Jackson Coxson -use crate::{lockdownd::LockdowndClient, Idevice, IdeviceError, IdeviceService}; +use crate::{lockdown::LockdowndClient, Idevice, IdeviceError, IdeviceService}; use byteorder::{BigEndian, WriteBytesExt}; use serde::{Deserialize, Serialize}; diff --git a/idevice/src/heartbeat.rs b/idevice/src/heartbeat.rs index 6025ad1..0fc6ca5 100644 --- a/idevice/src/heartbeat.rs +++ b/idevice/src/heartbeat.rs @@ -1,7 +1,7 @@ // Jackson Coxson // Abstractions for the heartbeat service on iOS -use crate::{lockdownd::LockdowndClient, Idevice, IdeviceError, IdeviceService}; +use crate::{lockdown::LockdowndClient, Idevice, IdeviceError, IdeviceService}; pub struct HeartbeatClient { pub idevice: Idevice, diff --git a/idevice/src/installation_proxy.rs b/idevice/src/installation_proxy.rs index 4f37a96..4d55f3d 100644 --- a/idevice/src/installation_proxy.rs +++ b/idevice/src/installation_proxy.rs @@ -3,7 +3,7 @@ use std::collections::HashMap; -use crate::{lockdownd::LockdowndClient, Idevice, IdeviceError, IdeviceService}; +use crate::{lockdown::LockdowndClient, Idevice, IdeviceError, IdeviceService}; pub struct InstallationProxyClient { pub idevice: Idevice, diff --git a/idevice/src/lib.rs b/idevice/src/lib.rs index f01e6d7..fdde38e 100644 --- a/idevice/src/lib.rs +++ b/idevice/src/lib.rs @@ -14,16 +14,16 @@ pub mod heartbeat; pub mod http2; #[cfg(feature = "installation_proxy")] pub mod installation_proxy; -pub mod lockdownd; +pub mod lockdown; #[cfg(feature = "misagent")] pub mod misagent; #[cfg(feature = "mounter")] -pub mod mounter; +pub mod mobile_image_mounter; pub mod pairing_file; pub mod provider; -#[cfg(feature = "sbservices")] -pub mod sbservices; mod sni; +#[cfg(feature = "sbservices")] +pub mod springboardservices; #[cfg(feature = "tunnel_tcp_stack")] pub mod tcp; #[cfg(feature = "tss")] diff --git a/idevice/src/lockdownd.rs b/idevice/src/lockdown.rs similarity index 100% rename from idevice/src/lockdownd.rs rename to idevice/src/lockdown.rs diff --git a/idevice/src/misagent.rs b/idevice/src/misagent.rs index 7718287..3a2f2bf 100644 --- a/idevice/src/misagent.rs +++ b/idevice/src/misagent.rs @@ -4,7 +4,7 @@ use log::warn; use plist::Dictionary; -use crate::{lockdownd::LockdowndClient, Idevice, IdeviceError, IdeviceService}; +use crate::{lockdown::LockdowndClient, Idevice, IdeviceError, IdeviceService}; pub struct MisagentClient { pub idevice: Idevice, diff --git a/idevice/src/mounter.rs b/idevice/src/mobile_image_mounter.rs similarity index 99% rename from idevice/src/mounter.rs rename to idevice/src/mobile_image_mounter.rs index 1ca0ce1..7209b54 100644 --- a/idevice/src/mounter.rs +++ b/idevice/src/mobile_image_mounter.rs @@ -2,7 +2,7 @@ use log::debug; -use crate::{lockdownd::LockdowndClient, Idevice, IdeviceError, IdeviceService}; +use crate::{lockdown::LockdowndClient, Idevice, IdeviceError, IdeviceService}; #[cfg(feature = "tss")] use crate::tss::TSSRequest; diff --git a/idevice/src/sbservices/mod.rs b/idevice/src/springboardservices.rs similarity index 95% rename from idevice/src/sbservices/mod.rs rename to idevice/src/springboardservices.rs index 52943e7..1f012f7 100644 --- a/idevice/src/sbservices/mod.rs +++ b/idevice/src/springboardservices.rs @@ -1,4 +1,4 @@ -use crate::{lockdownd::LockdowndClient, Idevice, IdeviceError, IdeviceService}; +use crate::{lockdown::LockdowndClient, Idevice, IdeviceError, IdeviceService}; pub struct SpringBoardServicesClient { pub idevice: Idevice, diff --git a/tools/src/ideviceinfo.rs b/tools/src/ideviceinfo.rs index 3204712..25956e1 100644 --- a/tools/src/ideviceinfo.rs +++ b/tools/src/ideviceinfo.rs @@ -2,7 +2,7 @@ // idevice Rust implementation of libimobiledevice's ideviceinfo use clap::{Arg, Command}; -use idevice::{lockdownd::LockdowndClient, pairing_file::PairingFile, IdeviceService}; +use idevice::{lockdown::LockdowndClient, pairing_file::PairingFile, IdeviceService}; mod common; diff --git a/tools/src/mounter.rs b/tools/src/mounter.rs index ce079f4..58955d2 100644 --- a/tools/src/mounter.rs +++ b/tools/src/mounter.rs @@ -5,7 +5,8 @@ use std::{io::Write, path::PathBuf}; use clap::{arg, value_parser, Arg, Command}; use idevice::{ - lockdownd::LockdowndClient, mounter::ImageMounter, pretty_print_plist, IdeviceService, + lockdown::LockdowndClient, mobile_image_mounter::ImageMounter, pretty_print_plist, + IdeviceService, }; mod common;