preflight: replace idevice_event_* with thread safe implementation

idevice_event_subscribe() calls usbmuxd_subscribe() which will
start a thread waiting for device add/remove events. But this
implementation is not able to handle more than one "subscription".
However the preflight worker will start a thread for _each_ device
resulting in a really messed up situation if more than one device
is attached at the same time. This fix will use usbmuxd's internal
device_remove function calling a preflight callback to make this
implementation thread safe.

1 files changed, 13 insertions, 11 deletions

diff --git a/src/preflight.c b/src/preflight.c
index 283c6d9..b011344 100644
--- a/src/preflight.c
+++ b/src/preflight.c
@@ -30,11 +30,14 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 #include <sys/time.h>
 
+#ifdef HAVE_LIBIMOBILEDEVICE
 #include <libimobiledevice/libimobiledevice.h>
 #include <libimobiledevice/lockdown.h>
 #include <libimobiledevice/notification_proxy.h>
+#endif
 
 #include "preflight.h"
+#include "device.h"
 #include "client.h"
 #include "conf.h"
 #include "log.h"
@@ -65,15 +68,12 @@ static void lockdownd_set_untrusted_host_buid(lockdownd_client_t lockdown)
         free(system_buid);
 }
 
-static void idevice_callback(const idevice_event_t* event, void* userdata)
+void preflight_device_remove_cb(void *data)
 {
-        struct cb_data *cbdata = (struct cb_data*)userdata;
-        idevice_t dev = cbdata->dev;
-        struct idevice_private *_dev = (struct idevice_private*)dev;
-
-        if (event->event == IDEVICE_DEVICE_REMOVE && !strcmp(_dev->udid, event->udid)) {
-                cbdata->is_device_connected = 0;
-        }
+        if (!data)
+                return;
+        struct cb_data *cbdata = (struct cb_data*)data;
+        cbdata->is_device_connected = 0;
 }
 
 static void np_callback(const char* notification, void* userdata)
@@ -246,7 +246,7 @@ retry:
                 cbdata.is_device_connected = 1;
 
                 np_set_notify_callback(np, np_callback, (void*)&cbdata);
-                idevice_event_subscribe(idevice_callback, (void*)&cbdata);
+                device_set_preflight_cb_data(info->id, (void*)&cbdata);
 
                 const char* spec[] = {
                         "com.apple.mobile.lockdown.request_pair",
@@ -267,8 +267,6 @@ retry:
                 }
                 usbmuxd_log(LL_INFO, "%s: Finished waiting for notification from device %s, is_device_connected %d", __func__, _dev->udid, cbdata.is_device_connected);
 
-                idevice_event_unsubscribe();
-
                 if (cbdata.np) {
                         np_client_free(cbdata.np);
                 }
@@ -326,6 +324,10 @@ leave:
 
         return NULL;
 }
+#else
+void preflight_device_remove_cb(void *data)
+{
+}
 #endif
 
 void preflight_worker_device_add(struct device_info* info)