commit aa643b57aa986fe5ad905a737721f02ab794e05b parent 64af6c9ff4d5130bc269ec43360080a79b6ad7d6 Author: Matyja Lukas Adam <lukas.matyja@students.bfh.ch> Date: Tue, 12 Dec 2023 11:37:20 +0100 [headers] agreeed changes Diffstat:
35 files changed, 82 insertions(+), 87 deletions(-)
diff --git a/src/donau/donau-httpd.c b/src/donau/donau-httpd.c @@ -276,7 +276,7 @@ handle_mhd_completion_callback (void *cls, void **con_cls, enum MHD_RequestTerminationCode toe) { - struct TDH_RequestContext *rc = *con_cls; + struct DH_RequestContext *rc = *con_cls; struct GNUNET_AsyncScopeSave old_scope; (void) cls; @@ -346,7 +346,7 @@ handle_mhd_completion_callback (void *cls, * @return MHD result code */ static MHD_RESULT -proceed_with_handler (struct TDH_RequestContext *rc, +proceed_with_handler (struct DH_RequestContext *rc, const char *url, const char *upload_data, size_t *upload_data_size) @@ -466,7 +466,7 @@ proceed_with_handler (struct TDH_RequestContext *rc, * @return MHD result code */ static MHD_RESULT -handler_seed (struct TDH_RequestContext *rc, +handler_seed (struct DH_RequestContext *rc, const char *const args[]) { #define SEED_SIZE 32 @@ -505,7 +505,7 @@ handler_seed (struct TDH_RequestContext *rc, * @param version HTTP version (ignored) * @param upload_data request data * @param upload_data_size size of @a upload_data in bytes - * @param con_cls closure for request (a `struct TDH_RequestContext *`) + * @param con_cls closure for request (a `struct DH_RequestContext *`) * @return MHD result code */ static MHD_RESULT @@ -596,7 +596,7 @@ handle_mhd_request (void *cls, .url = NULL } }; - struct TDH_RequestContext *rc = *con_cls; + struct DH_RequestContext *rc = *con_cls; struct GNUNET_AsyncScopeSave old_scope; const char *correlation_id = NULL; @@ -608,7 +608,7 @@ handle_mhd_request (void *cls, "Handling new request\n"); /* We're in a new async scope! */ - rc = *con_cls = GNUNET_new (struct TDH_RequestContext); + rc = *con_cls = GNUNET_new (struct DH_RequestContext); rc->start_time = GNUNET_TIME_absolute_get (); GNUNET_async_scope_fresh (&rc->async_scope_id); //TEH_check_invariants (); diff --git a/src/donau/donau-httpd.h b/src/donau/donau-httpd.h @@ -165,7 +165,7 @@ struct TEH_RequestHandler; * @brief Context in which the donau is processing * all requests */ -struct TDH_RequestContext +struct DH_RequestContext { /** @@ -204,7 +204,7 @@ struct TDH_RequestContext * clean up @a rh_ctx. Can be NULL. */ void - (*rh_cleaner)(struct TDH_RequestContext *rc); + (*rh_cleaner)(struct DH_RequestContext *rc); /** * @e rh-specific context. Place where the request @@ -246,7 +246,7 @@ struct TEH_RequestHandler * @return MHD result code */ MHD_RESULT - (*get)(struct TDH_RequestContext *rc, + (*get)(struct DH_RequestContext *rc, const char *const args[]); @@ -259,7 +259,7 @@ struct TEH_RequestHandler * @return MHD result code */ MHD_RESULT - (*post)(struct TDH_RequestContext *rc, + (*post)(struct DH_RequestContext *rc, const json_t *root, const char *const args[]); @@ -271,7 +271,7 @@ struct TEH_RequestHandler * @return MHD result code */ MHD_RESULT - (*delete)(struct TDH_RequestContext *rc, + (*delete)(struct DH_RequestContext *rc, const char *const args[]); } handler; diff --git a/src/donau/donau-httpd_batch-issue_receipts.c b/src/donau/donau-httpd_batch-issue_receipts.c @@ -82,7 +82,7 @@ struct BatchWithdrawContext /** * request context */ - const struct TDH_RequestContext *rc; + const struct DH_RequestContext *rc; /** * KYC status of the reserve used for the operation. @@ -198,7 +198,7 @@ aml_amount_cb ( * @return MHD queue status */ static MHD_RESULT -generate_reply_success (const struct TDH_RequestContext *rc, +generate_reply_success (const struct DH_RequestContext *rc, const struct BatchWithdrawContext *wc) { json_t *sigs; @@ -252,7 +252,7 @@ static bool check_request_idempotent (const struct BatchWithdrawContext *wc, MHD_RESULT *mret) { - const struct TDH_RequestContext *rc = wc->rc; + const struct DH_RequestContext *rc = wc->rc; for (unsigned int i = 0; i<wc->planchets_length; i++) { @@ -606,7 +606,7 @@ batch_withdraw_transaction (void *cls, * @return MHD result for the @a rc */ static MHD_RESULT -prepare_transaction (const struct TDH_RequestContext *rc, +prepare_transaction (const struct DH_RequestContext *rc, struct BatchWithdrawContext *wc) { struct TEH_CoinSignData csds[wc->planchets_length]; @@ -673,7 +673,7 @@ prepare_transaction (const struct TDH_RequestContext *rc, * @return MHD result for the @a rc */ static MHD_RESULT -parse_planchets (const struct TDH_RequestContext *rc, +parse_planchets (const struct DH_RequestContext *rc, struct BatchWithdrawContext *wc, const json_t *planchets) { @@ -859,7 +859,7 @@ parse_planchets (const struct TDH_RequestContext *rc, MHD_RESULT -TEH_handler_batch_withdraw (struct TDH_RequestContext *rc, +TEH_handler_batch_withdraw (struct DH_RequestContext *rc, const struct TALER_ReservePublicKeyP *reserve_pub, const json_t *root) { diff --git a/src/donau/donau-httpd_batch-issue_receipts.h b/src/donau/donau-httpd_batch-issue_receipts.h @@ -41,7 +41,7 @@ * @return MHD result code */ MHD_RESULT -TEH_handler_batch_withdraw (struct TDH_RequestContext *rc, +TEH_handler_batch_withdraw (struct DH_RequestContext *rc, const struct TALER_ReservePublicKeyP *reserve_pub, const json_t *root); diff --git a/src/donau/donau-httpd_batch-submit_receipts.c b/src/donau/donau-httpd_batch-submit_receipts.c @@ -495,7 +495,7 @@ parse_coin (struct MHD_Connection *connection, MHD_RESULT -TEH_handler_batch_deposit (struct TDH_RequestContext *rc, +TEH_handler_batch_deposit (struct DH_RequestContext *rc, const json_t *root, const char *const args[]) { diff --git a/src/donau/donau-httpd_batch-submit_receipts.h b/src/donau/donau-httpd_batch-submit_receipts.h @@ -41,7 +41,7 @@ * @return MHD result code */ MHD_RESULT -TEH_handler_batch_deposit (struct TDH_RequestContext *rc, +TEH_handler_batch_deposit (struct DH_RequestContext *rc, const json_t *root, const char *const args[]); diff --git a/src/donau/donau-httpd_charities_close.c b/src/donau/donau-httpd_charities_close.c @@ -354,7 +354,7 @@ reserve_close_transaction (void *cls, MHD_RESULT -TEH_handler_reserves_close (struct TDH_RequestContext *rc, +TEH_handler_reserves_close (struct DH_RequestContext *rc, const struct TALER_ReservePublicKeyP *reserve_pub, const json_t *root) { diff --git a/src/donau/donau-httpd_charities_close.h b/src/donau/donau-httpd_charities_close.h @@ -34,7 +34,7 @@ * @return MHD result code */ MHD_RESULT -TEH_handler_reserves_close (struct TDH_RequestContext *rc, +TEH_handler_reserves_close (struct DH_RequestContext *rc, const struct TALER_ReservePublicKeyP *reserve_pub, const json_t *root); diff --git a/src/donau/donau-httpd_charities_get.c b/src/donau/donau-httpd_charities_get.c @@ -54,7 +54,7 @@ struct ReservePoller /** * Our request context. */ - struct TDH_RequestContext *rc; + struct DH_RequestContext *rc; /** * Subscription for the database event we are waiting for. @@ -118,7 +118,7 @@ TEH_reserves_get_cleanup () * @param rc context to clean up for */ static void -rp_cleanup (struct TDH_RequestContext *rc) +rp_cleanup (struct DH_RequestContext *rc) { struct ReservePoller *rp = rc->rh_ctx; @@ -142,7 +142,7 @@ rp_cleanup (struct TDH_RequestContext *rc) * Function called on events received from Postgres. * Wakes up long pollers. * - * @param cls the `struct TDH_RequestContext *` + * @param cls the `struct DH_RequestContext *` * @param extra additional event data provided * @param extra_size number of bytes in @a extra */ @@ -170,7 +170,7 @@ db_event_cb (void *cls, MHD_RESULT -TEH_handler_reserves_get (struct TDH_RequestContext *rc, +TEH_handler_reserves_get (struct DH_RequestContext *rc, const char *const args[1]) { struct ReservePoller *rp = rc->rh_ctx; diff --git a/src/donau/donau-httpd_charities_get.h b/src/donau/donau-httpd_charities_get.h @@ -47,7 +47,7 @@ TEH_reserves_get_cleanup (void); * @return MHD result code */ MHD_RESULT -TEH_handler_reserves_get (struct TDH_RequestContext *rc, +TEH_handler_reserves_get (struct DH_RequestContext *rc, const char *const args[1]); #endif diff --git a/src/donau/donau-httpd_charities_history.c b/src/donau/donau-httpd_charities_history.c @@ -186,7 +186,7 @@ reserve_history_transaction (void *cls, MHD_RESULT -TEH_handler_reserves_history (struct TDH_RequestContext *rc, +TEH_handler_reserves_history (struct DH_RequestContext *rc, const struct TALER_ReservePublicKeyP *reserve_pub, const json_t *root) { diff --git a/src/donau/donau-httpd_charities_history.h b/src/donau/donau-httpd_charities_history.h @@ -35,7 +35,7 @@ * @return MHD result code */ MHD_RESULT -TEH_handler_reserves_history (struct TDH_RequestContext *rc, +TEH_handler_reserves_history (struct DH_RequestContext *rc, const struct TALER_ReservePublicKeyP *reserve_pub, const json_t *root); diff --git a/src/donau/donau-httpd_charities_open.c b/src/donau/donau-httpd_charities_open.c @@ -298,7 +298,7 @@ reserve_open_transaction (void *cls, MHD_RESULT -TEH_handler_reserves_open (struct TDH_RequestContext *rc, +TEH_handler_reserves_open (struct DH_RequestContext *rc, const struct TALER_ReservePublicKeyP *reserve_pub, const json_t *root) { diff --git a/src/donau/donau-httpd_charities_open.h b/src/donau/donau-httpd_charities_open.h @@ -34,7 +34,7 @@ * @return MHD result code */ MHD_RESULT -TEH_handler_reserves_open (struct TDH_RequestContext *rc, +TEH_handler_reserves_open (struct DH_RequestContext *rc, const struct TALER_ReservePublicKeyP *reserve_pub, const json_t *root); diff --git a/src/donau/donau-httpd_charities_status.c b/src/donau/donau-httpd_charities_status.c @@ -157,7 +157,7 @@ reserve_status_transaction (void *cls, MHD_RESULT -TEH_handler_reserves_status (struct TDH_RequestContext *rc, +TEH_handler_reserves_status (struct DH_RequestContext *rc, const struct TALER_ReservePublicKeyP *reserve_pub, const json_t *root) { diff --git a/src/donau/donau-httpd_charities_status.h b/src/donau/donau-httpd_charities_status.h @@ -36,7 +36,7 @@ * @return MHD result code */ MHD_RESULT -TEH_handler_reserves_status (struct TDH_RequestContext *rc, +TEH_handler_reserves_status (struct DH_RequestContext *rc, const struct TALER_ReservePublicKeyP *reserve_pub, const json_t *root); diff --git a/src/donau/donau-httpd_config.c b/src/donau/donau-httpd_config.c @@ -29,7 +29,7 @@ MHD_RESULT -TEH_handler_config (struct TDH_RequestContext *rc, +TEH_handler_config (struct DH_RequestContext *rc, const char *const args[]) { static struct MHD_Response *resp; diff --git a/src/donau/donau-httpd_config.h b/src/donau/donau-httpd_config.h @@ -52,7 +52,7 @@ * @return MHD result code */ MHD_RESULT -TEH_handler_config (struct TDH_RequestContext *rc, +TEH_handler_config (struct DH_RequestContext *rc, const char *const args[]); #endif diff --git a/src/donau/donau-httpd_csr.c b/src/donau/donau-httpd_csr.c @@ -33,7 +33,7 @@ MHD_RESULT -TEH_handler_csr_melt (struct TDH_RequestContext *rc, +TEH_handler_csr_melt (struct DH_RequestContext *rc, const json_t *root, const char *const args[]) { @@ -222,7 +222,7 @@ TEH_handler_csr_melt (struct TDH_RequestContext *rc, MHD_RESULT -TEH_handler_csr_withdraw (struct TDH_RequestContext *rc, +TEH_handler_csr_withdraw (struct DH_RequestContext *rc, const json_t *root, const char *const args[]) { diff --git a/src/donau/donau-httpd_csr.h b/src/donau/donau-httpd_csr.h @@ -35,7 +35,7 @@ * @return MHD result code */ MHD_RESULT -TEH_handler_csr_melt (struct TDH_RequestContext *rc, +TEH_handler_csr_melt (struct DH_RequestContext *rc, const json_t *root, const char *const args[]); @@ -49,7 +49,7 @@ TEH_handler_csr_melt (struct TDH_RequestContext *rc, * @return MHD result code */ MHD_RESULT -TEH_handler_csr_withdraw (struct TDH_RequestContext *rc, +TEH_handler_csr_withdraw (struct DH_RequestContext *rc, const json_t *root, const char *const args[]); diff --git a/src/donau/donau-httpd_issue_receipts.c b/src/donau/donau-httpd_issue_receipts.c @@ -425,7 +425,7 @@ withdraw_transaction (void *cls, * false if we did not find the request in the DB and did not set @a mret */ static bool -check_request_idempotent (struct TDH_RequestContext *rc, +check_request_idempotent (struct DH_RequestContext *rc, struct WithdrawContext *wc, MHD_RESULT *mret) { @@ -459,7 +459,7 @@ check_request_idempotent (struct TDH_RequestContext *rc, MHD_RESULT -TEH_handler_withdraw (struct TDH_RequestContext *rc, +TEH_handler_withdraw (struct DH_RequestContext *rc, const struct TALER_ReservePublicKeyP *reserve_pub, const json_t *root) { diff --git a/src/donau/donau-httpd_issue_receipts.h b/src/donau/donau-httpd_issue_receipts.h @@ -40,7 +40,7 @@ * @return MHD result code */ MHD_RESULT -TEH_handler_withdraw (struct TDH_RequestContext *rc, +TEH_handler_withdraw (struct DH_RequestContext *rc, const struct TALER_ReservePublicKeyP *reserve_pub, const json_t *root); diff --git a/src/donau/donau-httpd_keys.c b/src/donau/donau-httpd_keys.c @@ -3247,7 +3247,7 @@ krd_search_comparator (const void *key, MHD_RESULT -TEH_keys_get_handler (struct TDH_RequestContext *rc, +TEH_keys_get_handler (struct DH_RequestContext *rc, const char *const args[]) { struct GNUNET_TIME_Timestamp last_issue_date; diff --git a/src/donau/donau-httpd_keys.h b/src/donau/donau-httpd_keys.h @@ -33,7 +33,7 @@ * @brief All information about a donation unit key (which is used to * sign donation receipts into existence). */ -struct TDH_DonationUnitKey +struct DH_DonationUnitKey { /** @@ -59,7 +59,7 @@ struct TDH_DonationUnitKey /** * Information needed to derive the CS r_pub. */ -struct TDH_CsDeriveData +struct DH_CsDeriveData { /** * Hash of key to sign with. @@ -82,8 +82,8 @@ struct TDH_CsDeriveData * @return #TALER_EC_NONE on success */ enum TALER_ErrorCode -TDH_keys_donation_unit_cs_r_pub ( - const struct TDH_CsDeriveData *cdd, +DH_keys_donation_unit_cs_r_pub ( + const struct DH_CsDeriveData *cdd, struct GNUNET_CRYPTO_CSPublicRPairP *r_pub); @@ -98,8 +98,8 @@ TDH_keys_donation_unit_cs_r_pub ( * @return #DONAU_EC_NONE on success */ enum TALER_ErrorCode -TDH_keys_donation_unit_cs_batch_r_pub ( - const struct TDH_CsDeriveData *cdds, +DH_keys_donation_unit_cs_batch_r_pub ( + const struct DH_CsDeriveData *cdds, unsigned int cdds_length, bool for_melt, struct GNUNET_CRYPTO_CSPublicRPairP *r_pubs); @@ -110,7 +110,7 @@ TDH_keys_donation_unit_cs_batch_r_pub ( * The @a purpose data is the beginning of the data of which the signature is * to be created. The `size` field in @a purpose must correctly indicate the * number of bytes of the data structure, including its header. Use - * #TDH_keys_donau_sign() instead of calling this function directly! + * #DH_keys_donau_sign() instead of calling this function directly! * * @param purpose the message to sign * @param[out] pub set to the current public signing key of the donau @@ -118,7 +118,7 @@ TDH_keys_donation_unit_cs_batch_r_pub ( * @return #TALER_EC_NONE on success */ enum TALER_ErrorCode -TDH_keys_donau_sign_ ( +DH_keys_donau_sign_ ( const struct GNUNET_CRYPTO_EccSignaturePurpose *purpose, struct DONAU_EddsaPublicKeyP *pub, struct DONAU_DonauSignatureP *sig); @@ -130,7 +130,7 @@ TDH_keys_donau_sign_ ( * The @a purpose data is the beginning of the data of which the signature is * to be created. The `size` field in @a purpose must correctly indicate the * number of bytes of the data structure, including its header. Use - * #TDH_keys_donau_sign() instead of calling this function directly! + * #DH_keys_donau_sign() instead of calling this function directly! * * @param cls key state state to look in * @param purpose the message to sign @@ -139,7 +139,7 @@ TDH_keys_donau_sign_ ( * @return #TALER_EC_NONE on success */ enum TALER_ErrorCode -TDH_keys_donau_sign2_ ( +DH_keys_donau_sign2_ ( void *cls, const struct GNUNET_CRYPTO_EccSignaturePurpose *purpose, struct DONAU_EddsaPublicKeyP *pub, @@ -159,7 +159,7 @@ TDH_keys_donau_sign2_ ( * @param[out] sig where to write the signature * @return #TALER_EC_NONE on success */ -#define TDH_keys_donau_sign(ps,pub,sig) \ +#define DH_keys_donau_sign(ps,pub,sig) \ ({ \ /* check size is set correctly */ \ GNUNET_assert (htonl ((ps)->purpose.size) == \ @@ -167,7 +167,7 @@ TDH_keys_donau_sign2_ ( /* check 'ps' begins with the purpose */ \ GNUNET_static_assert (((void*) (ps)) == \ ((void*) &(ps)->purpose)); \ - TDH_keys_donau_sign_ (&(ps)->purpose, \ + DH_keys_donau_sign_ (&(ps)->purpose, \ pub, \ sig); \ }) @@ -183,8 +183,8 @@ TDH_keys_donau_sign2_ ( * * This allows requesting multiple donation units with the same @a ksh which * thus will remain valid until the next call to - * #TDH_keys_donation_unit_by_hash() or #TDH_keys_get_state() or - * #TDH_keys_donau_sign(). + * #DH_keys_donation_unit_by_hash() or #DH_keys_get_state() or + * #DH_keys_donau_sign(). * * @param ksh key state to use * @param ps packed struct with what to sign, MUST begin with a purpose @@ -192,7 +192,7 @@ TDH_keys_donau_sign2_ ( * @param[out] sig where to write the signature * @return #TALER_EC_NONE on success */ -#define TDH_keys_donau_sign2(ksh,ps,pub,sig) \ +#define DH_keys_donau_sign2(ksh,ps,pub,sig) \ ({ \ /* check size is set correctly */ \ GNUNET_assert (htonl ((ps)->purpose.size) == \ @@ -200,7 +200,7 @@ TDH_keys_donau_sign2_ ( /* check 'ps' begins with the purpose */ \ GNUNET_static_assert (((void*) (ps)) == \ ((void*) &(ps)->purpose)); \ - TDH_keys_donau_sign2_ (ksh, \ + DH_keys_donau_sign2_ (ksh, \ &(ps)->purpose, \ pub, \ sig); \ @@ -216,7 +216,7 @@ TDH_keys_donau_sign2_ ( * @return MHD result code */ MHD_RESULT -TDH_keys_get_handler (struct TDH_RequestContext *rc, +DH_keys_get_handler (struct DH_RequestContext *rc, const char *const args[]); @@ -226,7 +226,7 @@ TDH_keys_get_handler (struct TDH_RequestContext *rc, * @return #GNUNET_OK on success */ enum GNUNET_GenericReturnValue -TDH_keys_init (void); +DH_keys_init (void); #endif diff --git a/src/donau/donau-httpd_metrics.c b/src/donau/donau-httpd_metrics.c @@ -45,7 +45,7 @@ unsigned long long TEH_METRICS_num_success[TEH_MT_SUCCESS_COUNT]; MHD_RESULT -TEH_handler_metrics (struct TDH_RequestContext *rc, +TEH_handler_metrics (struct DH_RequestContext *rc, const char *const args[]) { char *reply; diff --git a/src/donau/donau-httpd_metrics.h b/src/donau/donau-httpd_metrics.h @@ -128,7 +128,7 @@ extern unsigned long long TEH_METRICS_num_keydonaus[TEH_MT_KEYX_COUNT]; * @return MHD result code */ MHD_RESULT -TEH_handler_metrics (struct TDH_RequestContext *rc, +TEH_handler_metrics (struct DH_RequestContext *rc, const char *const args[]); diff --git a/src/donau/donau-httpd_mhd.c b/src/donau/donau-httpd_mhd.c @@ -35,7 +35,7 @@ MHD_RESULT -TEH_handler_static_response (struct TDH_RequestContext *rc, +TEH_handler_static_response (struct DH_RequestContext *rc, const char *const args[]) { const struct TEH_RequestHandler *rh = rc->rh; @@ -54,7 +54,7 @@ TEH_handler_static_response (struct TDH_RequestContext *rc, MHD_RESULT -TEH_handler_agpl_redirect (struct TDH_RequestContext *rc, +TEH_handler_agpl_redirect (struct DH_RequestContext *rc, const char *const args[]) { (void) args; diff --git a/src/donau/donau-httpd_mhd.h b/src/donau/donau-httpd_mhd.h @@ -37,7 +37,7 @@ * @return MHD result code */ MHD_RESULT -TEH_handler_static_response (struct TDH_RequestContext *rc, +TEH_handler_static_response (struct DH_RequestContext *rc, const char *const args[]); @@ -50,7 +50,7 @@ TEH_handler_static_response (struct TDH_RequestContext *rc, * @return MHD result code */ MHD_RESULT -TEH_handler_agpl_redirect (struct TDH_RequestContext *rc, +TEH_handler_agpl_redirect (struct DH_RequestContext *rc, const char *const args[]); diff --git a/src/donau/donau-httpd_submit_receipts_get.c b/src/donau/donau-httpd_submit_receipts_get.c @@ -51,7 +51,7 @@ struct DepositWtidContext /** * Context for the request we are processing. */ - struct TDH_RequestContext *rc; + struct DH_RequestContext *rc; /** * Subscription for the database event we are waiting for. @@ -413,7 +413,7 @@ handle_track_transaction_request ( * @param rc request context with data to clean up */ static void -dwc_cleaner (struct TDH_RequestContext *rc) +dwc_cleaner (struct DH_RequestContext *rc) { struct DepositWtidContext *ctx = rc->rh_ctx; @@ -429,7 +429,7 @@ dwc_cleaner (struct TDH_RequestContext *rc) MHD_RESULT -TEH_handler_deposits_get (struct TDH_RequestContext *rc, +TEH_handler_deposits_get (struct DH_RequestContext *rc, const char *const args[4]) { struct DepositWtidContext *ctx = rc->rh_ctx; diff --git a/src/donau/donau-httpd_submit_receipts_get.h b/src/donau/donau-httpd_submit_receipts_get.h @@ -43,7 +43,7 @@ TEH_deposits_get_cleanup (void); * @return MHD result code */ MHD_RESULT -TEH_handler_deposits_get (struct TDH_RequestContext *rc, +TEH_handler_deposits_get (struct DH_RequestContext *rc, const char *const args[4]); diff --git a/src/donau/donau-httpd_terms.c b/src/donau/donau-httpd_terms.c @@ -39,7 +39,7 @@ // MHD_RESULT -// TEH_handler_terms (struct TDH_RequestContext *rc, +// TEH_handler_terms (struct DH_RequestContext *rc, // const char *const args[]) // { // (void) args; @@ -49,7 +49,7 @@ // MHD_RESULT -// TEH_handler_privacy (struct TDH_RequestContext *rc, +// TEH_handler_privacy (struct DH_RequestContext *rc, // const char *const args[]) // { // (void) args; diff --git a/src/donau/donau-httpd_terms.h b/src/donau/donau-httpd_terms.h @@ -37,7 +37,7 @@ * @return MHD result code */ MHD_RESULT -TEH_handler_terms (struct TDH_RequestContext *rc, +TEH_handler_terms (struct DH_RequestContext *rc, const char *const args[]); @@ -49,7 +49,7 @@ TEH_handler_terms (struct TDH_RequestContext *rc, * @return MHD result code */ MHD_RESULT -TEH_handler_privacy (struct TDH_RequestContext *rc, +TEH_handler_privacy (struct DH_RequestContext *rc, const char *const args[]); diff --git a/src/include/donau_crypto_lib.h b/src/include/donau_crypto_lib.h @@ -166,9 +166,9 @@ struct DONAU_CharitySignatureP struct DONAU_BearerToken { /** - * The token is a 128-bit UUID. + * The token of variable length. */ - struct GNUNET_Uuid token; + char *token; }; /* diff --git a/src/include/donau_service.h b/src/include/donau_service.h @@ -706,12 +706,7 @@ struct DONAU_CsRBatchIssueResponse * Values contributed by the donau for the * respective donation receipts's batch-issue operation. */ - //struct TALER_DonauBatchIssueValues alg_values; - - /** - * num of CsR signatures - */ - unsigned int num_sig; + struct TALER_DonauBatchIssueValues alg_values; } ok; @@ -1046,7 +1041,7 @@ DONAU_charity_get_cancel ( /** * add or change charity request */ -struct charityRequest +struct DONAU_CharityRequest { /** * name of the charity @@ -1097,7 +1092,7 @@ struct DONAU_PostCharityResponse /** * charity id */ - unsigned int charity_id; + uint64_t charity_id; } ok; @@ -1141,7 +1136,7 @@ struct DONAU_CharityPostHandle * DONAU_charity_post ( struct GNUNET_CURL_Context *ctx, const char *url, - const struct charityRequest charity_req, + const struct DONAU_CharityRequest *charity_req, const struct DONAU_BearerToken bearer, DONAU_PostCharityResponseCallback cb, void *cb_cls); @@ -1211,7 +1206,7 @@ struct DONAU_CharityPatchHandle * DONAU_charity_patch ( struct GNUNET_CURL_Context *ctx, const char *url, - const struct charityRequest charity_req, + const struct DONAU_CharityRequest *charity_req, const struct DONAU_BearerToken bearer, DONAU_PatchCharityResponseCallback cb, void *cb_cls); diff --git a/src/util/donau-config.in b/src/util/donau-config.in