Skip to content

preflight: serialize device visibility and notifications #290

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ooonea wants to merge 1 commit into
base: master
Choose a base branch
from
Open

preflight: serialize device visibility and notifications #290

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion src/client.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -988,7 +988,6 @@ void client_device_add(struct device_info *dev)
{
mutex_lock(&client_list_mutex);
usbmuxd_log(LL_DEBUG, "client_device_add: id %d, location 0x%x, serial %s", dev->id, dev->location, dev->serial);
device_set_visible(dev->id);
FOREACH(struct mux_client *client, &client_list) {
if(client->state == CLIENT_LISTEN)
send_device_add(client, dev);
Expand Down
5 changes: 3 additions & 2 deletions src/device.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -888,12 +888,13 @@ void device_remove(struct usb_device *usbdev)
usbmuxd_log(LL_WARNING, "Cannot find device entry while removing USB device %p on location 0x%x", usbdev, usb_get_location(usbdev));
}

void device_set_visible(int device_id)
void device_set_visible(struct device_info *info)
{
mutex_lock(&device_list_mutex);
FOREACH(struct mux_device *dev, &device_list) {
if(dev->id == device_id) {
if(dev->id == info->id) {
dev->visible = 1;
client_device_add(info);
break;
}
} ENDFOREACH
Expand Down
2 changes: 1 addition & 1 deletion src/device.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ int device_start_connect(int device_id, uint16_t port, struct mux_client *client
void device_client_process(int device_id, struct mux_client *client, short events);
void device_abort_connect(int device_id, struct mux_client *client);

void device_set_visible(int device_id);
void device_set_visible(struct device_info *info);
void device_set_preflight_cb_data(int device_id, void* data);

int device_get_count(int include_hidden);
Expand Down
22 changes: 11 additions & 11 deletions src/preflight.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@ static void* preflight_worker_handle_device_add(void* userdata)
// make restore mode devices visible
free(type);
usbmuxd_log(LL_INFO, "%s: Finished preflight on device %s", __func__, _dev->udid);
client_device_add(info);
device_set_visible(info);
goto leave;
}
free(type);
Expand All @@ -185,7 +185,7 @@ static void* preflight_worker_handle_device_add(void* userdata)
if (lerr == LOCKDOWN_E_SUCCESS) {
usbmuxd_log(LL_INFO, "%s: StartSession success for device %s", __func__, _dev->udid);
usbmuxd_log(LL_INFO, "%s: Finished preflight on device %s", __func__, _dev->udid);
client_device_add(info);
device_set_visible(info);
goto leave;
}

Expand Down Expand Up @@ -260,7 +260,7 @@ static void* preflight_worker_handle_device_add(void* userdata)
/* if device is still showing the setup screen it will pair even without trust dialog */
usbmuxd_log(LL_INFO, "%s: Pair success for device %s", __func__, _dev->udid);
usbmuxd_log(LL_INFO, "%s: Finished preflight on device %s", __func__, _dev->udid);
client_device_add(info);
device_set_visible(info);
goto leave;
}
}
Expand All @@ -270,7 +270,7 @@ static void* preflight_worker_handle_device_add(void* userdata)
if (lerr != LOCKDOWN_E_SUCCESS) {
/* even though we failed, simple mode should still work, so only warn of an error */
usbmuxd_log(LL_INFO, "%s: ERROR: Could not start insecure_notification_proxy on %s, lockdown error %d", __func__, _dev->udid, lerr);
client_device_add(info);
device_set_visible(info);
goto leave;
}

Expand Down Expand Up @@ -304,7 +304,7 @@ static void* preflight_worker_handle_device_add(void* userdata)
usbmuxd_log(LL_INFO, "%s: Waiting for user to trust this computer on device %s", __func__, _dev->udid);

/* make device visible anyways */
client_device_add(info);
device_set_visible(info);

while (cbdata.np && cbdata.is_device_connected && !cbdata.is_finished) {
sleep(1);
Expand All @@ -330,7 +330,7 @@ static void* preflight_worker_handle_device_add(void* userdata)
usbmuxd_log(LL_INFO, "%s: Finished preflight on device %s", __func__, _dev->udid);

/* make device visible anyways */
client_device_add(info);
device_set_visible(info);

goto leave;
}
Expand All @@ -353,7 +353,7 @@ static void* preflight_worker_handle_device_add(void* userdata)
usbmuxd_log(LL_INFO, "%s: Finished preflight on device %s", __func__, _dev->udid);

/* emit device added event and thus make device visible to clients */
client_device_add(info);
device_set_visible(info);
}

leave:
Expand All @@ -378,7 +378,7 @@ void preflight_device_remove_cb(void *data)
void preflight_worker_device_add(struct device_info* info)
{
if (info->pid == PID_APPLE_T2_COPROCESSOR || no_preflight == 1) {
client_device_add(info);
device_set_visible(info);
return;
}

Expand All @@ -395,12 +395,12 @@ void preflight_worker_device_add(struct device_info* info)
if (perr != 0) {
free((char*)infocopy->serial);
free(infocopy);
usbmuxd_log(LL_ERROR, "ERROR: failed to start preflight worker thread for device %s: %s (%d). Invoking client_device_add() directly but things might not work as expected.", info->serial, strerror(perr), perr);
client_device_add(info);
usbmuxd_log(LL_ERROR, "ERROR: failed to start preflight worker thread for device %s: %s (%d). Invoking device_set_visible() directly but things might not work as expected.", info->serial, strerror(perr), perr);
device_set_visible(info);
} else {
thread_detach(th);
}
#else
client_device_add(info);
device_set_visible(info);
#endif
}