From 361f534dbb590b112a428dc90158db6ba18000ca Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Tue, 31 May 2022 08:46:43 +0200 Subject: add -I option to wirewatch --- contrib/gana | 2 +- src/auditor/taler-helper-auditor-wire.c | 2 +- src/exchange/taler-exchange-wirewatch.c | 18 +++++++++++++++--- 3 files changed, 17 insertions(+), 5 deletions(-) diff --git a/contrib/gana b/contrib/gana index aebd54203..99d8d9e03 160000 --- a/contrib/gana +++ b/contrib/gana @@ -1 +1 @@ -Subproject commit aebd5420308d7599aadb8818a82d9ffc89492334 +Subproject commit 99d8d9e0336bacebab5af4ae00c3f685ffd90f60 diff --git a/src/auditor/taler-helper-auditor-wire.c b/src/auditor/taler-helper-auditor-wire.c index 2cc70a940..0de873f51 100644 --- a/src/auditor/taler-helper-auditor-wire.c +++ b/src/auditor/taler-helper-auditor-wire.c @@ -1576,7 +1576,7 @@ process_credits (void *cls); * @param json raw response * @return #GNUNET_OK to continue, #GNUNET_SYSERR to abort iteration */ -static int +static enum GNUNET_GenericReturnValue history_credit_cb (void *cls, unsigned int http_status, enum TALER_ErrorCode ec, diff --git a/src/exchange/taler-exchange-wirewatch.c b/src/exchange/taler-exchange-wirewatch.c index c69ce1ac8..c39abe135 100644 --- a/src/exchange/taler-exchange-wirewatch.c +++ b/src/exchange/taler-exchange-wirewatch.c @@ -212,6 +212,12 @@ static int global_ret; */ static int test_mode; +/** + * Should we ignore if the bank does not know our bank + * account? + */ +static int ignore_account_404; + /** * Current task waiting for execution, if any. */ @@ -623,9 +629,11 @@ history_cb (void *cls, if (NULL == details) { wa->hh = NULL; - if ( (MHD_HTTP_NO_CONTENT != http_status) && - ( (TALER_EC_NONE != ec) || - (MHD_HTTP_OK != http_status) ) ) + if ( (! ( (MHD_HTTP_NOT_FOUND == http_status) && + (ignore_account_404) ) ) && + ( (MHD_HTTP_NO_CONTENT != http_status) && + ( (TALER_EC_NONE != ec) || + (MHD_HTTP_OK != http_status) ) ) ) { GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Error fetching history: %s (%u)\n", @@ -966,6 +974,10 @@ main (int argc, char *const *argv) { struct GNUNET_GETOPT_CommandLineOption options[] = { + GNUNET_GETOPT_option_flag ('I', + "ignore-not-found", + "continue, even if the bank account of the exchange was not found", + &ignore_account_404), GNUNET_GETOPT_option_uint ('S', "size", "SIZE", -- cgit v1.2.3