From 773f5c797622bedbc2aed0ee8d8680e45a2807d2 Mon Sep 17 00:00:00 2001 From: Martin Szulecki Date: Sun, 21 Jun 2009 23:05:23 +0200 Subject: Silence warning and also dump iTunes format support information --- dev/iphoneinfo.c | 3 +++ 1 file changed, 3 insertions(+) (limited to 'dev/iphoneinfo.c') diff --git a/dev/iphoneinfo.c b/dev/iphoneinfo.c index c28eb9e..cee8dff 100644 --- a/dev/iphoneinfo.c +++ b/dev/iphoneinfo.c @@ -22,6 +22,7 @@ #include #include #include +#include #include @@ -43,6 +44,7 @@ int main(int argc, char *argv[]) for (i = 1; i < argc; i++) { if (!strcmp(argv[i], "-d") || !strcmp(argv[i], "--debug")) { iphone_set_debug_mask(DBGMASK_ALL); + iphone_set_debug(1); continue; } else if (!strcmp(argv[i], "-u") || !strcmp(argv[i], "--uuid")) { @@ -98,6 +100,7 @@ int main(int argc, char *argv[]) print_lckd_request_info(control, "com.apple.mobile.sync_data_class", "GetValue", NULL); print_lckd_request_info(control, "com.apple.iTunes", "GetValue", NULL); print_lckd_request_info(control, "com.apple.mobile.iTunes.store", "GetValue", NULL); + print_lckd_request_info(control, "com.apple.mobile.iTunes", "GetValue", NULL); iphone_lckd_free_client(control); iphone_free_device(phone); -- cgit v1.1-32-gdbae From 0463978f0c43d37e053d916b14c16121505266bb Mon Sep 17 00:00:00 2001 From: Martin Szulecki Date: Sat, 27 Jun 2009 18:09:30 +0200 Subject: Make iphoneinfo useful by adding XML output and queries by domain and/or key --- dev/iphoneinfo.c | 126 +++++++++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 105 insertions(+), 21 deletions(-) (limited to 'dev/iphoneinfo.c') diff --git a/dev/iphoneinfo.c b/dev/iphoneinfo.c index cee8dff..641b47d 100644 --- a/dev/iphoneinfo.c +++ b/dev/iphoneinfo.c @@ -26,8 +26,26 @@ #include +#define FORMAT_KEY_VALUE 1 +#define FORMAT_XML 2 + +static const char *domains[] = { + "com.apple.disk_usage", + "com.apple.mobile.battery", +/* FIXME: For some reason lockdownd segfaults on this, works sometimes though + "com.apple.mobile.debug",. */ + "com.apple.xcode.developerdomain", + "com.apple.international", + "com.apple.mobile.sync_data_class", + "com.apple.iTunes", + "com.apple.mobile.iTunes.store", + "com.apple.mobile.iTunes", + NULL +}; + +int is_domain_known(char *domain); void print_usage(int argc, char **argv); -void print_lckd_request_info(iphone_lckd_client_t control, const char *domain, const char *request, const char *key); +void print_lckd_request_result(iphone_lckd_client_t control, const char *domain, const char *request, const char *key, int format); void plist_node_to_string(plist_t *node); void plist_children_to_string(plist_t *node); @@ -37,7 +55,10 @@ int main(int argc, char *argv[]) iphone_device_t phone = NULL; iphone_error_t ret = IPHONE_E_UNKNOWN_ERROR; int i; + int format = FORMAT_KEY_VALUE; char uuid[41]; + char *domain = NULL; + char *key = NULL; uuid[0] = 0; /* parse cmdline args */ @@ -56,6 +77,31 @@ int main(int argc, char *argv[]) strcpy(uuid, argv[i]); continue; } + else if (!strcmp(argv[i], "-q") || !strcmp(argv[i], "--domain")) { + i++; + if (!argv[i] || (strlen(argv[i]) < 4)) { + print_usage(argc, argv); + return 0; + } + if (!is_domain_known(argv[i])) { + fprintf(stderr, "WARNING: Sending query with unknown domain \"%s\".\n", argv[i]); + } + domain = strdup(argv[i]); + continue; + } + else if (!strcmp(argv[i], "-k") || !strcmp(argv[i], "--key")) { + i++; + if (!argv[i] || (strlen(argv[i]) <= 1)) { + print_usage(argc, argv); + return 0; + } + key = strdup(argv[i]); + continue; + } + else if (!strcmp(argv[i], "-x") || !strcmp(argv[i], "--xml")) { + format = FORMAT_XML; + continue; + } else if (!strcmp(argv[i], "-h") || !strcmp(argv[i], "--help")) { print_usage(argc, argv); return 0; @@ -87,35 +133,45 @@ int main(int argc, char *argv[]) return -1; } - /* dump all information we can retrieve */ - printf("# general\n"); - print_lckd_request_info(control, NULL, "GetValue", NULL); - print_lckd_request_info(control, "com.apple.disk_usage", "GetValue", NULL); - print_lckd_request_info(control, "com.apple.mobile.battery", "GetValue", NULL); - /* FIXME: For some reason lockdownd segfaults on this, works sometimes though - print_lckd_request_info(control, "com.apple.mobile.debug", "GetValue", NULL); - */ - print_lckd_request_info(control, "com.apple.xcode.developerdomain", "GetValue", NULL); - print_lckd_request_info(control, "com.apple.international", "GetValue", NULL); - print_lckd_request_info(control, "com.apple.mobile.sync_data_class", "GetValue", NULL); - print_lckd_request_info(control, "com.apple.iTunes", "GetValue", NULL); - print_lckd_request_info(control, "com.apple.mobile.iTunes.store", "GetValue", NULL); - print_lckd_request_info(control, "com.apple.mobile.iTunes", "GetValue", NULL); + /* run query and output information */ + print_lckd_request_result(control, domain, "GetValue", key, format); + if (domain != NULL) + free(domain); iphone_lckd_free_client(control); iphone_free_device(phone); return 0; } +int is_domain_known(char *domain) +{ + int i = 0; + while (domains[i] != NULL) { + if (strstr(domain, domains[i++])) { + return 1; + } + } + return 0; +} + void print_usage(int argc, char **argv) { + int i = 0; printf("Usage: %s [OPTIONS]\n", (strrchr(argv[0], '/') + 1)); printf("Show information about the first connected iPhone/iPod Touch.\n\n"); printf(" -d, --debug\t\tenable communication debugging\n"); printf(" -u, --uuid UUID\ttarget specific device by its 40-digit device UUID\n"); + printf(" -q, --domain NAME\tset domain of query to NAME. Default: None\n"); + printf(" -k, --key NAME\tonly query key specified by NAME. Default: All keys.\n"); + printf(" -x, --xml\t\toutput information as xml plist instead of key/value pairs\n"); printf(" -h, --help\t\tprints usage information\n"); printf("\n"); + printf(" Known domains are:\n\n"); + while (domains[i] != NULL) { + printf(" %s\n", domains[i++]); + } + printf("\n"); } void plist_node_to_string(plist_t *node) @@ -189,14 +245,16 @@ void plist_children_to_string(plist_t *node) } } -void print_lckd_request_info(iphone_lckd_client_t control, const char *domain, const char *request, const char *key) { +void print_lckd_request_result(iphone_lckd_client_t control, const char *domain, const char *request, const char *key, int format) { + char *xml_doc = NULL; + char *s = NULL; + uint32_t xml_length = 0; iphone_error_t ret = IPHONE_E_UNKNOWN_ERROR; plist_t node = plist_new_dict(); if (domain) { plist_add_sub_key_el(node, "Domain"); plist_add_sub_string_el(node, domain); - printf("# %s\n", domain); } if (key) { plist_add_sub_key_el(node, "Key"); @@ -211,15 +269,41 @@ void print_lckd_request_info(iphone_lckd_client_t control, const char *domain, c node = NULL; ret = iphone_lckd_recv(control, &node); if (ret == IPHONE_E_SUCCESS) { - /* seek to first dict node */ + /* seek to value node */ for ( node = plist_get_first_child(node); - node && (plist_get_node_type(node) != PLIST_DICT); + node != NULL; node = plist_get_next_sibling(node) ) { + if(plist_get_node_type(node) == PLIST_KEY) + { + plist_get_key_val(node, &s); + + if (strcmp("Value", s)) + continue; + + node = plist_get_next_sibling(node); + + if (plist_get_node_type(node) == PLIST_DICT) { + if (plist_get_first_child(node)) + { + switch (format) { + case FORMAT_XML: + plist_to_xml(node, &xml_doc, &xml_length); + printf(xml_doc); + free(xml_doc); + break; + case FORMAT_KEY_VALUE: + default: + plist_children_to_string(node); + break; + } + } + } + else if(node && (key != NULL)) + plist_node_to_string(node); + } } - if(plist_get_first_child(node)) - plist_children_to_string(node); } } if (node) -- cgit v1.1-32-gdbae From 922339633b08d0815eaf236c94edb774e190ff7f Mon Sep 17 00:00:00 2001 From: Martin Szulecki Date: Wed, 1 Jul 2009 18:17:16 +0200 Subject: Fix segfault when displaying usage for installed iphoneinfo and iphonesyslog --- dev/iphoneinfo.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'dev/iphoneinfo.c') diff --git a/dev/iphoneinfo.c b/dev/iphoneinfo.c index 641b47d..18ee055 100644 --- a/dev/iphoneinfo.c +++ b/dev/iphoneinfo.c @@ -158,7 +158,10 @@ int is_domain_known(char *domain) void print_usage(int argc, char **argv) { int i = 0; - printf("Usage: %s [OPTIONS]\n", (strrchr(argv[0], '/') + 1)); + char *name = NULL; + + name = strrchr(argv[0], '/'); + printf("Usage: %s [OPTIONS]\n", (name ? name + 1: argv[0])); printf("Show information about the first connected iPhone/iPod Touch.\n\n"); printf(" -d, --debug\t\tenable communication debugging\n"); printf(" -u, --uuid UUID\ttarget specific device by its 40-digit device UUID\n"); -- cgit v1.1-32-gdbae From 62a6f558ac7ca7a9b83c2ed810929732c02bbc9d Mon Sep 17 00:00:00 2001 From: Martin Szulecki Date: Tue, 7 Jul 2009 21:02:00 +0200 Subject: Cleanup lockdown request API and fix docs, tools, bindings and exports --- dev/iphoneinfo.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) (limited to 'dev/iphoneinfo.c') diff --git a/dev/iphoneinfo.c b/dev/iphoneinfo.c index 18ee055..7c823e6 100644 --- a/dev/iphoneinfo.c +++ b/dev/iphoneinfo.c @@ -25,6 +25,7 @@ #include #include +#include #define FORMAT_KEY_VALUE 1 #define FORMAT_XML 2 @@ -45,13 +46,13 @@ static const char *domains[] = { int is_domain_known(char *domain); void print_usage(int argc, char **argv); -void print_lckd_request_result(iphone_lckd_client_t control, const char *domain, const char *request, const char *key, int format); +void print_lckd_request_result(lockdownd_client_t client, const char *domain, const char *request, const char *key, int format); void plist_node_to_string(plist_t *node); void plist_children_to_string(plist_t *node); int main(int argc, char *argv[]) { - iphone_lckd_client_t control = NULL; + lockdownd_client_t client = NULL; iphone_device_t phone = NULL; iphone_error_t ret = IPHONE_E_UNKNOWN_ERROR; int i; @@ -128,17 +129,17 @@ int main(int argc, char *argv[]) } } - if (IPHONE_E_SUCCESS != iphone_lckd_new_client(phone, &control)) { + if (IPHONE_E_SUCCESS != lockdownd_new_client(phone, &client)) { iphone_free_device(phone); return -1; } /* run query and output information */ - print_lckd_request_result(control, domain, "GetValue", key, format); + print_lckd_request_result(client, domain, "GetValue", key, format); if (domain != NULL) free(domain); - iphone_lckd_free_client(control); + lockdownd_free_client(client); iphone_free_device(phone); return 0; @@ -248,7 +249,7 @@ void plist_children_to_string(plist_t *node) } } -void print_lckd_request_result(iphone_lckd_client_t control, const char *domain, const char *request, const char *key, int format) { +void print_lckd_request_result(lockdownd_client_t client, const char *domain, const char *request, const char *key, int format) { char *xml_doc = NULL; char *s = NULL; uint32_t xml_length = 0; @@ -266,11 +267,11 @@ void print_lckd_request_result(iphone_lckd_client_t control, const char *domain, plist_add_sub_key_el(node, "Request"); plist_add_sub_string_el(node, request); - ret = iphone_lckd_send(control, node); + ret = lockdownd_send(client, node); if (ret == IPHONE_E_SUCCESS) { plist_free(node); node = NULL; - ret = iphone_lckd_recv(control, &node); + ret = lockdownd_recv(client, &node); if (ret == IPHONE_E_SUCCESS) { /* seek to value node */ for ( -- cgit v1.1-32-gdbae From 8606fb9575c9eb6ffcbc9afec50c7f24e9ddf8d6 Mon Sep 17 00:00:00 2001 From: Martin Szulecki Date: Sat, 18 Jul 2009 20:20:34 +0200 Subject: Simplify iphoneinfo by using new lockdownd_get_value replacing custom code --- dev/iphoneinfo.c | 95 ++++++++++++++++---------------------------------------- 1 file changed, 27 insertions(+), 68 deletions(-) (limited to 'dev/iphoneinfo.c') diff --git a/dev/iphoneinfo.c b/dev/iphoneinfo.c index 7c823e6..33ab3ac 100644 --- a/dev/iphoneinfo.c +++ b/dev/iphoneinfo.c @@ -46,7 +46,6 @@ static const char *domains[] = { int is_domain_known(char *domain); void print_usage(int argc, char **argv); -void print_lckd_request_result(lockdownd_client_t client, const char *domain, const char *request, const char *key, int format); void plist_node_to_string(plist_t *node); void plist_children_to_string(plist_t *node); @@ -60,6 +59,9 @@ int main(int argc, char *argv[]) char uuid[41]; char *domain = NULL; char *key = NULL; + char *xml_doc = NULL; + uint32_t xml_length; + plist_t node = NULL; uuid[0] = 0; /* parse cmdline args */ @@ -135,7 +137,30 @@ int main(int argc, char *argv[]) } /* run query and output information */ - print_lckd_request_result(client, domain, "GetValue", key, format); + if(lockdownd_get_value(client, domain, key, &node) == IPHONE_E_SUCCESS) + { + if (plist_get_node_type(node) == PLIST_DICT) { + if (plist_get_first_child(node)) + { + switch (format) { + case FORMAT_XML: + plist_to_xml(node, &xml_doc, &xml_length); + printf(xml_doc); + free(xml_doc); + break; + case FORMAT_KEY_VALUE: + default: + plist_children_to_string(node); + break; + } + } + } + else if(node && (key != NULL)) + plist_node_to_string(node); + if (node) + plist_free(node); + node = NULL; + } if (domain != NULL) free(domain); @@ -249,69 +274,3 @@ void plist_children_to_string(plist_t *node) } } -void print_lckd_request_result(lockdownd_client_t client, const char *domain, const char *request, const char *key, int format) { - char *xml_doc = NULL; - char *s = NULL; - uint32_t xml_length = 0; - iphone_error_t ret = IPHONE_E_UNKNOWN_ERROR; - - plist_t node = plist_new_dict(); - if (domain) { - plist_add_sub_key_el(node, "Domain"); - plist_add_sub_string_el(node, domain); - } - if (key) { - plist_add_sub_key_el(node, "Key"); - plist_add_sub_string_el(node, key); - } - plist_add_sub_key_el(node, "Request"); - plist_add_sub_string_el(node, request); - - ret = lockdownd_send(client, node); - if (ret == IPHONE_E_SUCCESS) { - plist_free(node); - node = NULL; - ret = lockdownd_recv(client, &node); - if (ret == IPHONE_E_SUCCESS) { - /* seek to value node */ - for ( - node = plist_get_first_child(node); - node != NULL; - node = plist_get_next_sibling(node) - ) { - if(plist_get_node_type(node) == PLIST_KEY) - { - plist_get_key_val(node, &s); - - if (strcmp("Value", s)) - continue; - - node = plist_get_next_sibling(node); - - if (plist_get_node_type(node) == PLIST_DICT) { - if (plist_get_first_child(node)) - { - switch (format) { - case FORMAT_XML: - plist_to_xml(node, &xml_doc, &xml_length); - printf(xml_doc); - free(xml_doc); - break; - case FORMAT_KEY_VALUE: - default: - plist_children_to_string(node); - break; - } - } - } - else if(node && (key != NULL)) - plist_node_to_string(node); - } - } - } - } - if (node) - plist_free(node); - node = NULL; -} - -- cgit v1.1-32-gdbae From 0e80ca70829eb7c3cab32019ca4dfaef577b6e69 Mon Sep 17 00:00:00 2001 From: Martin Szulecki Date: Tue, 21 Jul 2009 00:53:05 +0200 Subject: Add new lockdown request domains to iphoneinfo --- dev/iphoneinfo.c | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'dev/iphoneinfo.c') diff --git a/dev/iphoneinfo.c b/dev/iphoneinfo.c index 33ab3ac..67e7552 100644 --- a/dev/iphoneinfo.c +++ b/dev/iphoneinfo.c @@ -37,7 +37,12 @@ static const char *domains[] = { "com.apple.mobile.debug",. */ "com.apple.xcode.developerdomain", "com.apple.international", + "com.apple.mobile.mobile_application_usage", + "com.apple.mobile.backup", + "com.apple.mobile.user_preferences", "com.apple.mobile.sync_data_class", + "com.apple.mobile.software_behavior", + "com.apple.mobile.iTunes.SQLMusicLibraryPostProcessCommands", "com.apple.iTunes", "com.apple.mobile.iTunes.store", "com.apple.mobile.iTunes", -- cgit v1.1-32-gdbae From 601e70e8ee757b769bdc10b16e108e846a1a0b93 Mon Sep 17 00:00:00 2001 From: Martin Szulecki Date: Fri, 24 Jul 2009 17:46:30 +0200 Subject: Rename iphone_set_debug() to iphone_set_debug_level() and code using it --- dev/iphoneinfo.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'dev/iphoneinfo.c') diff --git a/dev/iphoneinfo.c b/dev/iphoneinfo.c index 67e7552..02b62d5 100644 --- a/dev/iphoneinfo.c +++ b/dev/iphoneinfo.c @@ -73,7 +73,7 @@ int main(int argc, char *argv[]) for (i = 1; i < argc; i++) { if (!strcmp(argv[i], "-d") || !strcmp(argv[i], "--debug")) { iphone_set_debug_mask(DBGMASK_ALL); - iphone_set_debug(1); + iphone_set_debug_level(1); continue; } else if (!strcmp(argv[i], "-u") || !strcmp(argv[i], "--uuid")) { -- cgit v1.1-32-gdbae From f5e9d76ebd74999512ab73f44fabba86879b1c1f Mon Sep 17 00:00:00 2001 From: Martin Szulecki Date: Sat, 25 Jul 2009 02:40:25 +0200 Subject: Update lockdown API and introduce new error codes --- dev/iphoneinfo.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'dev/iphoneinfo.c') diff --git a/dev/iphoneinfo.c b/dev/iphoneinfo.c index 02b62d5..52d7c8a 100644 --- a/dev/iphoneinfo.c +++ b/dev/iphoneinfo.c @@ -136,13 +136,13 @@ int main(int argc, char *argv[]) } } - if (IPHONE_E_SUCCESS != lockdownd_new_client(phone, &client)) { + if (LOCKDOWN_E_SUCCESS != lockdownd_client_new(phone, &client)) { iphone_free_device(phone); return -1; } /* run query and output information */ - if(lockdownd_get_value(client, domain, key, &node) == IPHONE_E_SUCCESS) + if(lockdownd_get_value(client, domain, key, &node) == LOCKDOWN_E_SUCCESS) { if (plist_get_node_type(node) == PLIST_DICT) { if (plist_get_first_child(node)) @@ -169,7 +169,7 @@ int main(int argc, char *argv[]) if (domain != NULL) free(domain); - lockdownd_free_client(client); + lockdownd_client_free(client); iphone_free_device(phone); return 0; -- cgit v1.1-32-gdbae From 5cb9ecc85240102402082c442d561d7350732027 Mon Sep 17 00:00:00 2001 From: Martin Szulecki Date: Sat, 25 Jul 2009 02:54:40 +0200 Subject: Follow glib style and rename iphone_free_device to iphone_device_free --- dev/iphoneinfo.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'dev/iphoneinfo.c') diff --git a/dev/iphoneinfo.c b/dev/iphoneinfo.c index 52d7c8a..790804c 100644 --- a/dev/iphoneinfo.c +++ b/dev/iphoneinfo.c @@ -137,7 +137,7 @@ int main(int argc, char *argv[]) } if (LOCKDOWN_E_SUCCESS != lockdownd_client_new(phone, &client)) { - iphone_free_device(phone); + iphone_device_free(phone); return -1; } @@ -170,7 +170,7 @@ int main(int argc, char *argv[]) if (domain != NULL) free(domain); lockdownd_client_free(client); - iphone_free_device(phone); + iphone_device_free(phone); return 0; } -- cgit v1.1-32-gdbae