Cleanup lockdown request API and fix docs, tools, bindings and exports

3 files changed, 57 insertions, 23 deletions

diff --git a/include/Makefile.am b/include/Makefile.am
index d8ae1e4..98792de 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -1 +1 @@
-nobase_include_HEADERS = libiphone/libiphone.h libiphone/afc.h libiphone/notification_proxy.h
+nobase_include_HEADERS = libiphone/libiphone.h libiphone/lockdown.h libiphone/afc.h libiphone/notification_proxy.h
diff --git a/include/libiphone/libiphone.h b/include/libiphone/libiphone.h
index 456f000..9e983bb 100644
--- a/include/libiphone/libiphone.h
+++ b/include/libiphone/libiphone.h
@@ -57,9 +57,6 @@ typedef int16_t iphone_error_t;
 struct iphone_device_int;
 typedef struct iphone_device_int *iphone_device_t;
 
-struct iphone_lckd_client_int;
-typedef struct iphone_lckd_client_int *iphone_lckd_client_t;
-
 struct iphone_msync_client_int;
 typedef struct iphone_msync_client_int *iphone_msync_client_t;
 
@@ -74,29 +71,15 @@ void iphone_set_debug_mask(uint16_t mask);
 void iphone_set_debug(int level);
 
 //device related functions
-iphone_error_t iphone_get_device ( iphone_device_t *device );
-iphone_error_t iphone_get_device_by_uuid ( iphone_device_t *device, const char *uuid );
-iphone_error_t iphone_free_device ( iphone_device_t device );
-
-uint32_t iphone_get_device_handle ( iphone_device_t device );
-
-//lockdownd related functions
-iphone_error_t lockdownd_get_device_uid(iphone_lckd_client_t control, char **uid);
-iphone_error_t lockdownd_get_device_name ( iphone_lckd_client_t client, char **device_name );
-iphone_error_t iphone_lckd_new_client ( iphone_device_t device, iphone_lckd_client_t *client );
-iphone_error_t iphone_lckd_free_client( iphone_lckd_client_t client );
-
-iphone_error_t iphone_lckd_start_service ( iphone_lckd_client_t client, const char *service, int *port );
-iphone_error_t iphone_lckd_recv ( iphone_lckd_client_t client, plist_t* plist);
-iphone_error_t iphone_lckd_send ( iphone_lckd_client_t client, plist_t plist);
-
-
+iphone_error_t iphone_get_device(iphone_device_t *device);
+iphone_error_t iphone_get_device_by_uuid(iphone_device_t *device, const char *uuid);
+iphone_error_t iphone_free_device(iphone_device_t device);
+uint32_t iphone_get_device_handle(iphone_device_t device);
 
 iphone_error_t iphone_msync_new_client(iphone_device_t device, int dst_port,
 									   iphone_msync_client_t * client);
 iphone_error_t iphone_msync_free_client(iphone_msync_client_t client);
-
-iphone_error_t iphone_msync_recv(iphone_msync_client_t client, plist_t * plist);
+iphone_error_t iphone_msync_recv(iphone_msync_client_t client, plist_t *plist);
 iphone_error_t iphone_msync_send(iphone_msync_client_t client, plist_t plist);
 
 #ifdef __cplusplus
diff --git a/include/libiphone/lockdown.h b/include/libiphone/lockdown.h
new file mode 100644
index 0000000..805c90b
--- /dev/null
+++ b/include/libiphone/lockdown.h
@@ -0,0 +1,51 @@
+/*
+ * lockdownd.h
+ *
+ * Copyright (c) 2009 Martin S. All Rights Reserved.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+#ifndef LOCKDOWN_H
+#define LOCKDOWN_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <libiphone/libiphone.h>
+
+struct lockdownd_client_int;
+typedef struct lockdownd_client_int *lockdownd_client_t;
+
+//lockdownd related functions
+iphone_error_t lockdownd_new_client (iphone_device_t device, lockdownd_client_t *client);
+iphone_error_t lockdownd_free_client(lockdownd_client_t client);
+iphone_error_t lockdownd_query_type(lockdownd_client_t client);
+iphone_error_t lockdownd_get_value(lockdownd_client_t client, const char *domain, const char *key, plist_t *value_node);
+iphone_error_t lockdownd_start_service (lockdownd_client_t client, const char *service, int *port);
+iphone_error_t lockdownd_stop_session(lockdownd_client_t client);
+iphone_error_t lockdownd_send (lockdownd_client_t client, plist_t plist);
+iphone_error_t lockdownd_recv (lockdownd_client_t client, plist_t *plist);
+iphone_error_t lockdownd_pair(lockdownd_client_t client, char *uid, char *host_id);
+iphone_error_t lockdownd_get_device_uid (lockdownd_client_t control, char **uid);
+iphone_error_t lockdownd_get_device_name (lockdownd_client_t client, char **device_name);
+iphone_error_t lockdownd_goodbye(lockdownd_client_t client);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif