From 63e70332393e4fb6ae275abf1e1baea0235f08e9 Mon Sep 17 00:00:00 2001
From: Martin Szulecki
Date: Tue, 26 Feb 2013 20:17:32 +0100
Subject: Add label argument to *_client_start_service() helpers

---
 dev/ideviceheartbeat.c                  | 2 +-
 include/libimobiledevice/heartbeat.h    | 2 +-
 include/libimobiledevice/webinspector.h | 2 +-
 src/heartbeat.c                         | 6 ++++--
 src/webinspector.c                      | 6 ++++--
 5 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/dev/ideviceheartbeat.c b/dev/ideviceheartbeat.c
index 4fb56ff..89fe742 100644
--- a/dev/ideviceheartbeat.c
+++ b/dev/ideviceheartbeat.c
@@ -101,7 +101,7 @@ int main(int argc, char *argv[])
 	}
 
 	/* start heartbeat service on device */
-	heartbeat_client_start_service(device, &heartbeat);
+	heartbeat_client_start_service(device, &heartbeat, "ideviceheartbeat");
 
 	if (heartbeat) {
 		printf("< heartbeat started, listening...\n");
diff --git a/include/libimobiledevice/heartbeat.h b/include/libimobiledevice/heartbeat.h
index 611a2dd..8db2941 100644
--- a/include/libimobiledevice/heartbeat.h
+++ b/include/libimobiledevice/heartbeat.h
@@ -49,7 +49,7 @@ typedef struct heartbeat_client_private heartbeat_client_private;
 typedef heartbeat_client_private *heartbeat_client_t; /**< The client handle. */
 
 heartbeat_error_t heartbeat_client_new(idevice_t device, lockdownd_service_descriptor_t service, heartbeat_client_t * client);
-heartbeat_error_t heartbeat_client_start_service(idevice_t device, heartbeat_client_t * client);
+heartbeat_error_t heartbeat_client_start_service(idevice_t device, heartbeat_client_t * client, const char* label);
 heartbeat_error_t heartbeat_client_free(heartbeat_client_t client);
 
 heartbeat_error_t heartbeat_send(heartbeat_client_t client, plist_t plist);
diff --git a/include/libimobiledevice/webinspector.h b/include/libimobiledevice/webinspector.h
index a6e8541..dfd4dd2 100644
--- a/include/libimobiledevice/webinspector.h
+++ b/include/libimobiledevice/webinspector.h
@@ -49,7 +49,7 @@ typedef struct webinspector_client_private webinspector_client_private;
 typedef webinspector_client_private *webinspector_client_t; /**< The client handle. */
 
 webinspector_error_t webinspector_client_new(idevice_t device, lockdownd_service_descriptor_t service, webinspector_client_t * client);
-webinspector_error_t webinspector_client_start_service(idevice_t device, webinspector_client_t * client);
+webinspector_error_t webinspector_client_start_service(idevice_t device, webinspector_client_t * client, const char* label);
 webinspector_error_t webinspector_client_free(webinspector_client_t client);
 
 webinspector_error_t webinspector_send(webinspector_client_t client, plist_t plist);
diff --git a/src/heartbeat.c b/src/heartbeat.c
index 30fb8af..817c6ad 100644
--- a/src/heartbeat.c
+++ b/src/heartbeat.c
@@ -104,16 +104,18 @@ heartbeat_error_t heartbeat_client_new(idevice_t device, lockdownd_service_descr
  * @param client Pointer that will point to a newly allocated
  *     heartbeat_client_t upon successful return. Must be freed using
  *     heartbeat_client_free() after use.
+ * @param label The label to use for communication. Usually the program name.
+ *  Pass NULL to disable sending the label in requests to lockdownd.
  *
  * @return HEARTBEAT_E_SUCCESS on success, or an HEARTBEAT_E_* error
  *     code otherwise.
  */
-heartbeat_error_t heartbeat_client_start_service(idevice_t device, heartbeat_client_t * client)
+heartbeat_error_t heartbeat_client_start_service(idevice_t device, heartbeat_client_t * client, const char* label)
 {
 	*client = NULL;
 
 	lockdownd_client_t lckd = NULL;
-	if (LOCKDOWN_E_SUCCESS != lockdownd_client_new_with_handshake(device, &lckd, NULL)) {
+	if (LOCKDOWN_E_SUCCESS != lockdownd_client_new_with_handshake(device, &lckd, label)) {
 		idevice_free(device);
 		debug_info("Could not create a lockdown client.");
 		return HEARTBEAT_E_UNKNOWN_ERROR;
diff --git a/src/webinspector.c b/src/webinspector.c
index 1b39ea0..8d05082 100644
--- a/src/webinspector.c
+++ b/src/webinspector.c
@@ -104,16 +104,18 @@ webinspector_error_t webinspector_client_new(idevice_t device, lockdownd_service
  * @param client Pointer that will point to a newly allocated
  *     webinspector_client_t upon successful return. Must be freed using
  *     webinspector_client_free() after use.
+ * @param label The label to use for communication. Usually the program name.
+ *  Pass NULL to disable sending the label in requests to lockdownd.
  *
  * @return WEBINSPECTOR_E_SUCCESS on success, or an WEBINSPECTOR_E_* error
  *     code otherwise.
  */
-webinspector_error_t webinspector_client_start_service(idevice_t device, webinspector_client_t * client)
+webinspector_error_t webinspector_client_start_service(idevice_t device, webinspector_client_t * client, const char* label)
 {
 	*client = NULL;
 
 	lockdownd_client_t lckd = NULL;
-	if (LOCKDOWN_E_SUCCESS != lockdownd_client_new_with_handshake(device, &lckd, NULL)) {
+	if (LOCKDOWN_E_SUCCESS != lockdownd_client_new_with_handshake(device, &lckd, label)) {
 		idevice_free(device);
 		debug_info("Could not create a lockdown client.");
 		return WEBINSPECTOR_E_UNKNOWN_ERROR;
-- 
cgit v1.1-32-gdbae