diff options
| author |  Martin Szulecki | 2009-07-24 23:51:53 +0200 |
|---|---|---|
| committer | Martin Szulecki | 2009-07-24 23:51:53 +0200 |
| commit | 19a28b0ed18c8ca2f855e7d129ddcdb8c939a707 (patch) | |
| tree | a8c3dbfd38705bbe73af53193d4c8cfa224ebee2 /src/lockdown.c | |
| parent | 83529098fbf4b39b2643a7c0bf39828247d11f9a (diff) | |
| download | libimobiledevice-19a28b0ed18c8ca2f855e7d129ddcdb8c939a707.tar.gz libimobiledevice-19a28b0ed18c8ca2f855e7d129ddcdb8c939a707.tar.bz2 | |
Use iphone_device_get_uuid() not lockdown, for less overhead where possible
Diffstat (limited to 'src/lockdown.c')
| -rw-r--r-- | src/lockdown.c | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/src/lockdown.c b/src/lockdown.c index bfb44d0..3d2b04c 100644 --- a/src/lockdown.c +++ b/src/lockdown.c @@ -673,24 +673,24 @@ iphone_error_t lockdownd_new_client(iphone_device_t device, lockdownd_client_t * ret = IPHONE_E_NOT_ENOUGH_DATA; } - char *uid = NULL; - ret = lockdownd_get_device_uid(client_loc, &uid); + char *uuid = NULL; + ret = iphone_device_get_uuid(device, &uuid); if (IPHONE_E_SUCCESS != ret) { log_debug_msg("%s: failed to get device uuid.\n", __func__); } - log_debug_msg("%s: device uuid: %s\n", __func__, uid); + log_debug_msg("%s: device uuid: %s\n", __func__, uuid); host_id = get_host_id(); if (IPHONE_E_SUCCESS == ret && !host_id) { ret = IPHONE_E_INVALID_CONF; } - if (IPHONE_E_SUCCESS == ret && !is_device_known(uid)) - ret = lockdownd_pair(client_loc, uid, host_id); + if (IPHONE_E_SUCCESS == ret && !is_device_known(uuid)) + ret = lockdownd_pair(client_loc, uuid, host_id); - if (uid) { - free(uid); - uid = NULL; + if (uuid) { + free(uuid); + uuid = NULL; } if (IPHONE_E_SUCCESS == ret) { @@ -779,9 +779,8 @@ iphone_error_t lockdownd_pair(lockdownd_client_t client, char *uid, char *host_i /* store public key in config if pairing succeeded */ if (ret == IPHONE_E_SUCCESS) { - log_dbg_msg(DBGMASK_LOCKDOWND, "%s: pair success\n", __func__); - store_device_public_key(uid, public_key); - ret = IPHONE_E_SUCCESS; + log_dbg_msg(DBGMASK_LOCKDOWND, "%s: pair success\n", __func__); + store_device_public_key(uuid, public_key); } else { log_dbg_msg(DBGMASK_LOCKDOWND, "%s: pair failure\n", __func__); ret = IPHONE_E_PAIRING_FAILED; |