diff options
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | src/preflight.c | 6 |
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 | |||
| 18 | # Checks for libraries. | 18 | # Checks for libraries. |
| 19 | PKG_CHECK_MODULES(libusb, libusb-1.0 >= 1.0.9) | 19 | PKG_CHECK_MODULES(libusb, libusb-1.0 >= 1.0.9) |
| 20 | PKG_CHECK_MODULES(libplist, libplist >= 1.11) | 20 | PKG_CHECK_MODULES(libplist, libplist >= 1.11) |
| 21 | PKG_CHECK_MODULES(libimobiledevice, libimobiledevice-1.0 >= 1.1.6, have_limd=yes, have_limd=no) | 21 | PKG_CHECK_MODULES(libimobiledevice, libimobiledevice-1.0 >= 1.2.1, have_limd=yes, have_limd=no) |
| 22 | AC_CHECK_LIB(pthread, [pthread_create, pthread_mutex_lock], [AC_SUBST(libpthread_LIBS,[-lpthread])], [AC_MSG_ERROR([libpthread is required to build usbmuxd])]) | 22 | AC_CHECK_LIB(pthread, [pthread_create, pthread_mutex_lock], [AC_SUBST(libpthread_LIBS,[-lpthread])], [AC_MSG_ERROR([libpthread is required to build usbmuxd])]) |
| 23 | 23 | ||
| 24 | AC_ARG_WITH([preflight], | 24 | 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 { | |||
| 49 | 49 | ||
| 50 | struct idevice_private { | 50 | struct idevice_private { |
| 51 | char *udid; | 51 | char *udid; |
| 52 | uint32_t mux_id; | ||
| 52 | enum connection_type conn_type; | 53 | enum connection_type conn_type; |
| 53 | void *conn_data; | 54 | void *conn_data; |
| 55 | int version; | ||
| 54 | }; | 56 | }; |
| 55 | 57 | ||
| 56 | struct cb_data { | 58 | struct cb_data { |
| @@ -123,8 +125,10 @@ static void* preflight_worker_handle_device_add(void* userdata) | |||
| 123 | struct device_info *info = (struct device_info*)userdata; | 125 | struct device_info *info = (struct device_info*)userdata; |
| 124 | struct idevice_private *_dev = (struct idevice_private*)malloc(sizeof(struct idevice_private)); | 126 | struct idevice_private *_dev = (struct idevice_private*)malloc(sizeof(struct idevice_private)); |
| 125 | _dev->udid = strdup(info->serial); | 127 | _dev->udid = strdup(info->serial); |
| 128 | _dev->mux_id = info->id; | ||
| 126 | _dev->conn_type = CONNECTION_USBMUXD; | 129 | _dev->conn_type = CONNECTION_USBMUXD; |
| 127 | _dev->conn_data = (void*)(long)info->id; | 130 | _dev->conn_data = NULL; |
| 131 | _dev->version = 0; | ||
| 128 | 132 | ||
| 129 | idevice_t dev = (idevice_t)_dev; | 133 | idevice_t dev = (idevice_t)_dev; |
| 130 | 134 | ||
