[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[taler-taler-mdb] 30/93: cleanup
From: |
gnunet |
Subject: |
[taler-taler-mdb] 30/93: cleanup |
Date: |
Mon, 18 Nov 2019 21:12:53 +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 6f809f45ff8ffb9a14aec80cdcd5c7902c28e7a8
Author: Christian Grothoff <address@hidden>
AuthorDate: Sat Nov 9 16:16:06 2019 +0100
cleanup
---
src/main.c | 60 ++++++++++++++++++++++++++++--------------------------------
1 file changed, 28 insertions(+), 32 deletions(-)
diff --git a/src/main.c b/src/main.c
index d9e5bad..1d0bd9e 100644
--- a/src/main.c
+++ b/src/main.c
@@ -20,7 +20,7 @@ along with
* @file main.c
* @brief main functionality of the application
* @author BOSS Marco
-* @author ...
+* @author Christian Grothoff
*/
#include <stdio.h>
#include <stdlib.h>
@@ -34,6 +34,8 @@ along with
#define BACKEND_POLL_TIMEOUT GNUNET_TIME_UNIT_MINUTES
+#define NFC_FAILURE_RETRY_FREQ GNUNET_TIME_UNIT_SECONDS
+
/**
* Timeout in milliseconds for libnfc operations.
*/
@@ -254,35 +256,33 @@ wallet_transmit_uri (void *cls)
{
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
"Failed to send command\n");
- pa->task = GNUNET_SCHEDULER_add_delayed (
- GNUNET_TIME_UNIT_SECONDS /* FIXME: timeout? */,
- &wallet_select_aid, /* TBD: where to resume? */
- pa);
-
+ nfc_initiator_deselect_target (pa->pnd);
+ pa->task = GNUNET_SCHEDULER_add_delayed (NFC_FAILURE_RETRY_FREQ,
+ &connect_target,
+ pa);
return;
}
- if (0 == memcmp (response,
+ if (0 != memcmp (response,
APDU_SUCCESS,
sizeof (response)))
- {
- GNUNET_log (GNUNET_ERROR_TYPE_INFO,
- "PUT DATA command sent successfully\n");
- pa->wallet_has_uri = GNUNET_YES;
- pa->delay_task = GNUNET_SCHEDULER_add_delayed (MAX_HTTP_RETRY_FREQ,
- &check_payment_again,
- pa);
- }
- else
{
GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
- "PUT DATA command transmission failed, return code: %x%x\n",
+ "'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);
+ return;
}
- pa->task = GNUNET_SCHEDULER_add_delayed (
- GNUNET_TIME_UNIT_SECONDS /* FIXME: timeout? */,
- &wallet_transmit_uri, /* TBD: where to resume? */
- pa);
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+ "'PUT DATA' command sent successfully\n");
+ pa->wallet_has_uri = GNUNET_YES;
+ /* FIXME: or just offer Internet service here? */
+ pa->delay_task = GNUNET_SCHEDULER_add_delayed (MAX_HTTP_RETRY_FREQ,
+ &wallet_transmit_uri,
+ pa);
}
@@ -309,10 +309,9 @@ 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 (
- GNUNET_TIME_UNIT_SECONDS /* FIXME: timeout? */,
- &connect_target,
- pa);
+ pa->task = GNUNET_SCHEDULER_add_delayed (NFC_FAILURE_RETRY_FREQ,
+ &connect_target,
+ pa);
return;
}
if (0 == memcmp (response,
@@ -330,10 +329,9 @@ wallet_select_aid (void *cls)
response[0],
response[1]);
nfc_initiator_deselect_target (pa->pnd);
- pa->task = GNUNET_SCHEDULER_add_delayed (
- GNUNET_TIME_UNIT_SECONDS /* FIXME: timeout? */,
- &connect_target,
- pa);
+ pa->task = GNUNET_SCHEDULER_add_delayed (NFC_FAILURE_RETRY_FREQ,
+ &connect_target,
+ pa);
}
@@ -420,12 +418,10 @@ check_payment_cb (void *cls,
struct PaymentActivity *pa = cls;
pa->cpo = NULL;
- // FIXME: check http_status, yada yada
-
if (MHD_HTTP_OK != http_status)
{
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- "Http check payment failed: %u",
+ "Backend request to /check-payment failed: %u",
http_status);
cleanup_payment (pa);
GNUNET_assert (payment_activity == pa);
--
To stop receiving notification emails like this one, please contact
address@hidden.
- [taler-taler-mdb] 10/93: add bootstrap and uncrustify logic, (continued)
- [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, 2019/11/18
- [taler-taler-mdb] 33/93: typo, gnunet, 2019/11/18
- [taler-taler-mdb] 30/93: cleanup,
gnunet <=
- [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
- [taler-taler-mdb] 35/93: explicitly detect not-found code, gnunet, 2019/11/18
- [taler-taler-mdb] 39/93: use test for now, gnunet, 2019/11/18