diff options
| author | 2013-11-04 23:06:35 +0100 | |
|---|---|---|
| committer | 2013-11-04 23:06:35 +0100 | |
| commit | ccfa91a88b80f768794ad184222c2bbbfb1b102c (patch) | |
| tree | 195feb2573318eebce72c37dd639aec2a156bede | |
| parent | 66b552798c0700ac851b53f6915d5a24aeeefdd9 (diff) | |
| download | usbmuxd-ccfa91a88b80f768794ad184222c2bbbfb1b102c.tar.gz usbmuxd-ccfa91a88b80f768794ad184222c2bbbfb1b102c.tar.bz2 | |
preflight: Add messages to indicate start and finish of preflight process
| -rw-r--r-- | src/preflight.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/src/preflight.c b/src/preflight.c index dc4b3dc..def6a82 100644 --- a/src/preflight.c +++ b/src/preflight.c | |||
| @@ -135,6 +135,8 @@ static void* preflight_worker_handle_device_add(void* userdata) | |||
| 135 | plist_t value = NULL; | 135 | plist_t value = NULL; |
| 136 | char* version_str = NULL; | 136 | char* version_str = NULL; |
| 137 | 137 | ||
| 138 | usbmuxd_log(LL_INFO, "%s: Starting preflight on device %s...", __func__, _dev->udid); | ||
| 139 | |||
| 138 | retry: | 140 | retry: |
| 139 | lerr = lockdownd_client_new(dev, &lockdown, "usbmuxd"); | 141 | lerr = lockdownd_client_new(dev, &lockdown, "usbmuxd"); |
| 140 | if (lerr != LOCKDOWN_E_SUCCESS) { | 142 | if (lerr != LOCKDOWN_E_SUCCESS) { |
| @@ -152,6 +154,7 @@ retry: | |||
| 152 | if (strcmp(type, "com.apple.mobile.lockdown") != 0) { | 154 | if (strcmp(type, "com.apple.mobile.lockdown") != 0) { |
| 153 | // make restore mode devices visible | 155 | // make restore mode devices visible |
| 154 | free(type); | 156 | free(type); |
| 157 | usbmuxd_log(LL_INFO, "%s: Finished preflight on device %s", __func__, _dev->udid); | ||
| 155 | client_device_add(info); | 158 | client_device_add(info); |
| 156 | goto leave; | 159 | goto leave; |
| 157 | } | 160 | } |
| @@ -164,6 +167,7 @@ retry: | |||
| 164 | free(host_id); | 167 | free(host_id); |
| 165 | if (lerr == LOCKDOWN_E_SUCCESS) { | 168 | if (lerr == LOCKDOWN_E_SUCCESS) { |
| 166 | usbmuxd_log(LL_INFO, "%s: StartSession success for device %s", __func__, _dev->udid); | 169 | usbmuxd_log(LL_INFO, "%s: StartSession success for device %s", __func__, _dev->udid); |
| 170 | usbmuxd_log(LL_INFO, "%s: Finished preflight on device %s", __func__, _dev->udid); | ||
| 167 | client_device_add(info); | 171 | client_device_add(info); |
| 168 | goto leave; | 172 | goto leave; |
| 169 | } | 173 | } |
| @@ -215,6 +219,7 @@ retry: | |||
| 215 | if (lockdownd_pair(lockdown, NULL) == LOCKDOWN_E_SUCCESS) { | 219 | if (lockdownd_pair(lockdown, NULL) == LOCKDOWN_E_SUCCESS) { |
| 216 | /* if device is still showing the setup screen it will pair even without trust dialog */ | 220 | /* if device is still showing the setup screen it will pair even without trust dialog */ |
| 217 | usbmuxd_log(LL_INFO, "%s: Pair success for device %s", __func__, _dev->udid); | 221 | usbmuxd_log(LL_INFO, "%s: Pair success for device %s", __func__, _dev->udid); |
| 222 | usbmuxd_log(LL_INFO, "%s: Finished preflight on device %s", __func__, _dev->udid); | ||
| 218 | client_device_add(info); | 223 | client_device_add(info); |
| 219 | goto leave; | 224 | goto leave; |
| 220 | } | 225 | } |
| @@ -279,6 +284,8 @@ retry: | |||
| 279 | usbmuxd_log(LL_ERROR, "%s: ERROR: Pair failed for device %s, lockdown error %d", __func__, _dev->udid, lerr); | 284 | usbmuxd_log(LL_ERROR, "%s: ERROR: Pair failed for device %s, lockdown error %d", __func__, _dev->udid, lerr); |
| 280 | } | 285 | } |
| 281 | 286 | ||
| 287 | usbmuxd_log(LL_INFO, "%s: Finished preflight on device %s", __func__, _dev->udid); | ||
| 288 | |||
| 282 | /* make device visible anyways */ | 289 | /* make device visible anyways */ |
| 283 | client_device_add(info); | 290 | client_device_add(info); |
| 284 | 291 | ||
| @@ -300,6 +307,8 @@ retry: | |||
| 300 | goto leave; | 307 | goto leave; |
| 301 | } | 308 | } |
| 302 | 309 | ||
| 310 | usbmuxd_log(LL_INFO, "%s: Finished preflight on device %s", __func__, _dev->udid); | ||
| 311 | |||
| 303 | /* emit device added event and thus make device visible to clients */ | 312 | /* emit device added event and thus make device visible to clients */ |
| 304 | client_device_add(info); | 313 | client_device_add(info); |
| 305 | } | 314 | } |
