summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Makefile.am4
-rwxr-xr-xautogen.sh2
-rw-r--r--configure.ac9
-rw-r--r--dev/Makefile.am9
-rw-r--r--dev/lckdclient.c1
-rw-r--r--dev/main.c5
-rwxr-xr-xdev/msync.py40
-rw-r--r--dev/msyncclient.c72
-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/swig_python.m465
-rw-r--r--src/AFC.c51
-rw-r--r--src/AFC.h10
-rw-r--r--src/Makefile.am8
-rw-r--r--src/MobileSync.c305
-rw-r--r--src/MobileSync.h39
-rw-r--r--src/initconf.c30
-rw-r--r--src/lockdown.c921
-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
31 files changed, 1692 insertions, 832 deletions
diff --git a/Makefile.am b/Makefile.am
index f103377..982f42b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,6 @@
AUTOMAKE_OPTIONS = foreign
-
-SUBDIRS = src include fdi $(DEV_SUB)
+ACLOCAL_AMFLAGS = -I m4
+SUBDIRS = src include fdi swig $(DEV_SUB)
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_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 @@
#!/bin/sh
-aclocal
+aclocal -I m4
libtoolize
autoheader
automake --add-missing
diff --git a/configure.ac b/configure.ac
index 286b1d8..87ed8dc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6,9 +6,15 @@ AC_INIT(libiphone, 0.1.0, nospam@nowhere.com)
AM_INIT_AUTOMAKE(libiphone, 0.1.0)
AC_CONFIG_SRCDIR([src/])
AC_CONFIG_HEADER([config.h])
+AC_CONFIG_MACRO_DIR([m4])
AC_PROG_LIBTOOL
+AM_PATH_PYTHON(2.3)
+AC_PROG_SWIG(1.3.21)
+SWIG_PYTHON
+
+
# Checks for programs.
AC_PROG_CC
AM_PROG_CC_C_O
@@ -20,6 +26,7 @@ PKG_CHECK_MODULES(libglib2, glib-2.0 >= 2.14.1)
PKG_CHECK_MODULES(libgthread2, gthread-2.0 >= 2.14.1)
PKG_CHECK_MODULES(libgnutls, gnutls >= 1.6.3 gnutls <= 2.5.0 )
PKG_CHECK_MODULES(libtasn1, libtasn1 >= 1.1)
+PKG_CHECK_MODULES(libplist, libplist-1.0 >= 0.1.0)
# Checks for header files.
AC_HEADER_STDC
@@ -59,4 +66,4 @@ if test "$no_debug_code" = true; then
AC_DEFINE(STRIP_DEBUG_CODE,1,[Strip debug reporting code])
fi
-AC_OUTPUT(Makefile src/Makefile include/Makefile fdi/Makefile dev/Makefile libiphone-1.0.pc)
+AC_OUTPUT(Makefile src/Makefile include/Makefile fdi/Makefile dev/Makefile swig/Makefile libiphone-1.0.pc)
diff --git a/dev/Makefile.am b/dev/Makefile.am
index 4833728..7ca7e99 100644
--- a/dev/Makefile.am
+++ b/dev/Makefile.am
@@ -3,7 +3,7 @@ INCLUDES = -I$(top_srcdir)/include
AM_CFLAGS = $(libxml2_CFLAGS) $(libusb_CFLAGS) $(libglib2_CFLAGS) $(libgnutls_CFLAGS) $(libtasn1_CFLAGS) $(libgthread2_CFLAGS) -g
AM_LDFLAGS = $(libxml2_LIBS) $(libusb_LIBS) $(libglib2_LIBS) $(libgnutls_LIBS) $(libtasn1_LIBS) $(libgthread2_LIBS)
-bin_PROGRAMS = iphoneclient lckd-client afccheck
+bin_PROGRAMS = iphoneclient lckd-client afccheck msyncclient
iphoneclient_SOURCES = main.c
iphoneclient_LDADD = ../src/libiphone.la
@@ -16,4 +16,9 @@ lckd_client_LDADD = ../src/libiphone.la
afccheck_SOURCES = afccheck.c
afccheck_CFLAGS = $(AM_CFLAGS)
afccheck_LDFLAGS = $(AM_LDFLAGS)
-afccheck_LDADD = ../src/libiphone.la \ No newline at end of file
+afccheck_LDADD = ../src/libiphone.la
+
+msyncclient_SOURCES = msyncclient.c
+msyncclient_CFLAGS = $(AM_CFLAGS)
+msyncclient_LDFLAGS = $(AM_LDFLAGS)
+msyncclient_LDADD = ../src/libiphone.la
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 @@
*/
#include <stdio.h>
+#include <stdlib.h>
#include <string.h>
#include <glib.h>
#include <readline/readline.h>
diff --git a/dev/main.c b/dev/main.c
index 2dbfb4a..f865e52 100644
--- a/dev/main.c
+++ b/dev/main.c
@@ -28,6 +28,7 @@
#include <libxml/tree.h>
#include <libiphone/libiphone.h>
+#include "../src/utils.h"
int main(int argc, char *argv[])
@@ -38,8 +39,10 @@ int main(int argc, char *argv[])
if (argc > 1 && !strcasecmp(argv[1], "--debug")) {
iphone_set_debug(1);
+ iphone_set_debug_mask(DBGMASK_ALL);
} else {
iphone_set_debug(0);
+ iphone_set_debug_mask(DBGMASK_NONE);
}
if (IPHONE_E_SUCCESS != iphone_get_device(&phone)) {
@@ -87,7 +90,7 @@ int main(int argc, char *argv[])
iphone_afc_get_file_attr(afc, "/iTunesOnTheGoPlaylist.plist", &stbuf);
if (IPHONE_E_SUCCESS ==
iphone_afc_open_file(afc, "/iTunesOnTheGoPlaylist.plist", IPHONE_AFC_FILE_READ, &my_file) && my_file) {
- printf("A file size: %i\n", stbuf.st_size);
+ printf("A file size: %i\n", (int) stbuf.st_size);
char *file_data = (char *) malloc(sizeof(char) * stbuf.st_size);
iphone_afc_read_file(afc, my_file, file_data, stbuf.st_size, &bytes);
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 @@
+#! /usr/bin/env python
+
+from libiphone.iPhone import *
+
+# get msync client
+def GetMobileSyncClient() :
+ phone = iPhone()
+ if not phone.InitDevice() :
+ print "Couldn't find device, is it connected ?\n"
+ return None
+ lckd = phone.GetLockdownClient()
+ if not lckd :
+ print "Failed to start lockdown service.\n"
+ return None
+ msync = lckd.GetMobileSyncClient()
+ if not msync :
+ print "Failed to start mobilesync service.\n"
+ return None
+ return msync
+
+
+msync = GetMobileSyncClient()
+
+if not msync :
+ exit(1)
+
+array = PListNode(PLIST_ARRAY)
+array.AddSubString("SDMessageSyncDataClassWithDevice")
+array.AddSubString("com.apple.Contacts");
+array.AddSubString("---");
+array.AddSubString("2009-01-13 22:25:58 +0100");
+array.AddSubUInt(106);
+array.AddSubString("___EmptyParameterString___");
+
+msync.Send(array)
+array = msync.Receive()
+print array.ToXml()
+
+
+
diff --git a/dev/msyncclient.c b/dev/msyncclient.c
new file mode 100644
index 0000000..2762f04
--- /dev/null
+++ b/dev/msyncclient.c
@@ -0,0 +1,72 @@
+/*
+ * msyncclient.c
+ * Rudimentary interface to the MobileSync iPhone
+ *
+ * Copyright (c) 2009 Jonathan Beck All Rights Reserved.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include <stdio.h>
+#include <string.h>
+#include <errno.h>
+#include <usb.h>
+
+#include <libxml/parser.h>
+#include <libxml/tree.h>
+
+#include <libiphone/libiphone.h>
+
+
+int main(int argc, char *argv[])
+{
+ int bytes = 0, port = 0, i = 0;
+ iphone_lckd_client_t control = NULL;
+ iphone_device_t phone = NULL;
+
+ if (argc > 1 && !strcasecmp(argv[1], "--debug"))
+ iphone_set_debug_mask(DBGMASK_MOBILESYNC);
+
+
+ if (IPHONE_E_SUCCESS != iphone_get_device(&phone)) {
+ printf("No iPhone found, is it plugged in?\n");
+ return -1;
+ }
+
+ if (IPHONE_E_SUCCESS != iphone_lckd_new_client(phone, &control)) {
+ iphone_free_device(phone);
+ return -1;
+ }
+
+ iphone_lckd_start_service(control, "com.apple.mobilesync", &port);
+
+ if (port) {
+ iphone_msync_client_t msync = NULL;
+ iphone_msync_new_client(phone, 3432, port, &msync);
+ if (msync) {
+ iphone_msync_get_all_contacts(msync);
+ iphone_msync_free_client(msync);
+ }
+ } else {
+ printf("Start service failure.\n");
+ }
+
+ printf("All done.\n");
+
+ iphone_lckd_free_client(control);
+ iphone_free_device(phone);
+
+ return 0;
+}
diff --git a/include/libiphone/libiphone.h b/include/libiphone/libiphone.h
index 32d47d3..9823bed 100644
--- a/include/libiphone/libiphone.h
+++ b/include/libiphone/libiphone.h
@@ -29,6 +29,7 @@ extern "C" {
#include <stdint.h>
#include <sys/types.h>
#include <sys/stat.h>
+#include <plist/plist.h>
//general errors
#define IPHONE_E_SUCCESS 0
@@ -77,8 +78,20 @@ typedef struct iphone_afc_client_int *iphone_afc_client_t;
struct iphone_afc_file_int;
typedef struct iphone_afc_file_int *iphone_afc_file_t;
-//device related functions
+struct iphone_msync_client_int;
+typedef struct iphone_msync_client_int *iphone_msync_client_t;
+
+//debug related functions
+#define DBGMASK_ALL 0xFFFF
+#define DBGMASK_NONE 0x0000
+#define DBGMASK_USBMUX (1 << 1)
+#define DBGMASK_LOCKDOWND (1 << 2)
+#define DBGMASK_MOBILESYNC (1 << 3)
+
+void iphone_set_debug_mask(uint16_t mask);
void iphone_set_debug(int level);
+
+//device related functions
iphone_error_t iphone_get_device ( iphone_device_t *device );
iphone_error_t iphone_free_device ( iphone_device_t device );
@@ -89,8 +102,8 @@ iphone_error_t iphone_lckd_new_client ( iphone_device_t device, iphone_lckd_clie
iphone_error_t iphone_lckd_free_client( iphone_lckd_client_t client );
iphone_error_t iphone_lckd_start_service ( iphone_lckd_client_t client, const char *service, int *port );
-iphone_error_t iphone_lckd_recv ( iphone_lckd_client_t client, char **dump_data, uint32_t *recv_bytes );
-iphone_error_t iphone_lckd_send ( iphone_lckd_client_t client, char *raw_data, uint32_t length, uint32_t *recv_bytes );
+iphone_error_t iphone_lckd_recv ( iphone_lckd_client_t client, plist_t* plist);
+iphone_error_t iphone_lckd_send ( iphone_lckd_client_t client, plist_t plist);
//usbmux related functions
@@ -120,6 +133,14 @@ iphone_error_t iphone_afc_rename_file ( iphone_afc_client_t client, const char *
iphone_error_t iphone_afc_mkdir ( iphone_afc_client_t client, const char *dir);
+
+iphone_error_t iphone_msync_new_client(iphone_device_t device, int src_port, int dst_port,
+ iphone_msync_client_t * client);
+iphone_error_t iphone_msync_free_client(iphone_msync_client_t client);
+
+iphone_error_t iphone_msync_recv(iphone_msync_client_t client, plist_t * plist);
+iphone_error_t iphone_msync_send(iphone_msync_client_t client, plist_t plist);
+
#ifdef __cplusplus
}
#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 @@
+# ===========================================================================
+# http://autoconf-archive.cryp.to/ac_pkg_swig.html
+# ===========================================================================
+#
+# SYNOPSIS
+#
+# AC_PROG_SWIG([major.minor.micro])
+#
+# DESCRIPTION
+#
+# This macro searches for a SWIG installation on your system. If found you
+# should call SWIG via $(SWIG). You can use the optional first argument to
+# check if the version of the available SWIG is greater than or equal to
+# the value of the argument. It should have the format: N[.N[.N]] (N is a
+# number between 0 and 999. Only the first N is mandatory.)
+#
+# If the version argument is given (e.g. 1.3.17), AC_PROG_SWIG checks that
+# the swig package is this version number or higher.
+#
+# In configure.in, use as:
+#
+# AC_PROG_SWIG(1.3.17)
+# SWIG_ENABLE_CXX
+# SWIG_MULTI_MODULE_SUPPORT
+# SWIG_PYTHON
+#
+# LAST MODIFICATION
+#
+# 2008-04-12
+#
+# COPYLEFT
+#
+# Copyright (c) 2008 Sebastian Huber <sebastian-huber@web.de>
+# Copyright (c) 2008 Alan W. Irwin <irwin@beluga.phys.uvic.ca>
+# Copyright (c) 2008 Rafael Laboissiere <rafael@laboissiere.net>
+# Copyright (c) 2008 Andrew Collier <colliera@ukzn.ac.za>
+#
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by the
+# Free Software Foundation; either version 2 of the License, or (at your
+# option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
+# Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program. If not, see <http://www.gnu.org/licenses/>.
+#
+# As a special exception, the respective Autoconf Macro's copyright owner
+# gives unlimited permission to copy, distribute and modify the configure
+# scripts that are the output of Autoconf when processing the Macro. You
+# need not follow the terms of the GNU General Public License when using
+# or distributing such scripts, even though portions of the text of the
+# Macro appear in them. The GNU General Public License (GPL) does govern
+# all other use of the material that constitutes the Autoconf Macro.
+#
+# This special exception to the GPL applies to versions of the Autoconf
+# Macro released by the Autoconf Macro Archive. When you make and
+# distribute a modified version of the Autoconf Macro, you may extend this
+# special exception to the GPL to apply to your modified version as well.
+
+AC_DEFUN([AC_PROG_SWIG],[
+ AC_PATH_PROG([SWIG],[swig])
+ if test -z "$SWIG" ; then
+ AC_MSG_WARN([cannot find 'swig' program. You should look at http://www.swig.org])
+ SWIG='echo "Error: SWIG is not installed. You should look at http://www.swig.org" ; false'
+ elif test -n "$1" ; then
+ AC_MSG_CHECKING([for SWIG version])
+ [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'`]
+ AC_MSG_RESULT([$swig_version])
+ if test -n "$swig_version" ; then
+ # Calculate the required version number components
+ [required=$1]
+ [required_major=`echo $required | sed 's/[^0-9].*//'`]
+ if test -z "$required_major" ; then
+ [required_major=0]
+ fi
+ [required=`echo $required | sed 's/[0-9]*[^0-9]//'`]
+ [required_minor=`echo $required | sed 's/[^0-9].*//'`]
+ if test -z "$required_minor" ; then
+ [required_minor=0]
+ fi
+ [required=`echo $required | sed 's/[0-9]*[^0-9]//'`]
+ [required_patch=`echo $required | sed 's/[^0-9].*//'`]
+ if test -z "$required_patch" ; then
+ [required_patch=0]
+ fi
+ # Calculate the available version number components
+ [available=$swig_version]
+ [available_major=`echo $available | sed 's/[^0-9].*//'`]
+ if test -z "$available_major" ; then
+ [available_major=0]
+ fi
+ [available=`echo $available | sed 's/[0-9]*[^0-9]//'`]
+ [available_minor=`echo $available | sed 's/[^0-9].*//'`]
+ if test -z "$available_minor" ; then
+ [available_minor=0]
+ fi
+ [available=`echo $available | sed 's/[0-9]*[^0-9]//'`]
+ [available_patch=`echo $available | sed 's/[^0-9].*//'`]
+ if test -z "$available_patch" ; then
+ [available_patch=0]
+ fi
+ if test $available_major -ne $required_major \
+ -o $available_minor -ne $required_minor \
+ -o $available_patch -lt $required_patch ; then
+ AC_MSG_WARN([SWIG version >= $1 is required. You have $swig_version. You should look at http://www.swig.org])
+ SWIG='echo "Error: SWIG version >= $1 is required. You have '"$swig_version"'. You should look at http://www.swig.org" ; false'
+ else
+ AC_MSG_NOTICE([SWIG executable is '$SWIG'])
+ SWIG_LIB=`$SWIG -swiglib`
+ AC_MSG_NOTICE([SWIG library directory is '$SWIG_LIB'])
+ fi
+ else
+ AC_MSG_WARN([cannot determine SWIG version])
+ SWIG='echo "Error: Cannot determine SWIG version. You should look at http://www.swig.org" ; false'
+ fi
+ fi
+ AC_SUBST([SWIG_LIB])
+])
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 @@
+# ===========================================================================
+# http://autoconf-archive.cryp.to/ac_python_devel.html
+# ===========================================================================
+#
+# SYNOPSIS
+#
+# AC_PYTHON_DEVEL([version])
+#
+# DESCRIPTION
+#
+# Note: Defines as a precious variable "PYTHON_VERSION". Don't override it
+# in your configure.ac.
+#
+# This macro checks for Python and tries to get the include path to
+# 'Python.h'. It provides the $(PYTHON_CPPFLAGS) and $(PYTHON_LDFLAGS)
+# output variables. It also exports $(PYTHON_EXTRA_LIBS) and
+# $(PYTHON_EXTRA_LDFLAGS) for embedding Python in your code.
+#
+# You can search for some particular version of Python by passing a
+# parameter to this macro, for example ">= '2.3.1'", or "== '2.4'". Please
+# note that you *have* to pass also an operator along with the version to
+# match, and pay special attention to the single quotes surrounding the
+# version number. Don't use "PYTHON_VERSION" for this: that environment
+# variable is declared as precious and thus reserved for the end-user.
+#
+# This macro should work for all versions of Python >= 2.1.0. As an end
+# user, you can disable the check for the python version by setting the
+# PYTHON_NOVERSIONCHECK environment variable to something else than the
+# empty string.
+#
+# If you need to use this macro for an older Python version, please
+# contact the authors. We're always open for feedback.
+#
+# LAST MODIFICATION
+#
+# 2008-04-12
+#
+# COPYLEFT
+#
+# Copyright (c) 2008 Sebastian Huber <sebastian-huber@web.de>
+# Copyright (c) 2008 Alan W. Irwin <irwin@beluga.phys.uvic.ca>
+# Copyright (c) 2008 Rafael Laboissiere <rafael@laboissiere.net>
+# Copyright (c) 2008 Andrew Collier <colliera@ukzn.ac.za>
+# Copyright (c) 2008 Matteo Settenvini <matteo@member.fsf.org>
+# Copyright (c) 2008 Horst Knorr <hk_classes@knoda.org>
+#
+# This program is free software: you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by the
+# Free Software Foundation, either version 3 of the License, or (at your
+# option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
+# Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program. If not, see <http://www.gnu.org/licenses/>.
+#
+# As a special exception, the respective Autoconf Macro's copyright owner
+# gives unlimited permission to copy, distribute and modify the configure
+# scripts that are the output of Autoconf when processing the Macro. You
+# need not follow the terms of the GNU General Public License when using
+# or distributing such scripts, even though portions of the text of the
+# Macro appear in them. The GNU General Public License (GPL) does govern
+# all other use of the material that constitutes the Autoconf Macro.
+#
+# This special exception to the GPL applies to versions of the Autoconf
+# Macro released by the Autoconf Macro Archive. When you make and
+# distribute a modified version of the Autoconf Macro, you may extend this
+# special exception to the GPL to apply to your modified version as well.
+
+AC_DEFUN([AC_PYTHON_DEVEL],[
+ #
+ # Allow the use of a (user set) custom python version
+ #
+ AC_ARG_VAR([PYTHON_VERSION],[The installed Python
+ version to use, for example '2.3'. This string
+ will be appended to the Python interpreter
+ canonical name.])
+
+ AC_PATH_PROG([PYTHON],[python[$PYTHON_VERSION]])
+ if test -z "$PYTHON"; then
+ AC_MSG_ERROR([Cannot find python$PYTHON_VERSION in your system path])
+ PYTHON_VERSION=""
+ fi
+
+ #
+ # Check for a version of Python >= 2.1.0
+ #
+ AC_MSG_CHECKING([for a version of Python >= '2.1.0'])
+ ac_supports_python_ver=`$PYTHON -c "import sys, string; \
+ ver = string.split(sys.version)[[0]]; \
+ print ver >= '2.1.0'"`
+ if test "$ac_supports_python_ver" != "True"; then
+ if test -z "$PYTHON_NOVERSIONCHECK"; then
+ AC_MSG_RESULT([no])
+ AC_MSG_FAILURE([
+This version of the AC@&t@_PYTHON_DEVEL macro
+doesn't work properly with versions of Python before
+2.1.0. You may need to re-run configure, setting the
+variables PYTHON_CPPFLAGS, PYTHON_LDFLAGS, PYTHON_SITE_PKG,
+PYTHON_EXTRA_LIBS and PYTHON_EXTRA_LDFLAGS by hand.
+Moreover, to disable this check, set PYTHON_NOVERSIONCHECK
+to something else than an empty string.
+])
+ else
+ AC_MSG_RESULT([skip at user request])
+ fi
+ else
+ AC_MSG_RESULT([yes])
+ fi
+
+ #
+ # if the macro parameter ``version'' is set, honour it
+ #
+ if test -n "$1"; then
+ AC_MSG_CHECKING([for a version of Python $1])
+ ac_supports_python_ver=`$PYTHON -c "import sys, string; \
+ ver = string.split(sys.version)[[0]]; \
+ print ver $1"`
+ if test "$ac_supports_python_ver" = "True"; then
+ AC_MSG_RESULT([yes])
+ else
+ AC_MSG_RESULT([no])
+ AC_MSG_ERROR([this package requires Python $1.
+If you have it installed, but it isn't the default Python
+interpreter in your system path, please pass the PYTHON_VERSION
+variable to configure. See ``configure --help'' for reference.
+])
+ PYTHON_VERSION=""
+ fi
+ fi
+
+ #
+ # Check if you have distutils, else fail
+ #
+ AC_MSG_CHECKING([for the distutils Python package])
+ ac_distutils_result=`$PYTHON -c "import distutils" 2>&1`
+ if test -z "$ac_distutils_result"; then
+ AC_MSG_RESULT([yes])
+ else
+ AC_MSG_RESULT([no])
+ AC_MSG_ERROR([cannot import Python module "distutils".
+Please check your Python installation. The error was:
+$ac_distutils_result])
+ PYTHON_VERSION=""
+ fi
+
+ #
+ # Check for Python include path
+ #
+ AC_MSG_CHECKING([for Python include path])
+ if test -z "$PYTHON_CPPFLAGS"; then
+ python_path=`$PYTHON -c "import distutils.sysconfig; \
+ print distutils.sysconfig.get_python_inc();"`
+ if test -n "${python_path}"; then
+ python_path="-I$python_path"
+ fi
+ PYTHON_CPPFLAGS=$python_path
+ fi
+ AC_MSG_RESULT([$PYTHON_CPPFLAGS])
+ AC_SUBST([PYTHON_CPPFLAGS])
+
+ #
+ # Check for Python library path
+ #
+ AC_MSG_CHECKING([for Python library path])
+ if test -z "$PYTHON_LDFLAGS"; then
+ # (makes two attempts to ensure we've got a version number
+ # from the interpreter)
+ py_version=`$PYTHON -c "from distutils.sysconfig import *; \
+ from string import join; \
+ print join(get_config_vars('VERSION'))"`
+ if test "$py_version" == "[None]"; then
+ if test -n "$PYTHON_VERSION"; then
+ py_version=$PYTHON_VERSION
+ else
+ py_version=`$PYTHON -c "import sys; \
+ print sys.version[[:3]]"`
+ fi
+ fi
+
+ PYTHON_LDFLAGS=`$PYTHON -c "from distutils.sysconfig import *; \
+ from string import join; \
+ print '-L' + get_python_lib(0,1), \
+ '-lpython';"`$py_version
+ fi
+ AC_MSG_RESULT([$PYTHON_LDFLAGS])
+ AC_SUBST([PYTHON_LDFLAGS])
+
+ #
+ # Check for site packages
+ #
+ AC_MSG_CHECKING([for Python site-packages path])
+ if test -z "$PYTHON_SITE_PKG"; then
+ PYTHON_SITE_PKG=`$PYTHON -c "import distutils.sysconfig; \
+ print distutils.sysconfig.get_python_lib(0,0);"`
+ fi
+ AC_MSG_RESULT([$PYTHON_SITE_PKG])
+ AC_SUBST([PYTHON_SITE_PKG])
+
+ #
+ # libraries which must be linked in when embedding
+ #
+ AC_MSG_CHECKING(python extra libraries)
+ if test -z "$PYTHON_EXTRA_LIBS"; then
+ PYTHON_EXTRA_LIBS=`$PYTHON -c "import distutils.sysconfig; \
+ conf = distutils.sysconfig.get_config_var; \
+ print conf('LOCALMODLIBS'), conf('LIBS')"`
+ fi
+ AC_MSG_RESULT([$PYTHON_EXTRA_LIBS])
+ AC_SUBST(PYTHON_EXTRA_LIBS)
+
+ #
+ # linking flags needed when embedding
+ #
+ AC_MSG_CHECKING(python extra linking flags)
+ if test -z "$PYTHON_EXTRA_LDFLAGS"; then
+ PYTHON_EXTRA_LDFLAGS=`$PYTHON -c "import distutils.sysconfig; \
+ conf = distutils.sysconfig.get_config_var; \
+ print conf('LINKFORSHARED')"`
+ fi
+ AC_MSG_RESULT([$PYTHON_EXTRA_LDFLAGS])
+ AC_SUBST(PYTHON_EXTRA_LDFLAGS)
+
+ #
+ # final check to see if everything compiles alright
+ #
+ AC_MSG_CHECKING([consistency of all components of python development environment])
+ AC_LANG_PUSH([C])
+ # save current global flags
+ LIBS="$ac_save_LIBS $PYTHON_LDFLAGS"
+ CPPFLAGS="$ac_save_CPPFLAGS $PYTHON_CPPFLAGS"
+ AC_TRY_LINK([
+ #include <Python.h>
+ ],[
+ Py_Initialize();
+ ],[pythonexists=yes],[pythonexists=no])
+
+ AC_MSG_RESULT([$pythonexists])
+
+ if test ! "$pythonexists" = "yes"; then
+ AC_MSG_ERROR([
+ Could not link test program to Python. Maybe the main Python library has been
+ installed in some non-standard library path. If so, pass it to configure,
+ via the LDFLAGS environment variable.
+ Example: ./configure LDFLAGS="-L/usr/non-standard-path/python/lib"
+ ============================================================================
+ ERROR!
+ You probably have to install the development version of the Python package
+ for your distribution. The exact name of this package varies among them.
+ ============================================================================
+ ])
+ PYTHON_VERSION=""
+ fi
+ AC_LANG_POP
+ # turn back to default flags
+ CPPFLAGS="$ac_save_CPPFLAGS"
+ LIBS="$ac_save_LIBS"
+
+ #
+ # all done!
+ #
+])
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 @@
+# ===========================================================================
+# http://autoconf-archive.cryp.to/swig_python.html
+# ===========================================================================
+#
+# SYNOPSIS
+#
+# SWIG_PYTHON([use-shadow-classes = {no, yes}])
+#
+# DESCRIPTION
+#
+# Checks for Python and provides the $(SWIG_PYTHON_CPPFLAGS), and
+# $(SWIG_PYTHON_OPT) output variables.
+#
+# $(SWIG_PYTHON_OPT) contains all necessary SWIG options to generate code
+# for Python. Shadow classes are enabled unless the value of the optional
+# first argument is exactly 'no'. If you need multi module support
+# (provided by the SWIG_MULTI_MODULE_SUPPORT macro) use
+# $(SWIG_PYTHON_LIBS) to link against the appropriate library. It contains
+# the SWIG Python runtime library that is needed by the type check system
+# for example.
+#
+# LAST MODIFICATION
+#
+# 2008-04-12
+#
+# COPYLEFT
+#
+# Copyright (c) 2008 Sebastian Huber <sebastian-huber@web.de>
+# Copyright (c) 2008 Alan W. Irwin <irwin@beluga.phys.uvic.ca>
+# Copyright (c) 2008 Rafael Laboissiere <rafael@laboissiere.net>
+# Copyright (c) 2008 Andrew Collier <colliera@ukzn.ac.za>
+#
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by the
+# Free Software Foundation; either version 2 of the License, or (at your
+# option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
+# Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program. If not, see <http://www.gnu.org/licenses/>.
+#
+# As a special exception, the respective Autoconf Macro's copyright owner
+# gives unlimited permission to copy, distribute and modify the configure
+# scripts that are the output of Autoconf when processing the Macro. You
+# need not follow the terms of the GNU General Public License when using
+# or distributing such scripts, even though portions of the text of the
+# Macro appear in them. The GNU General Public License (GPL) does govern
+# all other use of the material that constitutes the Autoconf Macro.
+#
+# This special exception to the GPL applies to versions of the Autoconf
+# Macro released by the Autoconf Macro Archive. When you make and
+# distribute a modified version of the Autoconf Macro, you may extend this
+# special exception to the GPL to apply to your modified version as well.
+
+AC_DEFUN([SWIG_PYTHON],[
+ AC_REQUIRE([AC_PROG_SWIG])
+ AC_REQUIRE([AC_PYTHON_DEVEL])
+ test "x$1" != "xno" || swig_shadow=" -noproxy"
+ AC_SUBST([SWIG_PYTHON_OPT],[-python$swig_shadow])
+ AC_SUBST([SWIG_PYTHON_CPPFLAGS],[$PYTHON_CPPFLAGS])
+])
diff --git a/src/AFC.c b/src/AFC.c
index cd24cc6..67d37f3 100644
--- a/src/AFC.c
+++ b/src/AFC.c
@@ -21,8 +21,7 @@
#include <stdio.h>
#include "AFC.h"
-#include "plist.h"
-#include "utils.h"
+
// 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)
return retval;
}
- uint32 param1 = buffer[sizeof(AFCPacket)];
+ uint32_t param1 = buffer[sizeof(AFCPacket)];
free(buffer);
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
iphone_error_t iphone_afc_rename_file(iphone_afc_client_t client, const char *from, const char *to)
{
char *response = NULL;
- char *send = (char *) malloc(sizeof(char) * (strlen(from) + strlen(to) + 1 + sizeof(uint32)));
+ char *send = (char *) malloc(sizeof(char) * (strlen(from) + strlen(to) + 1 + sizeof(uint32_t)));
int bytes = 0;
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,
iphone_afc_file_mode_t file_mode, iphone_afc_file_t * file)
{
iphone_afc_file_t file_loc = NULL;
- uint32 ag = 0;
+ uint32_t ag = 0;
int bytes = 0, length = 0;
char *data = (char *) malloc(sizeof(char) * (8 + strlen(filename) + 1));
@@ -796,8 +795,8 @@ iphone_afc_write_file(iphone_afc_client_t client, iphone_afc_file_t file,
{
char *acknowledgement = NULL;
const int MAXIMUM_WRITE_SIZE = 1 << 15;
- uint32 zero = 0, current_count = 0, i = 0;
- uint32 segments = (length / MAXIMUM_WRITE_SIZE);
+ uint32_t zero = 0, current_count = 0, i = 0;
+ uint32_t segments = (length / MAXIMUM_WRITE_SIZE);
int bytes_loc = 0;
char *out_buffer = NULL;
@@ -815,8 +814,8 @@ iphone_afc_write_file(iphone_afc_client_t client, iphone_afc_file_t file,
client->afc_packet->entire_length = client->afc_packet->this_length + MAXIMUM_WRITE_SIZE;
client->afc_packet->operation = AFC_WRITE;
out_buffer = (char *) malloc(sizeof(char) * client->afc_packet->entire_length - sizeof(AFCPacket));
- memcpy(out_buffer, (char *) &file->filehandle, sizeof(uint32));
- memcpy(out_buffer + 4, (char *) &zero, sizeof(uint32));
+ memcpy(out_buffer, (char *) &file->filehandle, sizeof(uint32_t));
+ memcpy(out_buffer + 4, (char *) &zero, sizeof(uint32_t));
memcpy(out_buffer + 8, data + current_count, MAXIMUM_WRITE_SIZE);
bytes_loc = dispatch_AFC_packet(client, out_buffer, MAXIMUM_WRITE_SIZE + 8);
if (bytes_loc < 0) {
@@ -848,8 +847,8 @@ iphone_afc_write_file(iphone_afc_client_t client, iphone_afc_file_t file,
client->afc_packet->entire_length = client->afc_packet->this_length + (length - current_count);
client->afc_packet->operation = AFC_WRITE;
out_buffer = (char *) malloc(sizeof(char) * client->afc_packet->entire_length - sizeof(AFCPacket));
- memcpy(out_buffer, (char *) &file->filehandle, sizeof(uint32));
- memcpy(out_buffer + 4, (char *) &zero, sizeof(uint32));
+ memcpy(out_buffer, (char *) &file->filehandle, sizeof(uint32_t));
+ memcpy(out_buffer + 4, (char *) &zero, sizeof(uint32_t));
memcpy(out_buffer + 8, data + current_count, (length - current_count));
bytes_loc = dispatch_AFC_packet(client, out_buffer, (length - current_count) + 8);
free(out_buffer);
@@ -884,7 +883,7 @@ iphone_error_t iphone_afc_close_file(iphone_afc_client_t client, iphone_afc_file
if (!client || !file)
return IPHONE_E_INVALID_ARG;
char *buffer = malloc(sizeof(char) * 8);
- uint32 zero = 0;
+ uint32_t zero = 0;
int bytes = 0;
afc_lock(client);
@@ -892,8 +891,8 @@ iphone_error_t iphone_afc_close_file(iphone_afc_client_t client, iphone_afc_file
log_debug_msg("afc_close_file: File handle %i\n", file->filehandle);
// Send command
- memcpy(buffer, &file->filehandle, sizeof(uint32));
- memcpy(buffer + sizeof(uint32), &zero, sizeof(zero));
+ memcpy(buffer, &file->filehandle, sizeof(uint32_t));
+ memcpy(buffer + sizeof(uint32_t), &zero, sizeof(zero));
client->afc_packet->operation = AFC_FILE_CLOSE;
client->afc_packet->entire_length = client->afc_packet->this_length = 0;
bytes = dispatch_AFC_packet(client, buffer, sizeof(char) * 8);
@@ -929,7 +928,7 @@ iphone_error_t iphone_afc_close_file(iphone_afc_client_t client, iphone_afc_file
iphone_error_t iphone_afc_seek_file(iphone_afc_client_t client, iphone_afc_file_t file, int seekpos)
{
char *buffer = (char *) malloc(sizeof(char) * 24);
- uint32 seekto = 0, zero = 0;
+ uint32_t seekto = 0, zero = 0;
int bytes = 0;
if (seekpos < 0)
@@ -939,12 +938,12 @@ iphone_error_t iphone_afc_seek_file(iphone_afc_client_t client, iphone_afc_file_
// Send the command
seekto = seekpos;
- memcpy(buffer, &file->filehandle, sizeof(uint32)); // handle
- memcpy(buffer + 4, &zero, sizeof(uint32)); // pad
- memcpy(buffer + 8, &zero, sizeof(uint32)); // fromwhere
- memcpy(buffer + 12, &zero, sizeof(uint32)); // pad
- memcpy(buffer + 16, &seekto, sizeof(uint32)); // offset
- memcpy(buffer + 20, &zero, sizeof(uint32)); // pad
+ memcpy(buffer, &file->filehandle, sizeof(uint32_t)); // handle
+ memcpy(buffer + 4, &zero, sizeof(uint32_t)); // pad
+ memcpy(buffer + 8, &zero, sizeof(uint32_t)); // fromwhere
+ memcpy(buffer + 12, &zero, sizeof(uint32_t)); // pad
+ memcpy(buffer + 16, &seekto, sizeof(uint32_t)); // offset
+ memcpy(buffer + 20, &zero, sizeof(uint32_t)); // pad
client->afc_packet->operation = AFC_FILE_SEEK;
client->afc_packet->this_length = client->afc_packet->entire_length = 0;
bytes = dispatch_AFC_packet(client, buffer, 23);
@@ -984,14 +983,14 @@ iphone_error_t iphone_afc_truncate_file(iphone_afc_client_t client, iphone_afc_f
{
char *buffer = (char *) malloc(sizeof(char) * 16);
int bytes = 0;
- uint32 zero = 0;
+ uint32_t zero = 0;
afc_lock(client);
// Send command
- memcpy(buffer, &file->filehandle, sizeof(uint32)); // handle
- memcpy(buffer + 4, &zero, sizeof(uint32)); // pad
- memcpy(buffer + 8, &newsize, sizeof(uint32)); // newsize
+ memcpy(buffer, &file->filehandle, sizeof(uint32_t)); // handle
+ memcpy(buffer + 4, &zero, sizeof(uint32_t)); // pad
+ memcpy(buffer + 8, &newsize, sizeof(uint32_t)); // newsize
memcpy(buffer + 12, &zero, 3); // pad
client->afc_packet->operation = AFC_FILE_TRUNCATE;
client->afc_packet->this_length = client->afc_packet->entire_length = 0;
@@ -1017,7 +1016,7 @@ iphone_error_t iphone_afc_truncate_file(iphone_afc_client_t client, iphone_afc_f
}
}
-uint32 iphone_afc_get_file_handle(iphone_afc_file_t file)
+uint32_t iphone_afc_get_file_handle(iphone_afc_file_t file)
{
return file->filehandle;
}
diff --git a/src/AFC.h b/src/AFC.h
index 463c13e..5e4d17c 100644
--- a/src/AFC.h
+++ b/src/AFC.h
@@ -29,12 +29,12 @@
#include <glib.h>
typedef struct {
- uint32 header1, header2;
- uint32 entire_length, unknown1, this_length, unknown2, packet_num, unknown3, operation, unknown4;
+ uint32_t header1, header2;
+ uint32_t entire_length, unknown1, this_length, unknown2, packet_num, unknown3, operation, unknown4;
} AFCPacket;
typedef struct {
- uint32 filehandle, unknown1, size, unknown2;
+ uint32_t filehandle, unknown1, size, unknown2;
} AFCFilePacket;
typedef struct __AFCToken {
@@ -51,7 +51,7 @@ struct iphone_afc_client_int {
};
struct iphone_afc_file_int {
- uint32 filehandle, blocks, size, type;
+ uint32_t filehandle, blocks, size, type;
};
@@ -74,4 +74,4 @@ enum {
AFC_WRITE = 0x00000010
};
-uint32 iphone_afc_get_file_handle(iphone_afc_file_t file);
+uint32_t iphone_afc_get_file_handle(iphone_afc_file_t file);
diff --git a/src/Makefile.am b/src/Makefile.am
index 382be1f..1b97f45 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,15 +1,15 @@
INCLUDES = -I$(top_srcdir)/include
-AM_CFLAGS = $(libxml2_CFLAGS) $(libusb_CFLAGS) $(libglib2_CFLAGS) $(libgnutls_CFLAGS) $(libtasn1_CFLAGS) $(libgthread2_CFLAGS) -g -Wall
-AM_LDFLAGS = $(libxml2_LIBS) $(libusb_LIBS) $(libglib2_LIBS) $(libgnutls_LIBS) $(libtasn1_LIBS) $(libgthread2_LIBS)
+AM_CFLAGS = $(libxml2_CFLAGS) $(libusb_CFLAGS) $(libglib2_CFLAGS) $(libgnutls_CFLAGS) $(libtasn1_CFLAGS) $(libgthread2_CFLAGS) $(libplist_CFLAGS) -g -Wall
+AM_LDFLAGS = $(libxml2_LIBS) $(libusb_LIBS) $(libglib2_LIBS) $(libgnutls_LIBS) $(libtasn1_LIBS) $(libgthread2_LIBS) $(libplist_LIBS)
bin_PROGRAMS = libiphone-initconf
-libiphone_initconf_SOURCES = initconf.c userpref.c lockdown.c plist.c usbmux.c iphone.c utils.c
+libiphone_initconf_SOURCES = initconf.c userpref.c utils.c
libiphone_initconf_CFLAGS = $(libgthread2_CFLAGS) $(AM_CFLAGS)
libiphone_initconf_LDFLAGS = $(libgthread2_LIBS) $(AM_LDFLAGS)
lib_LTLIBRARIES = libiphone.la
-libiphone_la_SOURCES = usbmux.c iphone.c plist.c lockdown.c AFC.c userpref.c utils.c
+libiphone_la_SOURCES = usbmux.c iphone.c lockdown.c AFC.c userpref.c utils.c MobileSync.c
diff --git a/src/MobileSync.c b/src/MobileSync.c
new file mode 100644
index 0000000..752aee9
--- /dev/null
+++ b/src/MobileSync.c
@@ -0,0 +1,305 @@
+/*
+ * MobileSync.c
+ * Contains functions for the built-in MobileSync client.
+ *
+ * Copyright (c) 2009 Jonathan Beck All Rights Reserved.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include "MobileSync.h"
+#include <plist/plist.h>
+#include <string.h>
+
+
+#define MSYNC_VERSION_INT1 100
+#define MSYNC_VERSION_INT2 100
+
+iphone_error_t iphone_msync_new_client(iphone_device_t device, int src_port, int dst_port,
+ iphone_msync_client_t * client)
+{
+ if (!device || src_port == 0 || dst_port == 0 || !client || *client)
+ return IPHONE_E_INVALID_ARG;
+
+ iphone_error_t ret = IPHONE_E_UNKNOWN_ERROR;
+
+ iphone_msync_client_t client_loc = (iphone_msync_client_t) malloc(sizeof(struct iphone_msync_client_int));
+
+ // Attempt connection
+ client_loc->connection = NULL;
+ ret = iphone_mux_new_client(device, src_port, dst_port, &client_loc->connection);
+ if (IPHONE_E_SUCCESS != ret || !client_loc->connection) {
+ free(client_loc);
+ return ret;
+ }
+ //perform handshake
+ plist_t array = NULL;
+
+ //first receive version
+ ret = iphone_msync_recv(client_loc, &array);
+
+ plist_t msg_node =
+ plist_find_node_by_string(array, "DLMessageVersionExchange");
+ plist_t ver_1 = plist_get_next_sibling(msg_node);
+ plist_t ver_2 = plist_get_next_sibling(ver_1);
+
+ plist_type ver_1_type = plist_get_node_type(ver_1);
+ plist_type ver_2_type = plist_get_node_type(ver_2);
+
+ if (PLIST_UINT == ver_1_type && PLIST_UINT == ver_2_type) {
+
+ uint64_t ver_1_val = 0;
+ uint64_t ver_2_val = 0;
+
+ plist_get_uint_val(ver_1, &ver_1_val);
+ plist_get_uint_val(ver_2, &ver_2_val);
+
+ plist_free(array);
+ array = NULL;
+
+ if (ver_1_type == PLIST_UINT && ver_2_type == PLIST_UINT && ver_1_val == MSYNC_VERSION_INT1
+ && ver_2_val == MSYNC_VERSION_INT2) {
+
+ array = plist_new_array();
+ plist_add_sub_string_el(array, "DLMessageVersionExchange");
+ plist_add_sub_string_el(array, "DLVersionsOk");
+
+ ret = iphone_msync_send(client_loc, array);
+
+ plist_free(array);
+ array = NULL;
+
+ ret = iphone_msync_recv(client_loc, &array);
+ plist_t rep_node =
+ plist_find_node_by_string(array, "DLMessageDeviceReady");
+
+ if (rep_node) {
+ ret = IPHONE_E_SUCCESS;
+ *client = client_loc;
+ }
+ plist_free(array);
+ array = NULL;
+
+ }
+ }
+
+ if (IPHONE_E_SUCCESS != ret)
+ iphone_msync_free_client(client_loc);
+
+ return ret;
+}
+
+static void iphone_msync_stop_session(iphone_msync_client_t client)
+{
+ if (!client)
+ return;
+
+ plist_t array = plist_new_array();
+ plist_add_sub_string_el(array, "DLMessageDisconnect");
+ plist_add_sub_string_el(array, "All done, thanks for the memories");
+
+ iphone_msync_send(client, array);
+ plist_free(array);
+ array = NULL;
+}
+
+iphone_error_t iphone_msync_free_client(iphone_msync_client_t client)
+{
+ if (!client)
+ return IPHONE_E_INVALID_ARG;
+
+ iphone_msync_stop_session(client);
+ return iphone_mux_free_client(client->connection);
+}
+
+/** Polls the iPhone for MobileSync data.
+ *
+ * @param client The MobileSync client
+ * @param dump_data The pointer to the location of the buffer in which to store
+ * the received data
+ * @param recv_byhtes The number of bytes received
+ *
+ * @return an error code
+ */
+iphone_error_t iphone_msync_recv(iphone_msync_client_t client, plist_t * plist)
+{
+ if (!client || !plist || (plist && *plist))
+ return IPHONE_E_INVALID_ARG;
+ iphone_error_t ret = IPHONE_E_UNKNOWN_ERROR;
+ char *receive;
+ uint32_t datalen = 0, bytes = 0;
+
+ ret = iphone_mux_recv(client->connection, (char *) &datalen, sizeof(datalen), &bytes);
+ datalen = ntohl(datalen);
+
+ receive = (char *) malloc(sizeof(char) * datalen);
+ ret = iphone_mux_recv(client->connection, receive, datalen, &bytes);
+
+ plist_from_bin(receive, bytes, plist);
+
+ char *XMLContent = NULL;
+ uint32_t length = 0;
+ plist_to_xml(*plist, &XMLContent, &length);
+ log_dbg_msg(DBGMASK_MOBILESYNC, "Recv msg :\nsize : %i\nbuffer :\n%s\n", length, XMLContent);
+ free(XMLContent);
+
+ return ret;
+}
+
+/** Sends MobileSync data to the iPhone
+ *
+ * @note This function is low-level and should only be used if you need to send
+ * a new type of message.
+ *
+ * @param client The MobileSync client
+ * @param raw_data The null terminated string buffer to send
+ * @param length The length of data to send
+ * @param sent_bytes The number of bytes sent
+ *
+ * @return an error code
+ */
+iphone_error_t iphone_msync_send(iphone_msync_client_t client, plist_t plist)
+{
+ if (!client || !plist)
+ return IPHONE_E_INVALID_ARG;
+
+ char *XMLContent = NULL;
+ uint32_t length = 0;
+ plist_to_xml(plist, &XMLContent, &length);
+ log_dbg_msg(DBGMASK_MOBILESYNC, "Send msg :\nsize : %i\nbuffer :\n%s\n", length, XMLContent);
+ free(XMLContent);
+
+ char *content = NULL;
+ length = 0;
+
+ plist_to_bin(plist, &content, &length);
+
+ char *real_query;
+ int bytes;
+ iphone_error_t ret = IPHONE_E_UNKNOWN_ERROR;
+
+ real_query = (char *) malloc(sizeof(char) * (length + 4));
+ length = htonl(length);
+ memcpy(real_query, &length, sizeof(length));
+ memcpy(real_query + 4, content, ntohl(length));
+
+ ret = iphone_mux_send(client->connection, real_query, ntohl(length) + sizeof(length), &bytes);
+ free(real_query);
+ return ret;
+}
+
+iphone_error_t iphone_msync_get_all_contacts(iphone_msync_client_t client)
+{
+ if (!client)
+ return IPHONE_E_INVALID_ARG;
+
+ iphone_error_t ret = IPHONE_E_UNKNOWN_ERROR;
+ plist_t array = NULL;
+
+ array = plist_new_array();
+ plist_add_sub_string_el(array, "SDMessageSyncDataClassWithDevice");
+ plist_add_sub_string_el(array, "com.apple.Contacts");
+ plist_add_sub_string_el(array, "---");
+ plist_add_sub_string_el(array, "2009-01-09 18:03:58 +0100");
+ plist_add_sub_uint_el(array, 106);
+ plist_add_sub_string_el(array, "___EmptyParameterString___");
+
+ ret = iphone_msync_send(client, array);
+ plist_free(array);
+ array = NULL;
+
+ ret = iphone_msync_recv(client, &array);
+
+ plist_t rep_node = plist_find_node(array, PLIST_STRING, "SDSyncTypeSlow", strlen("SDSyncTypeSlow"));
+
+ if (!rep_node)
+ return ret;
+
+ plist_free(array);
+ array = NULL;
+
+ array = plist_new_array();
+ plist_add_sub_string_el(array, "SDMessageGetAllRecordsFromDevice");
+ plist_add_sub_string_el(array, "com.apple.Contacts");
+
+
+ ret = iphone_msync_send(client, array);
+ plist_free(array);
+ array = NULL;
+
+ ret = iphone_msync_recv(client, &array);
+
+ plist_t contact_node;
+ plist_t switch_node;
+
+ contact_node = plist_find_node(array, PLIST_STRING, "com.apple.Contacts", strlen("com.apple.Contacts"));
+ switch_node =
+ plist_find_node(array, PLIST_STRING, "SDMessageDeviceReadyToReceiveChanges",
+ strlen("SDMessageDeviceReadyToReceiveChanges"));
+
+ while (NULL == switch_node) {
+
+ plist_free(array);
+ array = NULL;
+
+ array = plist_new_array();
+ plist_add_sub_string_el(array, "SDMessageAcknowledgeChangesFromDevice");
+ plist_add_sub_string_el(array, "com.apple.Contacts");
+
+ ret = iphone_msync_send(client, array);
+ plist_free(array);
+ array = NULL;
+
+ ret = iphone_msync_recv(client, &array);
+
+ contact_node = plist_find_node(array, PLIST_STRING, "com.apple.Contacts", strlen("com.apple.Contacts"));
+ switch_node =
+ plist_find_node(array, PLIST_STRING, "SDMessageDeviceReadyToReceiveChanges",
+ strlen("SDMessageDeviceReadyToReceiveChanges"));
+ }
+
+ array = plist_new_array();
+ plist_add_sub_string_el(array, "DLMessagePing");
+ plist_add_sub_string_el(array, "Preparing to get changes for device");
+
+ ret = iphone_msync_send(client, array);
+ plist_free(array);
+ array = NULL;
+
+ array = plist_new_array();
+ plist_add_sub_string_el(array, "SDMessageProcessChanges");
+ plist_add_sub_string_el(array, "com.apple.Contacts");
+ plist_add_sub_node(array, plist_new_dict());
+ plist_add_sub_bool_el(array, 0);
+ plist_t dict = plist_new_dict();
+ plist_add_sub_node(array, dict);
+ plist_add_sub_key_el(dict, "SyncDeviceLinkEntityNamesKey");
+ plist_t array2 = plist_new_array();
+ plist_add_sub_string_el(array2, "com.apple.contacts.Contact");
+ plist_add_sub_string_el(array2, "com.apple.contacts.Group");
+ plist_add_sub_key_el(dict, "SyncDeviceLinkAllRecordsOfPulledEntityTypeSentKey");
+ plist_add_sub_bool_el(dict, 0);
+
+ ret = iphone_msync_send(client, array);
+ plist_free(array);
+ array = NULL;
+
+ ret = iphone_msync_recv(client, &array);
+ plist_free(array);
+ array = NULL;
+
+
+ return ret;
+}
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 @@
+/*
+ * MobileSync.h
+ * Definitions for the built-in MobileSync client
+ *
+ * Copyright (c) 2009 Jonathan Beck All Rights Reserved.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+#ifndef MOBILESYNC_H
+#define MOBILESYNC_H
+
+#include "usbmux.h"
+#include "iphone.h"
+#include "utils.h"
+
+#include <plist/plist.h>
+
+
+
+struct iphone_msync_client_int {
+ iphone_umux_client_t connection;
+};
+
+
+iphone_error_t iphone_msync_get_all_contacts(iphone_msync_client_t client);
+
+#endif
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 @@
#include "libiphone/libiphone.h"
#include "userpref.h"
-#include "lockdown.h"
#include "utils.h"
/** 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)
g_thread_exit(0);
}
+int get_rand(int min, int max)
+{
+ int retval = (rand() % (max - min)) + min;
+ return retval;
+}
+
+/** Generates a valid HostID (which is actually a UUID).
+ *
+ * @param A null terminated string containing a valid HostID.
+ */
+char *lockdownd_generate_hostid()
+{
+ char *hostid = (char *) malloc(sizeof(char) * 37); // HostID's are just UUID's, and UUID's are 36 characters long
+ const char *chars = "ABCDEF0123456789";
+ srand(time(NULL));
+ int i = 0;
+
+ for (i = 0; i < 36; i++) {
+ if (i == 8 || i == 13 || i == 18 || i == 23) {
+ hostid[i] = '-';
+ continue;
+ } else {
+ hostid[i] = chars[get_rand(0, 16)];
+ }
+ }
+ hostid[36] = '\0'; // make it a real string
+ return hostid;
+}
+
int main(int argc, char *argv[])
{
GThread *progress_thread, *key_thread;
diff --git a/src/lockdown.c b/src/lockdown.c
index 2d85a03..a02e6a8 100644
--- a/src/lockdown.c
+++ b/src/lockdown.c
@@ -31,6 +31,9 @@
#include <libtasn1.h>
#include <gnutls/x509.h>
+#include <plist/plist.h>
+
+
const ASN1_ARRAY_TYPE pkcs1_asn1_tab[] = {
{"PKCS1", 536872976, 0},
{0, 1073741836, 0},
@@ -40,35 +43,6 @@ const ASN1_ARRAY_TYPE pkcs1_asn1_tab[] = {
{0, 0, 0}
};
-static int get_rand(int min, int max)
-{
- int retval = (rand() % (max - min)) + min;
- return retval;
-}
-
-/** Generates a valid HostID (which is actually a UUID).
- *
- * @param A null terminated string containing a valid HostID.
- */
-char *lockdownd_generate_hostid(void)
-{
- char *hostid = (char *) malloc(sizeof(char) * 37); // HostID's are just UUID's, and UUID's are 36 characters long
- const char *chars = "ABCDEF0123456789";
- srand(time(NULL));
- int i = 0;
-
- for (i = 0; i < 36; i++) {
- if (i == 8 || i == 13 || i == 18 || i == 23) {
- hostid[i] = '-';
- continue;
- } else {
- hostid[i] = chars[get_rand(0, 16)];
- }
- }
- hostid[36] = '\0'; // make it a real string
- return hostid;
-}
-
/** Creates a lockdownd client for the give iPhone.
*
* @param phone The iPhone to create a lockdownd client for
@@ -101,57 +75,56 @@ iphone_lckd_client_t new_lockdownd_client(iphone_device_t phone)
static void iphone_lckd_stop_session(iphone_lckd_client_t control)
{
if (!control)
- return; // IPHONE_E_INVALID_ARG;
- xmlDocPtr plist = new_plist();
- xmlNode *dict, *key;
- char **dictionary;
- int bytes = 0, i = 0;
+ return; //IPHONE_E_INVALID_ARG;
+
iphone_error_t ret = IPHONE_E_UNKNOWN_ERROR;
- log_debug_msg("lockdownd_stop_session() called\n");
- dict = add_child_to_plist(plist, "dict", "\n", NULL, 0);
- key = add_key_str_dict_element(plist, dict, "Request", "StopSession", 1);
- key = add_key_str_dict_element(plist, dict, "SessionID", control->session_id, 1);
+ plist_t dict = plist_new_dict();
+ plist_add_sub_key_el(dict, "Request");
+ plist_add_sub_string_el(dict, "StopSession");
+ plist_add_sub_key_el(dict, "SessionID");
+ plist_add_sub_string_el(dict, control->session_id);
- char *XML_content;
- uint32 length;
+ log_dbg_msg(DBGMASK_LOCKDOWND, "iphone_lckd_stop_session() called\n");
- xmlDocDumpMemory(plist, (xmlChar **) & XML_content, &length);
- ret = iphone_lckd_send(control, XML_content, length, &bytes);
+ ret = iphone_lckd_send(control, dict);
- xmlFree(XML_content);
- xmlFreeDoc(plist);
- plist = NULL;
- ret = iphone_lckd_recv(control, &XML_content, &bytes);
+ plist_free(dict);
+ dict = NULL;
+
+ ret = iphone_lckd_recv(control, &dict);
- plist = xmlReadMemory(XML_content, bytes, NULL, NULL, 0);
- if (!plist) {
- log_debug_msg("lockdownd_stop_session(): IPHONE_E_PLIST_ERROR\n");
- return; //IPHONE_E_PLIST_ERROR;
- }
- dict = xmlDocGetRootElement(plist);
- for (dict = dict->children; dict; dict = dict->next) {
- if (!xmlStrcmp(dict->name, "dict"))
- break;
- }
if (!dict) {
- log_debug_msg("lockdownd_stop_session(): IPHONE_E_DICT_ERROR\n");
- return; //IPHONE_E_DICT_ERROR;
+ log_dbg_msg(DBGMASK_LOCKDOWND, "lockdownd_stop_session(): IPHONE_E_PLIST_ERROR\n");
+ return; // IPHONE_E_PLIST_ERROR;
}
- dictionary = read_dict_element_strings(dict);
- xmlFreeDoc(plist);
- free(XML_content);
- for (i = 0; dictionary[i]; i += 2) {
- if (!strcmp(dictionary[i], "Result") && !strcmp(dictionary[i + 1], "Success")) {
- log_debug_msg("lockdownd_stop_session(): success\n");
+ plist_t query_node = plist_find_node_by_string(dict, "StopSession");
+ plist_t result_node = plist_get_next_sibling(query_node);
+ plist_t value_node = plist_get_next_sibling(result_node);
+
+ plist_type result_type = plist_get_node_type(result_node);
+ plist_type value_type = plist_get_node_type(value_node);
+
+ if (result_type == PLIST_KEY && value_type == PLIST_STRING) {
+
+ char *result_value = NULL;
+ char *value_value = NULL;
+
+ plist_get_key_val(result_node, &result_value);
+ plist_get_string_val(value_node, &value_value);
+
+ if (!strcmp(result_value, "Result") && !strcmp(value_value, "Success")) {
+ log_dbg_msg(DBGMASK_LOCKDOWND, "lockdownd_stop_session(): success\n");
ret = IPHONE_E_SUCCESS;
- break;
}
+ free(result_value);
+ free(value_value);
}
+ plist_free(dict);
+ dict = NULL;
- free_dictionary(dictionary);
- return; //ret;
+ return; // ret;
}
/**
@@ -164,14 +137,14 @@ static void iphone_lckd_stop_session(iphone_lckd_client_t control)
static void iphone_lckd_stop_SSL_session(iphone_lckd_client_t client)
{
if (!client) {
- log_debug_msg("lockdownd_stop_SSL_session(): invalid argument!\n");
+ log_dbg_msg(DBGMASK_LOCKDOWND, "lockdownd_stop_SSL_session(): invalid argument!\n");
return;
}
if (client->in_SSL) {
- log_debug_msg("Stopping SSL Session\n");
+ log_dbg_msg(DBGMASK_LOCKDOWND, "Stopping SSL Session\n");
iphone_lckd_stop_session(client);
- log_debug_msg("Sending SSL close notify\n");
+ log_dbg_msg(DBGMASK_LOCKDOWND, "Sending SSL close notify\n");
gnutls_bye(*client->ssl_session, GNUTLS_SHUT_RDWR);
}
if (client->ssl_session) {
@@ -217,13 +190,13 @@ iphone_error_t iphone_lckd_free_client(iphone_lckd_client_t client)
*
* @return The number of bytes received
*/
-iphone_error_t iphone_lckd_recv(iphone_lckd_client_t client, char **dump_data, uint32_t * recv_bytes)
+iphone_error_t iphone_lckd_recv(iphone_lckd_client_t client, plist_t * plist)
{
- if (!client || !dump_data || !recv_bytes)
+ if (!client || !plist || (plist && *plist))
return IPHONE_E_INVALID_ARG;
iphone_error_t ret = IPHONE_E_UNKNOWN_ERROR;
char *receive;
- uint32 datalen = 0, bytes = 0;
+ uint32_t datalen = 0, bytes = 0;
if (!client->in_SSL)
ret = iphone_mux_recv(client->connection, (char *) &datalen, sizeof(datalen), &bytes);
@@ -242,8 +215,18 @@ iphone_error_t iphone_lckd_recv(iphone_lckd_client_t client, char **dump_data, u
if (bytes > 0)
ret = IPHONE_E_SUCCESS;
}
- *dump_data = receive;
- *recv_bytes = bytes;
+
+ if (bytes <= 0) {
+ free(receive);
+ return IPHONE_E_NOT_ENOUGH_DATA;
+ }
+
+ plist_from_xml(receive, bytes, plist);
+ free(receive);
+
+ if (!*plist)
+ ret = IPHONE_E_PLIST_ERROR;
+
return ret;
}
@@ -252,26 +235,31 @@ iphone_error_t iphone_lckd_recv(iphone_lckd_client_t client, char **dump_data, u
* @note This function is low-level and should only be used if you need to send
* a new type of message.
*
- * @param control The lockdownd client
- * @param raw_data The null terminated string buffer to send
- * @param length The length of data to send
+ * @param client The lockdownd client
+ * @param plist The plist to send
*
- * @return The number of bytes sent
+ * @return an error code (IPHONE_E_SUCCESS on success)
*/
-iphone_error_t iphone_lckd_send(iphone_lckd_client_t client, char *raw_data, uint32_t length, uint32_t * sent_bytes)
+iphone_error_t iphone_lckd_send(iphone_lckd_client_t client, plist_t plist)
{
- if (!client || !raw_data || length == 0 || !sent_bytes)
+ if (!client || !plist)
return IPHONE_E_INVALID_ARG;
char *real_query;
int bytes;
+ char *XMLContent = NULL;
+ uint32_t length = 0;
iphone_error_t ret = IPHONE_E_UNKNOWN_ERROR;
+ plist_to_xml(plist, &XMLContent, &length);
+ log_dbg_msg(DBGMASK_LOCKDOWND, "Send msg :\nsize : %i\nbuffer :\n%s\n", length, XMLContent);
+
+
real_query = (char *) malloc(sizeof(char) * (length + 4));
length = htonl(length);
memcpy(real_query, &length, sizeof(length));
- memcpy(real_query + 4, raw_data, ntohl(length));
- log_debug_msg("lockdownd_send(): made the query, sending it along\n");
- dump_debug_buffer("grpkt", real_query, ntohl(length) + 4);
+ memcpy(real_query + 4, XMLContent, ntohl(length));
+ free(XMLContent);
+ log_dbg_msg(DBGMASK_LOCKDOWND, "lockdownd_send(): made the query, sending it along\n");
if (!client->in_SSL)
ret = iphone_mux_send(client->connection, real_query, ntohl(length) + sizeof(length), &bytes);
@@ -279,9 +267,9 @@ iphone_error_t iphone_lckd_send(iphone_lckd_client_t client, char *raw_data, uin
gnutls_record_send(*client->ssl_session, real_query, ntohl(length) + sizeof(length));
ret = IPHONE_E_SUCCESS;
}
- log_debug_msg("lockdownd_send(): sent it!\n");
+ log_dbg_msg(DBGMASK_LOCKDOWND, "lockdownd_send(): sent it!\n");
free(real_query);
- *sent_bytes = bytes;
+
return ret;
}
@@ -297,49 +285,50 @@ iphone_error_t lockdownd_hello(iphone_lckd_client_t control)
{
if (!control)
return IPHONE_E_INVALID_ARG;
- xmlDocPtr plist = new_plist();
- xmlNode *dict, *key;
- char **dictionary;
- int bytes = 0, i = 0;
+
iphone_error_t ret = IPHONE_E_UNKNOWN_ERROR;
- log_debug_msg("lockdownd_hello() called\n");
- dict = add_child_to_plist(plist, "dict", "\n", NULL, 0);
- key = add_key_str_dict_element(plist, dict, "Request", "QueryType", 1);
- char *XML_content;
- uint32 length;
+ plist_t dict = plist_new_dict();
+ plist_add_sub_key_el(dict, "Request");
+ plist_add_sub_string_el(dict, "QueryType");
- xmlDocDumpMemory(plist, (xmlChar **) & XML_content, &length);
- ret = iphone_lckd_send(control, XML_content, length, &bytes);
+ log_dbg_msg(DBGMASK_LOCKDOWND, "lockdownd_hello() called\n");
+ ret = iphone_lckd_send(control, dict);
- xmlFree(XML_content);
- xmlFreeDoc(plist);
- plist = NULL;
- ret = iphone_lckd_recv(control, &XML_content, &bytes);
+ plist_free(dict);
+ dict = NULL;
- plist = xmlReadMemory(XML_content, bytes, NULL, NULL, 0);
- if (!plist)
- return IPHONE_E_PLIST_ERROR;
- dict = xmlDocGetRootElement(plist);
- for (dict = dict->children; dict; dict = dict->next) {
- if (!xmlStrcmp(dict->name, "dict"))
- break;
- }
- if (!dict)
- return IPHONE_E_DICT_ERROR;
- dictionary = read_dict_element_strings(dict);
- xmlFreeDoc(plist);
- free(XML_content);
-
- for (i = 0; dictionary[i]; i += 2) {
- if (!strcmp(dictionary[i], "Result") && !strcmp(dictionary[i + 1], "Success")) {
- log_debug_msg("lockdownd_hello(): success\n");
+ ret = iphone_lckd_recv(control, &dict);
+
+ if (IPHONE_E_SUCCESS != ret)
+ return ret;
+
+ plist_t query_node = plist_find_node_by_string(dict, "QueryType");
+ plist_t result_node = plist_get_next_sibling(query_node);
+ plist_t value_node = plist_get_next_sibling(result_node);
+
+ plist_type result_type = plist_get_node_type(result_node);
+ plist_type value_type = plist_get_node_type(value_node);
+
+ if (result_type == PLIST_KEY && value_type == PLIST_STRING) {
+
+ char *result_value = NULL;
+ char *value_value = NULL;
+
+ plist_get_key_val(result_node, &result_value);
+ plist_get_string_val(value_node, &value_value);
+
+ if (!strcmp(result_value, "Result") && !strcmp(value_value, "Success")) {
+ log_dbg_msg(DBGMASK_LOCKDOWND, "lockdownd_hello(): success\n");
ret = IPHONE_E_SUCCESS;
- break;
}
+ free(result_value);
+ free(value_value);
}
- free_dictionary(dictionary);
+ plist_free(dict);
+ dict = NULL;
+
return ret;
}
@@ -351,74 +340,91 @@ iphone_error_t lockdownd_hello(iphone_lckd_client_t control)
*
* @return IPHONE_E_SUCCESS on success.
*/
-iphone_error_t lockdownd_generic_get_value(iphone_lckd_client_t control, const char *req_key, const char *req_string,
- char **value)
+iphone_error_t lockdownd_generic_get_value(iphone_lckd_client_t control, const char *req_key, char *req_string,
+ gnutls_datum_t * value)
{
- if (!control || !req_key || !value || (value && *value))
+ if (!control || !req_key || !value || value->data)
return IPHONE_E_INVALID_ARG;
- xmlDocPtr plist = new_plist();
- xmlNode *dict = NULL;
- xmlNode *key = NULL;;
- char **dictionary = NULL;
- int bytes = 0, i = 0;
- char *XML_content = NULL;
- uint32 length = 0;
+
+ plist_t dict = NULL;
iphone_error_t ret = IPHONE_E_UNKNOWN_ERROR;
/* Setup DevicePublicKey request plist */
- dict = add_child_to_plist(plist, "dict", "\n", NULL, 0);
- key = add_key_str_dict_element(plist, dict, req_key, req_string, 1);
- key = add_key_str_dict_element(plist, dict, "Request", "GetValue", 1);
- xmlDocDumpMemory(plist, (xmlChar **) & XML_content, &length);
+ dict = plist_new_dict();
+ plist_add_sub_key_el(dict, req_key);
+ plist_add_sub_string_el(dict, req_string);
+ plist_add_sub_key_el(dict, "Request");
+ plist_add_sub_string_el(dict, "GetValue");
/* send to iPhone */
- ret = iphone_lckd_send(control, XML_content, length, &bytes);
+ ret = iphone_lckd_send(control, dict);
- xmlFree(XML_content);
- xmlFreeDoc(plist);
- plist = NULL;
+ plist_free(dict);
+ dict = NULL;
if (ret != IPHONE_E_SUCCESS)
return ret;
/* Now get iPhone's answer */
- ret = iphone_lckd_recv(control, &XML_content, &bytes);
+ ret = iphone_lckd_recv(control, &dict);
if (ret != IPHONE_E_SUCCESS)
return ret;
- plist = xmlReadMemory(XML_content, bytes, NULL, NULL, 0);
- if (!plist)
- return IPHONE_E_PLIST_ERROR;
- dict = xmlDocGetRootElement(plist);
- for (dict = dict->children; dict; dict = dict->next) {
- if (!xmlStrcmp(dict->name, "dict"))
- break;
- }
- if (!dict)
- return IPHONE_E_DICT_ERROR;
+ plist_t query_node = plist_find_node_by_string(dict, "GetValue");
+ plist_t result_key_node = plist_get_next_sibling(query_node);
+ plist_t result_value_node = plist_get_next_sibling(result_key_node);
- /* Parse xml to check success and to find public key */
- dictionary = read_dict_element_strings(dict);
- xmlFreeDoc(plist);
- free(XML_content);
+ plist_type result_key_type = plist_get_node_type(result_key_node);
+ plist_type result_value_type = plist_get_node_type(result_value_node);
- int success = 0;
- for (i = 0; dictionary[i]; i += 2) {
- if (!strcmp(dictionary[i], "Result") && !strcmp(dictionary[i + 1], "Success")) {
- success = 1;
- }
- if (!strcmp(dictionary[i], "Value")) {
- *value = strdup(dictionary[i + 1]);
+ if (result_key_type == PLIST_KEY && result_value_type == PLIST_STRING) {
+
+ char *result_key = NULL;
+ char *result_value = NULL;
+ ret = IPHONE_E_DICT_ERROR;
+
+ plist_get_key_val(result_key_node, &result_key);
+ plist_get_string_val(result_value_node, &result_value);
+
+ if (!strcmp(result_key, "Result") && !strcmp(result_value, "Success")) {
+ log_dbg_msg(DBGMASK_LOCKDOWND, "lockdownd_generic_get_value(): success\n");
+ ret = IPHONE_E_SUCCESS;
}
+ free(result_key);
+ free(result_value);
+ }
+ if (ret != IPHONE_E_SUCCESS) {
+ return ret;
}
- if (dictionary) {
- free_dictionary(dictionary);
- dictionary = NULL;
+ plist_t value_key_node = plist_get_next_sibling(result_key_node);
+ plist_t value_value_node = plist_get_next_sibling(value_key_node);
+
+ plist_type value_key_type = plist_get_node_type(value_key_node);
+
+ if (value_key_type == PLIST_KEY) {
+
+ char *result_key = NULL;
+ plist_get_key_val(value_key_node, &result_key);
+
+ if (!strcmp(result_key, "Value")) {
+ log_dbg_msg(DBGMASK_LOCKDOWND, "lockdownd_generic_get_value(): success\n");
+
+ plist_type value_value_type;
+ char *value_value = NULL;
+ uint64_t valval_length = 0;
+
+ plist_get_type_and_value(value_value_node, &value_value_type, (void *) (&value_value), &valval_length);
+
+ value->data = value_value;
+ value->size = valval_length;
+ ret = IPHONE_E_SUCCESS;
+ }
+ free(result_key);
}
- if (success)
- ret = IPHONE_E_SUCCESS;
+
+ plist_free(dict);
return ret;
}
@@ -430,7 +436,9 @@ iphone_error_t lockdownd_generic_get_value(iphone_lckd_client_t control, const c
*/
iphone_error_t lockdownd_get_device_uid(iphone_lckd_client_t control, char **uid)
{
- return lockdownd_generic_get_value(control, "Key", "UniqueDeviceID", uid);
+ gnutls_datum_t temp = { NULL, 0 };
+ return lockdownd_generic_get_value(control, "Key", "UniqueDeviceID", &temp);
+ *uid = temp.data;
}
/** Askes for the device's public key. Part of the lockdownd handshake.
@@ -439,7 +447,7 @@ iphone_error_t lockdownd_get_device_uid(iphone_lckd_client_t control, char **uid
*
* @return 1 on success and 0 on failure.
*/
-iphone_error_t lockdownd_get_device_public_key(iphone_lckd_client_t control, char **public_key)
+iphone_error_t lockdownd_get_device_public_key(iphone_lckd_client_t control, gnutls_datum_t * public_key)
{
return lockdownd_generic_get_value(control, "Key", "DevicePublicKey", public_key);
}
@@ -511,107 +519,91 @@ iphone_error_t iphone_lckd_new_client(iphone_device_t device, iphone_lckd_client
iphone_error_t lockdownd_pair_device(iphone_lckd_client_t control, char *uid, char *host_id)
{
iphone_error_t ret = IPHONE_E_UNKNOWN_ERROR;
- xmlDocPtr plist = new_plist();
- xmlNode *dict = NULL;
- xmlNode *dictRecord = NULL;
- char **dictionary = NULL;
- int bytes = 0, i = 0;
- char *XML_content = NULL;
- uint32 length = 0;
-
- char *device_cert_b64 = NULL;
- char *host_cert_b64 = NULL;
- char *root_cert_b64 = NULL;
- char *public_key_b64 = NULL;
-
- ret = lockdownd_get_device_public_key(control, &public_key_b64);
+ plist_t dict = NULL;
+ plist_t dict_record = NULL;
+
+ gnutls_datum_t device_cert = { NULL, 0 };
+ gnutls_datum_t host_cert = { NULL, 0 };
+ gnutls_datum_t root_cert = { NULL, 0 };
+ gnutls_datum_t public_key = { NULL, 0 };
+
+ ret = lockdownd_get_device_public_key(control, &public_key);
if (ret != IPHONE_E_SUCCESS) {
log_debug_msg("Device refused to send public key.\n");
return ret;
}
- ret = lockdownd_gen_pair_cert(public_key_b64, &device_cert_b64, &host_cert_b64, &root_cert_b64);
+ ret = lockdownd_gen_pair_cert(public_key, &device_cert, &host_cert, &root_cert);
if (ret != IPHONE_E_SUCCESS) {
- free(public_key_b64);
+ free(public_key.data);
return ret;
}
/* Setup Pair request plist */
- dict = add_child_to_plist(plist, "dict", "\n", NULL, 0);
- dictRecord = add_key_dict_node(plist, dict, "PairRecord", "\n", 1);
- //dictRecord = add_child_to_plist(plist, "dict", "\n", NULL, 1);
- add_key_data_dict_element(plist, dictRecord, "DeviceCertificate", device_cert_b64, 2);
- add_key_data_dict_element(plist, dictRecord, "HostCertificate", host_cert_b64, 2);
- add_key_str_dict_element(plist, dictRecord, "HostID", host_id, 2);
- add_key_data_dict_element(plist, dictRecord, "RootCertificate", root_cert_b64, 2);
- add_key_str_dict_element(plist, dict, "Request", "Pair", 1);
-
- xmlDocDumpMemory(plist, (xmlChar **) & XML_content, &length);
-
- printf("XML Pairing request : %s\n", XML_content);
+ dict = plist_new_dict();
+ plist_add_sub_key_el(dict, "PairRecord");
+ dict_record = plist_new_dict();
+ plist_add_sub_node(dict, dict_record);
+ plist_add_sub_key_el(dict_record, "DeviceCertificate");
+ plist_add_sub_data_el(dict_record, device_cert.data, device_cert.size);
+ plist_add_sub_key_el(dict_record, "HostCertificate");
+ plist_add_sub_data_el(dict_record, host_cert.data, host_cert.size);
+ plist_add_sub_key_el(dict_record, "HostID");
+ plist_add_sub_string_el(dict_record, host_id);
+ plist_add_sub_key_el(dict_record, "RootCertificate");
+ plist_add_sub_data_el(dict_record, root_cert.data, root_cert.size);
+ plist_add_sub_key_el(dict_record, "Request");
+ plist_add_sub_string_el(dict_record, "Pair");
/* send to iPhone */
- ret = iphone_lckd_send(control, XML_content, length, &bytes);
-
- xmlFree(XML_content);
- xmlFreeDoc(plist);
- plist = NULL;
+ ret = iphone_lckd_send(control, dict);
+ plist_free(dict);
+ dict = NULL;
if (ret != IPHONE_E_SUCCESS)
return ret;
/* Now get iPhone's answer */
- ret = iphone_lckd_recv(control, &XML_content, &bytes);
+ ret = iphone_lckd_recv(control, &dict);
if (ret != IPHONE_E_SUCCESS)
return ret;
- log_debug_msg("lockdown_pair_device: iPhone's response to our pair request:\n");
- log_debug_msg(XML_content);
- log_debug_msg("\n\n");
+ plist_t query_node = plist_find_node_by_string(dict, "Pair");
+ plist_t result_key_node = plist_get_next_sibling(query_node);
+ plist_t result_value_node = plist_get_next_sibling(result_key_node);
- plist = xmlReadMemory(XML_content, bytes, NULL, NULL, 0);
- if (!plist) {
- free(public_key_b64);
- return IPHONE_E_PLIST_ERROR;
- }
- dict = xmlDocGetRootElement(plist);
- for (dict = dict->children; dict; dict = dict->next) {
- if (!xmlStrcmp(dict->name, "dict"))
- break;
- }
- if (!dict) {
- free(public_key_b64);
- return IPHONE_E_DICT_ERROR;
- }
+ plist_type result_key_type = plist_get_node_type(result_key_node);
+ plist_type result_value_type = plist_get_node_type(result_value_node);
+
+ if (result_key_type == PLIST_KEY && result_value_type == PLIST_STRING) {
- /* Parse xml to check success and to find public key */
- dictionary = read_dict_element_strings(dict);
- xmlFreeDoc(plist);
- free(XML_content);
+ char *result_key = NULL;
+ char *result_value = NULL;
- int success = 0;
- for (i = 0; dictionary[i]; i += 2) {
- if (!strcmp(dictionary[i], "Result") && !strcmp(dictionary[i + 1], "Success")) {
- success = 1;
+ plist_get_key_val(result_key_node, &result_key);
+ plist_get_string_val(result_value_node, &result_value);
+
+ if (!strcmp(result_key, "Result") && !strcmp(result_value, "Success")) {
+ ret = IPHONE_E_SUCCESS;
}
- }
- if (dictionary) {
- free_dictionary(dictionary);
- dictionary = NULL;
+ free(result_key);
+ free(result_value);
}
+ plist_free(dict);
+ dict = NULL;
/* store public key in config if pairing succeeded */
- if (success) {
- log_debug_msg("lockdownd_pair_device: pair success\n");
- store_device_public_key(uid, public_key_b64);
+ if (ret == IPHONE_E_SUCCESS) {
+ log_dbg_msg(DBGMASK_LOCKDOWND, "lockdownd_pair_device: pair success\n");
+ store_device_public_key(uid, public_key);
ret = IPHONE_E_SUCCESS;
} else {
- log_debug_msg("lockdownd_pair_device: pair failure\n");
+ log_dbg_msg(DBGMASK_LOCKDOWND, "lockdownd_pair_device: pair failure\n");
ret = IPHONE_E_PAIRING_FAILED;
}
- free(public_key_b64);
+ free(public_key.data);
return ret;
}
@@ -624,55 +616,51 @@ iphone_error_t lockdownd_pair_device(iphone_lckd_client_t control, char *uid, ch
void lockdownd_close(iphone_lckd_client_t control)
{
if (!control)
- return; // IPHONE_E_INVALID_ARG;
- xmlDocPtr plist = new_plist();
- xmlNode *dict, *key;
- char **dictionary;
- int bytes = 0, i = 0;
+ return; //IPHONE_E_INVALID_ARG;
+
iphone_error_t ret = IPHONE_E_UNKNOWN_ERROR;
- log_debug_msg("lockdownd_close() called\n");
- dict = add_child_to_plist(plist, "dict", "\n", NULL, 0);
- key = add_key_str_dict_element(plist, dict, "Request", "Goodbye", 1);
- char *XML_content;
- uint32 length;
+ plist_t dict = plist_new_dict();
+ plist_add_sub_key_el(dict, "Request");
+ plist_add_sub_string_el(dict, "Goodbye");
- xmlDocDumpMemory(plist, (xmlChar **) & XML_content, &length);
- ret = iphone_lckd_send(control, XML_content, length, &bytes);
+ log_dbg_msg(DBGMASK_LOCKDOWND, "lockdownd_close() called\n");
- xmlFree(XML_content);
- xmlFreeDoc(plist);
- plist = NULL;
- ret = iphone_lckd_recv(control, &XML_content, &bytes);
+ ret = iphone_lckd_send(control, dict);
+ plist_free(dict);
+ dict = NULL;
+
+ ret = iphone_lckd_recv(control, &dict);
- plist = xmlReadMemory(XML_content, bytes, NULL, NULL, 0);
- if (!plist) {
- log_debug_msg("lockdownd_close(): IPHONE_E_PLIST_ERROR\n");
- return; //IPHONE_E_PLIST_ERROR;
- }
- dict = xmlDocGetRootElement(plist);
- for (dict = dict->children; dict; dict = dict->next) {
- if (!xmlStrcmp(dict->name, "dict"))
- break;
- }
if (!dict) {
- log_debug_msg("lockdownd_close(): IPHONE_E_DICT_ERROR\n");
- return; //IPHONE_E_DICT_ERROR;
+ log_dbg_msg(DBGMASK_LOCKDOWND, "lockdownd_close(): IPHONE_E_PLIST_ERROR\n");
+ return; // IPHONE_E_PLIST_ERROR;
}
- dictionary = read_dict_element_strings(dict);
- xmlFreeDoc(plist);
- free(XML_content);
- for (i = 0; dictionary[i]; i += 2) {
- if (!strcmp(dictionary[i], "Result") && !strcmp(dictionary[i + 1], "Success")) {
- log_debug_msg("lockdownd_close(): success\n");
+ plist_t query_node = plist_find_node_by_string(dict, "Goodbye");
+ plist_t result_node = plist_get_next_sibling(query_node);
+ plist_t value_node = plist_get_next_sibling(result_node);
+
+ plist_type result_type = plist_get_node_type(result_node);
+ plist_type value_type = plist_get_node_type(value_node);
+
+ if (result_type == PLIST_KEY && value_type == PLIST_STRING) {
+ char *result_value = NULL;
+ char *value_value = NULL;
+
+ plist_get_key_val(result_node, &result_value);
+ plist_get_string_val(value_node, &value_value);
+
+ if (!strcmp(result_value, "Result") && !strcmp(value_value, "Success")) {
+ log_dbg_msg(DBGMASK_LOCKDOWND, "lockdownd_close(): success\n");
ret = IPHONE_E_SUCCESS;
- break;
}
+ free(result_value);
+ free(value_value);
}
-
- free_dictionary(dictionary);
- return; //ret;
+ plist_free(dict);
+ dict = NULL;
+ return; // ret;
}
/** Generates the device certificate from the public key as well as the host
@@ -680,25 +668,19 @@ void lockdownd_close(iphone_lckd_client_t control)
*
* @return IPHONE_E_SUCCESS on success.
*/
-iphone_error_t lockdownd_gen_pair_cert(char *public_key_b64, char **device_cert_b64, char **host_cert_b64,
- char **root_cert_b64)
+iphone_error_t lockdownd_gen_pair_cert(gnutls_datum_t public_key, gnutls_datum_t * odevice_cert,
+ gnutls_datum_t * ohost_cert, gnutls_datum_t * oroot_cert)
{
- if (!public_key_b64 || !device_cert_b64 || !host_cert_b64 || !root_cert_b64)
+ if (!public_key.data || !odevice_cert || !ohost_cert || !oroot_cert)
return IPHONE_E_INVALID_ARG;
iphone_error_t ret = IPHONE_E_UNKNOWN_ERROR;
gnutls_datum_t modulus = { NULL, 0 };
gnutls_datum_t exponent = { NULL, 0 };
- /* first decode base64 public_key */
- gnutls_datum_t pem_pub_key;
- gsize decoded_size;
- pem_pub_key.data = g_base64_decode(public_key_b64, &decoded_size);
- pem_pub_key.size = decoded_size;
-
/* now decode the PEM encoded key */
gnutls_datum_t der_pub_key;
- if (GNUTLS_E_SUCCESS == gnutls_pem_base64_decode_alloc("RSA PUBLIC KEY", &pem_pub_key, &der_pub_key)) {
+ if (GNUTLS_E_SUCCESS == gnutls_pem_base64_decode_alloc("RSA PUBLIC KEY", &public_key, &der_pub_key)) {
/* initalize asn.1 parser */
ASN1_TYPE pkcs1 = ASN1_TYPE_EMPTY;
@@ -782,10 +764,18 @@ iphone_error_t lockdownd_gen_pair_cert(char *public_key_b64, char **device_cert_
dev_pem.data = gnutls_malloc(dev_pem.size);
gnutls_x509_crt_export(dev_cert, GNUTLS_X509_FMT_PEM, dev_pem.data, &dev_pem.size);
- /* now encode certificates for output */
- *device_cert_b64 = g_base64_encode(dev_pem.data, dev_pem.size);
- *host_cert_b64 = g_base64_encode(pem_host_cert.data, pem_host_cert.size);
- *root_cert_b64 = g_base64_encode(pem_root_cert.data, pem_root_cert.size);
+ /* copy buffer for output */
+ odevice_cert->data = malloc(dev_pem.size);
+ memcpy(odevice_cert->data, dev_pem.data, dev_pem.size);
+ odevice_cert->size = dev_pem.size;
+
+ ohost_cert->data = malloc(pem_host_cert.size);
+ memcpy(ohost_cert->data, pem_host_cert.data, pem_host_cert.size);
+ ohost_cert->size = pem_host_cert.size;
+
+ oroot_cert->data = malloc(pem_root_cert.size);
+ memcpy(oroot_cert->data, pem_root_cert.data, pem_root_cert.size);
+ oroot_cert->size = pem_root_cert.size;
}
gnutls_free(pem_root_priv.data);
gnutls_free(pem_root_cert.data);
@@ -797,7 +787,6 @@ iphone_error_t lockdownd_gen_pair_cert(char *public_key_b64, char **device_cert_
gnutls_free(exponent.data);
gnutls_free(der_pub_key.data);
- g_free(pem_pub_key.data);
return ret;
}
@@ -811,129 +800,127 @@ iphone_error_t lockdownd_gen_pair_cert(char *public_key_b64, char **device_cert_
*/
iphone_error_t lockdownd_start_SSL_session(iphone_lckd_client_t control, const char *HostID)
{
- xmlDocPtr plist = new_plist();
- xmlNode *dict = add_child_to_plist(plist, "dict", "\n", NULL, 0);
- xmlNode *key;
- char *what2send = NULL, **dictionary = NULL;
- uint32 len = 0, bytes = 0, return_me = 0, i = 0;
- iphone_error_t ret = IPHONE_E_UNKNOWN_ERROR;
- // end variables
+ plist_t dict = NULL;
+ uint32_t return_me = 0;
+ iphone_error_t ret = IPHONE_E_UNKNOWN_ERROR;
control->session_id[0] = '\0';
- key = add_key_str_dict_element(plist, dict, "HostID", HostID, 1);
- if (!key) {
- log_debug_msg("Couldn't add a key.\n");
- xmlFreeDoc(plist);
- return IPHONE_E_DICT_ERROR;
- }
- key = add_key_str_dict_element(plist, dict, "Request", "StartSession", 1);
- if (!key) {
- log_debug_msg("Couldn't add a key.\n");
- xmlFreeDoc(plist);
- return IPHONE_E_DICT_ERROR;
- }
-
- xmlDocDumpMemory(plist, (xmlChar **) & what2send, &len);
- ret = iphone_lckd_send(control, what2send, len, &bytes);
+ /* Setup DevicePublicKey request plist */
+ dict = plist_new_dict();
+ plist_add_sub_key_el(dict, "HostID");
+ plist_add_sub_string_el(dict, HostID);
+ plist_add_sub_key_el(dict, "Request");
+ plist_add_sub_string_el(dict, "StartSession");
- xmlFree(what2send);
- xmlFreeDoc(plist);
+ ret = iphone_lckd_send(control, dict);
+ plist_free(dict);
+ dict = NULL;
if (ret != IPHONE_E_SUCCESS)
return ret;
- if (bytes > 0) {
- ret = iphone_lckd_recv(control, &what2send, &len);
- plist = xmlReadMemory(what2send, len, NULL, NULL, 0);
- dict = xmlDocGetRootElement(plist);
- if (!dict)
- return IPHONE_E_DICT_ERROR;
- for (dict = dict->children; dict; dict = dict->next) {
- if (!xmlStrcmp(dict->name, "dict"))
- break;
- }
- dictionary = read_dict_element_strings(dict);
- xmlFreeDoc(plist);
- free(what2send);
+ ret = iphone_lckd_recv(control, &dict);
+
+ if (!dict)
+ return IPHONE_E_PLIST_ERROR;
+
+ plist_t query_node = plist_find_node(dict, PLIST_STRING, "StartSession", strlen("StartSession"));
+ plist_t result_key_node = plist_get_next_sibling(query_node);
+ plist_t result_value_node = plist_get_next_sibling(result_key_node);
+
+ plist_type result_key_type = plist_get_node_type(result_key_node);
+ plist_type result_value_type = plist_get_node_type(result_value_node);
+
+ if (result_key_type == PLIST_KEY && result_value_type == PLIST_STRING) {
+ char *result_key = NULL;
+ char *result_value = NULL;
+
+ plist_get_key_val(result_key_node, &result_key);
+ plist_get_string_val(result_value_node, &result_value);
+
ret = IPHONE_E_SSL_ERROR;
- for (i = 0; dictionary[i]; i += 2) {
- if (!strcmp(dictionary[i], "Result") && !strcmp(dictionary[i + 1], "Success")) {
- // Set up GnuTLS...
- //gnutls_anon_client_credentials_t anoncred;
- gnutls_certificate_credentials_t xcred;
-
- log_debug_msg("We started the session OK, now trying GnuTLS\n");
- errno = 0;
- gnutls_global_init();
- //gnutls_anon_allocate_client_credentials(&anoncred);
- gnutls_certificate_allocate_credentials(&xcred);
- gnutls_certificate_set_x509_trust_file(xcred, "hostcert.pem", GNUTLS_X509_FMT_PEM);
- gnutls_init(control->ssl_session, GNUTLS_CLIENT);
- {
- int protocol_priority[16] = { GNUTLS_SSL3, 0 };
- int kx_priority[16] = { GNUTLS_KX_ANON_DH, GNUTLS_KX_RSA, 0 };
- int cipher_priority[16] = { GNUTLS_CIPHER_AES_128_CBC, GNUTLS_CIPHER_AES_256_CBC, 0 };
- int mac_priority[16] = { GNUTLS_MAC_SHA1, GNUTLS_MAC_MD5, 0 };
- int comp_priority[16] = { GNUTLS_COMP_NULL, 0 };
-
- gnutls_cipher_set_priority(*control->ssl_session, cipher_priority);
- gnutls_compression_set_priority(*control->ssl_session, comp_priority);
- gnutls_kx_set_priority(*control->ssl_session, kx_priority);
- gnutls_protocol_set_priority(*control->ssl_session, protocol_priority);
- gnutls_mac_set_priority(*control->ssl_session, mac_priority);
-
- }
- gnutls_credentials_set(*control->ssl_session, GNUTLS_CRD_CERTIFICATE, xcred); // this part is killing me.
-
- log_debug_msg("GnuTLS step 1...\n");
- gnutls_transport_set_ptr(*control->ssl_session, (gnutls_transport_ptr_t) control);
- log_debug_msg("GnuTLS step 2...\n");
- gnutls_transport_set_push_function(*control->ssl_session, (gnutls_push_func) & lockdownd_secuwrite);
- log_debug_msg("GnuTLS step 3...\n");
- gnutls_transport_set_pull_function(*control->ssl_session, (gnutls_pull_func) & lockdownd_securead);
- log_debug_msg("GnuTLS step 4 -- now handshaking...\n");
-
- if (errno)
- log_debug_msg("WARN: errno says %s before handshake!\n", strerror(errno));
- return_me = gnutls_handshake(*control->ssl_session);
- log_debug_msg("GnuTLS handshake done...\n");
-
- if (return_me != GNUTLS_E_SUCCESS) {
- log_debug_msg("GnuTLS reported something wrong.\n");
- gnutls_perror(return_me);
- log_debug_msg("oh.. errno says %s\n", strerror(errno));
- return IPHONE_E_SSL_ERROR;
- } else {
- control->in_SSL = 1;
- ret = IPHONE_E_SUCCESS;
- }
- } else if (!strcmp(dictionary[i], "SessionID")) {
- // we need to store the session ID for StopSession
- strcpy(control->session_id, dictionary[i + 1]);
- log_debug_msg("SessionID: %s\n", control->session_id);
- free_dictionary(dictionary);
- return ret;
+ if (!strcmp(result_key, "Result") && !strcmp(result_value, "Success")) {
+ // Set up GnuTLS...
+ //gnutls_anon_client_credentials_t anoncred;
+ gnutls_certificate_credentials_t xcred;
+
+ log_dbg_msg(DBGMASK_LOCKDOWND, "We started the session OK, now trying GnuTLS\n");
+ errno = 0;
+ gnutls_global_init();
+ //gnutls_anon_allocate_client_credentials(&anoncred);
+ gnutls_certificate_allocate_credentials(&xcred);
+ gnutls_certificate_set_x509_trust_file(xcred, "hostcert.pem", GNUTLS_X509_FMT_PEM);
+ gnutls_init(control->ssl_session, GNUTLS_CLIENT);
+ {
+ int protocol_priority[16] = { GNUTLS_SSL3, 0 };
+ int kx_priority[16] = { GNUTLS_KX_ANON_DH, GNUTLS_KX_RSA, 0 };
+ int cipher_priority[16] = { GNUTLS_CIPHER_AES_128_CBC, GNUTLS_CIPHER_AES_256_CBC, 0 };
+ int mac_priority[16] = { GNUTLS_MAC_SHA1, GNUTLS_MAC_MD5, 0 };
+ int comp_priority[16] = { GNUTLS_COMP_NULL, 0 };
+
+ gnutls_cipher_set_priority(*control->ssl_session, cipher_priority);
+ gnutls_compression_set_priority(*control->ssl_session, comp_priority);
+ gnutls_kx_set_priority(*control->ssl_session, kx_priority);
+ gnutls_protocol_set_priority(*control->ssl_session, protocol_priority);
+ gnutls_mac_set_priority(*control->ssl_session, mac_priority);
+
+ }
+ gnutls_credentials_set(*control->ssl_session, GNUTLS_CRD_CERTIFICATE, xcred); // this part is killing me.
+
+ log_dbg_msg(DBGMASK_LOCKDOWND, "GnuTLS step 1...\n");
+ gnutls_transport_set_ptr(*control->ssl_session, (gnutls_transport_ptr_t) control);
+ log_dbg_msg(DBGMASK_LOCKDOWND, "GnuTLS step 2...\n");
+ gnutls_transport_set_push_function(*control->ssl_session, (gnutls_push_func) & lockdownd_secuwrite);
+ log_dbg_msg(DBGMASK_LOCKDOWND, "GnuTLS step 3...\n");
+ gnutls_transport_set_pull_function(*control->ssl_session, (gnutls_pull_func) & lockdownd_securead);
+ log_dbg_msg(DBGMASK_LOCKDOWND, "GnuTLS step 4 -- now handshaking...\n");
+
+ if (errno)
+ log_dbg_msg(DBGMASK_LOCKDOWND, "WARN: errno says %s before handshake!\n", strerror(errno));
+ return_me = gnutls_handshake(*control->ssl_session);
+ log_dbg_msg(DBGMASK_LOCKDOWND, "GnuTLS handshake done...\n");
+
+ if (return_me != GNUTLS_E_SUCCESS) {
+ log_dbg_msg(DBGMASK_LOCKDOWND, "GnuTLS reported something wrong.\n");
+ gnutls_perror(return_me);
+ log_dbg_msg(DBGMASK_LOCKDOWND, "oh.. errno says %s\n", strerror(errno));
+ return IPHONE_E_SSL_ERROR;
+ } else {
+ control->in_SSL = 1;
+ ret = IPHONE_E_SUCCESS;
}
}
- if (ret == IPHONE_E_SUCCESS) {
- log_debug_msg("Failed to get SessionID!\n");
- return ret;
- }
+ }
+ //store session id
+ plist_t session_node = plist_find_node_by_key(dict, "SessionID");
+ if (session_node) {
- log_debug_msg("Apparently failed negotiating with lockdownd.\n");
- log_debug_msg("Responding dictionary: \n");
- for (i = 0; dictionary[i]; i += 2) {
- log_debug_msg("\t%s: %s\n", dictionary[i], dictionary[i + 1]);
+ plist_t session_node_val = plist_get_next_sibling(session_node);
+ plist_type session_node_val_type = plist_get_node_type(session_node_val);
+
+ if (session_node_val_type == PLIST_STRING) {
+
+ char *session_id = NULL;
+ plist_get_string_val(session_node_val, &session_id);
+
+ if (session_node_val_type == PLIST_STRING && session_id) {
+ // we need to store the session ID for StopSession
+ strcpy(control->session_id, session_id);
+ log_dbg_msg(DBGMASK_LOCKDOWND, "SessionID: %s\n", control->session_id);
+ }
+ free(session_id);
}
+ } else
+ log_dbg_msg(DBGMASK_LOCKDOWND, "Failed to get SessionID!\n");
+ plist_free(dict);
+ dict = NULL;
+ if (ret == IPHONE_E_SUCCESS)
+ return ret;
- free_dictionary(dictionary);
- return IPHONE_E_SSL_ERROR;
- } else {
- log_debug_msg("Didn't get enough bytes.\n");
- return IPHONE_E_NOT_ENOUGH_DATA;
- }
+ log_dbg_msg(DBGMASK_LOCKDOWND, "Apparently failed negotiating with lockdownd.\n");
+ return IPHONE_E_SSL_ERROR;
}
/** gnutls callback for writing data to the iPhone.
@@ -949,10 +936,10 @@ ssize_t lockdownd_secuwrite(gnutls_transport_ptr_t transport, char *buffer, size
int bytes = 0;
iphone_lckd_client_t control;
control = (iphone_lckd_client_t) transport;
- log_debug_msg("lockdownd_secuwrite() called\n");
- log_debug_msg("pre-send\nlength = %zi\n", length);
+ log_dbg_msg(DBGMASK_LOCKDOWND, "lockdownd_secuwrite() called\n");
+ log_dbg_msg(DBGMASK_LOCKDOWND, "pre-send\nlength = %zi\n", length);
iphone_mux_send(control->connection, buffer, length, &bytes);
- log_debug_msg("post-send\nsent %i bytes\n", bytes);
+ log_dbg_msg(DBGMASK_LOCKDOWND, "post-send\nsent %i bytes\n", bytes);
dump_debug_buffer("sslpacketwrite.out", buffer, length);
return bytes;
@@ -972,7 +959,7 @@ ssize_t lockdownd_securead(gnutls_transport_ptr_t transport, char *buffer, size_
char *hackhackhack = NULL;
iphone_lckd_client_t control;
control = (iphone_lckd_client_t) transport;
- log_debug_msg("lockdownd_securead() called\nlength = %zi\n", length);
+ log_dbg_msg(DBGMASK_LOCKDOWND, "lockdownd_securead() called\nlength = %zi\n", length);
// Buffering hack! Throw what we've got in our "buffer" into the stream first, then get more.
if (control->gtls_buffer_hack_len > 0) {
if (length > control->gtls_buffer_hack_len) { // If it's asking for more than we got
@@ -981,7 +968,7 @@ ssize_t lockdownd_securead(gnutls_transport_ptr_t transport, char *buffer, size_
memcpy(buffer, control->gtls_buffer_hack, control->gtls_buffer_hack_len); // Fill their buffer partially
free(control->gtls_buffer_hack); // free our memory, it's not chained anymore
control->gtls_buffer_hack_len = 0; // we don't have a hack buffer anymore
- log_debug_msg("Did a partial fill to help quench thirst for data\n");
+ log_dbg_msg(DBGMASK_LOCKDOWND, "Did a partial fill to help quench thirst for data\n");
} else if (length < control->gtls_buffer_hack_len) { // If it's asking for less...
control->gtls_buffer_hack_len -= length; // subtract what they're asking for
memcpy(buffer, control->gtls_buffer_hack, length); // fill their buffer
@@ -990,33 +977,34 @@ ssize_t lockdownd_securead(gnutls_transport_ptr_t transport, char *buffer, size_
free(control->gtls_buffer_hack); // Free the old one
control->gtls_buffer_hack = hackhackhack; // And make it the new one.
hackhackhack = NULL;
- log_debug_msg("Quenched the thirst for data; new hack length is %i\n", control->gtls_buffer_hack_len);
+ log_dbg_msg(DBGMASK_LOCKDOWND, "Quenched the thirst for data; new hack length is %i\n",
+ control->gtls_buffer_hack_len);
return length; // hand it over.
} else { // length == hack length
memcpy(buffer, control->gtls_buffer_hack, length); // copy our buffer into theirs
free(control->gtls_buffer_hack); // free our "obligation"
control->gtls_buffer_hack_len = 0; // free our "obligation"
- log_debug_msg("Satiated the thirst for data; now we have to eventually receive again.\n");
+ log_dbg_msg(DBGMASK_LOCKDOWND, "Satiated the thirst for data; now we have to eventually receive again.\n");
return length; // hand it over
}
}
// End buffering hack!
char *recv_buffer = (char *) malloc(sizeof(char) * (length * 1000)); // ensuring nothing stupid happens
- log_debug_msg("pre-read\nclient wants %zi bytes\n", length);
+ log_dbg_msg(DBGMASK_LOCKDOWND, "pre-read\nclient wants %zi bytes\n", length);
iphone_mux_recv(control->connection, recv_buffer, (length * 1000), &bytes);
- log_debug_msg("post-read\nwe got %i bytes\n", bytes);
+ log_dbg_msg(DBGMASK_LOCKDOWND, "post-read\nwe got %i bytes\n", bytes);
if (bytes < 0) {
- log_debug_msg("lockdownd_securead(): uh oh\n");
- log_debug_msg
- ("I believe what we have here is a failure to communicate... libusb says %s but strerror says %s\n",
- usb_strerror(), strerror(errno));
+ log_dbg_msg(DBGMASK_LOCKDOWND, "lockdownd_securead(): uh oh\n");
+ log_dbg_msg(DBGMASK_LOCKDOWND,
+ "I believe what we have here is a failure to communicate... libusb says %s but strerror says %s\n",
+ usb_strerror(), strerror(errno));
return bytes + 28; // an errno
}
if (bytes >= length) {
if (bytes > length) {
- log_debug_msg
- ("lockdownd_securead: Client deliberately read less data than was there; resorting to GnuTLS buffering hack.\n");
+ log_dbg_msg(DBGMASK_LOCKDOWND,
+ "lockdownd_securead: Client deliberately read less data than was there; resorting to GnuTLS buffering hack.\n");
if (!control->gtls_buffer_hack_len) { // if there's no hack buffer yet
//control->gtls_buffer_hack = strndup(recv_buffer+length, bytes-length); // strndup is NOT a good solution!
control->gtls_buffer_hack_len += bytes - length;
@@ -1032,10 +1020,11 @@ ssize_t lockdownd_securead(gnutls_transport_ptr_t transport, char *buffer, size_
memcpy(buffer + pos_start_fill, recv_buffer, length);
free(recv_buffer);
if (bytes == length) {
- log_debug_msg("Returning how much we received.\n");
+ log_dbg_msg(DBGMASK_LOCKDOWND, "Returning how much we received.\n");
return bytes;
} else {
- log_debug_msg("Returning what they want to hear.\nHack length: %i\n", control->gtls_buffer_hack_len);
+ log_dbg_msg(DBGMASK_LOCKDOWND, "Returning what they want to hear.\nHack length: %i\n",
+ control->gtls_buffer_hack_len);
return length;
}
}
@@ -1060,86 +1049,72 @@ iphone_error_t iphone_lckd_start_service(iphone_lckd_client_t client, const char
if (!client->in_SSL && !lockdownd_start_SSL_session(client, host_id))
return IPHONE_E_SSL_ERROR;
- char *XML_query, **dictionary;
- uint32 length, i = 0, port_loc = 0, bytes = 0;
- uint8 result = 0;
+ plist_t dict = NULL;
+ uint32_t port_loc = 0;
iphone_error_t ret = IPHONE_E_UNKNOWN_ERROR;
free(host_id);
host_id = NULL;
- xmlDocPtr plist = new_plist();
- xmlNode *dict = add_child_to_plist(plist, "dict", "\n", NULL, 0);
- xmlNode *key;
- key = add_key_str_dict_element(plist, dict, "Request", "StartService", 1);
- if (!key) {
- xmlFreeDoc(plist);
- return IPHONE_E_UNKNOWN_ERROR;
- }
- key = add_key_str_dict_element(plist, dict, "Service", service, 1);
- if (!key) {
- xmlFreeDoc(plist);
- return IPHONE_E_UNKNOWN_ERROR;
- }
+ dict = plist_new_dict();
+ plist_add_sub_key_el(dict, "Request");
+ plist_add_sub_string_el(dict, "StartService");
+ plist_add_sub_key_el(dict, "Service");
+ plist_add_sub_string_el(dict, service);
- xmlDocDumpMemory(plist, (xmlChar **) & XML_query, &length);
+ /* send to iPhone */
+ ret = iphone_lckd_send(client, dict);
+ plist_free(dict);
+ dict = NULL;
- ret = iphone_lckd_send(client, XML_query, length, &bytes);
- free(XML_query);
if (IPHONE_E_SUCCESS != ret)
return ret;
- ret = iphone_lckd_recv(client, &XML_query, &bytes);
- xmlFreeDoc(plist);
+ ret = iphone_lckd_recv(client, &dict);
+
if (IPHONE_E_SUCCESS != ret)
return ret;
- if (bytes <= 0)
- return IPHONE_E_NOT_ENOUGH_DATA;
- else {
- plist = xmlReadMemory(XML_query, bytes, NULL, NULL, 0);
- if (!plist)
- return IPHONE_E_UNKNOWN_ERROR;
- dict = xmlDocGetRootElement(plist);
- if (!dict)
- return IPHONE_E_UNKNOWN_ERROR;
- for (dict = dict->children; dict; dict = dict->next) {
- if (!xmlStrcmp(dict->name, "dict"))
- break;
- }
+ if (!dict)
+ return IPHONE_E_PLIST_ERROR;
- if (!dict)
- return IPHONE_E_UNKNOWN_ERROR;
- dictionary = read_dict_element_strings(dict);
+ plist_t query_node = plist_find_node_by_string(dict, "StartService");
+ plist_t result_key_node = plist_get_next_sibling(query_node);
+ plist_t result_value_node = plist_get_next_sibling(result_key_node);
- for (i = 0; dictionary[i]; i += 2) {
- log_debug_msg("lockdownd_start_service() dictionary %s: %s\n", dictionary[i], dictionary[i + 1]);
+ plist_t port_key_node = plist_find_node_by_key(dict, "Port");
+ plist_t port_value_node = plist_get_next_sibling(port_key_node);
- if (!xmlStrcmp(dictionary[i], "Port")) {
- port_loc = atoi(dictionary[i + 1]);
- log_debug_msg("lockdownd_start_service() atoi'd port: %i\n", port);
- }
+ plist_type result_key_type = plist_get_node_type(result_key_node);
+ plist_type result_value_type = plist_get_node_type(result_value_node);
+ plist_type port_key_type = plist_get_node_type(port_key_node);
+ plist_type port_value_type = plist_get_node_type(port_value_node);
- if (!xmlStrcmp(dictionary[i], "Result")) {
- if (!xmlStrcmp(dictionary[i + 1], "Success")) {
- result = 1;
- }
- }
- }
+ if (result_key_type == PLIST_KEY && result_value_type == PLIST_STRING && port_key_type == PLIST_KEY
+ && port_value_type == PLIST_UINT) {
+
+ char *result_key = NULL;
+ char *result_value = NULL;
+ char *port_key = NULL;
+ uint64_t port_value = 0;
- log_debug_msg("lockdownd_start_service(): DATA RECEIVED:\n\n");
- log_debug_msg(XML_query);
- log_debug_msg("end data received by lockdownd_start_service()\n");
+ plist_get_key_val(result_key_node, &result_key);
+ plist_get_string_val(result_value_node, &result_value);
+ plist_get_key_val(port_key_node, &port_key);
+ plist_get_uint_val(port_value_node, &port_value);
- free(XML_query);
- xmlFreeDoc(plist);
- free_dictionary(dictionary);
- if (port && result) {
+ if (!strcmp(result_key, "Result") && !strcmp(result_value, "Success") && !strcmp(port_key, "Port")) {
+ port_loc = port_value;
+ ret = IPHONE_E_SUCCESS;
+ }
+
+ if (port && ret == IPHONE_E_SUCCESS)
*port = port_loc;
- return IPHONE_E_SUCCESS;
- } else
- return IPHONE_E_UNKNOWN_ERROR;
+ else
+ ret = IPHONE_E_UNKNOWN_ERROR;
}
- return IPHONE_E_UNKNOWN_ERROR;
+ plist_free(dict);
+ dict = NULL;
+ return ret;
}
diff --git a/src/lockdown.h b/src/lockdown.h
index 91bcc77..2f2a4b9 100644
--- a/src/lockdown.h
+++ b/src/lockdown.h
@@ -23,7 +23,6 @@
#define LOCKDOWND_H
#include "usbmux.h"
-#include "plist.h"
#include <gnutls/gnutls.h>
#include <string.h>
@@ -41,17 +40,17 @@ struct iphone_lckd_client_int {
char session_id[40];
};
-char *lockdownd_generate_hostid(void);
-
iphone_lckd_client_t new_lockdownd_client(iphone_device_t phone);
iphone_error_t lockdownd_hello(iphone_lckd_client_t control);
-iphone_error_t lockdownd_generic_get_value(iphone_lckd_client_t control, const char *req_key, const char *req_string,
- char **value);
-iphone_error_t lockdownd_get_device_public_key(iphone_lckd_client_t control, char **public_key);
-iphone_error_t lockdownd_gen_pair_cert(char *public_key_b64, char **device_cert_b64, char **host_cert_b64,
- char **root_cert_b64);
-iphone_error_t lockdownd_pair_device(iphone_lckd_client_t control, char *public_key, char *host_id);
+iphone_error_t lockdownd_generic_get_value(iphone_lckd_client_t control, const char *req_key, char *req_string,
+ gnutls_datum_t * value);
+
+iphone_error_t lockdownd_get_device_public_key(iphone_lckd_client_t control, gnutls_datum_t * public_key);
+
+iphone_error_t lockdownd_gen_pair_cert(gnutls_datum_t public_key, gnutls_datum_t * device_cert,
+ gnutls_datum_t * host_cert, gnutls_datum_t * root_cert);
+iphone_error_t lockdownd_pair_device(iphone_lckd_client_t control, char *uid, char *host_id);
void lockdownd_close(iphone_lckd_client_t control);
// 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 @@
-/*
- * plist.c
- * Builds plist XML structures.
- *
- * Copyright (c) 2008 Zach C. All Rights Reserved.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#include <libxml/parser.h>
-#include <libxml/tree.h>
-#include <string.h>
-#include <assert.h>
-#include "plist.h"
-
-const char *plist_base = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n\
-<!DOCTYPE plist PUBLIC \"-//Apple Computer//DTD PLIST 1.0//EN\" \"http://www.apple.com/DTDs/PropertyList-1.0.dtd\">\n\
-<plist version=\"1.0\">\n\
-</plist>\0";
-
-/** Formats a block of text to be a given indentation and width.
- *
- * The total width of the return string will be depth + cols.
- *
- * @param buf The string to format.
- * @param cols The number of text columns for returned block of text.
- * @param depth The number of tabs to indent the returned block of text.
- *
- * @return The formatted string.
- */
-static char *format_string(const char *buf, int cols, int depth)
-{
- int colw = depth + cols + 1;
- int len = strlen(buf);
- int nlines = len / cols + 1;
- char *new_buf = (char *) malloc(nlines * colw + depth + 1);
- int i = 0;
- int j = 0;
-
- assert(cols >= 0);
- assert(depth >= 0);
-
- // Inserts new lines and tabs at appropriate locations
- for (i = 0; i < nlines; i++) {
- new_buf[i * colw] = '\n';
- for (j = 0; j < depth; j++)
- new_buf[i * colw + 1 + j] = '\t';
- memcpy(new_buf + i * colw + 1 + depth, buf + i * cols, cols);
- }
- new_buf[len + (1 + depth) * nlines] = '\n';
-
- // Inserts final row of indentation and termination character
- for (j = 0; j < depth; j++)
- new_buf[len + (1 + depth) * nlines + 1 + j] = '\t';
- new_buf[len + (1 + depth) * nlines + depth + 1] = '\0';
-
- return new_buf;
-}
-
-/** Creates a new plist XML document.
- *
- * @return The plist XML document.
- */
-xmlDocPtr new_plist(void)
-{
- char *plist = strdup(plist_base);
- xmlDocPtr plist_xml = xmlReadMemory(plist, strlen(plist), NULL, NULL, 0);
-
- if (!plist_xml)
- return NULL;
-
- free(plist);
-
- return plist_xml;
-}
-
-/** Destroys a previously created XML document.
- *
- * @param plist The XML document to destroy.
- */
-void free_plist(xmlDocPtr plist)
-{
- if (!plist)
- return;
-
- xmlFreeDoc(plist);
-}
-
-/** Adds a new node as a child to a given node.
- *
- * This is a lower level function so you probably want to use
- * add_key_str_dict_element, add_key_dict_node or add_key_data_dict_element
- * instead.
- *
- * @param plist The plist XML document to which the to_node belongs.
- * @param name The name of the new node.
- * @param content The string containing the text node of the new node.
- * @param to_node The node to attach the child node to. If none is given, the
- * root node of the given document is used.
- * @param depth The number of tabs to indent the new node.
- *
- * @return The newly created node.
- */
-xmlNode *add_child_to_plist(xmlDocPtr plist, const char *name, const char *content, xmlNode * to_node, int depth)
-{
- int i = 0;
- xmlNode *child;
-
- if (!plist)
- return NULL;
- assert(depth >= 0);
- if (!to_node)
- to_node = xmlDocGetRootElement(plist);
-
- for (i = 0; i < depth; i++) {
- xmlNodeAddContent(to_node, "\t");
- }
- child = xmlNewChild(to_node, NULL, name, content);
- xmlNodeAddContent(to_node, "\n");
-
- return child;
-}
-
-/** Adds a string key-pair to a plist XML document.
- *
- * @param plist The plist XML document to add the new node to.
- * @param dict The dictionary node within the plist XML document to add the new node to.
- * @param key The string containing the key value.
- * @param value The string containing the value.
- * @param depth The number of tabs to indent the new node.
- *
- * @return The newly created key node.
- */
-xmlNode *add_key_str_dict_element(xmlDocPtr plist, xmlNode * dict, const char *key, const char *value, int depth)
-{
- xmlNode *keyPtr;
-
- keyPtr = add_child_to_plist(plist, "key", key, dict, depth);
- add_child_to_plist(plist, "string", value, dict, depth);
-
- return keyPtr;
-}
-
-/** Adds a new dictionary key-pair to a plist XML document.
- *
- * @param plist The plist XML document to add the new node to.
- * @param dict The dictionary node within the plist XML document to add the new node to.
- * @param key The string containing the key value.
- * @param value The string containing the value.
- * @param depth The number of tabs to indent the new node.
- *
- * @return The newly created dict node.
- */
-xmlNode *add_key_dict_node(xmlDocPtr plist, xmlNode * dict, const char *key, const char *value, int depth)
-{
- xmlNode *child;
-
- add_child_to_plist(plist, "key", key, dict, depth);
- child = add_child_to_plist(plist, "dict", value, dict, depth);
-
- return child;
-}
-
-/** Adds a new data dictionary key-pair to a plist XML document.
- *
- * @param plist The plist XML document to add the new node to.
- * @param dict The dictionary node within the plist XML document to add the new node to.
- * @param key The string containing the key value.
- * @param value The string containing the value.
- * @param depth The number of tabs to indent the new node.
- *
- * @return The newly created key node.
- */
-xmlNode *add_key_data_dict_element(xmlDocPtr plist, xmlNode * dict, const char *key, const char *value, int depth)
-{
- xmlNode *keyPtr;
-
- keyPtr = add_child_to_plist(plist, "key", key, dict, depth);
- add_child_to_plist(plist, "data", format_string(value, 60, depth), dict, depth);
-
- return keyPtr;
-}
-
-/** Reads a set of keys and strings into an array from a plist XML document.
- *
- * @param dict The root XMLNode of a plist XML document to be read.
- *
- * @return An array where each even number is a key and the odd numbers are
- * values. If the odd number is \0, that's the end of the list.
- */
-char **read_dict_element_strings(xmlNode * dict)
-{
- char **return_me = NULL, **old = NULL;
- int current_length = 0;
- int current_pos = 0;
- xmlNode *dict_walker;
-
- for (dict_walker = dict->children; dict_walker; dict_walker = dict_walker->next) {
- if (!xmlStrcmp(dict_walker->name, "key")) {
- current_length += 2;
- old = return_me;
- return_me = realloc(return_me, sizeof(char *) * current_length);
- if (!return_me) {
- free(old);
- return NULL;
- }
- return_me[current_pos++] = xmlNodeGetContent(dict_walker);
- return_me[current_pos++] = xmlNodeGetContent(dict_walker->next->next);
- }
- }
-
- old = return_me;
- return_me = realloc(return_me, sizeof(char *) * (current_length + 1));
- return_me[current_pos] = NULL;
-
- return return_me;
-}
-
-/** Destroys a dictionary as returned by read_dict_element_strings
- */
-void free_dictionary(char **dictionary)
-{
- int i = 0;
-
- if (!dictionary)
- return;
-
- for (i = 0; dictionary[i]; i++) {
- free(dictionary[i]);
- }
-
- free(dictionary);
-}
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 @@
-/*
- * plist.h
- * contains structures and the like for plists
- *
- * Copyright (c) 2008 Zach C. All Rights Reserved.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef PLIST_H
-#define PLIST_H
-
-#include <libxml/parser.h>
-#include <libxml/tree.h>
-
-xmlNode *add_key_dict_node(xmlDocPtr plist, xmlNode * dict, const char *key, const char *value, int depth);
-xmlNode *add_key_str_dict_element(xmlDocPtr plist, xmlNode * dict, const char *key, const char *value, int depth);
-xmlNode *add_key_data_dict_element(xmlDocPtr plist, xmlNode * dict, const char *key, const char *value, int depth);
-xmlNode *add_child_to_plist(xmlDocPtr plist, const char *name, const char *content, xmlNode * to_node, int depth);
-
-void free_plist(xmlDocPtr plist);
-xmlDocPtr new_plist(void);
-
-char **read_dict_element_strings(xmlNode * dict);
-void free_dictionary(char **dictionary);
-#endif
diff --git a/src/usbmux.c b/src/usbmux.c
index c7ac7ef..5eaa1d1 100644
--- a/src/usbmux.c
+++ b/src/usbmux.c
@@ -38,7 +38,7 @@ static int clients = 0;
*
* @return A USBMux packet
*/
-usbmux_tcp_header *new_mux_packet(uint16 s_port, uint16 d_port)
+usbmux_tcp_header *new_mux_packet(uint16_t s_port, uint16_t d_port)
{
usbmux_tcp_header *conn = (usbmux_tcp_header *) malloc(sizeof(usbmux_tcp_header));
conn->type = htonl(6);
@@ -313,6 +313,7 @@ iphone_error_t iphone_mux_recv(iphone_umux_client_t client, char *data, uint32_t
} else {
memcpy(data, client->recv_buffer, client->r_len);
free(client->recv_buffer); // don't need to deal with anymore, but...
+ client->recv_buffer = NULL;
offset = client->r_len; // see #2b, above
client->r_len = 0;
}
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 @@
#include <sys/types.h>
#include <stdlib.h>
#include <stdint.h>
+#include "libiphone/libiphone.h"
#ifndef USBMUX_H
#define USBMUX_H
@@ -30,17 +31,12 @@
#include "iphone.h"
#endif
-typedef uint16_t uint16;
-typedef uint32_t uint32;
-typedef uint8_t uint8;
-
-
typedef struct {
- uint32 type, length;
- uint16 sport, dport;
- uint32 scnt, ocnt;
- uint8 offset, tcp_flags;
- uint16 window, nullnull, length16;
+ uint32_t type, length;
+ uint16_t sport, dport;
+ uint32_t scnt, ocnt;
+ uint8_t offset, tcp_flags;
+ uint16_t window, nullnull, length16;
} usbmux_tcp_header;
struct iphone_umux_client_int {
@@ -50,10 +46,10 @@ struct iphone_umux_client_int {
int r_len;
};
-usbmux_tcp_header *new_mux_packet(uint16 s_port, uint16 d_port);
+usbmux_tcp_header *new_mux_packet(uint16_t s_port, uint16_t d_port);
typedef struct {
- uint32 type, length, major, minor, allnull;
+ uint32_t type, length, major, minor, allnull;
} usbmux_version_header;
usbmux_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)
* @return 1 on success and 0 if no public key is given or if it has already
* been marked as connected previously.
*/
-int store_device_public_key(char *uid, char *public_key)
+int store_device_public_key(char *uid, gnutls_datum_t public_key)
{
- if (NULL == public_key || is_device_known(uid))
+ if (NULL == public_key.data || is_device_known(uid))
return 0;
/* ensure config directory exists */
@@ -124,15 +124,11 @@ int store_device_public_key(char *uid, char *public_key)
gchar *device_file = g_strconcat(uid, ".pem", NULL);
gchar *pem = g_build_path(G_DIR_SEPARATOR_S, g_get_user_config_dir(), LIBIPHONE_CONF_DIR, device_file, NULL);
- /* decode public key for storing */
- gsize decoded_size;
- gchar *data = g_base64_decode(public_key, &decoded_size);
/* store file */
FILE *pFile = fopen(pem, "wb");
- fwrite(data, 1, decoded_size, pFile);
+ fwrite(public_key.data, 1, public_key.size, pFile);
fclose(pFile);
g_free(pem);
- g_free(data);
g_free(device_file);
return 1;
}
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);
/**
* @return 1 if everything went well. Returns 0 otherwise.
*/
-int store_device_public_key(char *uid, char *public_key);
+int store_device_public_key(char *uid, gnutls_datum_t public_key);
/**
* @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 @@
#include "utils.h"
int toto_debug = 0;
+uint16_t dbg_mask = 0;
/**
* Sets the level of debugging. Currently the only acceptable values are 0 and
@@ -36,6 +37,15 @@ void iphone_set_debug(int level)
}
+/**
+ * Set debug ids to display. Values can be OR-ed
+ *
+ * @param level Set to 0 for no debugging or 1 for debugging.
+ */
+void iphone_set_debug_mask(uint16_t mask)
+{
+ dbg_mask = mask;
+}
void log_debug_msg(const char *format, ...)
{
@@ -53,6 +63,21 @@ void log_debug_msg(const char *format, ...)
#endif
}
+void log_dbg_msg(uint16_t id, const char *format, ...)
+{
+#ifndef STRIP_DEBUG_CODE
+ if (id & dbg_mask) {
+ va_list args;
+ /* run the real fprintf */
+ va_start(args, format);
+
+ vfprintf(stderr, format, args);
+
+ va_end(args);
+ }
+#endif
+}
+
inline void log_debug_buffer(const char *data, const int length)
{
#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 @@
#include "libiphone/libiphone.h"
+
+
inline void log_debug_msg(const char *format, ...);
+inline void log_dbg_msg(uint16_t id, const char *format, ...);
+
inline void log_debug_buffer(const char *data, const int length);
inline void dump_debug_buffer(const char *file, const char *data, const int length);
#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 @@
+INCLUDES = -I$(top_srcdir)/include $(libplist_CFLAGS)
+
+BUILT_SOURCES = $(srcdir)/iphone_wrap.c
+SWIG_SOURCES = iphone.i
+
+swigincludedir =$(includedir)/libiphone/swig
+swiginclude_HEADERS = $(SWIG_SOURCES)
+
+pkgpython_PYTHON = iPhone.py __init__.py
+pkgpyexec_LTLIBRARIES = _iPhone.la
+_iPhone_la_SOURCES = $(srcdir)/iphone_wrap.c $(SWIG_SOURCES)
+_iPhone_la_CFLAGS = $(PYTHON_CPPFLAGS) -I$(top_srcdir)/src
+_iPhone_la_LDFLAGS = -module $(PYTHON_LDFLAGS)
+_iPhone_la_LIBADD = ../src/libiphone.la
+
+$(srcdir)/iphone_wrap.c : $(SWIG_SOURCES)
+ $(SWIG) $(SWIG_PYTHON_OPT) $(INCLUDES) -I$(top_srcdir)/src -o $@ $<
+
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 @@
+ /* swig.i */
+ %module(package="libiphone") iPhone
+ %{
+ /* Includes the header in the wrapper code */
+ #include <libiphone/libiphone.h>
+ #include <plist/plist.h>
+#include "../src/utils.h"
+ typedef struct {
+ iphone_device_t dev;
+ } iPhone;
+
+ typedef struct {
+ iPhone* dev;
+ iphone_lckd_client_t client;
+ } Lockdownd;
+
+ typedef struct {
+ Lockdownd* lckd;
+ iphone_msync_client_t client;
+ } MobileSync;
+
+//now declare funtions to handle creation and deletion of objects
+void my_delete_iPhone(iPhone* dev);
+Lockdownd* my_new_Lockdownd(iPhone* phone);
+void my_delete_Lockdownd(Lockdownd* lckd);
+MobileSync* my_new_MobileSync(Lockdownd* lckd);
+
+ %}
+/* Parse the header file to generate wrappers */
+%include "stdint.i"
+%include "plist/swig/plist.i"
+
+typedef struct {
+ iphone_device_t dev;
+} iPhone;
+
+typedef struct {
+ iPhone* dev;
+ iphone_lckd_client_t client;
+} Lockdownd;
+
+typedef struct {
+ Lockdownd* lckd;
+ iphone_msync_client_t client;
+} MobileSync;
+
+%inline %{
+//now define funtions to handle creation and deletion of objects
+
+
+void my_delete_iPhone(iPhone* dev) {
+ if (dev) {
+ iphone_free_device ( dev->dev );
+ free(dev);
+ }
+}
+
+Lockdownd* my_new_Lockdownd(iPhone* phone) {
+ if (!phone) return NULL;
+ Lockdownd* client = (Lockdownd*) malloc(sizeof(Lockdownd));
+ client->dev = phone;
+ client->client = NULL;
+ if (IPHONE_E_SUCCESS == iphone_lckd_new_client ( phone->dev , &(client->client))) {
+ return client;
+ }
+ else {
+ free(client);
+ return NULL;
+ }
+}
+
+void my_delete_Lockdownd(Lockdownd* lckd) {
+ if (lckd) {
+ my_delete_iPhone(lckd->dev);
+ iphone_lckd_free_client ( lckd->client );
+ free(lckd);
+ }
+}
+
+MobileSync* my_new_MobileSync(Lockdownd* lckd) {
+ if (!lckd || !lckd->dev) return NULL;
+ MobileSync* client = NULL;
+ int port = 0;
+ if (IPHONE_E_SUCCESS == iphone_lckd_start_service ( lckd->client, "com.apple.mobilesync", &port )) {
+ client = (MobileSync*) malloc(sizeof(MobileSync));
+ client->lckd = lckd;
+ client->client = NULL;
+ iphone_msync_new_client ( lckd->dev->dev, 3432, port, &(client->client));
+ }
+ return client;
+}
+
+%}
+
+
+%extend iPhone { // Attach these functions to struct iPhone
+ iPhone() {
+ iPhone* phone = (iPhone*) malloc(sizeof(iPhone));
+ phone->dev = NULL;
+ iphone_set_debug_mask(DBGMASK_LOCKDOWND | DBGMASK_MOBILESYNC);
+ return phone;
+ }
+
+ ~iPhone() {
+ my_delete_iPhone($self);
+ }
+
+ int InitDevice() {
+ if (IPHONE_E_SUCCESS == iphone_get_device ( &($self->dev)))
+ return 1;
+ return 0;
+ }
+
+ Lockdownd* GetLockdownClient() {
+ return my_new_Lockdownd($self);
+ }
+};
+
+
+%extend Lockdownd { // Attach these functions to struct Lockdownd
+ Lockdownd(iPhone* phone) {
+ return my_new_Lockdownd(phone);
+ }
+
+ ~Lockdownd() {
+ my_delete_Lockdownd($self);
+ }
+
+ MobileSync* GetMobileSyncClient() {
+ return my_new_MobileSync($self);
+ }
+};
+
+%extend MobileSync { // Attach these functions to struct MobileSync
+ MobileSync(Lockdownd* lckd) {
+ return my_new_MobileSync(lckd);
+ }
+
+ ~MobileSync() {
+ my_delete_Lockdownd($self->lckd);
+ iphone_msync_free_client ( $self->client );
+ free($self);
+ }
+
+ void Send(PListNode* node) {
+ iphone_msync_send($self->client, node->node);
+ }
+
+ PListNode* Receive() {
+ PListNode* node = (PListNode*)malloc(sizeof(PListNode));
+ node->node = NULL;
+ iphone_msync_recv($self->client, &(node->node));
+ return node;
+ }
+};
+
© 2009-2020 libimobiledevice.org - All rights reserved - Generated by cgit - Icons from Tango - Uses Google Analytics