[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[taler-taler-mdb] 31/93: cleanup
From: |
gnunet |
Subject: |
[taler-taler-mdb] 31/93: cleanup |
Date: |
Mon, 18 Nov 2019 21:12:54 +0100 |
This is an automated email from the git hooks/post-receive script.
marco-boss pushed a commit to branch master
in repository taler-mdb.
commit 4b62f02405a2315bd38967a08eaa4642d0ddc44c
Author: Christian Grothoff <address@hidden>
AuthorDate: Sat Nov 9 16:18:27 2019 +0100
cleanup
---
src/main.c | 18 ++++++++++--------
1 file changed, 10 insertions(+), 8 deletions(-)
diff --git a/src/main.c b/src/main.c
index 1d0bd9e..b26d7ec 100644
--- a/src/main.c
+++ b/src/main.c
@@ -96,6 +96,8 @@ struct PaymentActivity
struct GNUNET_SCHEDULER_Task *delay_task;
+ int nfc_has_target;
+
int wallet_has_uri;
};
@@ -175,11 +177,10 @@ cleanup_payment (struct PaymentActivity *pa)
GNUNET_SCHEDULER_cancel (pa->task);
if (NULL != pa->delay_task)
GNUNET_SCHEDULER_cancel (pa->delay_task);
- if (NULL != pa->pnd)
- {
+ if (GNUNET_YES == pa->nfc_has_target)
nfc_initiator_deselect_target (pa->pnd); // needed?
+ if (NULL != pa->pnd)
nfc_close (pa->pnd);
- }
GNUNET_free_non_null (pa->taler_pay_uri);
GNUNET_free_non_null (pa->order_id);
GNUNET_free (pa);
@@ -256,7 +257,6 @@ wallet_transmit_uri (void *cls)
{
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
"Failed to send command\n");
- nfc_initiator_deselect_target (pa->pnd);
pa->task = GNUNET_SCHEDULER_add_delayed (NFC_FAILURE_RETRY_FREQ,
&connect_target,
pa);
@@ -270,7 +270,6 @@ wallet_transmit_uri (void *cls)
"'PUT DATA' command transmission failed, return code: %x%x\n",
response[0],
response[1]);
- nfc_initiator_deselect_target (pa->pnd);
pa->task = GNUNET_SCHEDULER_add_delayed (NFC_FAILURE_RETRY_FREQ,
&connect_target,
pa);
@@ -308,7 +307,6 @@ wallet_select_aid (void *cls)
{
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
"Failed to transceive with NFC app, trying to find another NFC
client in 1s\n");
- nfc_initiator_deselect_target (pa->pnd);
pa->task = GNUNET_SCHEDULER_add_delayed (NFC_FAILURE_RETRY_FREQ,
&connect_target,
pa);
@@ -328,7 +326,6 @@ wallet_select_aid (void *cls)
"AID selection failure, return code: %x%x, trying to find
another NFC client in 1s\n",
response[0],
response[1]);
- nfc_initiator_deselect_target (pa->pnd);
pa->task = GNUNET_SCHEDULER_add_delayed (NFC_FAILURE_RETRY_FREQ,
&connect_target,
pa);
@@ -351,6 +348,11 @@ connect_target (void *cls)
} };
pa->task = NULL;
+ if (GNUNET_YES == pa->nfc_has_target)
+ {
+ nfc_initiator_deselect_target (pa->pnd);
+ pa->nfc_has_target = GNUNET_NO;
+ }
pa->nt.nti.nai.szUidLen = 0;
GNUNET_log (GNUNET_ERROR_TYPE_INFO,
"Trying to find NFC client\n");
@@ -376,11 +378,11 @@ connect_target (void *cls)
{
GNUNET_log (GNUNET_ERROR_TYPE_INFO,
"Found NFC client\n");
+ pa->nfc_has_target = GNUNET_YES;
pa->task = GNUNET_SCHEDULER_add_now (&wallet_select_aid,
pa);
return;
}
- nfc_initiator_deselect_target (pa->pnd);
pa->task = GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_SECONDS,
&connect_target,
pa);
--
To stop receiving notification emails like this one, please contact
address@hidden.
- [taler-taler-mdb] 22/93: pseudo nonce, (continued)
- [taler-taler-mdb] 22/93: pseudo nonce, gnunet, 2019/11/18
- [taler-taler-mdb] 26/93: use check payment instead of poll payment, gnunet, 2019/11/18
- [taler-taler-mdb] 10/93: add bootstrap and uncrustify logic, gnunet, 2019/11/18
- [taler-taler-mdb] 17/93: merged jsonIntegrity, gnunet, 2019/11/18
- [taler-taler-mdb] 23/93: chaos monkey, gnunet, 2019/11/18
- [taler-taler-mdb] 15/93: fixes, gnunet, 2019/11/18
- [taler-taler-mdb] 14/93: updated .gitignore, gnunet, 2019/11/18
- [taler-taler-mdb] 20/93: more implementations using GNUNETUtils, gnunet, 2019/11/18
- [taler-taler-mdb] 19/93: GNUnet logs added, -h option added, gnunet, 2019/11/18
- [taler-taler-mdb] 12/93: initial indenting, gnunet, 2019/11/18
- [taler-taler-mdb] 31/93: cleanup,
gnunet <=
- [taler-taler-mdb] 33/93: typo, gnunet, 2019/11/18
- [taler-taler-mdb] 30/93: cleanup, gnunet, 2019/11/18
- [taler-taler-mdb] 24/93: use event loop, gnunet, 2019/11/18
- [taler-taler-mdb] 32/93: retry NFC failures more nicely, gnunet, 2019/11/18
- [taler-taler-mdb] 36/93: fixed delay when cancelling, new bugs detected marked with FIXME, gnunet, 2019/11/18
- [taler-taler-mdb] 46/93: first steps in configurable products, gnunet, 2019/11/18
- [taler-taler-mdb] 28/93: misc cleanup, gnunet, 2019/11/18
- [taler-taler-mdb] 45/93: first steps in configurable products, gnunet, 2019/11/18
- [taler-taler-mdb] 40/93: fix, gnunet, 2019/11/18
- [taler-taler-mdb] 43/93: preparations for QR code alternative path, gnunet, 2019/11/18