summaryrefslogtreecommitdiffstats
path: root/src/lockdown.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/lockdown.c')
-rw-r--r--src/lockdown.c78
1 files changed, 39 insertions, 39 deletions
diff --git a/src/lockdown.c b/src/lockdown.c
index 284840d..e21db30 100644
--- a/src/lockdown.c
+++ b/src/lockdown.c
@@ -158,7 +158,7 @@ static void plist_dict_add_label(plist_t plist, const char *label)
158{ 158{
159 if (plist && label) { 159 if (plist && label) {
160 if (plist_get_node_type(plist) == PLIST_DICT) 160 if (plist_get_node_type(plist) == PLIST_DICT)
161 plist_dict_insert_item(plist, "Label", plist_new_string(label)); 161 plist_dict_set_item(plist, "Label", plist_new_string(label));
162 } 162 }
163} 163}
164 164
@@ -186,8 +186,8 @@ lockdownd_error_t lockdownd_stop_session(lockdownd_client_t client, const char *
186 186
187 plist_t dict = plist_new_dict(); 187 plist_t dict = plist_new_dict();
188 plist_dict_add_label(dict, client->label); 188 plist_dict_add_label(dict, client->label);
189 plist_dict_insert_item(dict,"Request", plist_new_string("StopSession")); 189 plist_dict_set_item(dict,"Request", plist_new_string("StopSession"));
190 plist_dict_insert_item(dict,"SessionID", plist_new_string(session_id)); 190 plist_dict_set_item(dict,"SessionID", plist_new_string(session_id));
191 191
192 debug_info("stopping session %s", session_id); 192 debug_info("stopping session %s", session_id);
193 193
@@ -368,7 +368,7 @@ lockdownd_error_t lockdownd_query_type(lockdownd_client_t client, char **type)
368 368
369 plist_t dict = plist_new_dict(); 369 plist_t dict = plist_new_dict();
370 plist_dict_add_label(dict, client->label); 370 plist_dict_add_label(dict, client->label);
371 plist_dict_insert_item(dict,"Request", plist_new_string("QueryType")); 371 plist_dict_set_item(dict,"Request", plist_new_string("QueryType"));
372 372
373 debug_info("called"); 373 debug_info("called");
374 ret = lockdownd_send(client, dict); 374 ret = lockdownd_send(client, dict);
@@ -426,12 +426,12 @@ lockdownd_error_t lockdownd_get_value(lockdownd_client_t client, const char *dom
426 dict = plist_new_dict(); 426 dict = plist_new_dict();
427 plist_dict_add_label(dict, client->label); 427 plist_dict_add_label(dict, client->label);
428 if (domain) { 428 if (domain) {
429 plist_dict_insert_item(dict,"Domain", plist_new_string(domain)); 429 plist_dict_set_item(dict,"Domain", plist_new_string(domain));
430 } 430 }
431 if (key) { 431 if (key) {
432 plist_dict_insert_item(dict,"Key", plist_new_string(key)); 432 plist_dict_set_item(dict,"Key", plist_new_string(key));
433 } 433 }
434 plist_dict_insert_item(dict,"Request", plist_new_string("GetValue")); 434 plist_dict_set_item(dict,"Request", plist_new_string("GetValue"));
435 435
436 /* send to device */ 436 /* send to device */
437 ret = lockdownd_send(client, dict); 437 ret = lockdownd_send(client, dict);
@@ -490,13 +490,13 @@ lockdownd_error_t lockdownd_set_value(lockdownd_client_t client, const char *dom
490 dict = plist_new_dict(); 490 dict = plist_new_dict();
491 plist_dict_add_label(dict, client->label); 491 plist_dict_add_label(dict, client->label);
492 if (domain) { 492 if (domain) {
493 plist_dict_insert_item(dict,"Domain", plist_new_string(domain)); 493 plist_dict_set_item(dict,"Domain", plist_new_string(domain));
494 } 494 }
495 if (key) { 495 if (key) {
496 plist_dict_insert_item(dict,"Key", plist_new_string(key)); 496 plist_dict_set_item(dict,"Key", plist_new_string(key));
497 } 497 }
498 plist_dict_insert_item(dict,"Request", plist_new_string("SetValue")); 498 plist_dict_set_item(dict,"Request", plist_new_string("SetValue"));
499 plist_dict_insert_item(dict,"Value", value); 499 plist_dict_set_item(dict,"Value", value);
500 500
501 /* send to device */ 501 /* send to device */
502 ret = lockdownd_send(client, dict); 502 ret = lockdownd_send(client, dict);
@@ -549,12 +549,12 @@ lockdownd_error_t lockdownd_remove_value(lockdownd_client_t client, const char *
549 dict = plist_new_dict(); 549 dict = plist_new_dict();
550 plist_dict_add_label(dict, client->label); 550 plist_dict_add_label(dict, client->label);
551 if (domain) { 551 if (domain) {
552 plist_dict_insert_item(dict,"Domain", plist_new_string(domain)); 552 plist_dict_set_item(dict,"Domain", plist_new_string(domain));
553 } 553 }
554 if (key) { 554 if (key) {
555 plist_dict_insert_item(dict,"Key", plist_new_string(key)); 555 plist_dict_set_item(dict,"Key", plist_new_string(key));
556 } 556 }
557 plist_dict_insert_item(dict,"Request", plist_new_string("RemoveValue")); 557 plist_dict_set_item(dict,"Request", plist_new_string("RemoveValue"));
558 558
559 /* send to device */ 559 /* send to device */
560 ret = lockdownd_send(client, dict); 560 ret = lockdownd_send(client, dict);
@@ -818,11 +818,11 @@ static plist_t lockdownd_pair_record_to_plist(lockdownd_pair_record_t pair_recor
818 818
819 /* setup request plist */ 819 /* setup request plist */
820 plist_t dict = plist_new_dict(); 820 plist_t dict = plist_new_dict();
821 plist_dict_insert_item(dict, "DeviceCertificate", plist_new_data(pair_record->device_certificate, strlen(pair_record->device_certificate))); 821 plist_dict_set_item(dict, "DeviceCertificate", plist_new_data(pair_record->device_certificate, strlen(pair_record->device_certificate)));
822 plist_dict_insert_item(dict, "HostCertificate", plist_new_data(pair_record->host_certificate, strlen(pair_record->host_certificate))); 822 plist_dict_set_item(dict, "HostCertificate", plist_new_data(pair_record->host_certificate, strlen(pair_record->host_certificate)));
823 plist_dict_insert_item(dict, "HostID", plist_new_string(pair_record->host_id)); 823 plist_dict_set_item(dict, "HostID", plist_new_string(pair_record->host_id));
824 plist_dict_insert_item(dict, "RootCertificate", plist_new_data(pair_record->root_certificate, strlen(pair_record->root_certificate))); 824 plist_dict_set_item(dict, "RootCertificate", plist_new_data(pair_record->root_certificate, strlen(pair_record->root_certificate)));
825 plist_dict_insert_item(dict, "SystemBUID", plist_new_string(pair_record->system_buid)); 825 plist_dict_set_item(dict, "SystemBUID", plist_new_string(pair_record->system_buid));
826 826
827 return dict; 827 return dict;
828} 828}
@@ -878,11 +878,11 @@ static lockdownd_error_t generate_pair_record_plist(lockdownd_client_t client, p
878 878
879 /* setup request plist */ 879 /* setup request plist */
880 *pair_record_plist = plist_new_dict(); 880 *pair_record_plist = plist_new_dict();
881 plist_dict_insert_item(*pair_record_plist, "DeviceCertificate", plist_new_data((const char*)device_cert.data, device_cert.size)); 881 plist_dict_set_item(*pair_record_plist, "DeviceCertificate", plist_new_data((const char*)device_cert.data, device_cert.size));
882 plist_dict_insert_item(*pair_record_plist, "HostCertificate", plist_new_data((const char*)host_cert.data, host_cert.size)); 882 plist_dict_set_item(*pair_record_plist, "HostCertificate", plist_new_data((const char*)host_cert.data, host_cert.size));
883 plist_dict_insert_item(*pair_record_plist, "HostID", plist_new_string(host_id)); 883 plist_dict_set_item(*pair_record_plist, "HostID", plist_new_string(host_id));
884 plist_dict_insert_item(*pair_record_plist, "RootCertificate", plist_new_data((const char*)root_cert.data, root_cert.size)); 884 plist_dict_set_item(*pair_record_plist, "RootCertificate", plist_new_data((const char*)root_cert.data, root_cert.size));
885 plist_dict_insert_item(*pair_record_plist, "SystemBUID", plist_new_string(system_buid)); 885 plist_dict_set_item(*pair_record_plist, "SystemBUID", plist_new_string(system_buid));
886 886
887leave: 887leave:
888 if (host_id) 888 if (host_id)
@@ -962,13 +962,13 @@ static lockdownd_error_t lockdownd_do_pair(lockdownd_client_t client, lockdownd_
962 /* setup pair request plist */ 962 /* setup pair request plist */
963 dict = plist_new_dict(); 963 dict = plist_new_dict();
964 plist_dict_add_label(dict, client->label); 964 plist_dict_add_label(dict, client->label);
965 plist_dict_insert_item(dict, "PairRecord", plist_copy(dict_record)); 965 plist_dict_set_item(dict, "PairRecord", plist_copy(dict_record));
966 plist_dict_insert_item(dict, "Request", plist_new_string(verb)); 966 plist_dict_set_item(dict, "Request", plist_new_string(verb));
967 plist_dict_insert_item(dict, "ProtocolVersion", plist_new_string(LOCKDOWN_PROTOCOL_VERSION)); 967 plist_dict_set_item(dict, "ProtocolVersion", plist_new_string(LOCKDOWN_PROTOCOL_VERSION));
968 968
969 plist_t options = plist_new_dict(); 969 plist_t options = plist_new_dict();
970 plist_dict_insert_item(options, "ExtendedPairingErrors", plist_new_bool(1)); 970 plist_dict_set_item(options, "ExtendedPairingErrors", plist_new_bool(1));
971 plist_dict_insert_item(dict, "PairingOptions", options); 971 plist_dict_set_item(dict, "PairingOptions", options);
972 972
973 /* send to device */ 973 /* send to device */
974 ret = lockdownd_send(client, dict); 974 ret = lockdownd_send(client, dict);
@@ -1144,7 +1144,7 @@ lockdownd_error_t lockdownd_enter_recovery(lockdownd_client_t client)
1144 1144
1145 plist_t dict = plist_new_dict(); 1145 plist_t dict = plist_new_dict();
1146 plist_dict_add_label(dict, client->label); 1146 plist_dict_add_label(dict, client->label);
1147 plist_dict_insert_item(dict,"Request", plist_new_string("EnterRecovery")); 1147 plist_dict_set_item(dict,"Request", plist_new_string("EnterRecovery"));
1148 1148
1149 debug_info("telling device to enter recovery mode"); 1149 debug_info("telling device to enter recovery mode");
1150 1150
@@ -1181,7 +1181,7 @@ lockdownd_error_t lockdownd_goodbye(lockdownd_client_t client)
1181 1181
1182 plist_t dict = plist_new_dict(); 1182 plist_t dict = plist_new_dict();
1183 plist_dict_add_label(dict, client->label); 1183 plist_dict_add_label(dict, client->label);
1184 plist_dict_insert_item(dict,"Request", plist_new_string("Goodbye")); 1184 plist_dict_set_item(dict,"Request", plist_new_string("Goodbye"));
1185 1185
1186 debug_info("called"); 1186 debug_info("called");
1187 1187
@@ -1560,18 +1560,18 @@ lockdownd_error_t lockdownd_start_session(lockdownd_client_t client, const char
1560 /* setup request plist */ 1560 /* setup request plist */
1561 dict = plist_new_dict(); 1561 dict = plist_new_dict();
1562 plist_dict_add_label(dict, client->label); 1562 plist_dict_add_label(dict, client->label);
1563 plist_dict_insert_item(dict,"Request", plist_new_string("StartSession")); 1563 plist_dict_set_item(dict,"Request", plist_new_string("StartSession"));
1564 1564
1565 /* add host id */ 1565 /* add host id */
1566 if (host_id) { 1566 if (host_id) {
1567 plist_dict_insert_item(dict, "HostID", plist_new_string(host_id)); 1567 plist_dict_set_item(dict, "HostID", plist_new_string(host_id));
1568 } 1568 }
1569 1569
1570 /* add system buid */ 1570 /* add system buid */
1571 char *system_buid = NULL; 1571 char *system_buid = NULL;
1572 userpref_get_system_buid(&system_buid); 1572 userpref_get_system_buid(&system_buid);
1573 if (system_buid) { 1573 if (system_buid) {
1574 plist_dict_insert_item(dict, "SystemBUID", plist_new_string(system_buid)); 1574 plist_dict_set_item(dict, "SystemBUID", plist_new_string(system_buid));
1575 if (system_buid) { 1575 if (system_buid) {
1576 free(system_buid); 1576 free(system_buid);
1577 system_buid = NULL; 1577 system_buid = NULL;
@@ -1685,8 +1685,8 @@ lockdownd_error_t lockdownd_start_service(lockdownd_client_t client, const char
1685 1685
1686 dict = plist_new_dict(); 1686 dict = plist_new_dict();
1687 plist_dict_add_label(dict, client->label); 1687 plist_dict_add_label(dict, client->label);
1688 plist_dict_insert_item(dict,"Request", plist_new_string("StartService")); 1688 plist_dict_set_item(dict,"Request", plist_new_string("StartService"));
1689 plist_dict_insert_item(dict,"Service", plist_new_string(identifier)); 1689 plist_dict_set_item(dict,"Service", plist_new_string(identifier));
1690 1690
1691 /* send to device */ 1691 /* send to device */
1692 ret = lockdownd_send(client, dict); 1692 ret = lockdownd_send(client, dict);
@@ -1785,8 +1785,8 @@ lockdownd_error_t lockdownd_activate(lockdownd_client_t client, plist_t activati
1785 1785
1786 plist_t dict = plist_new_dict(); 1786 plist_t dict = plist_new_dict();
1787 plist_dict_add_label(dict, client->label); 1787 plist_dict_add_label(dict, client->label);
1788 plist_dict_insert_item(dict,"Request", plist_new_string("Activate")); 1788 plist_dict_set_item(dict,"Request", plist_new_string("Activate"));
1789 plist_dict_insert_item(dict,"ActivationRecord", plist_copy(activation_record)); 1789 plist_dict_set_item(dict,"ActivationRecord", plist_copy(activation_record));
1790 1790
1791 ret = lockdownd_send(client, dict); 1791 ret = lockdownd_send(client, dict);
1792 plist_free(dict); 1792 plist_free(dict);
@@ -1843,7 +1843,7 @@ lockdownd_error_t lockdownd_deactivate(lockdownd_client_t client)
1843 1843
1844 plist_t dict = plist_new_dict(); 1844 plist_t dict = plist_new_dict();
1845 plist_dict_add_label(dict, client->label); 1845 plist_dict_add_label(dict, client->label);
1846 plist_dict_insert_item(dict,"Request", plist_new_string("Deactivate")); 1846 plist_dict_set_item(dict,"Request", plist_new_string("Deactivate"));
1847 1847
1848 ret = lockdownd_send(client, dict); 1848 ret = lockdownd_send(client, dict);
1849 plist_free(dict); 1849 plist_free(dict);