cookiez/pam-fprint-grosshack
1
0
Fork 0
mirror of https://gitlab.com/mishakmak/pam-fprint-grosshack.git synced 2026-04-08 20:03:34 +02:00
Code Issues Packages Projects Releases Wiki Activity

Stop extra signals from being emitted

Browse Source 
Some devices keep sending us signals when an enrollment or
verification finished. Ignore all those signals, we hate them.
This commit is contained in:
Bastien Nocera
2008-11-26 18:05:22 +00:00
committed by Daniel Drake
parent 3941c3bff2
commit 6a480f409d
1 changed files with 24 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
src/device.c
View File

@ -117,6 +117,8 @@ struct FprintDevicePrivate {
/* whether we're running an identify, or a verify */ /* whether we're running an identify, or a verify */
FprintDeviceAction current_action; FprintDeviceAction current_action;
/* Whether we should ignore new signals on the device */
gboolean action_done;
}; };
typedef struct FprintDevicePrivate FprintDevicePrivate; typedef struct FprintDevicePrivate FprintDevicePrivate;
@ -780,16 +782,18 @@ static void verify_cb(struct fp_dev *dev, int r, struct fp_img *img,
struct FprintDevice *rdev = user_data; struct FprintDevice *rdev = user_data;
FprintDevicePrivate *priv = DEVICE_GET_PRIVATE(rdev); FprintDevicePrivate *priv = DEVICE_GET_PRIVATE(rdev);
const char *name = verify_result_to_name (r); const char *name = verify_result_to_name (r);
gboolean done = FALSE;
if (priv->action_done != FALSE)
return;
g_message("verify_cb: result %s (%d)", name, r); g_message("verify_cb: result %s (%d)", name, r);
if (r == FP_VERIFY_NO_MATCH || r == FP_VERIFY_MATCH || r < 0) if (r == FP_VERIFY_NO_MATCH || r == FP_VERIFY_MATCH || r < 0)
done = TRUE; priv->action_done = TRUE;
g_signal_emit(rdev, signals[SIGNAL_VERIFY_STATUS], 0, name, done); g_signal_emit(rdev, signals[SIGNAL_VERIFY_STATUS], 0, name, priv->action_done);
fp_img_free(img); fp_img_free(img);
if (done && priv->verify_data) { if (priv->action_done && priv->verify_data) {
fp_print_data_free (priv->verify_data); fp_print_data_free (priv->verify_data);
priv->verify_data = NULL; priv->verify_data = NULL;
} }
@ -801,16 +805,18 @@ static void identify_cb(struct fp_dev *dev, int r,
struct FprintDevice *rdev = user_data; struct FprintDevice *rdev = user_data;
FprintDevicePrivate *priv = DEVICE_GET_PRIVATE(rdev); FprintDevicePrivate *priv = DEVICE_GET_PRIVATE(rdev);
const char *name = verify_result_to_name (r); const char *name = verify_result_to_name (r);
gboolean done = FALSE;
if (priv->action_done != FALSE)
return;
g_message("identify_cb: result %s (%d)", name, r); g_message("identify_cb: result %s (%d)", name, r);
if (r == FP_VERIFY_NO_MATCH || r == FP_VERIFY_MATCH || r < 0) if (r == FP_VERIFY_NO_MATCH || r == FP_VERIFY_MATCH || r < 0)
done = TRUE; priv->action_done = TRUE;
g_signal_emit(rdev, signals[SIGNAL_VERIFY_STATUS], 0, name, done); g_signal_emit(rdev, signals[SIGNAL_VERIFY_STATUS], 0, name, priv->action_done);
fp_img_free(img); fp_img_free(img);
if (done && priv->identify_data != NULL) { if (priv->action_done && priv->identify_data != NULL) {
guint i; guint i;
for (i = 0; priv->identify_data[i] != NULL; i++) for (i = 0; priv->identify_data[i] != NULL; i++)
fp_print_data_free(priv->identify_data[i]); fp_print_data_free(priv->identify_data[i]);
@ -853,6 +859,7 @@ static void fprint_device_verify_start(FprintDevice *rdev,
g_error_free (error); g_error_free (error);
return; return;
} }
priv->action_done = FALSE;
if (finger_num == -1) { if (finger_num == -1) {
GSList *prints; GSList *prints;
@ -1013,9 +1020,12 @@ static void enroll_stage_cb(struct fp_dev *dev, int result,
struct FprintDevice *rdev = user_data; struct FprintDevice *rdev = user_data;
FprintDevicePrivate *priv = DEVICE_GET_PRIVATE(rdev); FprintDevicePrivate *priv = DEVICE_GET_PRIVATE(rdev);
struct session_data *session = priv->session; struct session_data *session = priv->session;
gboolean done = FALSE;
int r; int r;
/* We're done, ignore new events for the action */
if (priv->action_done != FALSE)
return;
g_message("enroll_stage_cb: result %d", result); g_message("enroll_stage_cb: result %d", result);
if (result == FP_ENROLL_COMPLETE) { if (result == FP_ENROLL_COMPLETE) {
r = store.print_data_save(print, session->enroll_finger, priv->username); r = store.print_data_save(print, session->enroll_finger, priv->username);
@ -1024,8 +1034,10 @@ static void enroll_stage_cb(struct fp_dev *dev, int result,
} }
if (result == FP_ENROLL_COMPLETE || result == FP_ENROLL_FAIL || result < 0) if (result == FP_ENROLL_COMPLETE || result == FP_ENROLL_FAIL || result < 0)
done = TRUE; priv->action_done = TRUE;
g_signal_emit(rdev, signals[SIGNAL_ENROLL_STATUS], 0, enroll_result_to_name (result), done);
g_signal_emit(rdev, signals[SIGNAL_ENROLL_STATUS], 0, enroll_result_to_name (result), priv->action_done);
fp_img_free(img); fp_img_free(img);
fp_print_data_free(print); fp_print_data_free(print);
} }
@ -1072,6 +1084,7 @@ static void fprint_device_enroll_start(FprintDevice *rdev,
g_message("start enrollment device %d finger %d", priv->id, finger_num); g_message("start enrollment device %d finger %d", priv->id, finger_num);
session->enroll_finger = finger_num; session->enroll_finger = finger_num;
priv->action_done = FALSE;
r = fp_async_enroll_start(priv->dev, enroll_stage_cb, rdev); r = fp_async_enroll_start(priv->dev, enroll_stage_cb, rdev);
if (r < 0) { if (r < 0) {