summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorGravatar Nikias Bassen2009-09-10 13:28:13 +0200
committerGravatar Martin Szulecki2009-09-12 11:41:38 +0200
commit1f6282ffddec7012df82fa929dfe72cfc74b063a (patch)
tree452c927c07806855f360ee9803111a1f72e05d3c /tools
parent26ce10634d277df51c4e9c2bd61b409df3f5b060 (diff)
downloadlibimobiledevice-1f6282ffddec7012df82fa929dfe72cfc74b063a.tar.gz
libimobiledevice-1f6282ffddec7012df82fa929dfe72cfc74b063a.tar.bz2
Public API rework, extension and adaption to latest libusbmuxd-1.0 API.
Diffstat (limited to 'tools')
-rw-r--r--tools/iphone_id.c9
-rw-r--r--tools/iphoneinfo.c4
-rw-r--r--tools/iphonesyslog.c16
3 files changed, 14 insertions, 15 deletions
diff --git a/tools/iphone_id.c b/tools/iphone_id.c
index 835e214..ab36e7c 100644
--- a/tools/iphone_id.c
+++ b/tools/iphone_id.c
@@ -28,7 +28,7 @@ int main(int argc, char **argv)
{
iphone_device_t phone = NULL;
lockdownd_client_t client = NULL;
- usbmuxd_scan_result *dev_list;
+ usbmuxd_device_info_t *dev_list;
char *devname = NULL;
int ret = 0;
int i;
@@ -65,7 +65,7 @@ int main(int argc, char **argv)
switch (mode) {
case MODE_SHOW_ID:
- iphone_get_device_by_uuid(&phone, uuid);
+ iphone_device_new(&phone, uuid);
if (!phone) {
fprintf(stderr, "ERROR: No device with UUID=%s attached.\n", uuid);
return -2;
@@ -96,13 +96,14 @@ int main(int argc, char **argv)
return ret;
case MODE_LIST_DEVICES:
default:
- if (usbmuxd_scan(&dev_list) < 0) {
+ if (usbmuxd_get_device_list(&dev_list) < 0) {
fprintf(stderr, "ERROR: usbmuxd is not running!\n");
return -1;
}
for (i = 0; dev_list[i].handle > 0; i++) {
- printf("handle=%d product_id=%04x uuid=%s\n", dev_list[i].handle, dev_list[i].product_id, dev_list[i].serial_number);
+ printf("handle=%d product_id=%04x uuid=%s\n", dev_list[i].handle, dev_list[i].product_id, dev_list[i].uuid);
}
+ usbmuxd_free_device_list(dev_list);
return 0;
}
}
diff --git a/tools/iphoneinfo.c b/tools/iphoneinfo.c
index 7e275b2..16a1069 100644
--- a/tools/iphoneinfo.c
+++ b/tools/iphoneinfo.c
@@ -121,7 +121,7 @@ int main(int argc, char *argv[])
}
if (uuid[0] != 0) {
- ret = iphone_get_device_by_uuid(&phone, uuid);
+ ret = iphone_device_new(&phone, uuid);
if (ret != IPHONE_E_SUCCESS) {
printf("No device found with uuid %s, is it plugged in?\n", uuid);
return -1;
@@ -129,7 +129,7 @@ int main(int argc, char *argv[])
}
else
{
- ret = iphone_get_device(&phone);
+ ret = iphone_device_new(&phone, NULL);
if (ret != IPHONE_E_SUCCESS) {
printf("No device found, is it plugged in?\n");
return -1;
diff --git a/tools/iphonesyslog.c b/tools/iphonesyslog.c
index a096101..10b3fb6 100644
--- a/tools/iphonesyslog.c
+++ b/tools/iphonesyslog.c
@@ -28,7 +28,6 @@
#include <libiphone/libiphone.h>
#include <libiphone/lockdown.h>
-#include <usbmuxd.h>
static int quit_flag = 0;
@@ -86,7 +85,7 @@ int main(int argc, char *argv[])
}
if (uuid[0] != 0) {
- ret = iphone_get_device_by_uuid(&phone, uuid);
+ ret = iphone_device_new(&phone, uuid);
if (ret != IPHONE_E_SUCCESS) {
printf("No device found with uuid %s, is it plugged in?\n", uuid);
return -1;
@@ -94,7 +93,7 @@ int main(int argc, char *argv[])
}
else
{
- ret = iphone_get_device(&phone);
+ ret = iphone_device_new(&phone, NULL);
if (ret != IPHONE_E_SUCCESS) {
printf("No device found, is it plugged in?\n");
return -1;
@@ -112,16 +111,15 @@ int main(int argc, char *argv[])
lockdownd_client_free(client);
/* connect to socket relay messages */
- iphone_device_get_handle(phone, &handle);
- int sfd = usbmuxd_connect(handle, port);
- if (sfd < 0) {
+ iphone_connection_t conn = NULL;
+ if ((iphone_device_connect(phone, port, &conn) != IPHONE_E_SUCCESS) || !conn) {
printf("ERROR: Could not open usbmux connection.\n");
} else {
while (!quit_flag) {
char *receive = NULL;
uint32_t datalen = 0, bytes = 0, recv_bytes = 0;
- ret = usbmuxd_recv(sfd, (char *) &datalen, sizeof(datalen), &bytes);
+ ret = iphone_device_recv(conn, (char *) &datalen, sizeof(datalen), &bytes);
datalen = ntohl(datalen);
if (datalen == 0)
@@ -131,7 +129,7 @@ int main(int argc, char *argv[])
receive = (char *) malloc(sizeof(char) * datalen);
while (!quit_flag && (recv_bytes <= datalen)) {
- ret = usbmuxd_recv(sfd, receive, datalen, &bytes);
+ ret = iphone_device_recv(conn, receive, datalen, &bytes);
if (bytes == 0)
break;
@@ -144,7 +142,7 @@ int main(int argc, char *argv[])
free(receive);
}
}
- usbmuxd_disconnect(sfd);
+ iphone_device_disconnect(conn);
} else {
printf("ERROR: Could not start service com.apple.syslog_relay.\n");
}