From 3604756139b1a2dde383122745d37fe9d1c95f88 Mon Sep 17 00:00:00 2001 From: Martin Szulecki Date: Mon, 5 Aug 2013 20:07:04 +0200 Subject: Implement *_start_service() helper to simplify creation of service clients --- include/libimobiledevice/afc.h | 2 ++ include/libimobiledevice/diagnostics_relay.h | 1 + include/libimobiledevice/file_relay.h | 1 + include/libimobiledevice/house_arrest.h | 1 + include/libimobiledevice/installation_proxy.h | 1 + include/libimobiledevice/misagent.h | 1 + include/libimobiledevice/mobile_image_mounter.h | 2 ++ include/libimobiledevice/mobilebackup.h | 2 ++ include/libimobiledevice/mobilebackup2.h | 2 ++ include/libimobiledevice/mobilesync.h | 1 + include/libimobiledevice/notification_proxy.h | 2 ++ include/libimobiledevice/sbservices.h | 2 ++ include/libimobiledevice/screenshotr.h | 2 ++ 13 files changed, 20 insertions(+) (limited to 'include') diff --git a/include/libimobiledevice/afc.h b/include/libimobiledevice/afc.h index 8cddcf0..289c749 100644 --- a/include/libimobiledevice/afc.h +++ b/include/libimobiledevice/afc.h @@ -96,7 +96,9 @@ typedef afc_client_private *afc_client_t; /**< The client handle. */ /* Interface */ afc_error_t afc_client_new(idevice_t device, lockdownd_service_descriptor_t service, afc_client_t *client); +afc_error_t afc_client_start_service(idevice_t device, afc_client_t* client, const char* label); afc_error_t afc_client_free(afc_client_t client); + afc_error_t afc_get_device_info(afc_client_t client, char ***infos); afc_error_t afc_read_directory(afc_client_t client, const char *dir, char ***list); afc_error_t afc_get_file_info(afc_client_t client, const char *filename, char ***infolist); diff --git a/include/libimobiledevice/diagnostics_relay.h b/include/libimobiledevice/diagnostics_relay.h index a0455cb..17e73dd 100644 --- a/include/libimobiledevice/diagnostics_relay.h +++ b/include/libimobiledevice/diagnostics_relay.h @@ -59,6 +59,7 @@ typedef struct diagnostics_relay_client_private diagnostics_relay_client_private typedef diagnostics_relay_client_private *diagnostics_relay_client_t; /**< The client handle. */ diagnostics_relay_error_t diagnostics_relay_client_new(idevice_t device, lockdownd_service_descriptor_t service, diagnostics_relay_client_t *client); +diagnostics_relay_error_t diagnostics_relay_client_start_service(idevice_t device, diagnostics_relay_client_t* client, const char* label); diagnostics_relay_error_t diagnostics_relay_client_free(diagnostics_relay_client_t client); diagnostics_relay_error_t diagnostics_relay_goodbye(diagnostics_relay_client_t client); diff --git a/include/libimobiledevice/file_relay.h b/include/libimobiledevice/file_relay.h index ca18770..28ce2ab 100644 --- a/include/libimobiledevice/file_relay.h +++ b/include/libimobiledevice/file_relay.h @@ -51,6 +51,7 @@ typedef struct file_relay_client_private file_relay_client_private; typedef file_relay_client_private *file_relay_client_t; /**< The client handle. */ file_relay_error_t file_relay_client_new(idevice_t device, lockdownd_service_descriptor_t service, file_relay_client_t *client); +file_relay_error_t file_relay_client_start_service(idevice_t device, file_relay_client_t* client, const char* label); file_relay_error_t file_relay_client_free(file_relay_client_t client); file_relay_error_t file_relay_request_sources(file_relay_client_t client, const char **sources, idevice_connection_t *connection); diff --git a/include/libimobiledevice/house_arrest.h b/include/libimobiledevice/house_arrest.h index c33c23b..ccd6ac7 100644 --- a/include/libimobiledevice/house_arrest.h +++ b/include/libimobiledevice/house_arrest.h @@ -52,6 +52,7 @@ typedef house_arrest_client_private *house_arrest_client_t; /**< The client hand /* Interface */ house_arrest_error_t house_arrest_client_new(idevice_t device, lockdownd_service_descriptor_t service, house_arrest_client_t *client); +house_arrest_error_t house_arrest_client_start_service(idevice_t device, house_arrest_client_t* client, const char* label); house_arrest_error_t house_arrest_client_free(house_arrest_client_t client); house_arrest_error_t house_arrest_send_request(house_arrest_client_t client, plist_t dict); diff --git a/include/libimobiledevice/installation_proxy.h b/include/libimobiledevice/installation_proxy.h index 3e373e3..1274884 100644 --- a/include/libimobiledevice/installation_proxy.h +++ b/include/libimobiledevice/installation_proxy.h @@ -55,6 +55,7 @@ typedef void (*instproxy_status_cb_t) (const char *operation, plist_t status, vo /* Interface */ instproxy_error_t instproxy_client_new(idevice_t device, lockdownd_service_descriptor_t service, instproxy_client_t *client); +instproxy_error_t instproxy_client_start_service(idevice_t device, instproxy_client_t * client, const char* label); instproxy_error_t instproxy_client_free(instproxy_client_t client); instproxy_error_t instproxy_browse(instproxy_client_t client, plist_t client_options, plist_t *result); diff --git a/include/libimobiledevice/misagent.h b/include/libimobiledevice/misagent.h index 4a198c7..fe0acb2 100644 --- a/include/libimobiledevice/misagent.h +++ b/include/libimobiledevice/misagent.h @@ -51,6 +51,7 @@ typedef misagent_client_private *misagent_client_t; /**< The client handle. */ /* Interface */ misagent_error_t misagent_client_new(idevice_t device, lockdownd_service_descriptor_t service, misagent_client_t *client); +misagent_error_t misagent_client_start_service(idevice_t device, misagent_client_t* client, const char* label); misagent_error_t misagent_client_free(misagent_client_t client); misagent_error_t misagent_install(misagent_client_t client, plist_t profile); diff --git a/include/libimobiledevice/mobile_image_mounter.h b/include/libimobiledevice/mobile_image_mounter.h index 2b44f2e..ceaf0c2 100644 --- a/include/libimobiledevice/mobile_image_mounter.h +++ b/include/libimobiledevice/mobile_image_mounter.h @@ -50,7 +50,9 @@ typedef mobile_image_mounter_client_private *mobile_image_mounter_client_t; /**< /* Interface */ mobile_image_mounter_error_t mobile_image_mounter_new(idevice_t device, lockdownd_service_descriptor_t service, mobile_image_mounter_client_t *client); +mobile_image_mounter_error_t mobile_image_mounter_start_service(idevice_t device, mobile_image_mounter_client_t* client, const char* label); mobile_image_mounter_error_t mobile_image_mounter_free(mobile_image_mounter_client_t client); + mobile_image_mounter_error_t mobile_image_mounter_lookup_image(mobile_image_mounter_client_t client, const char *image_type, plist_t *result); mobile_image_mounter_error_t mobile_image_mounter_mount_image(mobile_image_mounter_client_t client, const char *image_path, const char *image_signature, uint16_t signature_length, const char *image_type, plist_t *result); mobile_image_mounter_error_t mobile_image_mounter_hangup(mobile_image_mounter_client_t client); diff --git a/include/libimobiledevice/mobilebackup.h b/include/libimobiledevice/mobilebackup.h index 2e2c38e..c62e99e 100644 --- a/include/libimobiledevice/mobilebackup.h +++ b/include/libimobiledevice/mobilebackup.h @@ -57,7 +57,9 @@ typedef enum { } mobilebackup_flags_t; mobilebackup_error_t mobilebackup_client_new(idevice_t device, lockdownd_service_descriptor_t service, mobilebackup_client_t * client); +mobilebackup_error_t mobilebackup_client_start_service(idevice_t device, mobilebackup_client_t* client, const char* label); mobilebackup_error_t mobilebackup_client_free(mobilebackup_client_t client); + mobilebackup_error_t mobilebackup_receive(mobilebackup_client_t client, plist_t *plist); mobilebackup_error_t mobilebackup_send(mobilebackup_client_t client, plist_t plist); mobilebackup_error_t mobilebackup_request_backup(mobilebackup_client_t client, plist_t backup_manifest, const char *base_path, const char *proto_version); diff --git a/include/libimobiledevice/mobilebackup2.h b/include/libimobiledevice/mobilebackup2.h index 42d41a8..65bbfc7 100644 --- a/include/libimobiledevice/mobilebackup2.h +++ b/include/libimobiledevice/mobilebackup2.h @@ -52,7 +52,9 @@ typedef struct mobilebackup2_client_private mobilebackup2_client_private; typedef mobilebackup2_client_private *mobilebackup2_client_t; /**< The client handle. */ mobilebackup2_error_t mobilebackup2_client_new(idevice_t device, lockdownd_service_descriptor_t service, mobilebackup2_client_t * client); +mobilebackup2_error_t mobilebackup2_client_start_service(idevice_t device, mobilebackup2_client_t* client, const char* label); mobilebackup2_error_t mobilebackup2_client_free(mobilebackup2_client_t client); + mobilebackup2_error_t mobilebackup2_send_message(mobilebackup2_client_t client, const char *message, plist_t options); mobilebackup2_error_t mobilebackup2_receive_message(mobilebackup2_client_t client, plist_t *msg_plist, char **dlmessage); mobilebackup2_error_t mobilebackup2_send_raw(mobilebackup2_client_t client, const char *data, uint32_t length, uint32_t *bytes); diff --git a/include/libimobiledevice/mobilesync.h b/include/libimobiledevice/mobilesync.h index 8fa4c58..8e263ce 100644 --- a/include/libimobiledevice/mobilesync.h +++ b/include/libimobiledevice/mobilesync.h @@ -69,6 +69,7 @@ typedef mobilesync_anchors *mobilesync_anchors_t; /**< Anchors used by the devic /* Interface */ mobilesync_error_t mobilesync_client_new(idevice_t device, lockdownd_service_descriptor_t service, mobilesync_client_t * client); +mobilesync_error_t mobilesync_client_start_service(idevice_t device, mobilesync_client_t* client, const char* label); mobilesync_error_t mobilesync_client_free(mobilesync_client_t client); mobilesync_error_t mobilesync_receive(mobilesync_client_t client, plist_t *plist); diff --git a/include/libimobiledevice/notification_proxy.h b/include/libimobiledevice/notification_proxy.h index 00b0f8f..4f025ee 100644 --- a/include/libimobiledevice/notification_proxy.h +++ b/include/libimobiledevice/notification_proxy.h @@ -94,7 +94,9 @@ typedef void (*np_notify_cb_t) (const char *notification, void *user_data); /* Interface */ np_error_t np_client_new(idevice_t device, lockdownd_service_descriptor_t service, np_client_t *client); +np_error_t np_client_start_service(idevice_t device, np_client_t* client, const char* label); np_error_t np_client_free(np_client_t client); + np_error_t np_post_notification(np_client_t client, const char *notification); np_error_t np_observe_notification(np_client_t client, const char *notification); np_error_t np_observe_notifications(np_client_t client, const char **notification_spec); diff --git a/include/libimobiledevice/sbservices.h b/include/libimobiledevice/sbservices.h index ab3e966..f9d131b 100644 --- a/include/libimobiledevice/sbservices.h +++ b/include/libimobiledevice/sbservices.h @@ -61,7 +61,9 @@ typedef sbservices_client_private *sbservices_client_t; /**< The client handle. /* Interface */ sbservices_error_t sbservices_client_new(idevice_t device, lockdownd_service_descriptor_t service, sbservices_client_t *client); +sbservices_error_t sbservices_client_start_service(idevice_t device, sbservices_client_t* client, const char* label); sbservices_error_t sbservices_client_free(sbservices_client_t client); + sbservices_error_t sbservices_get_icon_state(sbservices_client_t client, plist_t *state, const char *format_version); sbservices_error_t sbservices_set_icon_state(sbservices_client_t client, plist_t newstate); sbservices_error_t sbservices_get_icon_pngdata(sbservices_client_t client, const char *bundleId, char **pngdata, uint64_t *pngsize); diff --git a/include/libimobiledevice/screenshotr.h b/include/libimobiledevice/screenshotr.h index 41b7ffa..c8679a9 100644 --- a/include/libimobiledevice/screenshotr.h +++ b/include/libimobiledevice/screenshotr.h @@ -51,7 +51,9 @@ typedef struct screenshotr_client_private screenshotr_client_private; typedef screenshotr_client_private *screenshotr_client_t; /**< The client handle. */ screenshotr_error_t screenshotr_client_new(idevice_t device, lockdownd_service_descriptor_t service, screenshotr_client_t * client); +screenshotr_error_t screenshotr_client_start_service(idevice_t device, screenshotr_client_t* client, const char* label); screenshotr_error_t screenshotr_client_free(screenshotr_client_t client); + screenshotr_error_t screenshotr_take_screenshot(screenshotr_client_t client, char **imgdata, uint64_t *imgsize); #ifdef __cplusplus -- cgit v1.1-32-gdbae