From a64fcc3988f75cb4fc2388013c245e5e884bb96f Mon Sep 17 00:00:00 2001
From: Nikias Bassen
Date: Fri, 4 Feb 2022 02:15:56 +0100
Subject: tools: Print meaningful error messages when service startup fails

---
 tools/idevicediagnostics.c | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'tools/idevicediagnostics.c')

diff --git a/tools/idevicediagnostics.c b/tools/idevicediagnostics.c
index 0e3e66e..66ed589 100644
--- a/tools/idevicediagnostics.c
+++ b/tools/idevicediagnostics.c
@@ -213,13 +213,18 @@ int main(int argc, char **argv)
 
 	/*  attempt to use newer diagnostics service available on iOS 5 and later */
 	ret = lockdownd_start_service(lockdown_client, "com.apple.mobile.diagnostics_relay", &service);
-	if (ret != LOCKDOWN_E_SUCCESS) {
+	if (ret == LOCKDOWN_E_INVALID_SERVICE) {
 		/*  attempt to use older diagnostics service */
 		ret = lockdownd_start_service(lockdown_client, "com.apple.iosdiagnostics.relay", &service);
 	}
-
 	lockdownd_client_free(lockdown_client);
 
+	if (ret != LOCKDOWN_E_SUCCESS) {
+		idevice_free(device);
+		printf("ERROR: Could not start diagnostics relay service: %s\n", lockdownd_strerror(ret));
+		goto cleanup;
+	}
+
 	result = EXIT_FAILURE;
 
 	if ((ret == LOCKDOWN_E_SUCCESS) && service && (service->port > 0)) {
-- 
cgit v1.1-32-gdbae