Merge pull request #217 from google/ios11_support

iOS11 support

Author: artygus

README.md

@@ -181,6 +181,16 @@ Please upgrade libimobiledevice to version from master and rebuild ios-webkit-de
     brew reinstall --HEAD libimobiledevice
     brew reinstall -s ios-webkit-debug-proxy
 
+##### iOS 11
+> Could not connect to lockdown. Exiting.: Resource temporarily unavailable  
+
+You would need to rebuild libimobiledevice with proposed [patch](https://gist.github.com/nikias/b351bf633d62703e0ff4f2fee9628401), for details follow the https://github.com/libimobiledevice/libimobiledevice/issues/510
+
+> Unable to connect to XXX  
+> Please verify that Settings > Safari > Advanced > Web Inspector = ON
+
+Build from master `brew reinstall --HEAD ios-webkit-debug-proxy`
+
 ##### Can not see Simulator
 
   - Make sure you started simulator before the proxy
@@ -190,6 +200,7 @@ Please upgrade libimobiledevice to version from master and rebuild ios-webkit-de
 ##### If no luck so far...
 Lastly, always try replugging in the USB cable.
 
+
 ## IWDP Clients
 
 JSON-formatted APIs are provided for programmatic clients.
@@ -213,5 +224,5 @@ 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.1.5](http://cgit.sukimashita.com/libimobiledevice.git)
-   - libimobiledevice 1.2.1 _if your taget iOS10+_
+   - [libimobiledevice 1.2.0](http://cgit.sukimashita.com/libimobiledevice.git)
+   - libimobiledevice 1.2.1 _if your target iOS10+_

examples/wi_client.c

@@ -103,7 +103,7 @@ int main(int argc, char **argv) {
   // connect to device
   char *device_id2 = NULL;
   int recv_timeout = 1000;
-  int fd = wi_connect(device_id, &device_id2, NULL, recv_timeout);
+  int fd = wi_connect(device_id, &device_id2, NULL, NULL, recv_timeout);
   if (fd < 0) {
     return -1;
   }

include/ios-webkit-debug-proxy/ios_webkit_debug_proxy.h

@@ -68,7 +68,7 @@ struct iwdp_struct {
   // @param to_device_name optional selected device name
   // @result fd, or -1 for error
   int (*attach)(iwdp_t iwdp, const char *device_id, char **to_device_id,
-                char **to_device_name);
+                char **to_device_name, int *to_device_version);
 
   // Select the port-scan range for the browser listener.
   // @param to_port preferred port, e.g. 9227.  If a device is re-attached

include/ios-webkit-debug-proxy/webinspector.h

@@ -33,11 +33,11 @@ typedef uint8_t wi_status;
 //    positive for milliseconds.
 // @result fd, or -1 for error
 int wi_connect(const char *device_id, char **to_device_id,
-               char **to_device_name, int recv_timeout);
+               char **to_device_name, int *to_device_version, int recv_timeout);
 
 struct wi_struct;
 typedef struct wi_struct *wi_t;
-wi_t wi_new(bool is_sim);
+wi_t wi_new(bool partials_supported);
 void wi_free(wi_t self);
 
 struct wi_private;

src/ios_webkit_debug_proxy.c

@@ -128,7 +128,7 @@ struct iwdp_iwi_struct {
   ht_t page_num_to_ipage;
 };
 
-iwdp_iwi_t iwdp_iwi_new(bool is_sim, bool *is_debug);
+iwdp_iwi_t iwdp_iwi_new(bool partials_supported, bool *is_debug);
 void iwdp_iwi_free(iwdp_iwi_t iwi);
 
 struct iwdp_ifs_struct;
@@ -404,6 +404,7 @@ dl_status iwdp_on_attach(dl_t dl, const char *device_id, int device_num) {
     return DL_SUCCESS;
   }
   char *device_name = iport->device_name;
+  int device_version = 0;
 
   // connect to inspector
   int wi_fd;
@@ -420,7 +421,7 @@ dl_status iwdp_on_attach(dl_t dl, const char *device_id, int device_num) {
     wi_fd = self->connect(self, "localhost", 27753);
   } else {
     wi_fd = self->attach(self, device_id, NULL,
-      (device_name ? NULL : &device_name));
+      (device_name ? NULL : &device_name), &device_version);
   }
   if (wi_fd < 0) {
     self->remove_fd(self, iport->s_fd);
@@ -430,7 +431,8 @@ dl_status iwdp_on_attach(dl_t dl, const char *device_id, int device_num) {
     return DL_SUCCESS;
   }
   iport->device_name = (device_name ? device_name : strdup(device_id));
-  iwdp_iwi_t iwi = iwdp_iwi_new(is_sim, self->is_debug);
+  iwdp_iwi_t iwi = iwdp_iwi_new(!is_sim && device_version < 0xb0000,
+      self->is_debug);
   iwi->iport = iport;
   iport->iwi = iwi;
   if (self->add_fd(self, wi_fd, iwi, false)) {
@@ -1660,7 +1662,7 @@ void iwdp_iwi_free(iwdp_iwi_t iwi) {
   }
 }
 
-iwdp_iwi_t iwdp_iwi_new(bool is_sim, bool *is_debug) {
+iwdp_iwi_t iwdp_iwi_new(bool partials_supported, bool *is_debug) {
   iwdp_iwi_t iwi = (iwdp_iwi_t)malloc(sizeof(struct iwdp_iwi_struct));
   if (!iwi) {
     return NULL;
@@ -1670,7 +1672,7 @@ iwdp_iwi_t iwdp_iwi_new(bool is_sim, bool *is_debug) {
   iwi->app_id_to_true = ht_new(HT_STRING_KEYS);
   iwi->page_num_to_ipage = ht_new(HT_INT_KEYS);
   rpc_t rpc = rpc_new();
-  wi_t wi = wi_new(is_sim);
+  wi_t wi = wi_new(partials_supported);
   if (!rpc || !wi || !iwi->page_num_to_ipage || !iwi->app_id_to_true) {
     iwdp_iwi_free(iwi);
     return NULL;

src/ios_webkit_debug_proxy_main.c

@@ -110,8 +110,9 @@ int iwdpm_subscribe(iwdp_t iwdp) {
   return dl_connect(-1);
 }
 int iwdpm_attach(iwdp_t iwdp, const char *device_id, char **to_device_id,
-    char **to_device_name) {
-  return wi_connect(device_id, to_device_id, to_device_name, -1);
+    char **to_device_name, int *to_device_version) {
+  return wi_connect(device_id, to_device_id, to_device_name,
+      to_device_version, -1);
 }
 iwdp_status iwdpm_select_port(iwdp_t iwdp, const char *device_id,
     int *to_port, int *to_min_port, int *to_max_port) {

src/rpc.h

@@ -27,7 +27,6 @@ rpc_status rpc_new_uuid(char **to_uuid);
 struct rpc_app_struct {
   char *app_id;
   char *app_name;
-  char *host_id;
   bool is_proxy;
 };
 typedef struct rpc_app_struct *rpc_app_t;

src/webinspector.c

@@ -40,7 +40,7 @@
 #define MAX_BODY_LENGTH 1<<24
 
 struct wi_private {
-  bool is_sim;
+  bool partials_supported;
   cb_t in;
   cb_t partial;
   bool has_length;
@@ -89,7 +89,7 @@ wi_status idevice_connection_get_fd(idevice_connection_t connection,
 #endif
 
 int wi_connect(const char *device_id, char **to_device_id,
-    char **to_device_name, int recv_timeout) {
+    char **to_device_name, int *to_device_version, int recv_timeout) {
   int ret = -1;
 
   idevice_t phone = NULL;
@@ -122,6 +122,24 @@ int wi_connect(const char *device_id, char **to_device_id,
   if (to_device_name &&
       !lockdownd_get_value(client, NULL, "DeviceName", &node)) {
     plist_get_string_val(node, to_device_name);
+    plist_free(node);
+    node = NULL;
+  }
+  if (to_device_version &&
+      !lockdownd_get_value(client, NULL, "ProductVersion", &node)) {
+    int vers[3] = {0, 0, 0};
+    char *s_version = NULL;
+    plist_get_string_val(node, &s_version);
+    if (s_version && sscanf(s_version, "%d.%d.%d",
+          &vers[0], &vers[1], &vers[2]) >= 2) {
+      *to_device_version = ((vers[0] & 0xFF) << 16) |
+                           ((vers[1] & 0xFF) << 8)  |
+                            (vers[2] & 0xFF);
+    } else {
+      *to_device_version = 0;
+    }
+    free(s_version);
+    plist_free(node);
   }
 
   // start webinspector, get port
@@ -191,7 +209,6 @@ int wi_connect(const char *device_id, char **to_device_id,
   //idevice_disconnect(connection);
   free(connection);
   lockdownd_client_free(client);
-  plist_free(node);
   idevice_free(phone);
   return ret;
 }
@@ -238,7 +255,7 @@ wi_status wi_send_plist(wi_t self, plist_t rpc_dict) {
     bool is_partial = false;
     char *data = NULL;
     uint32_t data_len = 0;
-    if (my->is_sim) {
+    if (!my->partials_supported) {
       data = rpc_bin;
       data_len = rpc_len;
       rpc_bin = NULL;
@@ -261,7 +278,7 @@ wi_status wi_send_plist(wi_t self, plist_t rpc_dict) {
     size_t length = data_len + 4;
     char *out_head = (char*)malloc(length * sizeof(char));
     if (!out_head) {
-      if (!my->is_sim) {
+      if (my->partials_supported) {
         free(data);
       }
       break;
@@ -325,7 +342,7 @@ wi_status wi_parse_plist(wi_t self, const char *from_buf, size_t length,
   *to_is_partial = false;
   *to_rpc_dict = NULL;
 
-  if (my->is_sim) {
+  if (!my->partials_supported) {
     plist_from_bin(from_buf, length, to_rpc_dict);
   } else {
     plist_t wi_dict = NULL;
@@ -395,7 +412,7 @@ wi_status wi_recv_packet(wi_t self, const char *packet, ssize_t length) {
     } else {
       cb_asprint(&text, packet, length, 80, 50);
     }
-    wi_status ret = self->on_error(self, "Invalid packet %s\n", text);
+    wi_status ret = self->on_error(self, "Invalid packet:\n%s\n", text);
     free(text);
     return ret;
   }
@@ -498,7 +515,7 @@ void wi_free(wi_t self) {
     free(self);
   }
 }
-wi_t wi_new(bool is_sim) {
+wi_t wi_new(bool partials_supported) {
   wi_t self = (wi_t)malloc(sizeof(struct wi_struct));
   if (!self) {
     return NULL;
@@ -513,6 +530,6 @@ wi_t wi_new(bool is_sim) {
     wi_free(self);
     return NULL;
   }
-  self->private_state->is_sim = is_sim;
+  self->private_state->partials_supported = partials_supported;
   return self;
 }