hopefully fixed race condition on connection setup

1 files changed, 22 insertions, 0 deletions

diff --git a/src/main.c b/src/main.c
index 1a62f17..8e27d8f 100644
--- a/src/main.c
+++ b/src/main.c
@@ -719,6 +719,7 @@ static void *usbmuxd_client_init_thread(void *arg)
                         logmsg(LOG_NOTICE,
                                    "%s[%x]: No attached iPhone/iPod devices found.",
                                    __func__, THREAD);
+                usbmuxd_send_result(cdata->socket, s_req->header.tag, -ENODEV);
                 goto leave;
         }
 
@@ -846,6 +847,27 @@ static void *usbmuxd_client_init_thread(void *arg)
         }
         pthread_mutex_unlock(&cur_dev->mutex);
 
+        // wait for the initial handshake (SYN->SYN+ACK->ACKto complete
+        struct timespec ts;
+        ts.tv_sec = 0;
+        ts.tv_nsec = 100000000;
+
+        i = 0;
+        printf("waiting for handshake to complete...\n");
+        while (i < 10000) {
+                if (usbmux_is_connected(cdata->muxclient)) {
+                        printf("handshake done\n");
+                        break;
+                }
+                nanosleep(&ts, NULL);
+                i+=100;
+        }
+        if (!usbmux_is_connected(cdata->muxclient)) {
+                printf("handshake failed\n");
+                usbmuxd_send_result(cdata->socket, c_req->header.tag, -ENOTCONN);
+                goto leave;
+        }
+
         // start connection handler thread
         cdata->handler_dead = 0;
         cdata->tag = c_req->header.tag;