diff options
| author | Christian Grothoff <christian@grothoff.org> | 2021-12-14 19:19:32 +0100 |
|---|---|---|
| committer | Christian Grothoff <christian@grothoff.org> | 2021-12-14 19:19:32 +0100 |
| commit | 36c2bb7d41b95564652a66b0de40527f78022582 (patch) | |
| tree | 80c685dec5c3c8291a4f55076e31488d3ff76138 /src/backend/anastasis-httpd_truth.c | |
| parent | fbe1514b2241ec77af20f5d8a50183fcaa1155c6 (diff) | |
| download | anastasis-36c2bb7d41b95564652a66b0de40527f78022582.tar.gz anastasis-36c2bb7d41b95564652a66b0de40527f78022582.tar.bz2 anastasis-36c2bb7d41b95564652a66b0de40527f78022582.zip | |
-fixing FTBFS for v11
Diffstat (limited to 'src/backend/anastasis-httpd_truth.c')
| -rw-r--r-- | src/backend/anastasis-httpd_truth.c | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/src/backend/anastasis-httpd_truth.c b/src/backend/anastasis-httpd_truth.c index 52d5dab..cbf13be 100644 --- a/src/backend/anastasis-httpd_truth.c +++ b/src/backend/anastasis-httpd_truth.c @@ -778,7 +778,7 @@ begin_payment (struct GetContext *gc) { /* Create a fresh order */ json_t *order; - struct GNUNET_TIME_Absolute pay_deadline; + struct GNUNET_TIME_Timestamp pay_deadline; GNUNET_CRYPTO_random_block (GNUNET_CRYPTO_QUALITY_WEAK, &gc->payment_identifier, @@ -789,9 +789,8 @@ begin_payment (struct GetContext *gc) GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Creating fresh order `%s'\n", order_id); - pay_deadline = GNUNET_TIME_relative_to_absolute ( + pay_deadline = GNUNET_TIME_relative_to_timestamp ( ANASTASIS_CHALLENGE_OFFER_LIFETIME); - GNUNET_TIME_round_abs (&pay_deadline); order = GNUNET_JSON_PACK ( TALER_JSON_pack_amount ("amount", &gc->challenge_cost), @@ -801,8 +800,8 @@ begin_payment (struct GetContext *gc) order_id), GNUNET_JSON_pack_time_rel ("auto_refund", AUTO_REFUND_TIMEOUT), - GNUNET_JSON_pack_time_abs ("pay_deadline", - pay_deadline)); + GNUNET_JSON_pack_timestamp ("pay_deadline", + pay_deadline)); gc->po = TALER_MERCHANT_orders_post2 (AH_ctx, AH_backend_url, order, @@ -1006,14 +1005,14 @@ static enum GNUNET_GenericReturnValue rate_limit (struct GetContext *gc) { enum GNUNET_DB_QueryStatus qs; - struct GNUNET_TIME_Absolute rt; + struct GNUNET_TIME_Timestamp rt; uint64_t code; enum ANASTASIS_DB_CodeStatus cs; struct GNUNET_HashCode hc; bool satisfied; uint64_t dummy; - rt = GNUNET_TIME_UNIT_FOREVER_ABS; + rt = GNUNET_TIME_UNIT_FOREVER_TS; qs = db->create_challenge_code (db->cls, &gc->truth_uuid, MAX_QUESTION_FREQ, @@ -1618,7 +1617,7 @@ AH_handler_truth_get ( /* Setup challenge and begin authorization process */ { - struct GNUNET_TIME_Absolute transmission_date; + struct GNUNET_TIME_Timestamp transmission_date; enum GNUNET_DB_QueryStatus qs; qs = db->create_challenge_code (db->cls, @@ -1652,8 +1651,11 @@ AH_handler_truth_get ( break; } - if (GNUNET_TIME_absolute_get_duration (transmission_date).rel_value_us < - gc->authorization->code_retransmission_frequency.rel_value_us) + if (GNUNET_TIME_relative_cmp (GNUNET_TIME_absolute_get_duration ( + transmission_date.abs_time), + (<), + gc->authorization-> + code_retransmission_frequency) ) { /* Too early for a retransmission! */ GNUNET_free (decrypted_truth); |