require libimobiledevice >= 1.3.0

new release of libimobiledevice is out.

- allows to drop custom implementation of idevice_connection_get_fd
- simplifies troubleshooting

Author: artygus

README.md

@@ -195,21 +195,11 @@ or
 
 > Could not connect to lockdownd, error code -\<number\>. Exiting.
 
-Please upgrade libimobiledevice to version from master and rebuild ios-webkit-debug-proxy. Upcoming 1.2.1 has many fixes but not marked for release just yet. If you're on OS X:
-
-    brew update
-    brew uninstall --force libimobiledevice ios-webkit-debug-proxy usbmuxd
-    brew install --HEAD usbmuxd
-    brew install --HEAD libimobiledevice
-    brew install -s ios-webkit-debug-proxy
-
+Make sure you're using latest version of ios-webkit-debug-proxy
 
 ##### Inspectable pages list is empty for iOS >= 12.2
 
-Please upgrade usbmuxd to version from master
-
-    brew update
-    brew install --HEAD usbmuxd
+Make sure you're using latest version of ios-webkit-debug-proxy
 
 ##### Can not see Simulator
 
@@ -243,7 +233,6 @@ Google BSD license <https://developers.google.com/google-bsd-license>
 Copyright 2012 Google Inc.  <[email protected]>
 
 The proxy uses the following open-source packages:
-   - [libplist 1.10](http://cgit.sukimashita.com/libplist.git)
-   - [libusbmuxd 1.0.8](http://cgit.sukimashita.com/usbmuxd.git/)
-   - [libimobiledevice 1.2.0](http://cgit.sukimashita.com/libimobiledevice.git)
-   - libimobiledevice 1.2.1 _if your target iOS10+_
+   - [libplist 2.2.0](http://cgit.sukimashita.com/libplist.git)
+   - [libusbmuxd 2.0.0](http://cgit.sukimashita.com/usbmuxd.git/)
+   - [libimobiledevice 1.3.0](http://cgit.sukimashita.com/libimobiledevice.git)

configure.ac

@@ -16,7 +16,7 @@ AC_PROG_INSTALL
 PKG_PROG_PKG_CONFIG
 
 # Checks for libraries.
-PKG_CHECK_MODULES(libimobiledevice, libimobiledevice-1.0 >= 1.2.0)
+PKG_CHECK_MODULES(libimobiledevice, libimobiledevice-1.0 >= 1.3.0)
 PKG_CHECK_MODULES(libplist, libplist-2.0 >= 2.2.0)
 PKG_CHECK_MODULES(openssl, openssl >= 0.9.8)
 AC_CHECK_LIB([plist-2.0], [plist_to_xml],
@@ -79,11 +79,6 @@ fi
 
 AC_CHECK_FUNCS([memmove memset regcomp select socket strcasecmp strncasecmp strchr strdup strndup strrchr strstr strtol strcasestr getline])
 
-SAVE_CFLAGS=$CFLAGS
-CFLAGS="$CFLAGS $libimobiledevice_CFLAGS"
-AC_CHECK_DECL(idevice_connection_get_fd, [AC_DEFINE([HAVE_IDEVICE_CONNECTION_GET_FD], 1, [ ])], [], [#include <libimobiledevice/libimobiledevice.h>])
-CFLAGS=$SAVE_CFLAGS
-
 AC_CONFIG_FILES([Makefile src/Makefile include/Makefile examples/Makefile])
 
 CFLAGS="${CFLAGS} -Wall -Werror"

src/webinspector.c

@@ -53,50 +53,13 @@ struct wi_private {
 // CONNECT
 //
 
-#ifndef HAVE_IDEVICE_CONNECTION_GET_FD
-// based on libimobiledevice 1.2.0
-enum connection_type {
-  CONNECTION_USBMUXD = 1
-};
-struct idevice_connection_private {
-  char *udid;  // added in v1.1.6
-  enum connection_type type;
-  void *data;
-  void *ssl_data;
-};
-
-wi_status idevice_connection_get_fd(idevice_connection_t connection,
-    int *to_fd) {
-  if (!connection || !to_fd) {
-    return WI_ERROR;
-  }
-  idevice_connection_private *c = (
-      (sizeof(*connection) == sizeof(idevice_connection_private)) ?
-      (idevice_connection_private *) connection : NULL);
-  if (!c || c->type != CONNECTION_USBMUXD || c->data <= 0) {
-    perror("Invalid idevice_connection struct.  Please verify that "
-        __FILE__ "'s idevice_connection_private matches your version of"
-        " libimbiledevice/src/idevice.h");
-    return WI_ERROR;
-  }
-  int fd = (int)(long)c->data;
-  struct stat fd_stat;
-  if (fstat(fd, &fd_stat) < 0 || !S_ISSOCK(fd_stat.st_mode)) {
-    perror("idevice_connection fd is not a socket?");
-    return WI_ERROR;
-  }
-  *to_fd = fd;
-  return WI_SUCCESS;
-}
-#else
 // based on latest libimobiledevice/src/idevice.h
 struct idevice_connection_private {
   idevice_t device;
   enum idevice_connection_type type;
   void *data;
   void *ssl_data;
 };
-#endif
 
 struct ssl_data_private {
 	SSL *session;