From ea27c569209d7b9d04e965ef070ad6a744f76f2d Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Wed, 25 Nov 2015 13:36:29 +0100 Subject: get rid of marcello's printf()-style debugging with compiler warnings... --- src/mint-lib/mint_api_deposit.c | 33 --------------------------------- 1 file changed, 33 deletions(-) (limited to 'src/mint-lib') diff --git a/src/mint-lib/mint_api_deposit.c b/src/mint-lib/mint_api_deposit.c index bf00ffa2..54131776 100644 --- a/src/mint-lib/mint_api_deposit.c +++ b/src/mint-lib/mint_api_deposit.c @@ -312,39 +312,6 @@ verify_signatures (const struct TALER_MINT_DenomPublicKey *dki, &dki->fee_deposit); dr.merchant = *merchant_pub; dr.coin_pub = *coin_pub; - - char *contract_str = GNUNET_STRINGS_data_to_string_alloc (h_contract, - sizeof (struct GNUNET_HashCode)); - char *wire_str = GNUNET_STRINGS_data_to_string_alloc (h_wire, - sizeof (struct GNUNET_HashCode)); - char *merchant_pub_str = GNUNET_STRINGS_data_to_string_alloc (merchant_pub, - sizeof (struct TALER_MerchantPublicKeyP)); - char *coin_pub_str = GNUNET_STRINGS_data_to_string_alloc (coin_pub, - sizeof (struct TALER_CoinSpendPublicKeyP)); - printf ("verifying:\ncontract [%s]\nwire [%s]\n" - "timestamp [%llu]\nrefund deadline [%llu]\n" - "transaction id [%llu]\namount [%s %llu.%lu]\n" - "fee deposit [%s %llu.%lu]\nmerch pub [%s]\n" - "coin pub [%s]\n", - contract_str, - wire_str, - timestamp.abs_value_us, - refund_deadline.abs_value_us, - transaction_id, - amount->currency, - amount->value, - amount->fraction, - dki->fee_deposit.currency, - dki->fee_deposit.value, - dki->fee_deposit.fraction, - merchant_pub_str, - coin_pub_str); - - GNUNET_free (contract_str); - GNUNET_free (wire_str); - GNUNET_free (merchant_pub_str); - GNUNET_free (coin_pub_str); - if (GNUNET_OK != GNUNET_CRYPTO_eddsa_verify (TALER_SIGNATURE_WALLET_COIN_DEPOSIT, &dr.purpose, -- cgit v1.2.3 From 304fc9fb1fa908158c2795a69be102598af272cb Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Sat, 19 Dec 2015 20:35:41 +0100 Subject: only reduce timeout, enable function to be called on existing values --- src/mint-lib/mint_api_context.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'src/mint-lib') diff --git a/src/mint-lib/mint_api_context.c b/src/mint-lib/mint_api_context.c index 4ab46e4e..be3df7c2 100644 --- a/src/mint-lib/mint_api_context.c +++ b/src/mint-lib/mint_api_context.c @@ -333,15 +333,23 @@ TALER_MINT_get_select_info (struct TALER_MINT_Context *ctx, int *max_fd, long *timeout) { + long to; + GNUNET_assert (CURLM_OK == curl_multi_fdset (ctx->multi, read_fd_set, write_fd_set, except_fd_set, max_fd)); + to = *timeout; GNUNET_assert (CURLM_OK == curl_multi_timeout (ctx->multi, - timeout)); + &to)); + /* Only if what we got back from curl is smaller than what we + already had (-1 == infinity!), then update timeout */ + if ( (to < *timeout) && + (-1 != to) ) + *timeout = to; if ( (-1 == (*timeout)) && (NULL != ctx->jobs_head) ) *timeout = 1000 * 60 * 5; /* curl is not always good about giving timeouts */ -- cgit v1.2.3 From 2d6303c698a277c831938c31a029661758ac397c Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Sat, 19 Dec 2015 20:43:41 +0100 Subject: avoid generating URLs with // in them --- src/mint-lib/mint_api_handle.c | 4 ++++ src/util/wireformats.c | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) (limited to 'src/mint-lib') diff --git a/src/mint-lib/mint_api_handle.c b/src/mint-lib/mint_api_handle.c index ef3da60e..0ee24123 100644 --- a/src/mint-lib/mint_api_handle.c +++ b/src/mint-lib/mint_api_handle.c @@ -695,6 +695,10 @@ MAH_path_to_url (struct TALER_MINT_Handle *h, { char *url; + if ( ('/' == path[0]) && + (0 < strlen (h->url)) && + ('/' == h->url[strlen (h->url) - 1]) ) + path++; /* avoid generating URL with "//" from concat */ GNUNET_asprintf (&url, "%s%s", h->url, diff --git a/src/util/wireformats.c b/src/util/wireformats.c index 4e928189..dab7fb92 100644 --- a/src/util/wireformats.c +++ b/src/util/wireformats.c @@ -334,7 +334,7 @@ validate_sepa (const json_t *wire) "s:s," /* name: beneficiary name */ "s:s," /* BIC: beneficiary bank's BIC */ "s:i," /* r: random 64-bit integer nounce */ - "s?s" /* address: address of the beneficiary */ + "s:s" /* address: address of the beneficiary */ "}", "type", &type, "IBAN", &iban, -- cgit v1.2.3 From 8e75ccaa714adf21469cefea68efada8aa1ab4c7 Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Sun, 20 Dec 2015 13:00:06 +0100 Subject: -check return value --- src/mint-lib/test_mint_api.c | 1 + src/mintdb/perf_taler_mintdb_interpreter.c | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'src/mint-lib') diff --git a/src/mint-lib/test_mint_api.c b/src/mint-lib/test_mint_api.c index 5f465363..024e080f 100644 --- a/src/mint-lib/test_mint_api.c +++ b/src/mint-lib/test_mint_api.c @@ -1524,6 +1524,7 @@ interpreter_run (void *cls, fail (is); return; } + json_decref (wire); trigger_context_task (); return; } diff --git a/src/mintdb/perf_taler_mintdb_interpreter.c b/src/mintdb/perf_taler_mintdb_interpreter.c index 31f5d650..9084513f 100644 --- a/src/mintdb/perf_taler_mintdb_interpreter.c +++ b/src/mintdb/perf_taler_mintdb_interpreter.c @@ -1735,7 +1735,7 @@ interpret (struct PERF_TALER_MINTDB_interpreter_state *state) 1, 1, refresh_commit); - + GNUNET_assert (GNUNET_OK == ret); } break; -- cgit v1.2.3 From 204f732c1a408490d6d13fa36b0635ce72fd4575 Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Sun, 20 Dec 2015 13:24:28 +0100 Subject: make sure triggered action actually runs --- src/mint-lib/mint_api_wire.c | 1 + 1 file changed, 1 insertion(+) (limited to 'src/mint-lib') diff --git a/src/mint-lib/mint_api_wire.c b/src/mint-lib/mint_api_wire.c index 2af9e6ed..5fc82f72 100644 --- a/src/mint-lib/mint_api_wire.c +++ b/src/mint-lib/mint_api_wire.c @@ -358,6 +358,7 @@ request_wire_method (struct TALER_MINT_WireHandle *wh) GNUNET_YES, &handle_wire_method_finished, wh); + TALER_MINT_perform (ctx); } -- cgit v1.2.3