taler-mdb

GNU Taler Extensions and Integrations
Log | Files | Refs | Submodules | README | LICENSE

commit eacacaf002e89b1591c80e480616278c6499a678
parent 0609d5c9cb0aaee6a3a0c9f7b6497b9aad488982
Author: BOSS_Marco <bossm8@students.bfh.ch>
Date:   Sat,  9 Nov 2019 20:02:17 +0100

fixed delay when cancelling, new bugs detected marked with FIXME

Diffstat:
Msrc/main.c | 18+++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/main.c b/src/main.c @@ -169,7 +169,7 @@ cleanup_payment (struct PaymentActivity *pa) { if (NULL != pa->pnd) { - nfc_abort_command(pa->pnd); + nfc_abort_command (pa->pnd); nfc_close (pa->pnd); } if (NULL != pa->po) @@ -180,7 +180,7 @@ cleanup_payment (struct PaymentActivity *pa) GNUNET_SCHEDULER_cancel (pa->task); if (NULL != pa->delay_task) GNUNET_SCHEDULER_cancel (pa->delay_task); /* FIXME - double free or corruption (!prev) - when already sent a message via nfc and then press 'c' (abort) */ - /* FIXME - cont. also abort when nfc device gets disconnected (maybe this is ok? because nfc is mandatory) */ + /* FIXME - cont. also abort when nfc device gets disconnected (maybe this is ok? because nfc is mandatory) */ GNUNET_free_non_null (pa->taler_pay_uri); GNUNET_free_non_null (pa->order_id); GNUNET_free (pa); @@ -325,9 +325,9 @@ wallet_select_aid (void *cls) "AID selection failure, return code: %x%x, trying to find another NFC client\n", response[0], response[1]); - pa->task = GNUNET_SCHEDULER_add_delayed(NFC_FAILURE_RETRY_FREQ, - &connect_target, - pa); + pa->task = GNUNET_SCHEDULER_add_delayed (NFC_FAILURE_RETRY_FREQ, + &connect_target, + pa); } @@ -350,7 +350,7 @@ connect_target (void *cls) pa->nt.nti.nai.szUidLen = 0; GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Trying to find NFC client\n"); - if( 0 > nfc_initiator_poll_target ( pa->pnd, + if ( 0 > nfc_initiator_poll_target (pa->pnd, nmMifare, 1, 0x01, @@ -377,9 +377,9 @@ connect_target (void *cls) pa); return; } - pa->task = GNUNET_SCHEDULER_add_delayed ( NFC_FAILURE_RETRY_FREQ, - &connect_target, - pa); + pa->task = GNUNET_SCHEDULER_add_delayed (NFC_FAILURE_RETRY_FREQ, + &connect_target, + pa); }