depau/libfprint
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

virtual-device: Do not time out when waiting for SCAN command

Browse source 
The timeout is designed to continue commands automatically that are
common (e.g. opening the device). This doesn't really make sense for
scan commands, and removing the timeout enables test setups where user
interaction with the device may happen at arbitrary times.

One exception is device removal/unplug, in which case the timeout will
be added anyway.
This commit is contained in:
Benjamin Berg 2021-07-26 19:45:02 +02:00
parent a68fce0f2c
commit 4cdca4da24
1 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
libfprint/drivers/virtual-device.c
View file

@ -150,6 +150,8 @@ process_cmds (FpDeviceVirtualDevice * self,
char **scan_id, char **scan_id,
GError **error) GError **error)
{ {
gboolean removed;
if (g_cancellable_is_cancelled (self->cancellable) || if (g_cancellable_is_cancelled (self->cancellable) ||
(fpi_device_get_current_action (FP_DEVICE (self)) != FPI_DEVICE_ACTION_NONE && (fpi_device_get_current_action (FP_DEVICE (self)) != FPI_DEVICE_ACTION_NONE &&
g_cancellable_is_cancelled (fpi_device_get_cancellable (FP_DEVICE (self))))) g_cancellable_is_cancelled (fpi_device_get_cancellable (FP_DEVICE (self)))))
@ -250,7 +252,10 @@ process_cmds (FpDeviceVirtualDevice * self,
if (self->ignore_wait) if (self->ignore_wait)
return TRUE; return TRUE;
g_object_get (self, "removed", &removed, NULL);
g_assert (self->wait_command_id == 0); g_assert (self->wait_command_id == 0);
if (!scan || removed)
self->wait_command_id = g_timeout_add (500, wait_for_command_timeout, self); self->wait_command_id = g_timeout_add (500, wait_for_command_timeout, self);
return FALSE; return FALSE;
} }
@ -304,6 +309,7 @@ recv_instruction_cb (GObject *source_object,
else if (g_str_has_prefix (cmd, UNPLUG_CMD)) else if (g_str_has_prefix (cmd, UNPLUG_CMD))
{ {
fpi_device_remove (FP_DEVICE (self)); fpi_device_remove (FP_DEVICE (self));
maybe_continue_current_action (self);
} }
else if (g_str_has_prefix (cmd, SET_ENROLL_STAGES_PREFIX)) else if (g_str_has_prefix (cmd, SET_ENROLL_STAGES_PREFIX))
{ {