summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Makefile.am4
-rwxr-xr-xautogen.sh2
-rw-r--r--configure.ac13
-rw-r--r--dev/Makefile.am12
-rw-r--r--dev/lckdclient.c1
-rw-r--r--dev/main.c8
-rwxr-xr-xdev/msync.py40
-rw-r--r--dev/msyncclient.c69
-rw-r--r--include/libiphone/libiphone.h27
-rw-r--r--m4/ac_pkg_swig.m4122
-rw-r--r--m4/ac_python_devel.m4265
-rw-r--r--m4/as-compiler-flag.m462
-rw-r--r--m4/swig_python.m465
-rw-r--r--src/AFC.c57
-rw-r--r--src/AFC.h10
-rw-r--r--src/Makefile.am8
-rw-r--r--src/MobileSync.c299
-rw-r--r--src/MobileSync.h39
-rw-r--r--src/NotificationProxy.c91
-rw-r--r--src/NotificationProxy.h1
-rw-r--r--src/initconf.c30
-rw-r--r--src/lockdown.c891
-rw-r--r--src/lockdown.h17
-rw-r--r--src/plist.c245
-rw-r--r--src/plist.h38
-rw-r--r--src/usbmux.c3
-rw-r--r--src/usbmux.h20
-rw-r--r--src/userpref.c10
-rw-r--r--src/userpref.h2
-rw-r--r--src/utils.c25
-rw-r--r--src/utils.h4
-rw-r--r--swig/Makefile.am18
-rw-r--r--swig/__init__.py1
-rw-r--r--swig/iphone.i156
34 files changed, 1787 insertions, 868 deletions
diff --git a/Makefile.am b/Makefile.am
index 2b9ce9a..cc6c06f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,6 @@
1AUTOMAKE_OPTIONS = foreign 1AUTOMAKE_OPTIONS = foreign
2 2ACLOCAL_AMFLAGS = -I m4
3SUBDIRS = src include fdi udev $(DEV_SUB) 3SUBDIRS = src include fdi swig udev $(DEV_SUB)
4 4
5pkgconfigdir = $(libdir)/pkgconfig 5pkgconfigdir = $(libdir)/pkgconfig
6pkgconfig_DATA = libiphone-1.0.pc 6pkgconfig_DATA = libiphone-1.0.pc
diff --git a/autogen.sh b/autogen.sh
index c17ea96..9aa7170 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,5 +1,5 @@
1#!/bin/sh 1#!/bin/sh
2aclocal 2aclocal -I m4
3libtoolize 3libtoolize
4autoheader 4autoheader
5automake --add-missing 5automake --add-missing
diff --git a/configure.ac b/configure.ac
index 2cabe29..29f9be3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6,20 +6,26 @@ AC_INIT(libiphone, 0.1.0, nospam@nowhere.com)
6AM_INIT_AUTOMAKE(libiphone, 0.1.0) 6AM_INIT_AUTOMAKE(libiphone, 0.1.0)
7AC_CONFIG_SRCDIR([src/]) 7AC_CONFIG_SRCDIR([src/])
8AC_CONFIG_HEADER([config.h]) 8AC_CONFIG_HEADER([config.h])
9AC_CONFIG_MACRO_DIR([m4])
9 10
10AC_PROG_LIBTOOL 11AC_PROG_LIBTOOL
11 12
13AM_PATH_PYTHON(2.3)
14AC_PROG_SWIG(1.3.21)
15SWIG_PYTHON
16
17
12# Checks for programs. 18# Checks for programs.
13AC_PROG_CC 19AC_PROG_CC
14AM_PROG_CC_C_O 20AM_PROG_CC_C_O
15 21
16# Checks for libraries. 22# Checks for libraries.
17PKG_CHECK_MODULES(libxml2, libxml-2.0 >= 2.6.30)
18PKG_CHECK_MODULES(libusb, libusb >= 0.1.12) 23PKG_CHECK_MODULES(libusb, libusb >= 0.1.12)
19PKG_CHECK_MODULES(libglib2, glib-2.0 >= 2.14.1) 24PKG_CHECK_MODULES(libglib2, glib-2.0 >= 2.14.1)
20PKG_CHECK_MODULES(libgthread2, gthread-2.0 >= 2.14.1) 25PKG_CHECK_MODULES(libgthread2, gthread-2.0 >= 2.14.1)
21PKG_CHECK_MODULES(libgnutls, gnutls >= 1.6.3 gnutls <= 2.5.0 ) 26PKG_CHECK_MODULES(libgnutls, gnutls >= 1.6.3 gnutls <= 2.5.0 )
22PKG_CHECK_MODULES(libtasn1, libtasn1 >= 1.1) 27PKG_CHECK_MODULES(libtasn1, libtasn1 >= 1.1)
28PKG_CHECK_MODULES(libplist, libplist >= 0.1.0)
23 29
24# Checks for header files. 30# Checks for header files.
25AC_HEADER_STDC 31AC_HEADER_STDC
@@ -59,6 +65,9 @@ if test "$no_debug_code" = true; then
59 AC_DEFINE(STRIP_DEBUG_CODE,1,[Strip debug reporting code]) 65 AC_DEFINE(STRIP_DEBUG_CODE,1,[Strip debug reporting code])
60fi 66fi
61 67
68AS_COMPILER_FLAGS(GLOBAL_CFLAGS, "-Wall -Wextra -Wmissing-declarations -Wredundant-decls -Wshadow -Wpointer-arith -Wwrite-strings -Wswitch-default -Wno-unused-parameter")
69AC_SUBST(GLOBAL_CFLAGS)
70
62# check for large file support 71# check for large file support
63AC_SYS_LARGEFILE 72AC_SYS_LARGEFILE
64LFS_CFLAGS='' 73LFS_CFLAGS=''
@@ -86,4 +95,4 @@ if test "$enable_largefile" != no; then
86fi 95fi
87AC_SUBST(LFS_CFLAGS) 96AC_SUBST(LFS_CFLAGS)
88 97
89AC_OUTPUT(Makefile src/Makefile include/Makefile fdi/Makefile udev/Makefile dev/Makefile libiphone-1.0.pc) 98AC_OUTPUT(Makefile src/Makefile include/Makefile fdi/Makefile dev/Makefile swig/Makefile udev/Makefile libiphone-1.0.pc)
diff --git a/dev/Makefile.am b/dev/Makefile.am
index 5f85ad7..f7d1109 100644
--- a/dev/Makefile.am
+++ b/dev/Makefile.am
@@ -1,9 +1,9 @@
1INCLUDES = -I$(top_srcdir)/include 1INCLUDES = -I$(top_srcdir)/include
2 2
3AM_CFLAGS = $(libxml2_CFLAGS) $(libusb_CFLAGS) $(libglib2_CFLAGS) $(libgnutls_CFLAGS) $(libtasn1_CFLAGS) $(libgthread2_CFLAGS) -g $(LFS_CFLAGS) 3AM_CFLAGS = $(GLOBAL_CFLAGS) $(libusb_CFLAGS) $(libglib2_CFLAGS) $(libgnutls_CFLAGS) $(libtasn1_CFLAGS) $(libgthread2_CFLAGS) $(LFS_CFLAGS)
4AM_LDFLAGS = $(libxml2_LIBS) $(libusb_LIBS) $(libglib2_LIBS) $(libgnutls_LIBS) $(libtasn1_LIBS) $(libgthread2_LIBS) 4AM_LDFLAGS = $(libusb_LIBS) $(libglib2_LIBS) $(libgnutls_LIBS) $(libtasn1_LIBS) $(libgthread2_LIBS)
5 5
6bin_PROGRAMS = iphoneclient lckd-client afccheck 6bin_PROGRAMS = iphoneclient lckd-client afccheck msyncclient
7 7
8iphoneclient_SOURCES = main.c 8iphoneclient_SOURCES = main.c
9iphoneclient_LDADD = ../src/libiphone.la 9iphoneclient_LDADD = ../src/libiphone.la
@@ -17,3 +17,9 @@ afccheck_SOURCES = afccheck.c
17afccheck_CFLAGS = $(AM_CFLAGS) 17afccheck_CFLAGS = $(AM_CFLAGS)
18afccheck_LDFLAGS = $(AM_LDFLAGS) 18afccheck_LDFLAGS = $(AM_LDFLAGS)
19afccheck_LDADD = ../src/libiphone.la 19afccheck_LDADD = ../src/libiphone.la
20
21msyncclient_SOURCES = msyncclient.c
22msyncclient_CFLAGS = $(AM_CFLAGS)
23msyncclient_LDFLAGS = $(AM_LDFLAGS)
24msyncclient_LDADD = ../src/libiphone.la
25
diff --git a/dev/lckdclient.c b/dev/lckdclient.c
index 96bc27d..c96f052 100644
--- a/dev/lckdclient.c
+++ b/dev/lckdclient.c
@@ -20,6 +20,7 @@
20 */ 20 */
21 21
22#include <stdio.h> 22#include <stdio.h>
23#include <stdlib.h>
23#include <string.h> 24#include <string.h>
24#include <glib.h> 25#include <glib.h>
25#include <readline/readline.h> 26#include <readline/readline.h>
diff --git a/dev/main.c b/dev/main.c
index c68427b..babcf67 100644
--- a/dev/main.c
+++ b/dev/main.c
@@ -24,10 +24,8 @@
24#include <errno.h> 24#include <errno.h>
25#include <usb.h> 25#include <usb.h>
26 26
27#include <libxml/parser.h>
28#include <libxml/tree.h>
29
30#include <libiphone/libiphone.h> 27#include <libiphone/libiphone.h>
28#include "../src/utils.h"
31 29
32void perform_syncWillStart(iphone_device_t phone, iphone_lckd_client_t control) 30void perform_syncWillStart(iphone_device_t phone, iphone_lckd_client_t control)
33{ 31{
@@ -77,8 +75,10 @@ int main(int argc, char *argv[])
77 75
78 if (argc > 1 && !strcasecmp(argv[1], "--debug")) { 76 if (argc > 1 && !strcasecmp(argv[1], "--debug")) {
79 iphone_set_debug(1); 77 iphone_set_debug(1);
78 iphone_set_debug_mask(DBGMASK_ALL);
80 } else { 79 } else {
81 iphone_set_debug(0); 80 iphone_set_debug(0);
81 iphone_set_debug_mask(DBGMASK_NONE);
82 } 82 }
83 83
84 if (IPHONE_E_SUCCESS != iphone_get_device(&phone)) { 84 if (IPHONE_E_SUCCESS != iphone_get_device(&phone)) {
@@ -136,7 +136,7 @@ int main(int argc, char *argv[])
136 iphone_afc_get_file_attr(afc, "/iTunesOnTheGoPlaylist.plist", &stbuf); 136 iphone_afc_get_file_attr(afc, "/iTunesOnTheGoPlaylist.plist", &stbuf);
137 if (IPHONE_E_SUCCESS == 137 if (IPHONE_E_SUCCESS ==
138 iphone_afc_open_file(afc, "/iTunesOnTheGoPlaylist.plist", IPHONE_AFC_FILE_READ, &my_file) && my_file) { 138 iphone_afc_open_file(afc, "/iTunesOnTheGoPlaylist.plist", IPHONE_AFC_FILE_READ, &my_file) && my_file) {
139 printf("A file size: %i\n", stbuf.st_size); 139 printf("A file size: %i\n", (int) stbuf.st_size);
140 char *file_data = (char *) malloc(sizeof(char) * stbuf.st_size); 140 char *file_data = (char *) malloc(sizeof(char) * stbuf.st_size);
141 iphone_afc_read_file(afc, my_file, file_data, stbuf.st_size, &bytes); 141 iphone_afc_read_file(afc, my_file, file_data, stbuf.st_size, &bytes);
142 if (bytes >= 0) { 142 if (bytes >= 0) {
diff --git a/dev/msync.py b/dev/msync.py
new file mode 100755
index 0000000..4170f87
--- /dev/null
+++ b/dev/msync.py
@@ -0,0 +1,40 @@
1#! /usr/bin/env python
2
3from libiphone.iPhone import *
4
5# get msync client
6def GetMobileSyncClient() :
7 phone = iPhone()
8 if not phone.InitDevice() :
9 print "Couldn't find device, is it connected ?\n"
10 return None
11 lckd = phone.GetLockdownClient()
12 if not lckd :
13 print "Failed to start lockdown service.\n"
14 return None
15 msync = lckd.GetMobileSyncClient()
16 if not msync :
17 print "Failed to start mobilesync service.\n"
18 return None
19 return msync
20
21
22msync = GetMobileSyncClient()
23
24if not msync :
25 exit(1)
26
27array = PListNode(PLIST_ARRAY)
28array.AddSubString("SDMessageSyncDataClassWithDevice")
29array.AddSubString("com.apple.Contacts");
30array.AddSubString("---");
31array.AddSubString("2009-01-13 22:25:58 +0100");
32array.AddSubUInt(106);
33array.AddSubString("___EmptyParameterString___");
34
35msync.Send(array)
36array = msync.Receive()
37print array.ToXml()
38
39
40
diff --git a/dev/msyncclient.c b/dev/msyncclient.c
new file mode 100644
index 0000000..804e1ed
--- /dev/null
+++ b/dev/msyncclient.c
@@ -0,0 +1,69 @@
1/*
2 * msyncclient.c
3 * Rudimentary interface to the MobileSync iPhone
4 *
5 * Copyright (c) 2009 Jonathan Beck All Rights Reserved.
6 *
7 * This library is free software; you can redistribute it and/or
8 * modify it under the terms of the GNU Lesser General Public
9 * License as published by the Free Software Foundation; either
10 * version 2.1 of the License, or (at your option) any later version.
11 *
12 * This library is distributed in the hope that it will be useful,
13 * but WITHOUT ANY WARRANTY; without even the implied warranty of
14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
15 * Lesser General Public License for more details.
16 *
17 * You should have received a copy of the GNU Lesser General Public
18 * License along with this library; if not, write to the Free Software
19 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
20 */
21
22#include <stdio.h>
23#include <string.h>
24#include <errno.h>
25#include <usb.h>
26
27#include <libiphone/libiphone.h>
28
29
30int main(int argc, char *argv[])
31{
32 int bytes = 0, port = 0, i = 0;
33 iphone_lckd_client_t control = NULL;
34 iphone_device_t phone = NULL;
35
36 if (argc > 1 && !strcasecmp(argv[1], "--debug"))
37 iphone_set_debug_mask(DBGMASK_MOBILESYNC);
38
39
40 if (IPHONE_E_SUCCESS != iphone_get_device(&phone)) {
41 printf("No iPhone found, is it plugged in?\n");
42 return -1;
43 }
44
45 if (IPHONE_E_SUCCESS != iphone_lckd_new_client(phone, &control)) {
46 iphone_free_device(phone);
47 return -1;
48 }
49
50 iphone_lckd_start_service(control, "com.apple.mobilesync", &port);
51
52 if (port) {
53 iphone_msync_client_t msync = NULL;
54 iphone_msync_new_client(phone, 3432, port, &msync);
55 if (msync) {
56 iphone_msync_get_all_contacts(msync);
57 iphone_msync_free_client(msync);
58 }
59 } else {
60 printf("Start service failure.\n");
61 }
62
63 printf("All done.\n");
64
65 iphone_lckd_free_client(control);
66 iphone_free_device(phone);
67
68 return 0;
69}
diff --git a/include/libiphone/libiphone.h b/include/libiphone/libiphone.h
index 7d9c223..0035e2f 100644
--- a/include/libiphone/libiphone.h
+++ b/include/libiphone/libiphone.h
@@ -29,6 +29,7 @@ extern "C" {
29#include <stdint.h> 29#include <stdint.h>
30#include <sys/types.h> 30#include <sys/types.h>
31#include <sys/stat.h> 31#include <sys/stat.h>
32#include <plist/plist.h>
32 33
33//general errors 34//general errors
34#define IPHONE_E_SUCCESS 0 35#define IPHONE_E_SUCCESS 0
@@ -77,11 +78,23 @@ typedef struct iphone_afc_client_int *iphone_afc_client_t;
77struct iphone_afc_file_int; 78struct iphone_afc_file_int;
78typedef struct iphone_afc_file_int *iphone_afc_file_t; 79typedef struct iphone_afc_file_int *iphone_afc_file_t;
79 80
81struct iphone_msync_client_int;
82typedef struct iphone_msync_client_int *iphone_msync_client_t;
83
80struct iphone_np_client_int; 84struct iphone_np_client_int;
81typedef struct iphone_np_client_int *iphone_np_client_t; 85typedef struct iphone_np_client_int *iphone_np_client_t;
82 86
83//device related functions 87//debug related functions
88#define DBGMASK_ALL 0xFFFF
89#define DBGMASK_NONE 0x0000
90#define DBGMASK_USBMUX (1 << 1)
91#define DBGMASK_LOCKDOWND (1 << 2)
92#define DBGMASK_MOBILESYNC (1 << 3)
93
94void iphone_set_debug_mask(uint16_t mask);
84void iphone_set_debug(int level); 95void iphone_set_debug(int level);
96
97//device related functions
85iphone_error_t iphone_get_device ( iphone_device_t *device ); 98iphone_error_t iphone_get_device ( iphone_device_t *device );
86iphone_error_t iphone_free_device ( iphone_device_t device ); 99iphone_error_t iphone_free_device ( iphone_device_t device );
87 100
@@ -92,8 +105,8 @@ iphone_error_t iphone_lckd_new_client ( iphone_device_t device, iphone_lckd_clie
92iphone_error_t iphone_lckd_free_client( iphone_lckd_client_t client ); 105iphone_error_t iphone_lckd_free_client( iphone_lckd_client_t client );
93 106
94iphone_error_t iphone_lckd_start_service ( iphone_lckd_client_t client, const char *service, int *port ); 107iphone_error_t iphone_lckd_start_service ( iphone_lckd_client_t client, const char *service, int *port );
95iphone_error_t iphone_lckd_recv ( iphone_lckd_client_t client, char **dump_data, uint32_t *recv_bytes ); 108iphone_error_t iphone_lckd_recv ( iphone_lckd_client_t client, plist_t* plist);
96iphone_error_t iphone_lckd_send ( iphone_lckd_client_t client, char *raw_data, uint32_t length, uint32_t *recv_bytes ); 109iphone_error_t iphone_lckd_send ( iphone_lckd_client_t client, plist_t plist);
97 110
98 111
99//usbmux related functions 112//usbmux related functions
@@ -125,6 +138,14 @@ iphone_error_t iphone_afc_mkdir ( iphone_afc_client_t client, const char *dir);
125iphone_error_t iphone_afc_truncate(iphone_afc_client_t client, const char *path, off_t newsize); 138iphone_error_t iphone_afc_truncate(iphone_afc_client_t client, const char *path, off_t newsize);
126 139
127 140
141
142iphone_error_t iphone_msync_new_client(iphone_device_t device, int src_port, int dst_port,
143 iphone_msync_client_t * client);
144iphone_error_t iphone_msync_free_client(iphone_msync_client_t client);
145
146iphone_error_t iphone_msync_recv(iphone_msync_client_t client, plist_t * plist);
147iphone_error_t iphone_msync_send(iphone_msync_client_t client, plist_t plist);
148
128#ifdef __cplusplus 149#ifdef __cplusplus
129} 150}
130#endif 151#endif
diff --git a/m4/ac_pkg_swig.m4 b/m4/ac_pkg_swig.m4
new file mode 100644
index 0000000..738f69d
--- /dev/null
+++ b/m4/ac_pkg_swig.m4
@@ -0,0 +1,122 @@
1# ===========================================================================
2# http://autoconf-archive.cryp.to/ac_pkg_swig.html
3# ===========================================================================
4#
5# SYNOPSIS
6#
7# AC_PROG_SWIG([major.minor.micro])
8#
9# DESCRIPTION
10#
11# This macro searches for a SWIG installation on your system. If found you
12# should call SWIG via $(SWIG). You can use the optional first argument to
13# check if the version of the available SWIG is greater than or equal to
14# the value of the argument. It should have the format: N[.N[.N]] (N is a
15# number between 0 and 999. Only the first N is mandatory.)
16#
17# If the version argument is given (e.g. 1.3.17), AC_PROG_SWIG checks that
18# the swig package is this version number or higher.
19#
20# In configure.in, use as:
21#
22# AC_PROG_SWIG(1.3.17)
23# SWIG_ENABLE_CXX
24# SWIG_MULTI_MODULE_SUPPORT
25# SWIG_PYTHON
26#
27# LAST MODIFICATION
28#
29# 2008-04-12
30#
31# COPYLEFT
32#
33# Copyright (c) 2008 Sebastian Huber <sebastian-huber@web.de>
34# Copyright (c) 2008 Alan W. Irwin <irwin@beluga.phys.uvic.ca>
35# Copyright (c) 2008 Rafael Laboissiere <rafael@laboissiere.net>
36# Copyright (c) 2008 Andrew Collier <colliera@ukzn.ac.za>
37#
38# This program is free software; you can redistribute it and/or modify it
39# under the terms of the GNU General Public License as published by the
40# Free Software Foundation; either version 2 of the License, or (at your
41# option) any later version.
42#
43# This program is distributed in the hope that it will be useful, but
44# WITHOUT ANY WARRANTY; without even the implied warranty of
45# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
46# Public License for more details.
47#
48# You should have received a copy of the GNU General Public License along
49# with this program. If not, see <http://www.gnu.org/licenses/>.
50#
51# As a special exception, the respective Autoconf Macro's copyright owner
52# gives unlimited permission to copy, distribute and modify the configure
53# scripts that are the output of Autoconf when processing the Macro. You
54# need not follow the terms of the GNU General Public License when using
55# or distributing such scripts, even though portions of the text of the
56# Macro appear in them. The GNU General Public License (GPL) does govern
57# all other use of the material that constitutes the Autoconf Macro.
58#
59# This special exception to the GPL applies to versions of the Autoconf
60# Macro released by the Autoconf Macro Archive. When you make and
61# distribute a modified version of the Autoconf Macro, you may extend this
62# special exception to the GPL to apply to your modified version as well.
63
64AC_DEFUN([AC_PROG_SWIG],[
65 AC_PATH_PROG([SWIG],[swig])
66 if test -z "$SWIG" ; then
67 AC_MSG_WARN([cannot find 'swig' program. You should look at http://www.swig.org])
68 SWIG='echo "Error: SWIG is not installed. You should look at http://www.swig.org" ; false'
69 elif test -n "$1" ; then
70 AC_MSG_CHECKING([for SWIG version])
71 [swig_version=`$SWIG -version 2>&1 | grep 'SWIG Version' | sed 's/.*\([0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\).*/\1/g'`]
72 AC_MSG_RESULT([$swig_version])
73 if test -n "$swig_version" ; then
74 # Calculate the required version number components
75 [required=$1]
76 [required_major=`echo $required | sed 's/[^0-9].*//'`]
77 if test -z "$required_major" ; then
78 [required_major=0]
79 fi
80 [required=`echo $required | sed 's/[0-9]*[^0-9]//'`]
81 [required_minor=`echo $required | sed 's/[^0-9].*//'`]
82 if test -z "$required_minor" ; then
83 [required_minor=0]
84 fi
85 [required=`echo $required | sed 's/[0-9]*[^0-9]//'`]
86 [required_patch=`echo $required | sed 's/[^0-9].*//'`]
87 if test -z "$required_patch" ; then
88 [required_patch=0]
89 fi
90 # Calculate the available version number components
91 [available=$swig_version]
92 [available_major=`echo $available | sed 's/[^0-9].*//'`]
93 if test -z "$available_major" ; then
94 [available_major=0]
95 fi
96 [available=`echo $available | sed 's/[0-9]*[^0-9]//'`]
97 [available_minor=`echo $available | sed 's/[^0-9].*//'`]
98 if test -z "$available_minor" ; then
99 [available_minor=0]
100 fi
101 [available=`echo $available | sed 's/[0-9]*[^0-9]//'`]
102 [available_patch=`echo $available | sed 's/[^0-9].*//'`]
103 if test -z "$available_patch" ; then
104 [available_patch=0]
105 fi
106 if test $available_major -ne $required_major \
107 -o $available_minor -ne $required_minor \
108 -o $available_patch -lt $required_patch ; then
109 AC_MSG_WARN([SWIG version >= $1 is required. You have $swig_version. You should look at http://www.swig.org])
110 SWIG='echo "Error: SWIG version >= $1 is required. You have '"$swig_version"'. You should look at http://www.swig.org" ; false'
111 else
112 AC_MSG_NOTICE([SWIG executable is '$SWIG'])
113 SWIG_LIB=`$SWIG -swiglib`
114 AC_MSG_NOTICE([SWIG library directory is '$SWIG_LIB'])
115 fi
116 else
117 AC_MSG_WARN([cannot determine SWIG version])
118 SWIG='echo "Error: Cannot determine SWIG version. You should look at http://www.swig.org" ; false'
119 fi
120 fi
121 AC_SUBST([SWIG_LIB])
122])
diff --git a/m4/ac_python_devel.m4 b/m4/ac_python_devel.m4
new file mode 100644
index 0000000..7cec10f
--- /dev/null
+++ b/m4/ac_python_devel.m4
@@ -0,0 +1,265 @@
1# ===========================================================================
2# http://autoconf-archive.cryp.to/ac_python_devel.html
3# ===========================================================================
4#
5# SYNOPSIS
6#
7# AC_PYTHON_DEVEL([version])
8#
9# DESCRIPTION
10#
11# Note: Defines as a precious variable "PYTHON_VERSION". Don't override it
12# in your configure.ac.
13#
14# This macro checks for Python and tries to get the include path to
15# 'Python.h'. It provides the $(PYTHON_CPPFLAGS) and $(PYTHON_LDFLAGS)
16# output variables. It also exports $(PYTHON_EXTRA_LIBS) and
17# $(PYTHON_EXTRA_LDFLAGS) for embedding Python in your code.
18#
19# You can search for some particular version of Python by passing a
20# parameter to this macro, for example ">= '2.3.1'", or "== '2.4'". Please
21# note that you *have* to pass also an operator along with the version to
22# match, and pay special attention to the single quotes surrounding the
23# version number. Don't use "PYTHON_VERSION" for this: that environment
24# variable is declared as precious and thus reserved for the end-user.
25#
26# This macro should work for all versions of Python >= 2.1.0. As an end
27# user, you can disable the check for the python version by setting the
28# PYTHON_NOVERSIONCHECK environment variable to something else than the
29# empty string.
30#
31# If you need to use this macro for an older Python version, please
32# contact the authors. We're always open for feedback.
33#
34# LAST MODIFICATION
35#
36# 2008-04-12
37#
38# COPYLEFT
39#
40# Copyright (c) 2008 Sebastian Huber <sebastian-huber@web.de>
41# Copyright (c) 2008 Alan W. Irwin <irwin@beluga.phys.uvic.ca>
42# Copyright (c) 2008 Rafael Laboissiere <rafael@laboissiere.net>
43# Copyright (c) 2008 Andrew Collier <colliera@ukzn.ac.za>
44# Copyright (c) 2008 Matteo Settenvini <matteo@member.fsf.org>
45# Copyright (c) 2008 Horst Knorr <hk_classes@knoda.org>
46#
47# This program is free software: you can redistribute it and/or modify it
48# under the terms of the GNU General Public License as published by the
49# Free Software Foundation, either version 3 of the License, or (at your
50# option) any later version.
51#
52# This program is distributed in the hope that it will be useful, but
53# WITHOUT ANY WARRANTY; without even the implied warranty of
54# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
55# Public License for more details.
56#
57# You should have received a copy of the GNU General Public License along
58# with this program. If not, see <http://www.gnu.org/licenses/>.
59#
60# As a special exception, the respective Autoconf Macro's copyright owner
61# gives unlimited permission to copy, distribute and modify the configure
62# scripts that are the output of Autoconf when processing the Macro. You
63# need not follow the terms of the GNU General Public License when using
64# or distributing such scripts, even though portions of the text of the
65# Macro appear in them. The GNU General Public License (GPL) does govern
66# all other use of the material that constitutes the Autoconf Macro.
67#
68# This special exception to the GPL applies to versions of the Autoconf
69# Macro released by the Autoconf Macro Archive. When you make and
70# distribute a modified version of the Autoconf Macro, you may extend this
71# special exception to the GPL to apply to your modified version as well.
72
73AC_DEFUN([AC_PYTHON_DEVEL],[
74 #
75 # Allow the use of a (user set) custom python version
76 #
77 AC_ARG_VAR([PYTHON_VERSION],[The installed Python
78 version to use, for example '2.3'. This string
79 will be appended to the Python interpreter
80 canonical name.])
81
82 AC_PATH_PROG([PYTHON],[python[$PYTHON_VERSION]])
83 if test -z "$PYTHON"; then
84 AC_MSG_ERROR([Cannot find python$PYTHON_VERSION in your system path])
85 PYTHON_VERSION=""
86 fi
87
88 #
89 # Check for a version of Python >= 2.1.0
90 #
91 AC_MSG_CHECKING([for a version of Python >= '2.1.0'])
92 ac_supports_python_ver=`$PYTHON -c "import sys, string; \
93 ver = string.split(sys.version)[[0]]; \
94 print ver >= '2.1.0'"`
95 if test "$ac_supports_python_ver" != "True"; then
96 if test -z "$PYTHON_NOVERSIONCHECK"; then
97 AC_MSG_RESULT([no])
98 AC_MSG_FAILURE([
99This version of the AC@&t@_PYTHON_DEVEL macro
100doesn't work properly with versions of Python before
1012.1.0. You may need to re-run configure, setting the
102variables PYTHON_CPPFLAGS, PYTHON_LDFLAGS, PYTHON_SITE_PKG,
103PYTHON_EXTRA_LIBS and PYTHON_EXTRA_LDFLAGS by hand.
104Moreover, to disable this check, set PYTHON_NOVERSIONCHECK
105to something else than an empty string.
106])
107 else
108 AC_MSG_RESULT([skip at user request])
109 fi
110 else
111 AC_MSG_RESULT([yes])
112 fi
113
114 #
115 # if the macro parameter ``version'' is set, honour it
116 #
117 if test -n "$1"; then
118 AC_MSG_CHECKING([for a version of Python $1])
119 ac_supports_python_ver=`$PYTHON -c "import sys, string; \
120 ver = string.split(sys.version)[[0]]; \
121 print ver $1"`
122 if test "$ac_supports_python_ver" = "True"; then
123 AC_MSG_RESULT([yes])
124 else
125 AC_MSG_RESULT([no])
126 AC_MSG_ERROR([this package requires Python $1.
127If you have it installed, but it isn't the default Python
128interpreter in your system path, please pass the PYTHON_VERSION
129variable to configure. See ``configure --help'' for reference.
130])
131 PYTHON_VERSION=""
132 fi
133 fi
134
135 #
136 # Check if you have distutils, else fail
137 #
138 AC_MSG_CHECKING([for the distutils Python package])
139 ac_distutils_result=`$PYTHON -c "import distutils" 2>&1`
140 if test -z "$ac_distutils_result"; then
141 AC_MSG_RESULT([yes])
142 else
143 AC_MSG_RESULT([no])
144 AC_MSG_ERROR([cannot import Python module "distutils".
145Please check your Python installation. The error was:
146$ac_distutils_result])
147 PYTHON_VERSION=""
148 fi
149
150 #
151 # Check for Python include path
152 #
153 AC_MSG_CHECKING([for Python include path])
154 if test -z "$PYTHON_CPPFLAGS"; then
155 python_path=`$PYTHON -c "import distutils.sysconfig; \
156 print distutils.sysconfig.get_python_inc();"`
157 if test -n "${python_path}"; then
158 python_path="-I$python_path"
159 fi
160 PYTHON_CPPFLAGS=$python_path
161 fi
162 AC_MSG_RESULT([$PYTHON_CPPFLAGS])
163 AC_SUBST([PYTHON_CPPFLAGS])
164
165 #
166 # Check for Python library path
167 #
168 AC_MSG_CHECKING([for Python library path])
169 if test -z "$PYTHON_LDFLAGS"; then
170 # (makes two attempts to ensure we've got a version number
171 # from the interpreter)
172 py_version=`$PYTHON -c "from distutils.sysconfig import *; \
173 from string import join; \
174 print join(get_config_vars('VERSION'))"`
175 if test "$py_version" == "[None]"; then
176 if test -n "$PYTHON_VERSION"; then
177 py_version=$PYTHON_VERSION
178 else
179 py_version=`$PYTHON -c "import sys; \
180 print sys.version[[:3]]"`
181 fi
182 fi
183
184 PYTHON_LDFLAGS=`$PYTHON -c "from distutils.sysconfig import *; \
185 from string import join; \
186 print '-L' + get_python_lib(0,1), \
187 '-lpython';"`$py_version
188 fi
189 AC_MSG_RESULT([$PYTHON_LDFLAGS])
190 AC_SUBST([PYTHON_LDFLAGS])
191
192 #
193 # Check for site packages
194 #
195 AC_MSG_CHECKING([for Python site-packages path])
196 if test -z "$PYTHON_SITE_PKG"; then
197 PYTHON_SITE_PKG=`$PYTHON -c "import distutils.sysconfig; \
198 print distutils.sysconfig.get_python_lib(0,0);"`
199 fi
200 AC_MSG_RESULT([$PYTHON_SITE_PKG])
201 AC_SUBST([PYTHON_SITE_PKG])
202
203 #
204 # libraries which must be linked in when embedding
205 #
206 AC_MSG_CHECKING(python extra libraries)
207 if test -z "$PYTHON_EXTRA_LIBS"; then
208 PYTHON_EXTRA_LIBS=`$PYTHON -c "import distutils.sysconfig; \
209 conf = distutils.sysconfig.get_config_var; \
210 print conf('LOCALMODLIBS'), conf('LIBS')"`
211 fi
212 AC_MSG_RESULT([$PYTHON_EXTRA_LIBS])
213 AC_SUBST(PYTHON_EXTRA_LIBS)
214
215 #
216 # linking flags needed when embedding
217 #
218 AC_MSG_CHECKING(python extra linking flags)
219 if test -z "$PYTHON_EXTRA_LDFLAGS"; then
220 PYTHON_EXTRA_LDFLAGS=`$PYTHON -c "import distutils.sysconfig; \
221 conf = distutils.sysconfig.get_config_var; \
222 print conf('LINKFORSHARED')"`
223 fi
224 AC_MSG_RESULT([$PYTHON_EXTRA_LDFLAGS])
225 AC_SUBST(PYTHON_EXTRA_LDFLAGS)
226
227 #
228 # final check to see if everything compiles alright
229 #
230 AC_MSG_CHECKING([consistency of all components of python development environment])
231 AC_LANG_PUSH([C])
232 # save current global flags
233 LIBS="$ac_save_LIBS $PYTHON_LDFLAGS"
234 CPPFLAGS="$ac_save_CPPFLAGS $PYTHON_CPPFLAGS"
235 AC_TRY_LINK([
236 #include <Python.h>
237 ],[
238 Py_Initialize();
239 ],[pythonexists=yes],[pythonexists=no])
240
241 AC_MSG_RESULT([$pythonexists])
242
243 if test ! "$pythonexists" = "yes"; then
244 AC_MSG_ERROR([
245 Could not link test program to Python. Maybe the main Python library has been
246 installed in some non-standard library path. If so, pass it to configure,
247 via the LDFLAGS environment variable.
248 Example: ./configure LDFLAGS="-L/usr/non-standard-path/python/lib"
249 ============================================================================
250 ERROR!
251 You probably have to install the development version of the Python package
252 for your distribution. The exact name of this package varies among them.
253 ============================================================================
254 ])
255 PYTHON_VERSION=""
256 fi
257 AC_LANG_POP
258 # turn back to default flags
259 CPPFLAGS="$ac_save_CPPFLAGS"
260 LIBS="$ac_save_LIBS"
261
262 #
263 # all done!
264 #
265])
diff --git a/m4/as-compiler-flag.m4 b/m4/as-compiler-flag.m4
new file mode 100644
index 0000000..0f660cf
--- /dev/null
+++ b/m4/as-compiler-flag.m4
@@ -0,0 +1,62 @@
1dnl as-compiler-flag.m4 0.1.0
2
3dnl autostars m4 macro for detection of compiler flags
4
5dnl David Schleef <ds@schleef.org>
6
7dnl $Id: as-compiler-flag.m4,v 1.1 2005/12/15 23:35:19 ds Exp $
8
9dnl AS_COMPILER_FLAG(CFLAGS, ACTION-IF-ACCEPTED, [ACTION-IF-NOT-ACCEPTED])
10dnl Tries to compile with the given CFLAGS.
11dnl Runs ACTION-IF-ACCEPTED if the compiler can compile with the flags,
12dnl and ACTION-IF-NOT-ACCEPTED otherwise.
13
14AC_DEFUN([AS_COMPILER_FLAG],
15[
16 AC_MSG_CHECKING([to see if compiler understands $1])
17
18 save_CFLAGS="$CFLAGS"
19 CFLAGS="$CFLAGS $1"
20
21 AC_TRY_COMPILE([ ], [], [flag_ok=yes], [flag_ok=no])
22 CFLAGS="$save_CFLAGS"
23
24 if test "X$flag_ok" = Xyes ; then
25 m4_ifvaln([$2],[$2])
26 true
27 else
28 m4_ifvaln([$3],[$3])
29 true
30 fi
31 AC_MSG_RESULT([$flag_ok])
32])
33
34dnl AS_COMPILER_FLAGS(VAR, FLAGS)
35dnl Tries to compile with the given CFLAGS.
36
37AC_DEFUN([AS_COMPILER_FLAGS],
38[
39 list=$2
40 flags_supported=""
41 flags_unsupported=""
42 AC_MSG_CHECKING([for supported compiler flags])
43 for each in $list
44 do
45 save_CFLAGS="$CFLAGS"
46 CFLAGS="$CFLAGS $each"
47 AC_TRY_COMPILE([ ], [], [flag_ok=yes], [flag_ok=no])
48 CFLAGS="$save_CFLAGS"
49
50 if test "X$flag_ok" = Xyes ; then
51 flags_supported="$flags_supported $each"
52 else
53 flags_unsupported="$flags_unsupported $each"
54 fi
55 done
56 AC_MSG_RESULT([$flags_supported])
57 if test "X$flags_unsupported" != X ; then
58 AC_MSG_WARN([unsupported compiler flags: $flags_unsupported])
59 fi
60 $1="$$1 $flags_supported"
61])
62
diff --git a/m4/swig_python.m4 b/m4/swig_python.m4
new file mode 100644
index 0000000..2496976
--- /dev/null
+++ b/m4/swig_python.m4
@@ -0,0 +1,65 @@
1# ===========================================================================
2# http://autoconf-archive.cryp.to/swig_python.html
3# ===========================================================================
4#
5# SYNOPSIS
6#
7# SWIG_PYTHON([use-shadow-classes = {no, yes}])
8#
9# DESCRIPTION
10#
11# Checks for Python and provides the $(SWIG_PYTHON_CPPFLAGS), and
12# $(SWIG_PYTHON_OPT) output variables.
13#
14# $(SWIG_PYTHON_OPT) contains all necessary SWIG options to generate code
15# for Python. Shadow classes are enabled unless the value of the optional
16# first argument is exactly 'no'. If you need multi module support
17# (provided by the SWIG_MULTI_MODULE_SUPPORT macro) use
18# $(SWIG_PYTHON_LIBS) to link against the appropriate library. It contains
19# the SWIG Python runtime library that is needed by the type check system
20# for example.
21#
22# LAST MODIFICATION
23#
24# 2008-04-12
25#
26# COPYLEFT
27#
28# Copyright (c) 2008 Sebastian Huber <sebastian-huber@web.de>
29# Copyright (c) 2008 Alan W. Irwin <irwin@beluga.phys.uvic.ca>
30# Copyright (c) 2008 Rafael Laboissiere <rafael@laboissiere.net>
31# Copyright (c) 2008 Andrew Collier <colliera@ukzn.ac.za>
32#
33# This program is free software; you can redistribute it and/or modify it
34# under the terms of the GNU General Public License as published by the
35# Free Software Foundation; either version 2 of the License, or (at your
36# option) any later version.
37#
38# This program is distributed in the hope that it will be useful, but
39# WITHOUT ANY WARRANTY; without even the implied warranty of
40# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
41# Public License for more details.
42#
43# You should have received a copy of the GNU General Public License along
44# with this program. If not, see <http://www.gnu.org/licenses/>.
45#
46# As a special exception, the respective Autoconf Macro's copyright owner
47# gives unlimited permission to copy, distribute and modify the configure
48# scripts that are the output of Autoconf when processing the Macro. You
49# need not follow the terms of the GNU General Public License when using
50# or distributing such scripts, even though portions of the text of the
51# Macro appear in them. The GNU General Public License (GPL) does govern
52# all other use of the material that constitutes the Autoconf Macro.
53#
54# This special exception to the GPL applies to versions of the Autoconf
55# Macro released by the Autoconf Macro Archive. When you make and
56# distribute a modified version of the Autoconf Macro, you may extend this
57# special exception to the GPL to apply to your modified version as well.
58
59AC_DEFUN([SWIG_PYTHON],[
60 AC_REQUIRE([AC_PROG_SWIG])
61 AC_REQUIRE([AC_PYTHON_DEVEL])
62 test "x$1" != "xno" || swig_shadow=" -noproxy"
63 AC_SUBST([SWIG_PYTHON_OPT],[-python$swig_shadow])
64 AC_SUBST([SWIG_PYTHON_CPPFLAGS],[$PYTHON_CPPFLAGS])
65])
diff --git a/src/AFC.c b/src/AFC.c
index af07b56..dfe8af7 100644
--- a/src/AFC.c
+++ b/src/AFC.c
@@ -21,8 +21,7 @@
21 21
22#include <stdio.h> 22#include <stdio.h>
23#include "AFC.h" 23#include "AFC.h"
24#include "plist.h" 24
25#include "utils.h"
26 25
27 26
28// This is the maximum size an AFC data packet can be 27// This is the maximum size an AFC data packet can be
@@ -246,7 +245,7 @@ static int receive_AFC_data(iphone_afc_client_t client, char **dump_here)
246 return retval; 245 return retval;
247 } 246 }
248 247
249 uint32 param1 = buffer[sizeof(AFCPacket)]; 248 uint32_t param1 = buffer[sizeof(AFCPacket)];
250 free(buffer); 249 free(buffer);
251 250
252 if (r_packet->operation == AFC_ERROR && !(client->afc_packet->operation == AFC_DELETE && param1 == 7)) { 251 if (r_packet->operation == AFC_ERROR && !(client->afc_packet->operation == AFC_DELETE && param1 == 7)) {
@@ -475,7 +474,7 @@ iphone_error_t iphone_afc_delete_file(iphone_afc_client_t client, const char *pa
475iphone_error_t iphone_afc_rename_file(iphone_afc_client_t client, const char *from, const char *to) 474iphone_error_t iphone_afc_rename_file(iphone_afc_client_t client, const char *from, const char *to)
476{ 475{
477 char *response = NULL; 476 char *response = NULL;
478 char *send = (char *) malloc(sizeof(char) * (strlen(from) + strlen(to) + 1 + sizeof(uint32))); 477 char *send = (char *) malloc(sizeof(char) * (strlen(from) + strlen(to) + 1 + sizeof(uint32_t)));
479 int bytes = 0; 478 int bytes = 0;
480 479
481 if (!client || !from || !to || !client->afc_packet || !client->connection) 480 if (!client || !from || !to || !client->afc_packet || !client->connection)
@@ -661,7 +660,7 @@ iphone_afc_open_file(iphone_afc_client_t client, const char *filename,
661 iphone_afc_file_mode_t file_mode, iphone_afc_file_t * file) 660 iphone_afc_file_mode_t file_mode, iphone_afc_file_t * file)
662{ 661{
663 iphone_afc_file_t file_loc = NULL; 662 iphone_afc_file_t file_loc = NULL;
664 uint32 ag = 0; 663 uint32_t ag = 0;
665 int bytes = 0, length = 0; 664 int bytes = 0, length = 0;
666 char *data = (char *) malloc(sizeof(char) * (8 + strlen(filename) + 1)); 665 char *data = (char *) malloc(sizeof(char) * (8 + strlen(filename) + 1));
667 666
@@ -796,8 +795,8 @@ iphone_afc_write_file(iphone_afc_client_t client, iphone_afc_file_t file,
796{ 795{
797 char *acknowledgement = NULL; 796 char *acknowledgement = NULL;
798 const int MAXIMUM_WRITE_SIZE = 1 << 15; 797 const int MAXIMUM_WRITE_SIZE = 1 << 15;
799 uint32 zero = 0, current_count = 0, i = 0; 798 uint32_t zero = 0, current_count = 0, i = 0;
800 uint32 segments = (length / MAXIMUM_WRITE_SIZE); 799 uint32_t segments = (length / MAXIMUM_WRITE_SIZE);
801 int bytes_loc = 0; 800 int bytes_loc = 0;
802 char *out_buffer = NULL; 801 char *out_buffer = NULL;
803 802
@@ -815,8 +814,8 @@ iphone_afc_write_file(iphone_afc_client_t client, iphone_afc_file_t file,
815 client->afc_packet->entire_length = client->afc_packet->this_length + MAXIMUM_WRITE_SIZE; 814 client->afc_packet->entire_length = client->afc_packet->this_length + MAXIMUM_WRITE_SIZE;
816 client->afc_packet->operation = AFC_WRITE; 815 client->afc_packet->operation = AFC_WRITE;
817 out_buffer = (char *) malloc(sizeof(char) * client->afc_packet->entire_length - sizeof(AFCPacket)); 816 out_buffer = (char *) malloc(sizeof(char) * client->afc_packet->entire_length - sizeof(AFCPacket));
818 memcpy(out_buffer, (char *) &file->filehandle, sizeof(uint32)); 817 memcpy(out_buffer, (char *) &file->filehandle, sizeof(uint32_t));
819 memcpy(out_buffer + 4, (char *) &zero, sizeof(uint32)); 818 memcpy(out_buffer + 4, (char *) &zero, sizeof(uint32_t));
820 memcpy(out_buffer + 8, data + current_count, MAXIMUM_WRITE_SIZE); 819 memcpy(out_buffer + 8, data + current_count, MAXIMUM_WRITE_SIZE);
821 bytes_loc = dispatch_AFC_packet(client, out_buffer, MAXIMUM_WRITE_SIZE + 8); 820 bytes_loc = dispatch_AFC_packet(client, out_buffer, MAXIMUM_WRITE_SIZE + 8);
822 if (bytes_loc < 0) { 821 if (bytes_loc < 0) {
@@ -848,8 +847,8 @@ iphone_afc_write_file(iphone_afc_client_t client, iphone_afc_file_t file,
848 client->afc_packet->entire_length = client->afc_packet->this_length + (length - current_count); 847 client->afc_packet->entire_length = client->afc_packet->this_length + (length - current_count);
849 client->afc_packet->operation = AFC_WRITE; 848 client->afc_packet->operation = AFC_WRITE;
850 out_buffer = (char *) malloc(sizeof(char) * client->afc_packet->entire_length - sizeof(AFCPacket)); 849 out_buffer = (char *) malloc(sizeof(char) * client->afc_packet->entire_length - sizeof(AFCPacket));
851 memcpy(out_buffer, (char *) &file->filehandle, sizeof(uint32)); 850 memcpy(out_buffer, (char *) &file->filehandle, sizeof(uint32_t));
852 memcpy(out_buffer + 4, (char *) &zero, sizeof(uint32)); 851 memcpy(out_buffer + 4, (char *) &zero, sizeof(uint32_t));
853 memcpy(out_buffer + 8, data + current_count, (length - current_count)); 852 memcpy(out_buffer + 8, data + current_count, (length - current_count));
854 bytes_loc = dispatch_AFC_packet(client, out_buffer, (length - current_count) + 8); 853 bytes_loc = dispatch_AFC_packet(client, out_buffer, (length - current_count) + 8);
855 free(out_buffer); 854 free(out_buffer);
@@ -884,7 +883,7 @@ iphone_error_t iphone_afc_close_file(iphone_afc_client_t client, iphone_afc_file
884 if (!client || !file) 883 if (!client || !file)
885 return IPHONE_E_INVALID_ARG; 884 return IPHONE_E_INVALID_ARG;
886 char *buffer = malloc(sizeof(char) * 8); 885 char *buffer = malloc(sizeof(char) * 8);
887 uint32 zero = 0; 886 uint32_t zero = 0;
888 int bytes = 0; 887 int bytes = 0;
889 888
890 afc_lock(client); 889 afc_lock(client);
@@ -892,8 +891,8 @@ iphone_error_t iphone_afc_close_file(iphone_afc_client_t client, iphone_afc_file
892 log_debug_msg("afc_close_file: File handle %i\n", file->filehandle); 891 log_debug_msg("afc_close_file: File handle %i\n", file->filehandle);
893 892
894 // Send command 893 // Send command
895 memcpy(buffer, &file->filehandle, sizeof(uint32)); 894 memcpy(buffer, &file->filehandle, sizeof(uint32_t));
896 memcpy(buffer + sizeof(uint32), &zero, sizeof(zero)); 895 memcpy(buffer + sizeof(uint32_t), &zero, sizeof(zero));
897 client->afc_packet->operation = AFC_FILE_CLOSE; 896 client->afc_packet->operation = AFC_FILE_CLOSE;
898 client->afc_packet->entire_length = client->afc_packet->this_length = 0; 897 client->afc_packet->entire_length = client->afc_packet->this_length = 0;
899 bytes = dispatch_AFC_packet(client, buffer, sizeof(char) * 8); 898 bytes = dispatch_AFC_packet(client, buffer, sizeof(char) * 8);
@@ -939,7 +938,7 @@ iphone_error_t iphone_afc_lock_file(iphone_afc_client_t client, iphone_afc_file_
939 if (!client || !file) 938 if (!client || !file)
940 return IPHONE_E_INVALID_ARG; 939 return IPHONE_E_INVALID_ARG;
941 char *buffer = malloc(16); 940 char *buffer = malloc(16);
942 uint32 zero = 0; 941 uint32_t zero = 0;
943 int bytes = 0; 942 int bytes = 0;
944 uint64_t op = operation; 943 uint64_t op = operation;
945 944
@@ -948,8 +947,8 @@ iphone_error_t iphone_afc_lock_file(iphone_afc_client_t client, iphone_afc_file_
948 log_debug_msg("afc_lock_file: File handle %i\n", file->filehandle); 947 log_debug_msg("afc_lock_file: File handle %i\n", file->filehandle);
949 948
950 // Send command 949 // Send command
951 memcpy(buffer, &file->filehandle, sizeof(uint32)); 950 memcpy(buffer, &file->filehandle, sizeof(uint32_t));
952 memcpy(buffer + sizeof(uint32), &zero, sizeof(zero)); 951 memcpy(buffer + sizeof(uint32_t), &zero, sizeof(zero));
953 memcpy(buffer + 8, &op, 8); 952 memcpy(buffer + 8, &op, 8);
954 953
955 client->afc_packet->operation = AFC_FILE_LOCK; 954 client->afc_packet->operation = AFC_FILE_LOCK;
@@ -986,7 +985,7 @@ iphone_error_t iphone_afc_lock_file(iphone_afc_client_t client, iphone_afc_file_
986iphone_error_t iphone_afc_seek_file(iphone_afc_client_t client, iphone_afc_file_t file, int seekpos) 985iphone_error_t iphone_afc_seek_file(iphone_afc_client_t client, iphone_afc_file_t file, int seekpos)
987{ 986{
988 char *buffer = (char *) malloc(sizeof(char) * 24); 987 char *buffer = (char *) malloc(sizeof(char) * 24);
989 uint32 seekto = 0, zero = 0; 988 uint32_t seekto = 0, zero = 0;
990 int bytes = 0; 989 int bytes = 0;
991 990
992 if (seekpos < 0) 991 if (seekpos < 0)
@@ -996,12 +995,12 @@ iphone_error_t iphone_afc_seek_file(iphone_afc_client_t client, iphone_afc_file_
996 995
997 // Send the command 996 // Send the command
998 seekto = seekpos; 997 seekto = seekpos;
999 memcpy(buffer, &file->filehandle, sizeof(uint32)); // handle 998 memcpy(buffer, &file->filehandle, sizeof(uint32_t)); // handle
1000 memcpy(buffer + 4, &zero, sizeof(uint32)); // pad 999 memcpy(buffer + 4, &zero, sizeof(uint32_t)); // pad
1001 memcpy(buffer + 8, &zero, sizeof(uint32)); // fromwhere 1000 memcpy(buffer + 8, &zero, sizeof(uint32_t)); // fromwhere
1002 memcpy(buffer + 12, &zero, sizeof(uint32)); // pad 1001 memcpy(buffer + 12, &zero, sizeof(uint32_t)); // pad
1003 memcpy(buffer + 16, &seekto, sizeof(uint32)); // offset 1002 memcpy(buffer + 16, &seekto, sizeof(uint32_t)); // offset
1004 memcpy(buffer + 20, &zero, sizeof(uint32)); // pad 1003 memcpy(buffer + 20, &zero, sizeof(uint32_t)); // pad
1005 client->afc_packet->operation = AFC_FILE_SEEK; 1004 client->afc_packet->operation = AFC_FILE_SEEK;
1006 client->afc_packet->this_length = client->afc_packet->entire_length = 0; 1005 client->afc_packet->this_length = client->afc_packet->entire_length = 0;
1007 bytes = dispatch_AFC_packet(client, buffer, 23); 1006 bytes = dispatch_AFC_packet(client, buffer, 23);
@@ -1041,14 +1040,14 @@ iphone_error_t iphone_afc_truncate_file(iphone_afc_client_t client, iphone_afc_f
1041{ 1040{
1042 char *buffer = (char *) malloc(sizeof(char) * 16); 1041 char *buffer = (char *) malloc(sizeof(char) * 16);
1043 int bytes = 0; 1042 int bytes = 0;
1044 uint32 zero = 0; 1043 uint32_t zero = 0;
1045 1044
1046 afc_lock(client); 1045 afc_lock(client);
1047 1046
1048 // Send command 1047 // Send command
1049 memcpy(buffer, &file->filehandle, sizeof(uint32)); // handle 1048 memcpy(buffer, &file->filehandle, sizeof(uint32_t)); // handle
1050 memcpy(buffer + 4, &zero, sizeof(uint32)); // pad 1049 memcpy(buffer + 4, &zero, sizeof(uint32_t)); // pad
1051 memcpy(buffer + 8, &newsize, sizeof(uint32)); // newsize 1050 memcpy(buffer + 8, &newsize, sizeof(uint32_t)); // newsize
1052 memcpy(buffer + 12, &zero, 3); // pad 1051 memcpy(buffer + 12, &zero, 3); // pad
1053 client->afc_packet->operation = AFC_FILE_TRUNCATE; 1052 client->afc_packet->operation = AFC_FILE_TRUNCATE;
1054 client->afc_packet->this_length = client->afc_packet->entire_length = 0; 1053 client->afc_packet->this_length = client->afc_packet->entire_length = 0;
@@ -1121,7 +1120,7 @@ iphone_error_t iphone_afc_truncate(iphone_afc_client_t client, const char *path,
1121} 1120}
1122 1121
1123 1122
1124uint32 iphone_afc_get_file_handle(iphone_afc_file_t file) 1123uint32_t iphone_afc_get_file_handle(iphone_afc_file_t file)
1125{ 1124{
1126 return file->filehandle; 1125 return file->filehandle;
1127} 1126}
diff --git a/src/AFC.h b/src/AFC.h
index ae035c6..86a924e 100644
--- a/src/AFC.h
+++ b/src/AFC.h
@@ -29,12 +29,12 @@
29#include <glib.h> 29#include <glib.h>
30 30
31typedef struct { 31typedef struct {
32 uint32 header1, header2; 32 uint32_t header1, header2;
33 uint32 entire_length, unknown1, this_length, unknown2, packet_num, unknown3, operation, unknown4; 33 uint32_t entire_length, unknown1, this_length, unknown2, packet_num, unknown3, operation, unknown4;
34} AFCPacket; 34} AFCPacket;
35 35
36typedef struct { 36typedef struct {
37 uint32 filehandle, unknown1, size, unknown2; 37 uint32_t filehandle, unknown1, size, unknown2;
38} AFCFilePacket; 38} AFCFilePacket;
39 39
40typedef struct __AFCToken { 40typedef struct __AFCToken {
@@ -51,7 +51,7 @@ struct iphone_afc_client_int {
51}; 51};
52 52
53struct iphone_afc_file_int { 53struct iphone_afc_file_int {
54 uint32 filehandle, blocks, size, type; 54 uint32_t filehandle, blocks, size, type;
55}; 55};
56 56
57 57
@@ -87,4 +87,4 @@ enum {
87 AFC_MAKE_LINK = 0x0000001C // MakeLink 87 AFC_MAKE_LINK = 0x0000001C // MakeLink
88}; 88};
89 89
90uint32 iphone_afc_get_file_handle(iphone_afc_file_t file); 90uint32_t iphone_afc_get_file_handle(iphone_afc_file_t file);
diff --git a/src/Makefile.am b/src/Makefile.am
index 76b15ec..71667ae 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,15 +1,15 @@
1INCLUDES = -I$(top_srcdir)/include 1INCLUDES = -I$(top_srcdir)/include
2 2
3AM_CFLAGS = $(libxml2_CFLAGS) $(libusb_CFLAGS) $(libglib2_CFLAGS) $(libgnutls_CFLAGS) $(libtasn1_CFLAGS) $(libgthread2_CFLAGS) -g -Wall $(LFS_CFLAGS) 3AM_CFLAGS = $(GLOBAL_CFLAGS) $(libusb_CFLAGS) $(libglib2_CFLAGS) $(libgnutls_CFLAGS) $(libtasn1_CFLAGS) $(libgthread2_CFLAGS) $(libplist_CFLAGS) $(LFS_CFLAGS)
4AM_LDFLAGS = $(libxml2_LIBS) $(libusb_LIBS) $(libglib2_LIBS) $(libgnutls_LIBS) $(libtasn1_LIBS) $(libgthread2_LIBS) 4AM_LDFLAGS = $(libusb_LIBS) $(libglib2_LIBS) $(libgnutls_LIBS) $(libtasn1_LIBS) $(libgthread2_LIBS) $(libplist_LIBS)
5 5
6bin_PROGRAMS = libiphone-initconf 6bin_PROGRAMS = libiphone-initconf
7 7
8 8
9libiphone_initconf_SOURCES = initconf.c userpref.c lockdown.c plist.c usbmux.c iphone.c utils.c 9libiphone_initconf_SOURCES = initconf.c userpref.c utils.c
10libiphone_initconf_CFLAGS = $(libgthread2_CFLAGS) $(AM_CFLAGS) 10libiphone_initconf_CFLAGS = $(libgthread2_CFLAGS) $(AM_CFLAGS)
11libiphone_initconf_LDFLAGS = $(libgthread2_LIBS) $(AM_LDFLAGS) 11libiphone_initconf_LDFLAGS = $(libgthread2_LIBS) $(AM_LDFLAGS)
12 12
13 13
14lib_LTLIBRARIES = libiphone.la 14lib_LTLIBRARIES = libiphone.la
15libiphone_la_SOURCES = usbmux.c iphone.c plist.c lockdown.c AFC.c NotificationProxy.c userpref.c utils.c 15libiphone_la_SOURCES = usbmux.c iphone.c lockdown.c AFC.c NotificationProxy.c userpref.c utils.c MobileSync.c
diff --git a/src/MobileSync.c b/src/MobileSync.c
new file mode 100644
index 0000000..b16a51b
--- /dev/null
+++ b/src/MobileSync.c
@@ -0,0 +1,299 @@
1/*
2 * MobileSync.c
3 * Contains functions for the built-in MobileSync client.
4 *
5 * Copyright (c) 2009 Jonathan Beck All Rights Reserved.
6 *
7 * This library is free software; you can redistribute it and/or
8 * modify it under the terms of the GNU Lesser General Public
9 * License as published by the Free Software Foundation; either
10 * version 2.1 of the License, or (at your option) any later version.
11 *
12 * This library is distributed in the hope that it will be useful,
13 * but WITHOUT ANY WARRANTY; without even the implied warranty of
14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
15 * Lesser General Public License for more details.
16 *
17 * You should have received a copy of the GNU Lesser General Public
18 * License along with this library; if not, write to the Free Software
19 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
20 */
21
22#include "MobileSync.h"
23#include <plist/plist.h>
24#include <string.h>
25
26
27#define MSYNC_VERSION_INT1 100
28#define MSYNC_VERSION_INT2 100
29
30iphone_error_t iphone_msync_new_client(iphone_device_t device, int src_port, int dst_port,
31 iphone_msync_client_t * client)
32{
33 if (!device || src_port == 0 || dst_port == 0 || !client || *client)
34 return IPHONE_E_INVALID_ARG;
35
36 iphone_error_t ret = IPHONE_E_UNKNOWN_ERROR;
37
38 iphone_msync_client_t client_loc = (iphone_msync_client_t) malloc(sizeof(struct iphone_msync_client_int));
39
40 // Attempt connection
41 client_loc->connection = NULL;
42 ret = iphone_mux_new_client(device, src_port, dst_port, &client_loc->connection);
43 if (IPHONE_E_SUCCESS != ret || !client_loc->connection) {
44 free(client_loc);
45 return ret;
46 }
47 //perform handshake
48 plist_t array = NULL;
49
50 //first receive version
51 ret = iphone_msync_recv(client_loc, &array);
52
53 plist_t msg_node = plist_find_node_by_string(array, "DLMessageVersionExchange");
54 plist_t ver_1 = plist_get_next_sibling(msg_node);
55 plist_t ver_2 = plist_get_next_sibling(ver_1);
56
57 plist_type ver_1_type = plist_get_node_type(ver_1);
58 plist_type ver_2_type = plist_get_node_type(ver_2);
59
60 if (PLIST_UINT == ver_1_type && PLIST_UINT == ver_2_type) {
61
62 uint64_t ver_1_val = 0;
63 uint64_t ver_2_val = 0;
64
65 plist_get_uint_val(ver_1, &ver_1_val);
66 plist_get_uint_val(ver_2, &ver_2_val);
67
68 plist_free(array);
69 array = NULL;
70
71 if (ver_1_type == PLIST_UINT && ver_2_type == PLIST_UINT && ver_1_val == MSYNC_VERSION_INT1
72 && ver_2_val == MSYNC_VERSION_INT2) {
73
74 array = plist_new_array();
75 plist_add_sub_string_el(array, "DLMessageVersionExchange");
76 plist_add_sub_string_el(array, "DLVersionsOk");
77
78 ret = iphone_msync_send(client_loc, array);
79
80 plist_free(array);
81 array = NULL;
82
83 ret = iphone_msync_recv(client_loc, &array);
84 plist_t rep_node = plist_find_node_by_string(array, "DLMessageDeviceReady");
85
86 if (rep_node) {
87 ret = IPHONE_E_SUCCESS;
88 *client = client_loc;
89 }
90 plist_free(array);
91 array = NULL;
92
93 }
94 }
95
96 if (IPHONE_E_SUCCESS != ret)
97 iphone_msync_free_client(client_loc);
98
99 return ret;
100}
101
102static void iphone_msync_stop_session(iphone_msync_client_t client)
103{
104 if (!client)
105 return;
106
107 plist_t array = plist_new_array();
108 plist_add_sub_string_el(array, "DLMessageDisconnect");
109 plist_add_sub_string_el(array, "All done, thanks for the memories");
110
111 iphone_msync_send(client, array);
112 plist_free(array);
113 array = NULL;
114}
115
116iphone_error_t iphone_msync_free_client(iphone_msync_client_t client)
117{
118 if (!client)
119 return IPHONE_E_INVALID_ARG;
120
121 iphone_msync_stop_session(client);
122 return iphone_mux_free_client(client->connection);
123}
124
125/** Polls the iPhone for MobileSync data.
126 *
127 * @param client The MobileSync client
128 * @param dump_data The pointer to the location of the buffer in which to store
129 * the received data
130 * @param recv_byhtes The number of bytes received
131 *
132 * @return an error code
133 */
134iphone_error_t iphone_msync_recv(iphone_msync_client_t client, plist_t * plist)
135{
136 if (!client || !plist || (plist && *plist))
137 return IPHONE_E_INVALID_ARG;
138 iphone_error_t ret = IPHONE_E_UNKNOWN_ERROR;
139 char *receive;
140 uint32_t datalen = 0, bytes = 0;
141
142 ret = iphone_mux_recv(client->connection, (char *) &datalen, sizeof(datalen), &bytes);
143 datalen = ntohl(datalen);
144
145 receive = (char *) malloc(sizeof(char) * datalen);
146 ret = iphone_mux_recv(client->connection, receive, datalen, &bytes);
147
148 plist_from_bin(receive, bytes, plist);
149
150 char *XMLContent = NULL;
151 uint32_t length = 0;
152 plist_to_xml(*plist, &XMLContent, &length);
153 log_dbg_msg(DBGMASK_MOBILESYNC, "Recv msg :\nsize : %i\nbuffer :\n%s\n", length, XMLContent);
154 free(XMLContent);
155
156 return ret;
157}
158
159/** Sends MobileSync data to the iPhone
160 *
161 * @note This function is low-level and should only be used if you need to send
162 * a new type of message.
163 *
164 * @param client The MobileSync client
165 * @param raw_data The null terminated string buffer to send
166 * @param length The length of data to send
167 * @param sent_bytes The number of bytes sent
168 *
169 * @return an error code
170 */
171iphone_error_t iphone_msync_send(iphone_msync_client_t client, plist_t plist)
172{
173 if (!client || !plist)
174 return IPHONE_E_INVALID_ARG;
175
176 char *XMLContent = NULL;
177 uint32_t length = 0;
178 plist_to_xml(plist, &XMLContent, &length);
179 log_dbg_msg(DBGMASK_MOBILESYNC, "Send msg :\nsize : %i\nbuffer :\n%s\n", length, XMLContent);
180 free(XMLContent);
181
182 char *content = NULL;
183 length = 0;
184
185 plist_to_bin(plist, &content, &length);
186
187 char *real_query;
188 int bytes;
189 iphone_error_t ret = IPHONE_E_UNKNOWN_ERROR;
190
191 real_query = (char *) malloc(sizeof(char) * (length + 4));
192 length = htonl(length);
193 memcpy(real_query, &length, sizeof(length));
194 memcpy(real_query + 4, content, ntohl(length));
195
196 ret = iphone_mux_send(client->connection, real_query, ntohl(length) + sizeof(length), &bytes);
197 free(real_query);
198 return ret;
199}
200
201iphone_error_t iphone_msync_get_all_contacts(iphone_msync_client_t client)
202{
203 if (!client)
204 return IPHONE_E_INVALID_ARG;
205
206 iphone_error_t ret = IPHONE_E_UNKNOWN_ERROR;
207 plist_t array = NULL;
208
209 array = plist_new_array();
210 plist_add_sub_string_el(array, "SDMessageSyncDataClassWithDevice");
211 plist_add_sub_string_el(array, "com.apple.Contacts");
212 plist_add_sub_string_el(array, "---");
213 plist_add_sub_string_el(array, "2009-01-09 18:03:58 +0100");
214 plist_add_sub_uint_el(array, 106);
215 plist_add_sub_string_el(array, "___EmptyParameterString___");
216
217 ret = iphone_msync_send(client, array);
218 plist_free(array);
219 array = NULL;
220
221 ret = iphone_msync_recv(client, &array);
222
223 plist_t rep_node = plist_find_node_by_string(array, "SDSyncTypeSlow");
224
225 if (!rep_node)
226 return ret;
227
228 plist_free(array);
229 array = NULL;
230
231 array = plist_new_array();
232 plist_add_sub_string_el(array, "SDMessageGetAllRecordsFromDevice");
233 plist_add_sub_string_el(array, "com.apple.Contacts");
234
235
236 ret = iphone_msync_send(client, array);
237 plist_free(array);
238 array = NULL;
239
240 ret = iphone_msync_recv(client, &array);
241
242 plist_t contact_node;
243 plist_t switch_node;
244
245 contact_node = plist_find_node_by_string(array, "com.apple.Contacts");
246 switch_node = plist_find_node_by_string(array, "SDMessageDeviceReadyToReceiveChanges");
247
248 while (NULL == switch_node) {
249
250 plist_free(array);
251 array = NULL;
252
253 array = plist_new_array();
254 plist_add_sub_string_el(array, "SDMessageAcknowledgeChangesFromDevice");
255 plist_add_sub_string_el(array, "com.apple.Contacts");
256
257 ret = iphone_msync_send(client, array);
258 plist_free(array);
259 array = NULL;
260
261 ret = iphone_msync_recv(client, &array);
262
263 contact_node = plist_find_node_by_string(array, "com.apple.Contacts");
264 switch_node = plist_find_node_by_string(array, "SDMessageDeviceReadyToReceiveChanges");
265 }
266
267 array = plist_new_array();
268 plist_add_sub_string_el(array, "DLMessagePing");
269 plist_add_sub_string_el(array, "Preparing to get changes for device");
270
271 ret = iphone_msync_send(client, array);
272 plist_free(array);
273 array = NULL;
274
275 array = plist_new_array();
276 plist_add_sub_string_el(array, "SDMessageProcessChanges");
277 plist_add_sub_string_el(array, "com.apple.Contacts");
278 plist_add_sub_node(array, plist_new_dict());
279 plist_add_sub_bool_el(array, 0);
280 plist_t dict = plist_new_dict();
281 plist_add_sub_node(array, dict);
282 plist_add_sub_key_el(dict, "SyncDeviceLinkEntityNamesKey");
283 plist_t array2 = plist_new_array();
284 plist_add_sub_string_el(array2, "com.apple.contacts.Contact");
285 plist_add_sub_string_el(array2, "com.apple.contacts.Group");
286 plist_add_sub_key_el(dict, "SyncDeviceLinkAllRecordsOfPulledEntityTypeSentKey");
287 plist_add_sub_bool_el(dict, 0);
288
289 ret = iphone_msync_send(client, array);
290 plist_free(array);
291 array = NULL;
292
293 ret = iphone_msync_recv(client, &array);
294 plist_free(array);
295 array = NULL;
296
297
298 return ret;
299}
diff --git a/src/MobileSync.h b/src/MobileSync.h
new file mode 100644
index 0000000..7655b59
--- /dev/null
+++ b/src/MobileSync.h
@@ -0,0 +1,39 @@
1/*
2 * MobileSync.h
3 * Definitions for the built-in MobileSync client
4 *
5 * Copyright (c) 2009 Jonathan Beck All Rights Reserved.
6 *
7 * This library is free software; you can redistribute it and/or
8 * modify it under the terms of the GNU Lesser General Public
9 * License as published by the Free Software Foundation; either
10 * version 2.1 of the License, or (at your option) any later version.
11 *
12 * This library is distributed in the hope that it will be useful,
13 * but WITHOUT ANY WARRANTY; without even the implied warranty of
14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
15 * Lesser General Public License for more details.
16 *
17 * You should have received a copy of the GNU Lesser General Public
18 * License along with this library; if not, write to the Free Software
19 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
20 */
21#ifndef MOBILESYNC_H
22#define MOBILESYNC_H
23
24#include "usbmux.h"
25#include "iphone.h"
26#include "utils.h"
27
28#include <plist/plist.h>
29
30
31
32struct iphone_msync_client_int {
33 iphone_umux_client_t connection;
34};
35
36
37iphone_error_t iphone_msync_get_all_contacts(iphone_msync_client_t client);
38
39#endif
diff --git a/src/NotificationProxy.c b/src/NotificationProxy.c
index c13a547..726852e 100644
--- a/src/NotificationProxy.c
+++ b/src/NotificationProxy.c
@@ -20,8 +20,8 @@
20 */ 20 */
21 21
22#include <stdio.h> 22#include <stdio.h>
23#include <plist/plist.h>
23#include "NotificationProxy.h" 24#include "NotificationProxy.h"
24#include "plist.h"
25#include "utils.h" 25#include "utils.h"
26 26
27/** Locks an NP client, done for thread safety stuff. 27/** Locks an NP client, done for thread safety stuff.
@@ -103,26 +103,26 @@ iphone_error_t iphone_np_free_client(iphone_np_client_t client)
103 */ 103 */
104iphone_error_t iphone_np_post_notification(iphone_np_client_t client, const char *notification) 104iphone_error_t iphone_np_post_notification(iphone_np_client_t client, const char *notification)
105{ 105{
106 xmlDocPtr plist; 106 char *XML_content = NULL;
107 xmlNode *dict, *key; 107 uint32_t length = 0;
108 char *XML_content; 108 int bytes = 0;
109 uint32_t length;
110 int bytes;
111 iphone_error_t ret; 109 iphone_error_t ret;
112 unsigned char sndbuf[4096]; 110 unsigned char sndbuf[4096];
113 int sndlen = 0; 111 int sndlen = 0;
114 int nlen; 112 int nlen = 0;
113 plist_t dict = NULL;
115 114
116 if (!client || !notification) { 115 if (!client || !notification) {
117 return IPHONE_E_INVALID_ARG; 116 return IPHONE_E_INVALID_ARG;
118 } 117 }
119 np_lock(client); 118 np_lock(client);
120 119
121 plist = new_plist(); 120 dict = plist_new_dict();
122 dict = add_child_to_plist(plist, "dict", "\n", NULL, 0); 121 plist_add_sub_key_el(dict, "Command");
123 key = add_key_str_dict_element(plist, dict, "Command", "PostNotification", 1); 122 plist_add_sub_string_el(dict, "PostNotification");
124 key = add_key_str_dict_element(plist, dict, "Name", notification, 1); 123 plist_add_sub_key_el(dict, "Name");
125 xmlDocDumpMemory(plist, (xmlChar **) & XML_content, &length); 124 plist_add_sub_string_el(dict, notification);
125 plist_to_xml(dict, &XML_content, &length);
126 126
127 nlen = htonl(length); 127 nlen = htonl(length);
128 128
@@ -131,13 +131,15 @@ iphone_error_t iphone_np_post_notification(iphone_np_client_t client, const char
131 memcpy(sndbuf + sndlen, XML_content, length); 131 memcpy(sndbuf + sndlen, XML_content, length);
132 sndlen += length; 132 sndlen += length;
133 133
134 xmlFree(XML_content); 134 plist_free(dict);
135 xmlFreeDoc(plist); 135 dict = NULL;
136 free(XML_content);
137 XML_content = NULL;
136 138
137 plist = new_plist(); 139 dict = plist_new_dict();
138 dict = add_child_to_plist(plist, "dict", "\n", NULL, 0); 140 plist_add_sub_key_el(dict, "Command");
139 key = add_key_str_dict_element(plist, dict, "Command", "Shutdown", 1); 141 plist_add_sub_string_el(dict, "Shutdown");
140 xmlDocDumpMemory(plist, (xmlChar **) & XML_content, &length); 142 plist_to_xml(dict, &XML_content, &length);
141 143
142 nlen = htonl(length); 144 nlen = htonl(length);
143 145
@@ -147,9 +149,10 @@ iphone_error_t iphone_np_post_notification(iphone_np_client_t client, const char
147 memcpy(sndbuf + sndlen, XML_content, length); 149 memcpy(sndbuf + sndlen, XML_content, length);
148 sndlen += length; 150 sndlen += length;
149 151
150 xmlFree(XML_content); 152 plist_free(dict);
151 xmlFreeDoc(plist); 153 dict = NULL;
152 plist = NULL; 154 free(XML_content);
155 XML_content = NULL;
153 156
154 log_debug_buffer(sndbuf, sndlen); 157 log_debug_buffer(sndbuf, sndlen);
155 158
@@ -180,17 +183,16 @@ iphone_error_t iphone_np_post_notification(iphone_np_client_t client, const char
180 */ 183 */
181iphone_error_t iphone_np_observe_notification(iphone_np_client_t client) 184iphone_error_t iphone_np_observe_notification(iphone_np_client_t client)
182{ 185{
183 xmlDocPtr plist; 186 plist_t dict = NULL;
184 xmlNode *dict, *key; 187 char *XML_content = NULL;
185 char *XML_content; 188 uint32_t length = 0;
186 uint32_t length; 189 int bytes = 0;
187 int bytes;
188 iphone_error_t ret; 190 iphone_error_t ret;
189 unsigned char sndbuf[4096]; 191 unsigned char sndbuf[4096];
190 int sndlen = 0; 192 int sndlen = 0;
191 int nlen; 193 int nlen = 0;
192 int i = 0; 194 int i = 0;
193 char *notifications[10] = { 195 const char *notifications[10] = {
194 "com.apple.itunes-client.syncCancelRequest", 196 "com.apple.itunes-client.syncCancelRequest",
195 "com.apple.itunes-client.syncSuspendRequest", 197 "com.apple.itunes-client.syncSuspendRequest",
196 "com.apple.itunes-client.syncResumeRequest", 198 "com.apple.itunes-client.syncResumeRequest",
@@ -211,11 +213,13 @@ iphone_error_t iphone_np_observe_notification(iphone_np_client_t client)
211 np_lock(client); 213 np_lock(client);
212 214
213 while (notifications[i]) { 215 while (notifications[i]) {
214 plist = new_plist(); 216
215 dict = add_child_to_plist(plist, "dict", "\n", NULL, 0); 217 dict = plist_new_dict();
216 key = add_key_str_dict_element(plist, dict, "Command", "ObserveNotification", 1); 218 plist_add_sub_key_el(dict, "Command");
217 key = add_key_str_dict_element(plist, dict, "Name", notifications[i++], 1); 219 plist_add_sub_string_el(dict, "ObserveNotification");
218 xmlDocDumpMemory(plist, (xmlChar **) & XML_content, &length); 220 plist_add_sub_key_el(dict, "Name");
221 plist_add_sub_string_el(dict, notifications[i++]);
222 plist_to_xml(dict, &XML_content, &length);
219 223
220 nlen = htonl(length); 224 nlen = htonl(length);
221 memcpy(sndbuf + sndlen, &nlen, 4); 225 memcpy(sndbuf + sndlen, &nlen, 4);
@@ -223,14 +227,16 @@ iphone_error_t iphone_np_observe_notification(iphone_np_client_t client)
223 memcpy(sndbuf + sndlen, XML_content, length); 227 memcpy(sndbuf + sndlen, XML_content, length);
224 sndlen += length; 228 sndlen += length;
225 229
226 xmlFree(XML_content); 230 plist_free(dict);
227 xmlFreeDoc(plist); 231 dict = NULL;
232 free(XML_content);
233 XML_content = NULL;
228 } 234 }
229 235
230 plist = new_plist(); 236 dict = plist_new_dict();
231 dict = add_child_to_plist(plist, "dict", "\n", NULL, 0); 237 plist_add_sub_key_el(dict, "Command");
232 key = add_key_str_dict_element(plist, dict, "Command", "Shutdown", 1); 238 plist_add_sub_string_el(dict, "Shutdown");
233 xmlDocDumpMemory(plist, (xmlChar **) & XML_content, &length); 239 plist_to_xml(dict, &XML_content, &length);
234 240
235 nlen = htonl(length); 241 nlen = htonl(length);
236 242
@@ -240,9 +246,10 @@ iphone_error_t iphone_np_observe_notification(iphone_np_client_t client)
240 memcpy(sndbuf + sndlen, XML_content, length); 246 memcpy(sndbuf + sndlen, XML_content, length);
241 sndlen += length; 247 sndlen += length;
242 248
243 xmlFree(XML_content); 249 plist_free(dict);
244 xmlFreeDoc(plist); 250 dict = NULL;
245 plist = NULL; 251 free(XML_content);
252 XML_content = NULL;
246 253
247 log_debug_buffer(sndbuf, sndlen); 254 log_debug_buffer(sndbuf, sndlen);
248 255
diff --git a/src/NotificationProxy.h b/src/NotificationProxy.h
index b2fa3d9..7b4b48d 100644
--- a/src/NotificationProxy.h
+++ b/src/NotificationProxy.h
@@ -18,6 +18,7 @@
18 * License along with this library; if not, write to the Free Software 18 * License along with this library; if not, write to the Free Software
19 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA 19 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
20 */ 20 */
21#include "libiphone/libiphone.h"
21#include "usbmux.h" 22#include "usbmux.h"
22#include "iphone.h" 23#include "iphone.h"
23 24
diff --git a/src/initconf.c b/src/initconf.c
index 205c97a..538f344 100644
--- a/src/initconf.c
+++ b/src/initconf.c
@@ -28,7 +28,6 @@
28 28
29#include "libiphone/libiphone.h" 29#include "libiphone/libiphone.h"
30#include "userpref.h" 30#include "userpref.h"
31#include "lockdown.h"
32#include "utils.h" 31#include "utils.h"
33 32
34/** Generates a 2048 byte key, split into a function so that it can be run in a 33/** Generates a 2048 byte key, split into a function so that it can be run in a
@@ -60,6 +59,35 @@ static void progress_bar(gpointer mutex)
60 g_thread_exit(0); 59 g_thread_exit(0);
61} 60}
62 61
62int get_rand(int min, int max)
63{
64 int retval = (rand() % (max - min)) + min;
65 return retval;
66}
67
68/** Generates a valid HostID (which is actually a UUID).
69 *
70 * @param A null terminated string containing a valid HostID.
71 */
72char *lockdownd_generate_hostid()
73{
74 char *hostid = (char *) malloc(sizeof(char) * 37); // HostID's are just UUID's, and UUID's are 36 characters long
75 const char *chars = "ABCDEF0123456789";
76 srand(time(NULL));
77 int i = 0;
78
79 for (i = 0; i < 36; i++) {
80 if (i == 8 || i == 13 || i == 18 || i == 23) {
81 hostid[i] = '-';
82 continue;
83 } else {
84 hostid[i] = chars[get_rand(0, 16)];
85 }
86 }
87 hostid[36] = '\0'; // make it a real string
88 return hostid;
89}
90
63int main(int argc, char *argv[]) 91int main(int argc, char *argv[])
64{ 92{
65 GThread *progress_thread, *key_thread; 93 GThread *progress_thread, *key_thread;
diff --git a/src/lockdown.c b/src/lockdown.c
index 73a8bbc..63f9090 100644
--- a/src/lockdown.c
+++ b/src/lockdown.c
@@ -31,6 +31,9 @@
31#include <libtasn1.h> 31#include <libtasn1.h>
32#include <gnutls/x509.h> 32#include <gnutls/x509.h>
33 33
34#include <plist/plist.h>
35
36
34const ASN1_ARRAY_TYPE pkcs1_asn1_tab[] = { 37const ASN1_ARRAY_TYPE pkcs1_asn1_tab[] = {
35 {"PKCS1", 536872976, 0}, 38 {"PKCS1", 536872976, 0},
36 {0, 1073741836, 0}, 39 {0, 1073741836, 0},
@@ -40,35 +43,6 @@ const ASN1_ARRAY_TYPE pkcs1_asn1_tab[] = {
40 {0, 0, 0} 43 {0, 0, 0}
41}; 44};
42 45
43static int get_rand(int min, int max)
44{
45 int retval = (rand() % (max - min)) + min;
46 return retval;
47}
48
49/** Generates a valid HostID (which is actually a UUID).
50 *
51 * @param A null terminated string containing a valid HostID.
52 */
53char *lockdownd_generate_hostid(void)
54{
55 char *hostid = (char *) malloc(sizeof(char) * 37); // HostID's are just UUID's, and UUID's are 36 characters long
56 const char *chars = "ABCDEF0123456789";
57 srand(time(NULL));
58 int i = 0;
59
60 for (i = 0; i < 36; i++) {
61 if (i == 8 || i == 13 || i == 18 || i == 23) {
62 hostid[i] = '-';
63 continue;
64 } else {
65 hostid[i] = chars[get_rand(0, 16)];
66 }
67 }
68 hostid[36] = '\0'; // make it a real string
69 return hostid;
70}
71
72/** Creates a lockdownd client for the give iPhone. 46/** Creates a lockdownd client for the give iPhone.
73 * 47 *
74 * @param phone The iPhone to create a lockdownd client for 48 * @param phone The iPhone to create a lockdownd client for
@@ -100,57 +74,56 @@ iphone_lckd_client_t new_lockdownd_client(iphone_device_t phone)
100static void iphone_lckd_stop_session(iphone_lckd_client_t control) 74static void iphone_lckd_stop_session(iphone_lckd_client_t control)
101{ 75{
102 if (!control) 76 if (!control)
103 return; // IPHONE_E_INVALID_ARG; 77 return; //IPHONE_E_INVALID_ARG;
104 xmlDocPtr plist = new_plist(); 78
105 xmlNode *dict, *key;
106 char **dictionary;
107 int bytes = 0, i = 0;
108 iphone_error_t ret = IPHONE_E_UNKNOWN_ERROR; 79 iphone_error_t ret = IPHONE_E_UNKNOWN_ERROR;
109 80
110 log_debug_msg("lockdownd_stop_session() called\n"); 81 plist_t dict = plist_new_dict();
111 dict = add_child_to_plist(plist, "dict", "\n", NULL, 0); 82 plist_add_sub_key_el(dict, "Request");
112 key = add_key_str_dict_element(plist, dict, "Request", "StopSession", 1); 83 plist_add_sub_string_el(dict, "StopSession");
113 key = add_key_str_dict_element(plist, dict, "SessionID", control->session_id, 1); 84 plist_add_sub_key_el(dict, "SessionID");
85 plist_add_sub_string_el(dict, control->session_id);
114 86
115 char *XML_content; 87 log_dbg_msg(DBGMASK_LOCKDOWND, "iphone_lckd_stop_session() called\n");
116 uint32 length;
117 88
118 xmlDocDumpMemory(plist, (xmlChar **) & XML_content, &length); 89 ret = iphone_lckd_send(control, dict);
119 ret = iphone_lckd_send(control, XML_content, length, &bytes);
120 90
121 xmlFree(XML_content); 91 plist_free(dict);
122 xmlFreeDoc(plist); 92 dict = NULL;
123 plist = NULL; 93
124 ret = iphone_lckd_recv(control, &XML_content, &bytes); 94 ret = iphone_lckd_recv(control, &dict);
125 95
126 plist = xmlReadMemory(XML_content, bytes, NULL, NULL, 0);
127 if (!plist) {
128 log_debug_msg("lockdownd_stop_session(): IPHONE_E_PLIST_ERROR\n");
129 return; //IPHONE_E_PLIST_ERROR;
130 }
131 dict = xmlDocGetRootElement(plist);
132 for (dict = dict->children; dict; dict = dict->next) {
133 if (!xmlStrcmp(dict->name, "dict"))
134 break;
135 }
136 if (!dict) { 96 if (!dict) {
137 log_debug_msg("lockdownd_stop_session(): IPHONE_E_DICT_ERROR\n"); 97 log_dbg_msg(DBGMASK_LOCKDOWND, "lockdownd_stop_session(): IPHONE_E_PLIST_ERROR\n");
138 return; //IPHONE_E_DICT_ERROR; 98 return; // IPHONE_E_PLIST_ERROR;
139 } 99 }
140 dictionary = read_dict_element_strings(dict);
141 xmlFreeDoc(plist);
142 free(XML_content);
143 100
144 for (i = 0; dictionary[i]; i += 2) { 101 plist_t query_node = plist_find_node_by_string(dict, "StopSession");
145 if (!strcmp(dictionary[i], "Result") && !strcmp(dictionary[i + 1], "Success")) { 102 plist_t result_node = plist_get_next_sibling(query_node);
146 log_debug_msg("lockdownd_stop_session(): success\n"); 103 plist_t value_node = plist_get_next_sibling(result_node);
104
105 plist_type result_type = plist_get_node_type(result_node);
106 plist_type value_type = plist_get_node_type(value_node);
107
108 if (result_type == PLIST_KEY && value_type == PLIST_STRING) {
109
110 char *result_value = NULL;
111 char *value_value = NULL;
112
113 plist_get_key_val(result_node, &result_value);
114 plist_get_string_val(value_node, &value_value);
115
116 if (!strcmp(result_value, "Result") && !strcmp(value_value, "Success")) {
117 log_dbg_msg(DBGMASK_LOCKDOWND, "lockdownd_stop_session(): success\n");
147 ret = IPHONE_E_SUCCESS; 118 ret = IPHONE_E_SUCCESS;
148 break;
149 } 119 }
120 free(result_value);
121 free(value_value);
150 } 122 }
123 plist_free(dict);
124 dict = NULL;
151 125
152 free_dictionary(dictionary); 126 return; // ret;
153 return; //ret;
154} 127}
155 128
156/** 129/**
@@ -163,14 +136,14 @@ static void iphone_lckd_stop_session(iphone_lckd_client_t control)
163static void iphone_lckd_stop_SSL_session(iphone_lckd_client_t client) 136static void iphone_lckd_stop_SSL_session(iphone_lckd_client_t client)
164{ 137{
165 if (!client) { 138 if (!client) {
166 log_debug_msg("lockdownd_stop_SSL_session(): invalid argument!\n"); 139 log_dbg_msg(DBGMASK_LOCKDOWND, "lockdownd_stop_SSL_session(): invalid argument!\n");
167 return; 140 return;
168 } 141 }
169 142
170 if (client->in_SSL) { 143 if (client->in_SSL) {
171 log_debug_msg("Stopping SSL Session\n"); 144 log_dbg_msg(DBGMASK_LOCKDOWND, "Stopping SSL Session\n");
172 iphone_lckd_stop_session(client); 145 iphone_lckd_stop_session(client);
173 log_debug_msg("Sending SSL close notify\n"); 146 log_dbg_msg(DBGMASK_LOCKDOWND, "Sending SSL close notify\n");
174 gnutls_bye(*client->ssl_session, GNUTLS_SHUT_RDWR); 147 gnutls_bye(*client->ssl_session, GNUTLS_SHUT_RDWR);
175 } 148 }
176 if (client->ssl_session) { 149 if (client->ssl_session) {
@@ -215,13 +188,13 @@ iphone_error_t iphone_lckd_free_client(iphone_lckd_client_t client)
215 * 188 *
216 * @return The number of bytes received 189 * @return The number of bytes received
217 */ 190 */
218iphone_error_t iphone_lckd_recv(iphone_lckd_client_t client, char **dump_data, uint32_t * recv_bytes) 191iphone_error_t iphone_lckd_recv(iphone_lckd_client_t client, plist_t * plist)
219{ 192{
220 if (!client || !dump_data || !recv_bytes) 193 if (!client || !plist || (plist && *plist))
221 return IPHONE_E_INVALID_ARG; 194 return IPHONE_E_INVALID_ARG;
222 iphone_error_t ret = IPHONE_E_UNKNOWN_ERROR; 195 iphone_error_t ret = IPHONE_E_UNKNOWN_ERROR;
223 char *receive; 196 char *receive;
224 uint32 datalen = 0, bytes = 0; 197 uint32_t datalen = 0, bytes = 0;
225 198
226 if (!client->in_SSL) 199 if (!client->in_SSL)
227 ret = iphone_mux_recv(client->connection, (char *) &datalen, sizeof(datalen), &bytes); 200 ret = iphone_mux_recv(client->connection, (char *) &datalen, sizeof(datalen), &bytes);
@@ -240,8 +213,18 @@ iphone_error_t iphone_lckd_recv(iphone_lckd_client_t client, char **dump_data, u
240 if (bytes > 0) 213 if (bytes > 0)
241 ret = IPHONE_E_SUCCESS; 214 ret = IPHONE_E_SUCCESS;
242 } 215 }
243 *dump_data = receive; 216
244 *recv_bytes = bytes; 217 if (bytes <= 0) {
218 free(receive);
219 return IPHONE_E_NOT_ENOUGH_DATA;
220 }
221
222 plist_from_xml(receive, bytes, plist);
223 free(receive);
224
225 if (!*plist)
226 ret = IPHONE_E_PLIST_ERROR;
227
245 return ret; 228 return ret;
246} 229}
247 230
@@ -250,26 +233,31 @@ iphone_error_t iphone_lckd_recv(iphone_lckd_client_t client, char **dump_data, u
250 * @note This function is low-level and should only be used if you need to send 233 * @note This function is low-level and should only be used if you need to send
251 * a new type of message. 234 * a new type of message.
252 * 235 *
253 * @param control The lockdownd client 236 * @param client The lockdownd client
254 * @param raw_data The null terminated string buffer to send 237 * @param plist The plist to send
255 * @param length The length of data to send
256 * 238 *
257 * @return The number of bytes sent 239 * @return an error code (IPHONE_E_SUCCESS on success)
258 */ 240 */
259iphone_error_t iphone_lckd_send(iphone_lckd_client_t client, char *raw_data, uint32_t length, uint32_t * sent_bytes) 241iphone_error_t iphone_lckd_send(iphone_lckd_client_t client, plist_t plist)
260{ 242{
261 if (!client || !raw_data || length == 0 || !sent_bytes) 243 if (!client || !plist)
262 return IPHONE_E_INVALID_ARG; 244 return IPHONE_E_INVALID_ARG;
263 char *real_query; 245 char *real_query;
264 int bytes; 246 int bytes;
247 char *XMLContent = NULL;
248 uint32_t length = 0;
265 iphone_error_t ret = IPHONE_E_UNKNOWN_ERROR; 249 iphone_error_t ret = IPHONE_E_UNKNOWN_ERROR;
266 250
251 plist_to_xml(plist, &XMLContent, &length);
252 log_dbg_msg(DBGMASK_LOCKDOWND, "Send msg :\nsize : %i\nbuffer :\n%s\n", length, XMLContent);
253
254
267 real_query = (char *) malloc(sizeof(char) * (length + 4)); 255 real_query = (char *) malloc(sizeof(char) * (length + 4));
268 length = htonl(length); 256 length = htonl(length);
269 memcpy(real_query, &length, sizeof(length)); 257 memcpy(real_query, &length, sizeof(length));
270 memcpy(real_query + 4, raw_data, ntohl(length)); 258 memcpy(real_query + 4, XMLContent, ntohl(length));
271 log_debug_msg("lockdownd_send(): made the query, sending it along\n"); 259 free(XMLContent);
272 dump_debug_buffer("grpkt", real_query, ntohl(length) + 4); 260 log_dbg_msg(DBGMASK_LOCKDOWND, "lockdownd_send(): made the query, sending it along\n");
273 261
274 if (!client->in_SSL) 262 if (!client->in_SSL)
275 ret = iphone_mux_send(client->connection, real_query, ntohl(length) + sizeof(length), &bytes); 263 ret = iphone_mux_send(client->connection, real_query, ntohl(length) + sizeof(length), &bytes);
@@ -277,9 +265,9 @@ iphone_error_t iphone_lckd_send(iphone_lckd_client_t client, char *raw_data, uin
277 gnutls_record_send(*client->ssl_session, real_query, ntohl(length) + sizeof(length)); 265 gnutls_record_send(*client->ssl_session, real_query, ntohl(length) + sizeof(length));
278 ret = IPHONE_E_SUCCESS; 266 ret = IPHONE_E_SUCCESS;
279 } 267 }
280 log_debug_msg("lockdownd_send(): sent it!\n"); 268 log_dbg_msg(DBGMASK_LOCKDOWND, "lockdownd_send(): sent it!\n");
281 free(real_query); 269 free(real_query);
282 *sent_bytes = bytes; 270
283 return ret; 271 return ret;
284} 272}
285 273
@@ -295,49 +283,50 @@ iphone_error_t lockdownd_hello(iphone_lckd_client_t control)
295{ 283{
296 if (!control) 284 if (!control)
297 return IPHONE_E_INVALID_ARG; 285 return IPHONE_E_INVALID_ARG;
298 xmlDocPtr plist = new_plist(); 286
299 xmlNode *dict, *key;
300 char **dictionary;
301 int bytes = 0, i = 0;
302 iphone_error_t ret = IPHONE_E_UNKNOWN_ERROR; 287 iphone_error_t ret = IPHONE_E_UNKNOWN_ERROR;
303 288
304 log_debug_msg("lockdownd_hello() called\n"); 289 plist_t dict = plist_new_dict();
305 dict = add_child_to_plist(plist, "dict", "\n", NULL, 0); 290 plist_add_sub_key_el(dict, "Request");
306 key = add_key_str_dict_element(plist, dict, "Request", "QueryType", 1); 291 plist_add_sub_string_el(dict, "QueryType");
307 char *XML_content;
308 uint32 length;
309 292
310 xmlDocDumpMemory(plist, (xmlChar **) & XML_content, &length); 293 log_dbg_msg(DBGMASK_LOCKDOWND, "lockdownd_hello() called\n");
311 ret = iphone_lckd_send(control, XML_content, length, &bytes); 294 ret = iphone_lckd_send(control, dict);
312 295
313 xmlFree(XML_content); 296 plist_free(dict);
314 xmlFreeDoc(plist); 297 dict = NULL;
315 plist = NULL;
316 ret = iphone_lckd_recv(control, &XML_content, &bytes);
317 298
318 plist = xmlReadMemory(XML_content, bytes, NULL, NULL, 0); 299 ret = iphone_lckd_recv(control, &dict);
319 if (!plist) 300
320 return IPHONE_E_PLIST_ERROR; 301 if (IPHONE_E_SUCCESS != ret)
321 dict = xmlDocGetRootElement(plist); 302 return ret;
322 for (dict = dict->children; dict; dict = dict->next) { 303
323 if (!xmlStrcmp(dict->name, "dict")) 304 plist_t query_node = plist_find_node_by_string(dict, "QueryType");
324 break; 305 plist_t result_node = plist_get_next_sibling(query_node);
325 } 306 plist_t value_node = plist_get_next_sibling(result_node);
326 if (!dict) 307
327 return IPHONE_E_DICT_ERROR; 308 plist_type result_type = plist_get_node_type(result_node);
328 dictionary = read_dict_element_strings(dict); 309 plist_type value_type = plist_get_node_type(value_node);
329 xmlFreeDoc(plist); 310
330 free(XML_content); 311 if (result_type == PLIST_KEY && value_type == PLIST_STRING) {
331 312
332 for (i = 0; dictionary[i]; i += 2) { 313 char *result_value = NULL;
333 if (!strcmp(dictionary[i], "Result") && !strcmp(dictionary[i + 1], "Success")) { 314 char *value_value = NULL;
334 log_debug_msg("lockdownd_hello(): success\n"); 315
316 plist_get_key_val(result_node, &result_value);
317 plist_get_string_val(value_node, &value_value);
318
319 if (!strcmp(result_value, "Result") && !strcmp(value_value, "Success")) {
320 log_dbg_msg(DBGMASK_LOCKDOWND, "lockdownd_hello(): success\n");
335 ret = IPHONE_E_SUCCESS; 321 ret = IPHONE_E_SUCCESS;
336 break;
337 } 322 }
323 free(result_value);
324 free(value_value);
338 } 325 }
339 326
340 free_dictionary(dictionary); 327 plist_free(dict);
328 dict = NULL;
329
341 return ret; 330 return ret;
342} 331}
343 332
@@ -349,74 +338,91 @@ iphone_error_t lockdownd_hello(iphone_lckd_client_t control)
349 * 338 *
350 * @return IPHONE_E_SUCCESS on success. 339 * @return IPHONE_E_SUCCESS on success.
351 */ 340 */
352iphone_error_t lockdownd_generic_get_value(iphone_lckd_client_t control, const char *req_key, const char *req_string, 341iphone_error_t lockdownd_generic_get_value(iphone_lckd_client_t control, const char *req_key, char *req_string,
353 char **value) 342 gnutls_datum_t * value)
354{ 343{
355 if (!control || !req_key || !value || (value && *value)) 344 if (!control || !req_key || !value || value->data)
356 return IPHONE_E_INVALID_ARG; 345 return IPHONE_E_INVALID_ARG;
357 xmlDocPtr plist = new_plist(); 346
358 xmlNode *dict = NULL; 347 plist_t dict = NULL;
359 xmlNode *key = NULL;;
360 char **dictionary = NULL;
361 int bytes = 0, i = 0;
362 char *XML_content = NULL;
363 uint32 length = 0;
364 iphone_error_t ret = IPHONE_E_UNKNOWN_ERROR; 348 iphone_error_t ret = IPHONE_E_UNKNOWN_ERROR;
365 349
366 /* Setup DevicePublicKey request plist */ 350 /* Setup DevicePublicKey request plist */
367 dict = add_child_to_plist(plist, "dict", "\n", NULL, 0); 351 dict = plist_new_dict();
368 key = add_key_str_dict_element(plist, dict, req_key, req_string, 1); 352 plist_add_sub_key_el(dict, req_key);
369 key = add_key_str_dict_element(plist, dict, "Request", "GetValue", 1); 353 plist_add_sub_string_el(dict, req_string);
370 xmlDocDumpMemory(plist, (xmlChar **) & XML_content, &length); 354 plist_add_sub_key_el(dict, "Request");
355 plist_add_sub_string_el(dict, "GetValue");
371 356
372 /* send to iPhone */ 357 /* send to iPhone */
373 ret = iphone_lckd_send(control, XML_content, length, &bytes); 358 ret = iphone_lckd_send(control, dict);
374 359
375 xmlFree(XML_content); 360 plist_free(dict);
376 xmlFreeDoc(plist); 361 dict = NULL;
377 plist = NULL;
378 362
379 if (ret != IPHONE_E_SUCCESS) 363 if (ret != IPHONE_E_SUCCESS)
380 return ret; 364 return ret;
381 365
382 /* Now get iPhone's answer */ 366 /* Now get iPhone's answer */
383 ret = iphone_lckd_recv(control, &XML_content, &bytes); 367 ret = iphone_lckd_recv(control, &dict);
384 368
385 if (ret != IPHONE_E_SUCCESS) 369 if (ret != IPHONE_E_SUCCESS)
386 return ret; 370 return ret;
387 371
388 plist = xmlReadMemory(XML_content, bytes, NULL, NULL, 0); 372 plist_t query_node = plist_find_node_by_string(dict, "GetValue");
389 if (!plist) 373 plist_t result_key_node = plist_get_next_sibling(query_node);
390 return IPHONE_E_PLIST_ERROR; 374 plist_t result_value_node = plist_get_next_sibling(result_key_node);
391 dict = xmlDocGetRootElement(plist);
392 for (dict = dict->children; dict; dict = dict->next) {
393 if (!xmlStrcmp(dict->name, "dict"))
394 break;
395 }
396 if (!dict)
397 return IPHONE_E_DICT_ERROR;
398 375
399 /* Parse xml to check success and to find public key */ 376 plist_type result_key_type = plist_get_node_type(result_key_node);
400 dictionary = read_dict_element_strings(dict); 377 plist_type result_value_type = plist_get_node_type(result_value_node);
401 xmlFreeDoc(plist);
402 free(XML_content);
403 378
404 int success = 0; 379 if (result_key_type == PLIST_KEY && result_value_type == PLIST_STRING) {
405 for (i = 0; dictionary[i]; i += 2) { 380
406 if (!strcmp(dictionary[i], "Result") && !strcmp(dictionary[i + 1], "Success")) { 381 char *result_key = NULL;
407 success = 1; 382 char *result_value = NULL;
408 } 383 ret = IPHONE_E_DICT_ERROR;
409 if (!strcmp(dictionary[i], "Value")) { 384
410 *value = strdup(dictionary[i + 1]); 385 plist_get_key_val(result_key_node, &result_key);
386 plist_get_string_val(result_value_node, &result_value);
387
388 if (!strcmp(result_key, "Result") && !strcmp(result_value, "Success")) {
389 log_dbg_msg(DBGMASK_LOCKDOWND, "lockdownd_generic_get_value(): success\n");
390 ret = IPHONE_E_SUCCESS;
411 } 391 }
392 free(result_key);
393 free(result_value);
394 }
395 if (ret != IPHONE_E_SUCCESS) {
396 return ret;
412 } 397 }
413 398
414 if (dictionary) { 399 plist_t value_key_node = plist_get_next_sibling(result_key_node);
415 free_dictionary(dictionary); 400 plist_t value_value_node = plist_get_next_sibling(value_key_node);
416 dictionary = NULL; 401
402 plist_type value_key_type = plist_get_node_type(value_key_node);
403
404 if (value_key_type == PLIST_KEY) {
405
406 char *result_key = NULL;
407 plist_get_key_val(value_key_node, &result_key);
408
409 if (!strcmp(result_key, "Value")) {
410 log_dbg_msg(DBGMASK_LOCKDOWND, "lockdownd_generic_get_value(): success\n");
411
412 plist_type value_value_type = plist_get_node_type(value_value_node);
413 if (PLIST_STRING == value_value_type) {
414 char *value_value = NULL;
415 plist_get_string_val(value_value_node, &value_value);
416
417 value->data = value_value;
418 value->size = strlen(value_value);
419 ret = IPHONE_E_SUCCESS;
420 }
421 }
422 free(result_key);
417 } 423 }
418 if (success) 424
419 ret = IPHONE_E_SUCCESS; 425 plist_free(dict);
420 return ret; 426 return ret;
421} 427}
422 428
@@ -428,7 +434,9 @@ iphone_error_t lockdownd_generic_get_value(iphone_lckd_client_t control, const c
428 */ 434 */
429iphone_error_t lockdownd_get_device_uid(iphone_lckd_client_t control, char **uid) 435iphone_error_t lockdownd_get_device_uid(iphone_lckd_client_t control, char **uid)
430{ 436{
431 return lockdownd_generic_get_value(control, "Key", "UniqueDeviceID", uid); 437 gnutls_datum_t temp = { NULL, 0 };
438 return lockdownd_generic_get_value(control, "Key", "UniqueDeviceID", &temp);
439 *uid = temp.data;
432} 440}
433 441
434/** Askes for the device's public key. Part of the lockdownd handshake. 442/** Askes for the device's public key. Part of the lockdownd handshake.
@@ -437,7 +445,7 @@ iphone_error_t lockdownd_get_device_uid(iphone_lckd_client_t control, char **uid
437 * 445 *
438 * @return 1 on success and 0 on failure. 446 * @return 1 on success and 0 on failure.
439 */ 447 */
440iphone_error_t lockdownd_get_device_public_key(iphone_lckd_client_t control, char **public_key) 448iphone_error_t lockdownd_get_device_public_key(iphone_lckd_client_t control, gnutls_datum_t * public_key)
441{ 449{
442 return lockdownd_generic_get_value(control, "Key", "DevicePublicKey", public_key); 450 return lockdownd_generic_get_value(control, "Key", "DevicePublicKey", public_key);
443} 451}
@@ -513,107 +521,91 @@ iphone_error_t iphone_lckd_new_client(iphone_device_t device, iphone_lckd_client
513iphone_error_t lockdownd_pair_device(iphone_lckd_client_t control, char *uid, char *host_id) 521iphone_error_t lockdownd_pair_device(iphone_lckd_client_t control, char *uid, char *host_id)
514{ 522{
515 iphone_error_t ret = IPHONE_E_UNKNOWN_ERROR; 523 iphone_error_t ret = IPHONE_E_UNKNOWN_ERROR;
516 xmlDocPtr plist = new_plist(); 524 plist_t dict = NULL;
517 xmlNode *dict = NULL; 525 plist_t dict_record = NULL;
518 xmlNode *dictRecord = NULL; 526
519 char **dictionary = NULL; 527 gnutls_datum_t device_cert = { NULL, 0 };
520 int bytes = 0, i = 0; 528 gnutls_datum_t host_cert = { NULL, 0 };
521 char *XML_content = NULL; 529 gnutls_datum_t root_cert = { NULL, 0 };
522 uint32 length = 0; 530 gnutls_datum_t public_key = { NULL, 0 };
523 531
524 char *device_cert_b64 = NULL; 532 ret = lockdownd_get_device_public_key(control, &public_key);
525 char *host_cert_b64 = NULL;
526 char *root_cert_b64 = NULL;
527 char *public_key_b64 = NULL;
528
529 ret = lockdownd_get_device_public_key(control, &public_key_b64);
530 if (ret != IPHONE_E_SUCCESS) { 533 if (ret != IPHONE_E_SUCCESS) {
531 log_debug_msg("Device refused to send public key.\n"); 534 log_debug_msg("Device refused to send public key.\n");
532 return ret; 535 return ret;
533 } 536 }
534 537
535 ret = lockdownd_gen_pair_cert(public_key_b64, &device_cert_b64, &host_cert_b64, &root_cert_b64); 538 ret = lockdownd_gen_pair_cert(public_key, &device_cert, &host_cert, &root_cert);
536 if (ret != IPHONE_E_SUCCESS) { 539 if (ret != IPHONE_E_SUCCESS) {
537 free(public_key_b64); 540 free(public_key.data);
538 return ret; 541 return ret;
539 } 542 }
540 543
541 /* Setup Pair request plist */ 544 /* Setup Pair request plist */
542 dict = add_child_to_plist(plist, "dict", "\n", NULL, 0); 545 dict = plist_new_dict();
543 dictRecord = add_key_dict_node(plist, dict, "PairRecord", "\n", 1); 546 plist_add_sub_key_el(dict, "PairRecord");
544 //dictRecord = add_child_to_plist(plist, "dict", "\n", NULL, 1); 547 dict_record = plist_new_dict();
545 add_key_data_dict_element(plist, dictRecord, "DeviceCertificate", device_cert_b64, 2); 548 plist_add_sub_node(dict, dict_record);
546 add_key_data_dict_element(plist, dictRecord, "HostCertificate", host_cert_b64, 2); 549 plist_add_sub_key_el(dict_record, "DeviceCertificate");
547 add_key_str_dict_element(plist, dictRecord, "HostID", host_id, 2); 550 plist_add_sub_data_el(dict_record, device_cert.data, device_cert.size);
548 add_key_data_dict_element(plist, dictRecord, "RootCertificate", root_cert_b64, 2); 551 plist_add_sub_key_el(dict_record, "HostCertificate");
549 add_key_str_dict_element(plist, dict, "Request", "Pair", 1); 552 plist_add_sub_data_el(dict_record, host_cert.data, host_cert.size);
550 553 plist_add_sub_key_el(dict_record, "HostID");
551 xmlDocDumpMemory(plist, (xmlChar **) & XML_content, &length); 554 plist_add_sub_string_el(dict_record, host_id);
552 555 plist_add_sub_key_el(dict_record, "RootCertificate");
553 printf("XML Pairing request : %s\n", XML_content); 556 plist_add_sub_data_el(dict_record, root_cert.data, root_cert.size);
557 plist_add_sub_key_el(dict_record, "Request");
558 plist_add_sub_string_el(dict_record, "Pair");
554 559
555 /* send to iPhone */ 560 /* send to iPhone */
556 ret = iphone_lckd_send(control, XML_content, length, &bytes); 561 ret = iphone_lckd_send(control, dict);
557 562 plist_free(dict);
558 xmlFree(XML_content); 563 dict = NULL;
559 xmlFreeDoc(plist);
560 plist = NULL;
561 564
562 if (ret != IPHONE_E_SUCCESS) 565 if (ret != IPHONE_E_SUCCESS)
563 return ret; 566 return ret;
564 567
565 /* Now get iPhone's answer */ 568 /* Now get iPhone's answer */
566 ret = iphone_lckd_recv(control, &XML_content, &bytes); 569 ret = iphone_lckd_recv(control, &dict);
567 570
568 if (ret != IPHONE_E_SUCCESS) 571 if (ret != IPHONE_E_SUCCESS)
569 return ret; 572 return ret;
570 573
571 log_debug_msg("lockdown_pair_device: iPhone's response to our pair request:\n"); 574 plist_t query_node = plist_find_node_by_string(dict, "Pair");
572 log_debug_msg(XML_content); 575 plist_t result_key_node = plist_get_next_sibling(query_node);
573 log_debug_msg("\n\n"); 576 plist_t result_value_node = plist_get_next_sibling(result_key_node);
574 577
575 plist = xmlReadMemory(XML_content, bytes, NULL, NULL, 0); 578 plist_type result_key_type = plist_get_node_type(result_key_node);
576 if (!plist) { 579 plist_type result_value_type = plist_get_node_type(result_value_node);
577 free(public_key_b64); 580
578 return IPHONE_E_PLIST_ERROR; 581 if (result_key_type == PLIST_KEY && result_value_type == PLIST_STRING) {
579 } 582
580 dict = xmlDocGetRootElement(plist); 583 char *result_key = NULL;
581 for (dict = dict->children; dict; dict = dict->next) { 584 char *result_value = NULL;
582 if (!xmlStrcmp(dict->name, "dict"))
583 break;
584 }
585 if (!dict) {
586 free(public_key_b64);
587 return IPHONE_E_DICT_ERROR;
588 }
589 585
590 /* Parse xml to check success and to find public key */ 586 plist_get_key_val(result_key_node, &result_key);
591 dictionary = read_dict_element_strings(dict); 587 plist_get_string_val(result_value_node, &result_value);
592 xmlFreeDoc(plist);
593 free(XML_content);
594 588
595 int success = 0; 589 if (!strcmp(result_key, "Result") && !strcmp(result_value, "Success")) {
596 for (i = 0; dictionary[i]; i += 2) { 590 ret = IPHONE_E_SUCCESS;
597 if (!strcmp(dictionary[i], "Result") && !strcmp(dictionary[i + 1], "Success")) {
598 success = 1;
599 } 591 }
600 }
601 592
602 if (dictionary) { 593 free(result_key);
603 free_dictionary(dictionary); 594 free(result_value);
604 dictionary = NULL;
605 } 595 }
596 plist_free(dict);
597 dict = NULL;
606 598
607 /* store public key in config if pairing succeeded */ 599 /* store public key in config if pairing succeeded */
608 if (success) { 600 if (ret == IPHONE_E_SUCCESS) {
609 log_debug_msg("lockdownd_pair_device: pair success\n"); 601 log_dbg_msg(DBGMASK_LOCKDOWND, "lockdownd_pair_device: pair success\n");
610 store_device_public_key(uid, public_key_b64); 602 store_device_public_key(uid, public_key);
611 ret = IPHONE_E_SUCCESS; 603 ret = IPHONE_E_SUCCESS;
612 } else { 604 } else {
613 log_debug_msg("lockdownd_pair_device: pair failure\n"); 605 log_dbg_msg(DBGMASK_LOCKDOWND, "lockdownd_pair_device: pair failure\n");
614 ret = IPHONE_E_PAIRING_FAILED; 606 ret = IPHONE_E_PAIRING_FAILED;
615 } 607 }
616 free(public_key_b64); 608 free(public_key.data);
617 return ret; 609 return ret;
618} 610}
619 611
@@ -626,55 +618,51 @@ iphone_error_t lockdownd_pair_device(iphone_lckd_client_t control, char *uid, ch
626void lockdownd_close(iphone_lckd_client_t control) 618void lockdownd_close(iphone_lckd_client_t control)
627{ 619{
628 if (!control) 620 if (!control)
629 return; // IPHONE_E_INVALID_ARG; 621 return; //IPHONE_E_INVALID_ARG;
630 xmlDocPtr plist = new_plist(); 622
631 xmlNode *dict, *key;
632 char **dictionary;
633 int bytes = 0, i = 0;
634 iphone_error_t ret = IPHONE_E_UNKNOWN_ERROR; 623 iphone_error_t ret = IPHONE_E_UNKNOWN_ERROR;
635 624
636 log_debug_msg("lockdownd_close() called\n"); 625 plist_t dict = plist_new_dict();
637 dict = add_child_to_plist(plist, "dict", "\n", NULL, 0); 626 plist_add_sub_key_el(dict, "Request");
638 key = add_key_str_dict_element(plist, dict, "Request", "Goodbye", 1); 627 plist_add_sub_string_el(dict, "Goodbye");
639 char *XML_content;
640 uint32 length;
641 628
642 xmlDocDumpMemory(plist, (xmlChar **) & XML_content, &length); 629 log_dbg_msg(DBGMASK_LOCKDOWND, "lockdownd_close() called\n");
643 ret = iphone_lckd_send(control, XML_content, length, &bytes);
644 630
645 xmlFree(XML_content); 631 ret = iphone_lckd_send(control, dict);
646 xmlFreeDoc(plist); 632 plist_free(dict);
647 plist = NULL; 633 dict = NULL;
648 ret = iphone_lckd_recv(control, &XML_content, &bytes); 634
635 ret = iphone_lckd_recv(control, &dict);
649 636
650 plist = xmlReadMemory(XML_content, bytes, NULL, NULL, 0);
651 if (!plist) {
652 log_debug_msg("lockdownd_close(): IPHONE_E_PLIST_ERROR\n");
653 return; //IPHONE_E_PLIST_ERROR;
654 }
655 dict = xmlDocGetRootElement(plist);
656 for (dict = dict->children; dict; dict = dict->next) {
657 if (!xmlStrcmp(dict->name, "dict"))
658 break;
659 }
660 if (!dict) { 637 if (!dict) {
661 log_debug_msg("lockdownd_close(): IPHONE_E_DICT_ERROR\n"); 638 log_dbg_msg(DBGMASK_LOCKDOWND, "lockdownd_close(): IPHONE_E_PLIST_ERROR\n");
662 return; //IPHONE_E_DICT_ERROR; 639 return; // IPHONE_E_PLIST_ERROR;
663 } 640 }
664 dictionary = read_dict_element_strings(dict);
665 xmlFreeDoc(plist);
666 free(XML_content);
667 641
668 for (i = 0; dictionary[i]; i += 2) { 642 plist_t query_node = plist_find_node_by_string(dict, "Goodbye");
669 if (!strcmp(dictionary[i], "Result") && !strcmp(dictionary[i + 1], "Success")) { 643 plist_t result_node = plist_get_next_sibling(query_node);
670 log_debug_msg("lockdownd_close(): success\n"); 644 plist_t value_node = plist_get_next_sibling(result_node);
645
646 plist_type result_type = plist_get_node_type(result_node);
647 plist_type value_type = plist_get_node_type(value_node);
648
649 if (result_type == PLIST_KEY && value_type == PLIST_STRING) {
650 char *result_value = NULL;
651 char *value_value = NULL;
652
653 plist_get_key_val(result_node, &result_value);
654 plist_get_string_val(value_node, &value_value);
655
656 if (!strcmp(result_value, "Result") && !strcmp(value_value, "Success")) {
657 log_dbg_msg(DBGMASK_LOCKDOWND, "lockdownd_close(): success\n");
671 ret = IPHONE_E_SUCCESS; 658 ret = IPHONE_E_SUCCESS;
672 break;
673 } 659 }
660 free(result_value);
661 free(value_value);
674 } 662 }
675 663 plist_free(dict);
676 free_dictionary(dictionary); 664 dict = NULL;
677 return; //ret; 665 return; // ret;
678} 666}
679 667
680/** Generates the device certificate from the public key as well as the host 668/** Generates the device certificate from the public key as well as the host
@@ -682,25 +670,19 @@ void lockdownd_close(iphone_lckd_client_t control)
682 * 670 *
683 * @return IPHONE_E_SUCCESS on success. 671 * @return IPHONE_E_SUCCESS on success.
684 */ 672 */
685iphone_error_t lockdownd_gen_pair_cert(char *public_key_b64, char **device_cert_b64, char **host_cert_b64, 673iphone_error_t lockdownd_gen_pair_cert(gnutls_datum_t public_key, gnutls_datum_t * odevice_cert,
686 char **root_cert_b64) 674 gnutls_datum_t * ohost_cert, gnutls_datum_t * oroot_cert)
687{ 675{
688 if (!public_key_b64 || !device_cert_b64 || !host_cert_b64 || !root_cert_b64) 676 if (!public_key.data || !odevice_cert || !ohost_cert || !oroot_cert)
689 return IPHONE_E_INVALID_ARG; 677 return IPHONE_E_INVALID_ARG;
690 iphone_error_t ret = IPHONE_E_UNKNOWN_ERROR; 678 iphone_error_t ret = IPHONE_E_UNKNOWN_ERROR;
691 679
692 gnutls_datum_t modulus = { NULL, 0 }; 680 gnutls_datum_t modulus = { NULL, 0 };
693 gnutls_datum_t exponent = { NULL, 0 }; 681 gnutls_datum_t exponent = { NULL, 0 };
694 682
695 /* first decode base64 public_key */
696 gnutls_datum_t pem_pub_key;
697 gsize decoded_size;
698 pem_pub_key.data = g_base64_decode(public_key_b64, &decoded_size);
699 pem_pub_key.size = decoded_size;
700
701 /* now decode the PEM encoded key */ 683 /* now decode the PEM encoded key */
702 gnutls_datum_t der_pub_key; 684 gnutls_datum_t der_pub_key;
703 if (GNUTLS_E_SUCCESS == gnutls_pem_base64_decode_alloc("RSA PUBLIC KEY", &pem_pub_key, &der_pub_key)) { 685 if (GNUTLS_E_SUCCESS == gnutls_pem_base64_decode_alloc("RSA PUBLIC KEY", &public_key, &der_pub_key)) {
704 686
705 /* initalize asn.1 parser */ 687 /* initalize asn.1 parser */
706 ASN1_TYPE pkcs1 = ASN1_TYPE_EMPTY; 688 ASN1_TYPE pkcs1 = ASN1_TYPE_EMPTY;
@@ -784,10 +766,18 @@ iphone_error_t lockdownd_gen_pair_cert(char *public_key_b64, char **device_cert_
784 dev_pem.data = gnutls_malloc(dev_pem.size); 766 dev_pem.data = gnutls_malloc(dev_pem.size);
785 gnutls_x509_crt_export(dev_cert, GNUTLS_X509_FMT_PEM, dev_pem.data, &dev_pem.size); 767 gnutls_x509_crt_export(dev_cert, GNUTLS_X509_FMT_PEM, dev_pem.data, &dev_pem.size);
786 768
787 /* now encode certificates for output */ 769 /* copy buffer for output */
788 *device_cert_b64 = g_base64_encode(dev_pem.data, dev_pem.size); 770 odevice_cert->data = malloc(dev_pem.size);
789 *host_cert_b64 = g_base64_encode(pem_host_cert.data, pem_host_cert.size); 771 memcpy(odevice_cert->data, dev_pem.data, dev_pem.size);
790 *root_cert_b64 = g_base64_encode(pem_root_cert.data, pem_root_cert.size); 772 odevice_cert->size = dev_pem.size;
773
774 ohost_cert->data = malloc(pem_host_cert.size);
775 memcpy(ohost_cert->data, pem_host_cert.data, pem_host_cert.size);
776 ohost_cert->size = pem_host_cert.size;
777
778 oroot_cert->data = malloc(pem_root_cert.size);
779 memcpy(oroot_cert->data, pem_root_cert.data, pem_root_cert.size);
780 oroot_cert->size = pem_root_cert.size;
791 } 781 }
792 gnutls_free(pem_root_priv.data); 782 gnutls_free(pem_root_priv.data);
793 gnutls_free(pem_root_cert.data); 783 gnutls_free(pem_root_cert.data);
@@ -799,7 +789,6 @@ iphone_error_t lockdownd_gen_pair_cert(char *public_key_b64, char **device_cert_
799 gnutls_free(exponent.data); 789 gnutls_free(exponent.data);
800 790
801 gnutls_free(der_pub_key.data); 791 gnutls_free(der_pub_key.data);
802 g_free(pem_pub_key.data);
803 792
804 return ret; 793 return ret;
805} 794}
@@ -813,129 +802,127 @@ iphone_error_t lockdownd_gen_pair_cert(char *public_key_b64, char **device_cert_
813 */ 802 */
814iphone_error_t lockdownd_start_SSL_session(iphone_lckd_client_t control, const char *HostID) 803iphone_error_t lockdownd_start_SSL_session(iphone_lckd_client_t control, const char *HostID)
815{ 804{
816 xmlDocPtr plist = new_plist(); 805 plist_t dict = NULL;
817 xmlNode *dict = add_child_to_plist(plist, "dict", "\n", NULL, 0); 806 uint32_t return_me = 0;
818 xmlNode *key;
819 char *what2send = NULL, **dictionary = NULL;
820 uint32 len = 0, bytes = 0, return_me = 0, i = 0;
821 iphone_error_t ret = IPHONE_E_UNKNOWN_ERROR;
822 // end variables
823 807
808 iphone_error_t ret = IPHONE_E_UNKNOWN_ERROR;
824 control->session_id[0] = '\0'; 809 control->session_id[0] = '\0';
825 810
826 key = add_key_str_dict_element(plist, dict, "HostID", HostID, 1); 811 /* Setup DevicePublicKey request plist */
827 if (!key) { 812 dict = plist_new_dict();
828 log_debug_msg("Couldn't add a key.\n"); 813 plist_add_sub_key_el(dict, "HostID");
829 xmlFreeDoc(plist); 814 plist_add_sub_string_el(dict, HostID);
830 return IPHONE_E_DICT_ERROR; 815 plist_add_sub_key_el(dict, "Request");
831 } 816 plist_add_sub_string_el(dict, "StartSession");
832 key = add_key_str_dict_element(plist, dict, "Request", "StartSession", 1);
833 if (!key) {
834 log_debug_msg("Couldn't add a key.\n");
835 xmlFreeDoc(plist);
836 return IPHONE_E_DICT_ERROR;
837 }
838
839 xmlDocDumpMemory(plist, (xmlChar **) & what2send, &len);
840 ret = iphone_lckd_send(control, what2send, len, &bytes);
841 817
842 xmlFree(what2send); 818 ret = iphone_lckd_send(control, dict);
843 xmlFreeDoc(plist); 819 plist_free(dict);
820 dict = NULL;
844 821
845 if (ret != IPHONE_E_SUCCESS) 822 if (ret != IPHONE_E_SUCCESS)
846 return ret; 823 return ret;
847 824
848 if (bytes > 0) { 825 ret = iphone_lckd_recv(control, &dict);
849 ret = iphone_lckd_recv(control, &what2send, &len); 826
850 plist = xmlReadMemory(what2send, len, NULL, NULL, 0); 827 if (!dict)
851 dict = xmlDocGetRootElement(plist); 828 return IPHONE_E_PLIST_ERROR;
852 if (!dict) 829
853 return IPHONE_E_DICT_ERROR; 830 plist_t query_node = plist_find_node_by_string(dict, "StartSession");
854 for (dict = dict->children; dict; dict = dict->next) { 831 plist_t result_key_node = plist_get_next_sibling(query_node);
855 if (!xmlStrcmp(dict->name, "dict")) 832 plist_t result_value_node = plist_get_next_sibling(result_key_node);
856 break; 833
857 } 834 plist_type result_key_type = plist_get_node_type(result_key_node);
858 dictionary = read_dict_element_strings(dict); 835 plist_type result_value_type = plist_get_node_type(result_value_node);
859 xmlFreeDoc(plist); 836
860 free(what2send); 837 if (result_key_type == PLIST_KEY && result_value_type == PLIST_STRING) {
838 char *result_key = NULL;
839 char *result_value = NULL;
840
841 plist_get_key_val(result_key_node, &result_key);
842 plist_get_string_val(result_value_node, &result_value);
843
861 ret = IPHONE_E_SSL_ERROR; 844 ret = IPHONE_E_SSL_ERROR;
862 for (i = 0; dictionary[i]; i += 2) { 845 if (!strcmp(result_key, "Result") && !strcmp(result_value, "Success")) {
863 if (!strcmp(dictionary[i], "Result") && !strcmp(dictionary[i + 1], "Success")) { 846 // Set up GnuTLS...
864 // Set up GnuTLS... 847 //gnutls_anon_client_credentials_t anoncred;
865 //gnutls_anon_client_credentials_t anoncred; 848 gnutls_certificate_credentials_t xcred;
866 gnutls_certificate_credentials_t xcred; 849
867 850 log_dbg_msg(DBGMASK_LOCKDOWND, "We started the session OK, now trying GnuTLS\n");
868 log_debug_msg("We started the session OK, now trying GnuTLS\n"); 851 errno = 0;
869 errno = 0; 852 gnutls_global_init();
870 gnutls_global_init(); 853 //gnutls_anon_allocate_client_credentials(&anoncred);
871 //gnutls_anon_allocate_client_credentials(&anoncred); 854 gnutls_certificate_allocate_credentials(&xcred);
872 gnutls_certificate_allocate_credentials(&xcred); 855 gnutls_certificate_set_x509_trust_file(xcred, "hostcert.pem", GNUTLS_X509_FMT_PEM);
873 gnutls_certificate_set_x509_trust_file(xcred, "hostcert.pem", GNUTLS_X509_FMT_PEM); 856 gnutls_init(control->ssl_session, GNUTLS_CLIENT);
874 gnutls_init(control->ssl_session, GNUTLS_CLIENT); 857 {
875 { 858 int protocol_priority[16] = { GNUTLS_SSL3, 0 };
876 int protocol_priority[16] = { GNUTLS_SSL3, 0 }; 859 int kx_priority[16] = { GNUTLS_KX_ANON_DH, GNUTLS_KX_RSA, 0 };
877 int kx_priority[16] = { GNUTLS_KX_ANON_DH, GNUTLS_KX_RSA, 0 }; 860 int cipher_priority[16] = { GNUTLS_CIPHER_AES_128_CBC, GNUTLS_CIPHER_AES_256_CBC, 0 };
878 int cipher_priority[16] = { GNUTLS_CIPHER_AES_128_CBC, GNUTLS_CIPHER_AES_256_CBC, 0 }; 861 int mac_priority[16] = { GNUTLS_MAC_SHA1, GNUTLS_MAC_MD5, 0 };
879 int mac_priority[16] = { GNUTLS_MAC_SHA1, GNUTLS_MAC_MD5, 0 }; 862 int comp_priority[16] = { GNUTLS_COMP_NULL, 0 };
880 int comp_priority[16] = { GNUTLS_COMP_NULL, 0 }; 863
881 864 gnutls_cipher_set_priority(*control->ssl_session, cipher_priority);
882 gnutls_cipher_set_priority(*control->ssl_session, cipher_priority); 865 gnutls_compression_set_priority(*control->ssl_session, comp_priority);
883 gnutls_compression_set_priority(*control->ssl_session, comp_priority); 866 gnutls_kx_set_priority(*control->ssl_session, kx_priority);
884 gnutls_kx_set_priority(*control->ssl_session, kx_priority); 867 gnutls_protocol_set_priority(*control->ssl_session, protocol_priority);
885 gnutls_protocol_set_priority(*control->ssl_session, protocol_priority); 868 gnutls_mac_set_priority(*control->ssl_session, mac_priority);
886 gnutls_mac_set_priority(*control->ssl_session, mac_priority); 869
887 870 }
888 } 871 gnutls_credentials_set(*control->ssl_session, GNUTLS_CRD_CERTIFICATE, xcred); // this part is killing me.
889 gnutls_credentials_set(*control->ssl_session, GNUTLS_CRD_CERTIFICATE, xcred); // this part is killing me. 872
890 873 log_dbg_msg(DBGMASK_LOCKDOWND, "GnuTLS step 1...\n");
891 log_debug_msg("GnuTLS step 1...\n"); 874 gnutls_transport_set_ptr(*control->ssl_session, (gnutls_transport_ptr_t) control);
892 gnutls_transport_set_ptr(*control->ssl_session, (gnutls_transport_ptr_t) control); 875 log_dbg_msg(DBGMASK_LOCKDOWND, "GnuTLS step 2...\n");
893 log_debug_msg("GnuTLS step 2...\n"); 876 gnutls_transport_set_push_function(*control->ssl_session, (gnutls_push_func) & lockdownd_secuwrite);
894 gnutls_transport_set_push_function(*control->ssl_session, (gnutls_push_func) & lockdownd_secuwrite); 877 log_dbg_msg(DBGMASK_LOCKDOWND, "GnuTLS step 3...\n");
895 log_debug_msg("GnuTLS step 3...\n"); 878 gnutls_transport_set_pull_function(*control->ssl_session, (gnutls_pull_func) & lockdownd_securead);
896 gnutls_transport_set_pull_function(*control->ssl_session, (gnutls_pull_func) & lockdownd_securead); 879 log_dbg_msg(DBGMASK_LOCKDOWND, "GnuTLS step 4 -- now handshaking...\n");
897 log_debug_msg("GnuTLS step 4 -- now handshaking...\n"); 880
898 881 if (errno)
899 if (errno) 882 log_dbg_msg(DBGMASK_LOCKDOWND, "WARN: errno says %s before handshake!\n", strerror(errno));
900 log_debug_msg("WARN: errno says %s before handshake!\n", strerror(errno)); 883 return_me = gnutls_handshake(*control->ssl_session);
901 return_me = gnutls_handshake(*control->ssl_session); 884 log_dbg_msg(DBGMASK_LOCKDOWND, "GnuTLS handshake done...\n");
902 log_debug_msg("GnuTLS handshake done...\n"); 885
903 886 if (return_me != GNUTLS_E_SUCCESS) {
904 if (return_me != GNUTLS_E_SUCCESS) { 887 log_dbg_msg(DBGMASK_LOCKDOWND, "GnuTLS reported something wrong.\n");
905 log_debug_msg("GnuTLS reported something wrong.\n"); 888 gnutls_perror(return_me);
906 gnutls_perror(return_me); 889 log_dbg_msg(DBGMASK_LOCKDOWND, "oh.. errno says %s\n", strerror(errno));
907 log_debug_msg("oh.. errno says %s\n", strerror(errno)); 890 return IPHONE_E_SSL_ERROR;
908 return IPHONE_E_SSL_ERROR; 891 } else {
909 } else { 892 control->in_SSL = 1;
910 control->in_SSL = 1; 893 ret = IPHONE_E_SUCCESS;
911 ret = IPHONE_E_SUCCESS;
912 }
913 } else if (!strcmp(dictionary[i], "SessionID")) {
914 // we need to store the session ID for StopSession
915 strcpy(control->session_id, dictionary[i + 1]);
916 log_debug_msg("SessionID: %s\n", control->session_id);
917 free_dictionary(dictionary);
918 return ret;
919 } 894 }
920 } 895 }
921 if (ret == IPHONE_E_SUCCESS) { 896 }
922 log_debug_msg("Failed to get SessionID!\n"); 897 //store session id
923 return ret; 898 plist_t session_node = plist_find_node_by_key(dict, "SessionID");
924 } 899 if (session_node) {
900
901 plist_t session_node_val = plist_get_next_sibling(session_node);
902 plist_type session_node_val_type = plist_get_node_type(session_node_val);
925 903
926 log_debug_msg("Apparently failed negotiating with lockdownd.\n"); 904 if (session_node_val_type == PLIST_STRING) {
927 log_debug_msg("Responding dictionary: \n"); 905
928 for (i = 0; dictionary[i]; i += 2) { 906 char *session_id = NULL;
929 log_debug_msg("\t%s: %s\n", dictionary[i], dictionary[i + 1]); 907 plist_get_string_val(session_node_val, &session_id);
908
909 if (session_node_val_type == PLIST_STRING && session_id) {
910 // we need to store the session ID for StopSession
911 strcpy(control->session_id, session_id);
912 log_dbg_msg(DBGMASK_LOCKDOWND, "SessionID: %s\n", control->session_id);
913 }
914 free(session_id);
930 } 915 }
916 } else
917 log_dbg_msg(DBGMASK_LOCKDOWND, "Failed to get SessionID!\n");
918 plist_free(dict);
919 dict = NULL;
931 920
921 if (ret == IPHONE_E_SUCCESS)
922 return ret;
932 923
933 free_dictionary(dictionary); 924 log_dbg_msg(DBGMASK_LOCKDOWND, "Apparently failed negotiating with lockdownd.\n");
934 return IPHONE_E_SSL_ERROR; 925 return IPHONE_E_SSL_ERROR;
935 } else {
936 log_debug_msg("Didn't get enough bytes.\n");
937 return IPHONE_E_NOT_ENOUGH_DATA;
938 }
939} 926}
940 927
941/** gnutls callback for writing data to the iPhone. 928/** gnutls callback for writing data to the iPhone.
@@ -951,10 +938,10 @@ ssize_t lockdownd_secuwrite(gnutls_transport_ptr_t transport, char *buffer, size
951 int bytes = 0; 938 int bytes = 0;
952 iphone_lckd_client_t control; 939 iphone_lckd_client_t control;
953 control = (iphone_lckd_client_t) transport; 940 control = (iphone_lckd_client_t) transport;
954 log_debug_msg("lockdownd_secuwrite() called\n"); 941 log_dbg_msg(DBGMASK_LOCKDOWND, "lockdownd_secuwrite() called\n");
955 log_debug_msg("pre-send\nlength = %zi\n", length); 942 log_dbg_msg(DBGMASK_LOCKDOWND, "pre-send\nlength = %zi\n", length);
956 iphone_mux_send(control->connection, buffer, length, &bytes); 943 iphone_mux_send(control->connection, buffer, length, &bytes);
957 log_debug_msg("post-send\nsent %i bytes\n", bytes); 944 log_dbg_msg(DBGMASK_LOCKDOWND, "post-send\nsent %i bytes\n", bytes);
958 945
959 dump_debug_buffer("sslpacketwrite.out", buffer, length); 946 dump_debug_buffer("sslpacketwrite.out", buffer, length);
960 return bytes; 947 return bytes;
@@ -1038,86 +1025,72 @@ iphone_error_t iphone_lckd_start_service(iphone_lckd_client_t client, const char
1038 if (!client->in_SSL && !lockdownd_start_SSL_session(client, host_id)) 1025 if (!client->in_SSL && !lockdownd_start_SSL_session(client, host_id))
1039 return IPHONE_E_SSL_ERROR; 1026 return IPHONE_E_SSL_ERROR;
1040 1027
1041 char *XML_query, **dictionary; 1028 plist_t dict = NULL;
1042 uint32 length, i = 0, port_loc = 0, bytes = 0; 1029 uint32_t port_loc = 0;
1043 uint8 result = 0;
1044 iphone_error_t ret = IPHONE_E_UNKNOWN_ERROR; 1030 iphone_error_t ret = IPHONE_E_UNKNOWN_ERROR;
1045 1031
1046 free(host_id); 1032 free(host_id);
1047 host_id = NULL; 1033 host_id = NULL;
1048 1034
1049 xmlDocPtr plist = new_plist(); 1035 dict = plist_new_dict();
1050 xmlNode *dict = add_child_to_plist(plist, "dict", "\n", NULL, 0); 1036 plist_add_sub_key_el(dict, "Request");
1051 xmlNode *key; 1037 plist_add_sub_string_el(dict, "StartService");
1052 key = add_key_str_dict_element(plist, dict, "Request", "StartService", 1); 1038 plist_add_sub_key_el(dict, "Service");
1053 if (!key) { 1039 plist_add_sub_string_el(dict, service);
1054 xmlFreeDoc(plist);
1055 return IPHONE_E_UNKNOWN_ERROR;
1056 }
1057 key = add_key_str_dict_element(plist, dict, "Service", service, 1);
1058 if (!key) {
1059 xmlFreeDoc(plist);
1060 return IPHONE_E_UNKNOWN_ERROR;
1061 }
1062 1040
1063 xmlDocDumpMemory(plist, (xmlChar **) & XML_query, &length); 1041 /* send to iPhone */
1042 ret = iphone_lckd_send(client, dict);
1043 plist_free(dict);
1044 dict = NULL;
1064 1045
1065 ret = iphone_lckd_send(client, XML_query, length, &bytes);
1066 free(XML_query);
1067 if (IPHONE_E_SUCCESS != ret) 1046 if (IPHONE_E_SUCCESS != ret)
1068 return ret; 1047 return ret;
1069 1048
1070 ret = iphone_lckd_recv(client, &XML_query, &bytes); 1049 ret = iphone_lckd_recv(client, &dict);
1071 xmlFreeDoc(plist); 1050
1072 if (IPHONE_E_SUCCESS != ret) 1051 if (IPHONE_E_SUCCESS != ret)
1073 return ret; 1052 return ret;
1074 1053
1075 if (bytes <= 0) 1054 if (!dict)
1076 return IPHONE_E_NOT_ENOUGH_DATA; 1055 return IPHONE_E_PLIST_ERROR;
1077 else {
1078 plist = xmlReadMemory(XML_query, bytes, NULL, NULL, 0);
1079 if (!plist)
1080 return IPHONE_E_UNKNOWN_ERROR;
1081 dict = xmlDocGetRootElement(plist);
1082 if (!dict)
1083 return IPHONE_E_UNKNOWN_ERROR;
1084 for (dict = dict->children; dict; dict = dict->next) {
1085 if (!xmlStrcmp(dict->name, "dict"))
1086 break;
1087 }
1088 1056
1089 if (!dict) 1057 plist_t query_node = plist_find_node_by_string(dict, "StartService");
1090 return IPHONE_E_UNKNOWN_ERROR; 1058 plist_t result_key_node = plist_get_next_sibling(query_node);
1091 dictionary = read_dict_element_strings(dict); 1059 plist_t result_value_node = plist_get_next_sibling(result_key_node);
1092 1060
1093 for (i = 0; dictionary[i]; i += 2) { 1061 plist_t port_key_node = plist_find_node_by_key(dict, "Port");
1094 log_debug_msg("lockdownd_start_service() dictionary %s: %s\n", dictionary[i], dictionary[i + 1]); 1062 plist_t port_value_node = plist_get_next_sibling(port_key_node);
1095 1063
1096 if (!xmlStrcmp(dictionary[i], "Port")) { 1064 plist_type result_key_type = plist_get_node_type(result_key_node);
1097 port_loc = atoi(dictionary[i + 1]); 1065 plist_type result_value_type = plist_get_node_type(result_value_node);
1098 log_debug_msg("lockdownd_start_service() atoi'd port: %i\n", port); 1066 plist_type port_key_type = plist_get_node_type(port_key_node);
1099 } 1067 plist_type port_value_type = plist_get_node_type(port_value_node);
1100 1068
1101 if (!xmlStrcmp(dictionary[i], "Result")) { 1069 if (result_key_type == PLIST_KEY && result_value_type == PLIST_STRING && port_key_type == PLIST_KEY
1102 if (!xmlStrcmp(dictionary[i + 1], "Success")) { 1070 && port_value_type == PLIST_UINT) {
1103 result = 1; 1071
1104 } 1072 char *result_key = NULL;
1105 } 1073 char *result_value = NULL;
1106 } 1074 char *port_key = NULL;
1075 uint64_t port_value = 0;
1107 1076
1108 log_debug_msg("lockdownd_start_service(): DATA RECEIVED:\n\n"); 1077 plist_get_key_val(result_key_node, &result_key);
1109 log_debug_msg(XML_query); 1078 plist_get_string_val(result_value_node, &result_value);
1110 log_debug_msg("end data received by lockdownd_start_service()\n"); 1079 plist_get_key_val(port_key_node, &port_key);
1080 plist_get_uint_val(port_value_node, &port_value);
1111 1081
1112 free(XML_query); 1082 if (!strcmp(result_key, "Result") && !strcmp(result_value, "Success") && !strcmp(port_key, "Port")) {
1113 xmlFreeDoc(plist); 1083 port_loc = port_value;
1114 free_dictionary(dictionary); 1084 ret = IPHONE_E_SUCCESS;
1115 if (port && result) { 1085 }
1086
1087 if (port && ret == IPHONE_E_SUCCESS)
1116 *port = port_loc; 1088 *port = port_loc;
1117 return IPHONE_E_SUCCESS; 1089 else
1118 } else 1090 ret = IPHONE_E_UNKNOWN_ERROR;
1119 return IPHONE_E_UNKNOWN_ERROR;
1120 } 1091 }
1121 1092
1122 return IPHONE_E_UNKNOWN_ERROR; 1093 plist_free(dict);
1094 dict = NULL;
1095 return ret;
1123} 1096}
diff --git a/src/lockdown.h b/src/lockdown.h
index c30a182..cad06a3 100644
--- a/src/lockdown.h
+++ b/src/lockdown.h
@@ -23,7 +23,6 @@
23#define LOCKDOWND_H 23#define LOCKDOWND_H
24 24
25#include "usbmux.h" 25#include "usbmux.h"
26#include "plist.h"
27 26
28#include <gnutls/gnutls.h> 27#include <gnutls/gnutls.h>
29#include <string.h> 28#include <string.h>
@@ -39,17 +38,17 @@ struct iphone_lckd_client_int {
39 char session_id[40]; 38 char session_id[40];
40}; 39};
41 40
42char *lockdownd_generate_hostid(void);
43
44iphone_lckd_client_t new_lockdownd_client(iphone_device_t phone); 41iphone_lckd_client_t new_lockdownd_client(iphone_device_t phone);
45iphone_error_t lockdownd_hello(iphone_lckd_client_t control); 42iphone_error_t lockdownd_hello(iphone_lckd_client_t control);
46iphone_error_t lockdownd_generic_get_value(iphone_lckd_client_t control, const char *req_key, const char *req_string,
47 char **value);
48iphone_error_t lockdownd_get_device_public_key(iphone_lckd_client_t control, char **public_key);
49 43
50iphone_error_t lockdownd_gen_pair_cert(char *public_key_b64, char **device_cert_b64, char **host_cert_b64, 44iphone_error_t lockdownd_generic_get_value(iphone_lckd_client_t control, const char *req_key, char *req_string,
51 char **root_cert_b64); 45 gnutls_datum_t * value);
52iphone_error_t lockdownd_pair_device(iphone_lckd_client_t control, char *public_key, char *host_id); 46
47iphone_error_t lockdownd_get_device_public_key(iphone_lckd_client_t control, gnutls_datum_t * public_key);
48
49iphone_error_t lockdownd_gen_pair_cert(gnutls_datum_t public_key, gnutls_datum_t * device_cert,
50 gnutls_datum_t * host_cert, gnutls_datum_t * root_cert);
51iphone_error_t lockdownd_pair_device(iphone_lckd_client_t control, char *uid, char *host_id);
53void lockdownd_close(iphone_lckd_client_t control); 52void lockdownd_close(iphone_lckd_client_t control);
54 53
55// SSL functions 54// SSL functions
diff --git a/src/plist.c b/src/plist.c
deleted file mode 100644
index b9d9e6a..0000000
--- a/src/plist.c
+++ /dev/null
@@ -1,245 +0,0 @@
1/*
2 * plist.c
3 * Builds plist XML structures.
4 *
5 * Copyright (c) 2008 Zach C. All Rights Reserved.
6 *
7 * This library is free software; you can redistribute it and/or
8 * modify it under the terms of the GNU Lesser General Public
9 * License as published by the Free Software Foundation; either
10 * version 2.1 of the License, or (at your option) any later version.
11 *
12 * This library is distributed in the hope that it will be useful,
13 * but WITHOUT ANY WARRANTY; without even the implied warranty of
14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
15 * Lesser General Public License for more details.
16 *
17 * You should have received a copy of the GNU Lesser General Public
18 * License along with this library; if not, write to the Free Software
19 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
20 */
21
22#include <libxml/parser.h>
23#include <libxml/tree.h>
24#include <string.h>
25#include <assert.h>
26#include "plist.h"
27
28const char *plist_base = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n\
29<!DOCTYPE plist PUBLIC \"-//Apple Computer//DTD PLIST 1.0//EN\" \"http://www.apple.com/DTDs/PropertyList-1.0.dtd\">\n\
30<plist version=\"1.0\">\n\
31</plist>\0";
32
33/** Formats a block of text to be a given indentation and width.
34 *
35 * The total width of the return string will be depth + cols.
36 *
37 * @param buf The string to format.
38 * @param cols The number of text columns for returned block of text.
39 * @param depth The number of tabs to indent the returned block of text.
40 *
41 * @return The formatted string.
42 */
43static char *format_string(const char *buf, int cols, int depth)
44{
45 int colw = depth + cols + 1;
46 int len = strlen(buf);
47 int nlines = len / cols + 1;
48 char *new_buf = (char *) malloc(nlines * colw + depth + 1);
49 int i = 0;
50 int j = 0;
51
52 assert(cols >= 0);
53 assert(depth >= 0);
54
55 // Inserts new lines and tabs at appropriate locations
56 for (i = 0; i < nlines; i++) {
57 new_buf[i * colw] = '\n';
58 for (j = 0; j < depth; j++)
59 new_buf[i * colw + 1 + j] = '\t';
60 memcpy(new_buf + i * colw + 1 + depth, buf + i * cols, cols);
61 }
62 new_buf[len + (1 + depth) * nlines] = '\n';
63
64 // Inserts final row of indentation and termination character
65 for (j = 0; j < depth; j++)
66 new_buf[len + (1 + depth) * nlines + 1 + j] = '\t';
67 new_buf[len + (1 + depth) * nlines + depth + 1] = '\0';
68
69 return new_buf;
70}
71
72/** Creates a new plist XML document.
73 *
74 * @return The plist XML document.
75 */
76xmlDocPtr new_plist(void)
77{
78 char *plist = strdup(plist_base);
79 xmlDocPtr plist_xml = xmlReadMemory(plist, strlen(plist), NULL, NULL, 0);
80
81 if (!plist_xml)
82 return NULL;
83
84 free(plist);
85
86 return plist_xml;
87}
88
89/** Destroys a previously created XML document.
90 *
91 * @param plist The XML document to destroy.
92 */
93void free_plist(xmlDocPtr plist)
94{
95 if (!plist)
96 return;
97
98 xmlFreeDoc(plist);
99}
100
101/** Adds a new node as a child to a given node.
102 *
103 * This is a lower level function so you probably want to use
104 * add_key_str_dict_element, add_key_dict_node or add_key_data_dict_element
105 * instead.
106 *
107 * @param plist The plist XML document to which the to_node belongs.
108 * @param name The name of the new node.
109 * @param content The string containing the text node of the new node.
110 * @param to_node The node to attach the child node to. If none is given, the
111 * root node of the given document is used.
112 * @param depth The number of tabs to indent the new node.
113 *
114 * @return The newly created node.
115 */
116xmlNode *add_child_to_plist(xmlDocPtr plist, const char *name, const char *content, xmlNode * to_node, int depth)
117{
118 int i = 0;
119 xmlNode *child;
120
121 if (!plist)
122 return NULL;
123 assert(depth >= 0);
124 if (!to_node)
125 to_node = xmlDocGetRootElement(plist);
126
127 for (i = 0; i < depth; i++) {
128 xmlNodeAddContent(to_node, "\t");
129 }
130 child = xmlNewChild(to_node, NULL, name, content);
131 xmlNodeAddContent(to_node, "\n");
132
133 return child;
134}
135
136/** Adds a string key-pair to a plist XML document.
137 *
138 * @param plist The plist XML document to add the new node to.
139 * @param dict The dictionary node within the plist XML document to add the new node to.
140 * @param key The string containing the key value.
141 * @param value The string containing the value.
142 * @param depth The number of tabs to indent the new node.
143 *
144 * @return The newly created key node.
145 */
146xmlNode *add_key_str_dict_element(xmlDocPtr plist, xmlNode * dict, const char *key, const char *value, int depth)
147{
148 xmlNode *keyPtr;
149
150 keyPtr = add_child_to_plist(plist, "key", key, dict, depth);
151 add_child_to_plist(plist, "string", value, dict, depth);
152
153 return keyPtr;
154}
155
156/** Adds a new dictionary key-pair to a plist XML document.
157 *
158 * @param plist The plist XML document to add the new node to.
159 * @param dict The dictionary node within the plist XML document to add the new node to.
160 * @param key The string containing the key value.
161 * @param value The string containing the value.
162 * @param depth The number of tabs to indent the new node.
163 *
164 * @return The newly created dict node.
165 */
166xmlNode *add_key_dict_node(xmlDocPtr plist, xmlNode * dict, const char *key, const char *value, int depth)
167{
168 xmlNode *child;
169
170 add_child_to_plist(plist, "key", key, dict, depth);
171 child = add_child_to_plist(plist, "dict", value, dict, depth);
172
173 return child;
174}
175
176/** Adds a new data dictionary key-pair to a plist XML document.
177 *
178 * @param plist The plist XML document to add the new node to.
179 * @param dict The dictionary node within the plist XML document to add the new node to.
180 * @param key The string containing the key value.
181 * @param value The string containing the value.
182 * @param depth The number of tabs to indent the new node.
183 *
184 * @return The newly created key node.
185 */
186xmlNode *add_key_data_dict_element(xmlDocPtr plist, xmlNode * dict, const char *key, const char *value, int depth)
187{
188 xmlNode *keyPtr;
189
190 keyPtr = add_child_to_plist(plist, "key", key, dict, depth);
191 add_child_to_plist(plist, "data", format_string(value, 60, depth), dict, depth);
192
193 return keyPtr;
194}
195
196/** Reads a set of keys and strings into an array from a plist XML document.
197 *
198 * @param dict The root XMLNode of a plist XML document to be read.
199 *
200 * @return An array where each even number is a key and the odd numbers are
201 * values. If the odd number is \0, that's the end of the list.
202 */
203char **read_dict_element_strings(xmlNode * dict)
204{
205 char **return_me = NULL, **old = NULL;
206 int current_length = 0;
207 int current_pos = 0;
208 xmlNode *dict_walker;
209
210 for (dict_walker = dict->children; dict_walker; dict_walker = dict_walker->next) {
211 if (!xmlStrcmp(dict_walker->name, "key")) {
212 current_length += 2;
213 old = return_me;
214 return_me = realloc(return_me, sizeof(char *) * current_length);
215 if (!return_me) {
216 free(old);
217 return NULL;
218 }
219 return_me[current_pos++] = xmlNodeGetContent(dict_walker);
220 return_me[current_pos++] = xmlNodeGetContent(dict_walker->next->next);
221 }
222 }
223
224 old = return_me;
225 return_me = realloc(return_me, sizeof(char *) * (current_length + 1));
226 return_me[current_pos] = NULL;
227
228 return return_me;
229}
230
231/** Destroys a dictionary as returned by read_dict_element_strings
232 */
233void free_dictionary(char **dictionary)
234{
235 int i = 0;
236
237 if (!dictionary)
238 return;
239
240 for (i = 0; dictionary[i]; i++) {
241 free(dictionary[i]);
242 }
243
244 free(dictionary);
245}
diff --git a/src/plist.h b/src/plist.h
deleted file mode 100644
index cd2028e..0000000
--- a/src/plist.h
+++ /dev/null
@@ -1,38 +0,0 @@
1/*
2 * plist.h
3 * contains structures and the like for plists
4 *
5 * Copyright (c) 2008 Zach C. All Rights Reserved.
6 *
7 * This library is free software; you can redistribute it and/or
8 * modify it under the terms of the GNU Lesser General Public
9 * License as published by the Free Software Foundation; either
10 * version 2.1 of the License, or (at your option) any later version.
11 *
12 * This library is distributed in the hope that it will be useful,
13 * but WITHOUT ANY WARRANTY; without even the implied warranty of
14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
15 * Lesser General Public License for more details.
16 *
17 * You should have received a copy of the GNU Lesser General Public
18 * License along with this library; if not, write to the Free Software
19 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
20 */
21
22#ifndef PLIST_H
23#define PLIST_H
24
25#include <libxml/parser.h>
26#include <libxml/tree.h>
27
28xmlNode *add_key_dict_node(xmlDocPtr plist, xmlNode * dict, const char *key, const char *value, int depth);
29xmlNode *add_key_str_dict_element(xmlDocPtr plist, xmlNode * dict, const char *key, const char *value, int depth);
30xmlNode *add_key_data_dict_element(xmlDocPtr plist, xmlNode * dict, const char *key, const char *value, int depth);
31xmlNode *add_child_to_plist(xmlDocPtr plist, const char *name, const char *content, xmlNode * to_node, int depth);
32
33void free_plist(xmlDocPtr plist);
34xmlDocPtr new_plist(void);
35
36char **read_dict_element_strings(xmlNode * dict);
37void free_dictionary(char **dictionary);
38#endif
diff --git a/src/usbmux.c b/src/usbmux.c
index d8e6b44..22ce588 100644
--- a/src/usbmux.c
+++ b/src/usbmux.c
@@ -38,7 +38,7 @@ static int clients = 0;
38 * 38 *
39 * @return A USBMux packet 39 * @return A USBMux packet
40 */ 40 */
41usbmux_tcp_header *new_mux_packet(uint16 s_port, uint16 d_port) 41usbmux_tcp_header *new_mux_packet(uint16_t s_port, uint16_t d_port)
42{ 42{
43 usbmux_tcp_header *conn = (usbmux_tcp_header *) malloc(sizeof(usbmux_tcp_header)); 43 usbmux_tcp_header *conn = (usbmux_tcp_header *) malloc(sizeof(usbmux_tcp_header));
44 conn->type = htonl(6); 44 conn->type = htonl(6);
@@ -314,6 +314,7 @@ iphone_error_t iphone_mux_recv(iphone_umux_client_t client, char *data, uint32_t
314 } else { 314 } else {
315 memcpy(data, client->recv_buffer, client->r_len); 315 memcpy(data, client->recv_buffer, client->r_len);
316 free(client->recv_buffer); // don't need to deal with anymore, but... 316 free(client->recv_buffer); // don't need to deal with anymore, but...
317 client->recv_buffer = NULL;
317 offset = client->r_len; // see #2b, above 318 offset = client->r_len; // see #2b, above
318 client->r_len = 0; 319 client->r_len = 0;
319 } 320 }
diff --git a/src/usbmux.h b/src/usbmux.h
index fd5fc78..bea83f7 100644
--- a/src/usbmux.h
+++ b/src/usbmux.h
@@ -22,6 +22,7 @@
22#include <sys/types.h> 22#include <sys/types.h>
23#include <stdlib.h> 23#include <stdlib.h>
24#include <stdint.h> 24#include <stdint.h>
25#include "libiphone/libiphone.h"
25 26
26#ifndef USBMUX_H 27#ifndef USBMUX_H
27#define USBMUX_H 28#define USBMUX_H
@@ -30,17 +31,12 @@
30#include "iphone.h" 31#include "iphone.h"
31#endif 32#endif
32 33
33typedef uint16_t uint16;
34typedef uint32_t uint32;
35typedef uint8_t uint8;
36
37
38typedef struct { 34typedef struct {
39 uint32 type, length; 35 uint32_t type, length;
40 uint16 sport, dport; 36 uint16_t sport, dport;
41 uint32 scnt, ocnt; 37 uint32_t scnt, ocnt;
42 uint8 offset, tcp_flags; 38 uint8_t offset, tcp_flags;
43 uint16 window, nullnull, length16; 39 uint16_t window, nullnull, length16;
44} usbmux_tcp_header; 40} usbmux_tcp_header;
45 41
46struct iphone_umux_client_int { 42struct iphone_umux_client_int {
@@ -50,10 +46,10 @@ struct iphone_umux_client_int {
50 int r_len; 46 int r_len;
51}; 47};
52 48
53usbmux_tcp_header *new_mux_packet(uint16 s_port, uint16 d_port); 49usbmux_tcp_header *new_mux_packet(uint16_t s_port, uint16_t d_port);
54 50
55typedef struct { 51typedef struct {
56 uint32 type, length, major, minor, allnull; 52 uint32_t type, length, major, minor, allnull;
57} usbmux_version_header; 53} usbmux_version_header;
58 54
59usbmux_version_header *version_header(void); 55usbmux_version_header *version_header(void);
diff --git a/src/userpref.c b/src/userpref.c
index 5f227b0..3e5eb06 100644
--- a/src/userpref.c
+++ b/src/userpref.c
@@ -111,10 +111,10 @@ int is_device_known(char *uid)
111 * @return 1 on success and 0 if no public key is given or if it has already 111 * @return 1 on success and 0 if no public key is given or if it has already
112 * been marked as connected previously. 112 * been marked as connected previously.
113 */ 113 */
114int store_device_public_key(char *uid, char *public_key) 114int store_device_public_key(char *uid, gnutls_datum_t public_key)
115{ 115{
116 116
117 if (NULL == public_key || is_device_known(uid)) 117 if (NULL == public_key.data || is_device_known(uid))
118 return 0; 118 return 0;
119 119
120 /* ensure config directory exists */ 120 /* ensure config directory exists */
@@ -124,15 +124,11 @@ int store_device_public_key(char *uid, char *public_key)
124 gchar *device_file = g_strconcat(uid, ".pem", NULL); 124 gchar *device_file = g_strconcat(uid, ".pem", NULL);
125 gchar *pem = g_build_path(G_DIR_SEPARATOR_S, g_get_user_config_dir(), LIBIPHONE_CONF_DIR, device_file, NULL); 125 gchar *pem = g_build_path(G_DIR_SEPARATOR_S, g_get_user_config_dir(), LIBIPHONE_CONF_DIR, device_file, NULL);
126 126
127 /* decode public key for storing */
128 gsize decoded_size;
129 gchar *data = g_base64_decode(public_key, &decoded_size);
130 /* store file */ 127 /* store file */
131 FILE *pFile = fopen(pem, "wb"); 128 FILE *pFile = fopen(pem, "wb");
132 fwrite(data, 1, decoded_size, pFile); 129 fwrite(public_key.data, 1, public_key.size, pFile);
133 fclose(pFile); 130 fclose(pFile);
134 g_free(pem); 131 g_free(pem);
135 g_free(data);
136 g_free(device_file); 132 g_free(device_file);
137 return 1; 133 return 1;
138} 134}
diff --git a/src/userpref.h b/src/userpref.h
index e7835d0..7e606eb 100644
--- a/src/userpref.h
+++ b/src/userpref.h
@@ -40,7 +40,7 @@ int is_device_known(char *uid);
40/** 40/**
41 * @return 1 if everything went well. Returns 0 otherwise. 41 * @return 1 if everything went well. Returns 0 otherwise.
42 */ 42 */
43int store_device_public_key(char *uid, char *public_key); 43int store_device_public_key(char *uid, gnutls_datum_t public_key);
44 44
45/** 45/**
46 * @return 1 if everything went well. Returns 0 otherwise. 46 * @return 1 if everything went well. Returns 0 otherwise.
diff --git a/src/utils.c b/src/utils.c
index fb98471..5b0872d 100644
--- a/src/utils.c
+++ b/src/utils.c
@@ -23,6 +23,7 @@
23#include "utils.h" 23#include "utils.h"
24 24
25int toto_debug = 0; 25int toto_debug = 0;
26uint16_t dbg_mask = 0;
26 27
27/** 28/**
28 * Sets the level of debugging. Currently the only acceptable values are 0 and 29 * Sets the level of debugging. Currently the only acceptable values are 0 and
@@ -36,6 +37,15 @@ void iphone_set_debug(int level)
36} 37}
37 38
38 39
40/**
41 * Set debug ids to display. Values can be OR-ed
42 *
43 * @param level Set to 0 for no debugging or 1 for debugging.
44 */
45void iphone_set_debug_mask(uint16_t mask)
46{
47 dbg_mask = mask;
48}
39 49
40void log_debug_msg(const char *format, ...) 50void log_debug_msg(const char *format, ...)
41{ 51{
@@ -53,6 +63,21 @@ void log_debug_msg(const char *format, ...)
53#endif 63#endif
54} 64}
55 65
66void log_dbg_msg(uint16_t id, const char *format, ...)
67{
68#ifndef STRIP_DEBUG_CODE
69 if (id & dbg_mask) {
70 va_list args;
71 /* run the real fprintf */
72 va_start(args, format);
73
74 vfprintf(stderr, format, args);
75
76 va_end(args);
77 }
78#endif
79}
80
56inline void log_debug_buffer(const char *data, const int length) 81inline void log_debug_buffer(const char *data, const int length)
57{ 82{
58#ifndef STRIP_DEBUG_CODE 83#ifndef STRIP_DEBUG_CODE
diff --git a/src/utils.h b/src/utils.h
index 489f610..1750b8e 100644
--- a/src/utils.h
+++ b/src/utils.h
@@ -24,7 +24,11 @@
24 24
25#include "libiphone/libiphone.h" 25#include "libiphone/libiphone.h"
26 26
27
28
27inline void log_debug_msg(const char *format, ...); 29inline void log_debug_msg(const char *format, ...);
30inline void log_dbg_msg(uint16_t id, const char *format, ...);
31
28inline void log_debug_buffer(const char *data, const int length); 32inline void log_debug_buffer(const char *data, const int length);
29inline void dump_debug_buffer(const char *file, const char *data, const int length); 33inline void dump_debug_buffer(const char *file, const char *data, const int length);
30#endif 34#endif
diff --git a/swig/Makefile.am b/swig/Makefile.am
new file mode 100644
index 0000000..e47356b
--- /dev/null
+++ b/swig/Makefile.am
@@ -0,0 +1,18 @@
1INCLUDES = -I$(top_srcdir)/include $(libplist_CFLAGS)
2
3BUILT_SOURCES = $(srcdir)/iphone_wrap.c
4SWIG_SOURCES = iphone.i
5
6swigincludedir =$(includedir)/libiphone/swig
7swiginclude_HEADERS = $(SWIG_SOURCES)
8
9pkgpython_PYTHON = iPhone.py __init__.py
10pkgpyexec_LTLIBRARIES = _iPhone.la
11_iPhone_la_SOURCES = $(srcdir)/iphone_wrap.c $(SWIG_SOURCES)
12_iPhone_la_CFLAGS = $(PYTHON_CPPFLAGS) -I$(top_srcdir)/src
13_iPhone_la_LDFLAGS = -module $(PYTHON_LDFLAGS)
14_iPhone_la_LIBADD = ../src/libiphone.la
15
16$(srcdir)/iphone_wrap.c : $(SWIG_SOURCES)
17 $(SWIG) $(SWIG_PYTHON_OPT) $(INCLUDES) -I$(top_srcdir)/src -o $@ $<
18
diff --git a/swig/__init__.py b/swig/__init__.py
new file mode 100644
index 0000000..8d1c8b6
--- /dev/null
+++ b/swig/__init__.py
@@ -0,0 +1 @@
diff --git a/swig/iphone.i b/swig/iphone.i
new file mode 100644
index 0000000..e970e89
--- /dev/null
+++ b/swig/iphone.i
@@ -0,0 +1,156 @@
1 /* swig.i */
2 %module(package="libiphone") iPhone
3 %{
4 /* Includes the header in the wrapper code */
5 #include <libiphone/libiphone.h>
6 #include <plist/plist.h>
7#include "../src/utils.h"
8 typedef struct {
9 iphone_device_t dev;
10 } iPhone;
11
12 typedef struct {
13 iPhone* dev;
14 iphone_lckd_client_t client;
15 } Lockdownd;
16
17 typedef struct {
18 Lockdownd* lckd;
19 iphone_msync_client_t client;
20 } MobileSync;
21
22//now declare funtions to handle creation and deletion of objects
23void my_delete_iPhone(iPhone* dev);
24Lockdownd* my_new_Lockdownd(iPhone* phone);
25void my_delete_Lockdownd(Lockdownd* lckd);
26MobileSync* my_new_MobileSync(Lockdownd* lckd);
27
28 %}
29/* Parse the header file to generate wrappers */
30%include "stdint.i"
31%include "plist/swig/plist.i"
32
33typedef struct {
34 iphone_device_t dev;
35} iPhone;
36
37typedef struct {
38 iPhone* dev;
39 iphone_lckd_client_t client;
40} Lockdownd;
41
42typedef struct {
43 Lockdownd* lckd;
44 iphone_msync_client_t client;
45} MobileSync;
46
47%inline %{
48//now define funtions to handle creation and deletion of objects
49
50
51void my_delete_iPhone(iPhone* dev) {
52 if (dev) {
53 iphone_free_device ( dev->dev );
54 free(dev);
55 }
56}
57
58Lockdownd* my_new_Lockdownd(iPhone* phone) {
59 if (!phone) return NULL;
60 Lockdownd* client = (Lockdownd*) malloc(sizeof(Lockdownd));
61 client->dev = phone;
62 client->client = NULL;
63 if (IPHONE_E_SUCCESS == iphone_lckd_new_client ( phone->dev , &(client->client))) {
64 return client;
65 }
66 else {
67 free(client);
68 return NULL;
69 }
70}
71
72void my_delete_Lockdownd(Lockdownd* lckd) {
73 if (lckd) {
74 my_delete_iPhone(lckd->dev);
75 iphone_lckd_free_client ( lckd->client );
76 free(lckd);
77 }
78}
79
80MobileSync* my_new_MobileSync(Lockdownd* lckd) {
81 if (!lckd || !lckd->dev) return NULL;
82 MobileSync* client = NULL;
83 int port = 0;
84 if (IPHONE_E_SUCCESS == iphone_lckd_start_service ( lckd->client, "com.apple.mobilesync", &port )) {
85 client = (MobileSync*) malloc(sizeof(MobileSync));
86 client->lckd = lckd;
87 client->client = NULL;
88 iphone_msync_new_client ( lckd->dev->dev, 3432, port, &(client->client));
89 }
90 return client;
91}
92
93%}
94
95
96%extend iPhone { // Attach these functions to struct iPhone
97 iPhone() {
98 iPhone* phone = (iPhone*) malloc(sizeof(iPhone));
99 phone->dev = NULL;
100 iphone_set_debug_mask(DBGMASK_LOCKDOWND | DBGMASK_MOBILESYNC);
101 return phone;
102 }
103
104 ~iPhone() {
105 my_delete_iPhone($self);
106 }
107
108 int InitDevice() {
109 if (IPHONE_E_SUCCESS == iphone_get_device ( &($self->dev)))
110 return 1;
111 return 0;
112 }
113
114 Lockdownd* GetLockdownClient() {
115 return my_new_Lockdownd($self);
116 }
117};
118
119
120%extend Lockdownd { // Attach these functions to struct Lockdownd
121 Lockdownd(iPhone* phone) {
122 return my_new_Lockdownd(phone);
123 }
124
125 ~Lockdownd() {
126 my_delete_Lockdownd($self);
127 }
128
129 MobileSync* GetMobileSyncClient() {
130 return my_new_MobileSync($self);
131 }
132};
133
134%extend MobileSync { // Attach these functions to struct MobileSync
135 MobileSync(Lockdownd* lckd) {
136 return my_new_MobileSync(lckd);
137 }
138
139 ~MobileSync() {
140 my_delete_Lockdownd($self->lckd);
141 iphone_msync_free_client ( $self->client );
142 free($self);
143 }
144
145 void Send(PListNode* node) {
146 iphone_msync_send($self->client, node->node);
147 }
148
149 PListNode* Receive() {
150 PListNode* node = (PListNode*)malloc(sizeof(PListNode));
151 node->node = NULL;
152 iphone_msync_recv($self->client, &(node->node));
153 return node;
154 }
155};
156
© 2009-2020 sukimashita.com - Generated by cgit - Icons from Tango - Uses Google Analytics