summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar Nikias Bassen2018-10-02 14:54:18 +0200
committerGravatar Nikias Bassen2018-10-02 14:54:18 +0200
commit49576fdf06e3a7e3ef7824f29136556005f2239d (patch)
tree2e4f9c25eef300079236f952b9137c939f1b4d17
parentd33402036d563667a76910dbfec50a37b622d3a5 (diff)
downloadusbmuxd-49576fdf06e3a7e3ef7824f29136556005f2239d.tar.gz
usbmuxd-49576fdf06e3a7e3ef7824f29136556005f2239d.tar.bz2
preflight: Fix compatibility with latest internal changes to libimobiledevice
-rw-r--r--configure.ac2
-rw-r--r--src/preflight.c6
2 files changed, 6 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac
index 2690f78..46a725e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -18,7 +18,7 @@ AC_PROG_LIBTOOL
# Checks for libraries.
PKG_CHECK_MODULES(libusb, libusb-1.0 >= 1.0.9)
PKG_CHECK_MODULES(libplist, libplist >= 1.11)
-PKG_CHECK_MODULES(libimobiledevice, libimobiledevice-1.0 >= 1.1.6, have_limd=yes, have_limd=no)
+PKG_CHECK_MODULES(libimobiledevice, libimobiledevice-1.0 >= 1.2.1, have_limd=yes, have_limd=no)
AC_CHECK_LIB(pthread, [pthread_create, pthread_mutex_lock], [AC_SUBST(libpthread_LIBS,[-lpthread])], [AC_MSG_ERROR([libpthread is required to build usbmuxd])])
AC_ARG_WITH([preflight],
diff --git a/src/preflight.c b/src/preflight.c
index c74e49d..0eea179 100644
--- a/src/preflight.c
+++ b/src/preflight.c
@@ -49,8 +49,10 @@ enum connection_type {
struct idevice_private {
char *udid;
+ uint32_t mux_id;
enum connection_type conn_type;
void *conn_data;
+ int version;
};
struct cb_data {
@@ -123,8 +125,10 @@ static void* preflight_worker_handle_device_add(void* userdata)
struct device_info *info = (struct device_info*)userdata;
struct idevice_private *_dev = (struct idevice_private*)malloc(sizeof(struct idevice_private));
_dev->udid = strdup(info->serial);
+ _dev->mux_id = info->id;
_dev->conn_type = CONNECTION_USBMUXD;
- _dev->conn_data = (void*)(long)info->id;
+ _dev->conn_data = NULL;
+ _dev->version = 0;
idevice_t dev = (idevice_t)_dev;