commit 3b789227f29614d826f61a23514e9a17fed3f743 parent bf4edc25f9aa704d190670b2639a08c914b029e7 Author: Casaburi Johannes <johannes.casaburi@students.bfh.ch> Date: Wed, 3 Jan 2024 12:52:33 +0100 rename add config path Diffstat:
35 files changed, 84 insertions(+), 75 deletions(-)
diff --git a/src/donau-tools/taler-donau-dbinit.c b/src/donau-tools/taler-donau-dbinit.c @@ -175,8 +175,8 @@ main (int argc, GNUNET_GETOPT_OPTION_END }; enum GNUNET_GenericReturnValue ret; - (void)options; // delete me - ret = 1; //delete me + (void) options; // delete me + ret = 1; // delete me if (GNUNET_OK != GNUNET_STRINGS_get_utf8_args (argc, argv, diff --git a/src/donau/Makefile.am b/src/donau/Makefile.am @@ -39,6 +39,10 @@ donau_httpd_LDADD = \ -lz \ $(XLIB) +donau_httpd_SOURCES = \ + donau-httpd.c donau-httpd.h \ + donau-httpd_config.c donau-httpd_config.h + # Testcases AM_TESTS_ENVIRONMENT=export TALER_PREFIX=$${TALER_PREFIX:-@libdir@};export PATH=$${TALER_PREFIX:-@prefix@}/bin:$$PATH; diff --git a/src/donau/donau-httpd.c b/src/donau/donau-httpd.c @@ -33,7 +33,6 @@ #include "donaudb_plugin.h" #include <gnunet/gnunet_mhd_compat.h> #include "donau_util.h" -//#include "donau-httpd.h" #include "donau-httpd_config.h" /** @@ -50,7 +49,7 @@ * Above what request latency do we start to log? */ #define WARN_LATENCY GNUNET_TIME_relative_multiply ( \ - GNUNET_TIME_UNIT_MILLISECONDS, 500) + GNUNET_TIME_UNIT_MILLISECONDS, 500) /** * Are clients allowed to request /keys for times other than the @@ -413,6 +412,12 @@ handle_mhd_request (void *cls, .data = "User-agent: *\nDisallow: /\n", .response_code = MHD_HTTP_OK }, + /* Configuration */ + { + .url = "config", + .method = MHD_HTTP_METHOD_GET, + .handler.get = &DH_handler_config + }, /* mark end of list */ { .url = NULL diff --git a/src/donau/donau-httpd_config.c b/src/donau/donau-httpd_config.c @@ -20,7 +20,7 @@ */ #include "taler/platform.h" #include <gnunet/gnunet_json_lib.h> -#include "taler_dbevents.h" +#include "taler/taler_dbevents.h" #include "donau-httpd_config.h" #include "taler/taler_json_lib.h" #include "taler/taler_mhd_lib.h" diff --git a/src/donau/donau-httpd_config.h b/src/donau/donau-httpd_config.h @@ -53,6 +53,6 @@ */ MHD_RESULT DH_handler_config (struct DH_RequestContext *rc, - const char *const args[]); + const char *const args[]); #endif diff --git a/src/donau/donau-httpd_db.c b/src/donau/donau-httpd_db.c @@ -24,7 +24,7 @@ #include <gnunet/gnunet_json_lib.h> #include "taler/taler_json_lib.h" #include "taler/taler_mhd_lib.h" -#include "taler_donaudb_lib.h" +#include "taler/taler_donaudb_lib.h" #include "donau-httpd_db.h" #include "donau-httpd_responses.h" diff --git a/src/donau/donau-httpd_db.h b/src/donau/donau-httpd_db.h @@ -51,9 +51,9 @@ */ enum GNUNET_DB_QueryStatus DH_make_coin_known (const struct TALER_CoinPublicInfo *coin, - struct MHD_Connection *connection, - uint64_t *known_coin_id, - MHD_RESULT *mhd_ret); + struct MHD_Connection *connection, + uint64_t *known_coin_id, + MHD_RESULT *mhd_ret); /** @@ -72,8 +72,8 @@ DH_make_coin_known (const struct TALER_CoinPublicInfo *coin, */ typedef enum GNUNET_DB_QueryStatus (*DH_DB_TransactionCallback)(void *cls, - struct MHD_Connection *connection, - MHD_RESULT *mhd_ret); + struct MHD_Connection *connection, + MHD_RESULT *mhd_ret); /** @@ -95,11 +95,11 @@ typedef enum GNUNET_DB_QueryStatus */ enum GNUNET_GenericReturnValue DH_DB_run_transaction (struct MHD_Connection *connection, - const char *name, - enum DH_MetricTypeRequest mt, - MHD_RESULT *mhd_ret, - DH_DB_TransactionCallback cb, - void *cb_cls); + const char *name, + enum DH_MetricTypeRequest mt, + MHD_RESULT *mhd_ret, + DH_DB_TransactionCallback cb, + void *cb_cls); #endif diff --git a/src/donau/donau-httpd_mhd.c b/src/donau/donau-httpd_mhd.c @@ -36,7 +36,7 @@ MHD_RESULT DH_handler_static_response (struct DH_RequestContext *rc, - const char *const args[]) + const char *const args[]) { const struct DH_RequestHandler *rh = rc->rh; size_t dlen; @@ -55,7 +55,7 @@ DH_handler_static_response (struct DH_RequestContext *rc, MHD_RESULT DH_handler_agpl_redirect (struct DH_RequestContext *rc, - const char *const args[]) + const char *const args[]) { (void) args; return TALER_MHD_reply_agpl (rc->connection, diff --git a/src/donau/donau-httpd_mhd.h b/src/donau/donau-httpd_mhd.h @@ -38,7 +38,7 @@ */ MHD_RESULT DH_handler_static_response (struct DH_RequestContext *rc, - const char *const args[]); + const char *const args[]); /** @@ -51,7 +51,7 @@ DH_handler_static_response (struct DH_RequestContext *rc, */ MHD_RESULT DH_handler_agpl_redirect (struct DH_RequestContext *rc, - const char *const args[]); + const char *const args[]); #endif diff --git a/src/donaudb/pg_activate_signing_key.c b/src/donaudb/pg_activate_signing_key.c @@ -20,8 +20,8 @@ */ #include "taler/platform.h" #include "taler/taler_error_codes.h" -#include "taler_dbevents.h" -#include "taler_pq_lib.h" +#include "taler/taler_dbevents.h" +#include "taler/taler_pq_lib.h" #include "pg_activate_signing_key.h" #include "pg_helper.h" diff --git a/src/donaudb/pg_add_donation_unit_key.c b/src/donaudb/pg_add_donation_unit_key.c @@ -20,8 +20,8 @@ */ #include "taler/platform.h" #include "taler/taler_error_codes.h" -#include "taler_dbevents.h" -#include "taler_pq_lib.h" +#include "taler/taler_dbevents.h" +#include "taler/taler_pq_lib.h" #include "pg_add_donation_unit_key.h" #include "pg_helper.h" diff --git a/src/donaudb/pg_commit.c b/src/donaudb/pg_commit.c @@ -20,8 +20,8 @@ */ #include "taler/platform.h" #include "taler/taler_error_codes.h" -#include "taler_dbevents.h" -#include "taler_pq_lib.h" +#include "taler/taler_dbevents.h" +#include "taler/taler_pq_lib.h" #include "pg_commit.h" #include "pg_helper.h" diff --git a/src/donaudb/pg_create_tables.c b/src/donaudb/pg_create_tables.c @@ -20,8 +20,8 @@ */ #include "taler/platform.h" #include "taler/taler_error_codes.h" -#include "taler_dbevents.h" -#include "taler_pq_lib.h" +#include "taler/taler_dbevents.h" +#include "taler/taler_pq_lib.h" #include "pg_create_tables.h" #include "pg_helper.h" diff --git a/src/donaudb/pg_drop_tables.c b/src/donaudb/pg_drop_tables.c @@ -20,8 +20,8 @@ */ #include "taler/platform.h" #include "taler/taler_error_codes.h" -#include "taler_dbevents.h" -#include "taler_pq_lib.h" +#include "taler/taler_dbevents.h" +#include "taler/taler_pq_lib.h" #include "pg_drop_tables.h" #include "pg_helper.h" diff --git a/src/donaudb/pg_event_listen.c b/src/donaudb/pg_event_listen.c @@ -20,8 +20,8 @@ */ #include "taler/platform.h" #include "taler/taler_error_codes.h" -#include "taler_dbevents.h" -#include "taler_pq_lib.h" +#include "taler/taler_dbevents.h" +#include "taler/taler_pq_lib.h" #include "pg_event_listen.h" #include "pg_helper.h" diff --git a/src/donaudb/pg_event_listen_cancel.c b/src/donaudb/pg_event_listen_cancel.c @@ -20,8 +20,8 @@ */ #include "taler/platform.h" #include "taler/taler_error_codes.h" -#include "taler_dbevents.h" -#include "taler_pq_lib.h" +#include "taler/taler_dbevents.h" +#include "taler/taler_pq_lib.h" #include "pg_event_listen_cancel.h" #include "pg_helper.h" diff --git a/src/donaudb/pg_event_notify.c b/src/donaudb/pg_event_notify.c @@ -20,8 +20,8 @@ */ #include "taler/platform.h" #include "taler/taler_error_codes.h" -#include "taler_dbevents.h" -#include "taler_pq_lib.h" +#include "taler/taler_dbevents.h" +#include "taler/taler_pq_lib.h" #include "pg_event_notify.h" #include "pg_helper.h" diff --git a/src/donaudb/pg_get_donation_unit_info.c b/src/donaudb/pg_get_donation_unit_info.c @@ -20,8 +20,8 @@ */ #include "taler/platform.h" #include "taler/taler_error_codes.h" -#include "taler_dbevents.h" -#include "taler_pq_lib.h" +#include "taler/taler_dbevents.h" +#include "taler/taler_pq_lib.h" #include "pg_get_donation_unit_info.h" #include "pg_helper.h" diff --git a/src/donaudb/pg_insert_charity.c b/src/donaudb/pg_insert_charity.c @@ -20,8 +20,8 @@ */ #include "taler/platform.h" #include "taler/taler_error_codes.h" -#include "taler_dbevents.h" -#include "taler_pq_lib.h" +#include "taler/taler_dbevents.h" +#include "taler/taler_pq_lib.h" #include "pg_insert_charity.h" #include "pg_helper.h" diff --git a/src/donaudb/pg_insert_history_entry.c b/src/donaudb/pg_insert_history_entry.c @@ -20,8 +20,8 @@ */ #include "taler/platform.h" #include "taler/taler_error_codes.h" -#include "taler_dbevents.h" -#include "taler_pq_lib.h" +#include "taler/taler_dbevents.h" +#include "taler/taler_pq_lib.h" #include "pg_insert_history_entry.h" #include "pg_helper.h" diff --git a/src/donaudb/pg_insert_issued_receipt.c b/src/donaudb/pg_insert_issued_receipt.c @@ -20,8 +20,8 @@ */ #include "taler/platform.h" #include "taler/taler_error_codes.h" -#include "taler_dbevents.h" -#include "taler_pq_lib.h" +#include "taler/taler_dbevents.h" +#include "taler/taler_pq_lib.h" #include "pg_insert_issued_receipt.h" #include "pg_helper.h" diff --git a/src/donaudb/pg_insert_submitted_receipt.c b/src/donaudb/pg_insert_submitted_receipt.c @@ -20,8 +20,8 @@ */ #include "taler/platform.h" #include "taler/taler_error_codes.h" -#include "taler_dbevents.h" -#include "taler_pq_lib.h" +#include "taler/taler_dbevents.h" +#include "taler/taler_pq_lib.h" #include "pg_insert_submitted_receipt.h" #include "pg_helper.h" diff --git a/src/donaudb/pg_lookup_donation_unit_key.c b/src/donaudb/pg_lookup_donation_unit_key.c @@ -20,8 +20,8 @@ */ #include "taler/platform.h" #include "taler/taler_error_codes.h" -#include "taler_dbevents.h" -#include "taler_pq_lib.h" +#include "taler/taler_dbevents.h" +#include "taler/taler_pq_lib.h" #include "pg_lookup_donation_unit_key.h" #include "pg_helper.h" diff --git a/src/donaudb/pg_lookup_signing_key.c b/src/donaudb/pg_lookup_signing_key.c @@ -20,8 +20,8 @@ */ #include "taler/platform.h" #include "taler/taler_error_codes.h" -#include "taler_dbevents.h" -#include "taler_pq_lib.h" +#include "taler/taler_dbevents.h" +#include "taler/taler_pq_lib.h" #include "pg_lookup_signing_key.h" #include "pg_helper.h" diff --git a/src/donaudb/pg_preflight.c b/src/donaudb/pg_preflight.c @@ -20,8 +20,8 @@ */ #include "taler/platform.h" #include "taler/taler_error_codes.h" -#include "taler_dbevents.h" -#include "taler_pq_lib.h" +#include "taler/taler_dbevents.h" +#include "taler/taler_pq_lib.h" #include "pg_preflight.h" #include "pg_helper.h" diff --git a/src/donaudb/pg_rollback.c b/src/donaudb/pg_rollback.c @@ -20,8 +20,8 @@ */ #include "taler/platform.h" #include "taler/taler_error_codes.h" -#include "taler_dbevents.h" -#include "taler_pq_lib.h" +#include "taler/taler_dbevents.h" +#include "taler/taler_pq_lib.h" #include "pg_rollback.h" #include "pg_helper.h" diff --git a/src/donaudb/pg_start.c b/src/donaudb/pg_start.c @@ -20,8 +20,8 @@ */ #include "taler/platform.h" #include "taler/taler_error_codes.h" -#include "taler_dbevents.h" -#include "taler_pq_lib.h" +#include "taler/taler_dbevents.h" +#include "taler/taler_pq_lib.h" #include "pg_preflight.h" #include "pg_start.h" #include "pg_helper.h" diff --git a/src/donaudb/pg_start_read_committed.c b/src/donaudb/pg_start_read_committed.c @@ -20,8 +20,8 @@ */ #include "taler/platform.h" #include "taler/taler_error_codes.h" -#include "taler_dbevents.h" -#include "taler_pq_lib.h" +#include "taler/taler_dbevents.h" +#include "taler/taler_pq_lib.h" #include "pg_start_read_committed.h" #include "pg_preflight.h" #include "pg_helper.h" diff --git a/src/donaudb/pg_start_read_only.c b/src/donaudb/pg_start_read_only.c @@ -20,8 +20,8 @@ */ #include "taler/platform.h" #include "taler/taler_error_codes.h" -#include "taler_dbevents.h" -#include "taler_pq_lib.h" +#include "taler/taler_dbevents.h" +#include "taler/taler_pq_lib.h" #include "pg_start_read_only.h" #include "pg_preflight.h" #include "pg_helper.h" diff --git a/src/donaudb/pg_template.c b/src/donaudb/pg_template.c @@ -20,7 +20,7 @@ */ #include "taler/platform.h" #include "taler/taler_error_codes.h" -#include "taler_dbevents.h" -#include "taler_pq_lib.h" +#include "taler/taler_dbevents.h" +#include "taler/taler_pq_lib.h" #include "pg_template.h" #include "pg_helper.h" diff --git a/src/donaudb/test_donaudb.c b/src/donaudb/test_donaudb.c @@ -21,7 +21,7 @@ * @author Marcello Stanisci */ #include "taler/platform.h" -#include "taler_donaudb_lib.h" +#include "taler/taler_donaudb_lib.h" #include "taler/taler_json_lib.h" #include "donaudb_plugin.h" diff --git a/src/lib/donau_api_handle.c b/src/lib/donau_api_handle.c @@ -28,12 +28,12 @@ #include <microhttpd.h> #include <gnunet/gnunet_curl_lib.h> #include "taler/taler_json_lib.h" -#include "taler_donau_service.h" -#include "taler_signatures.h" +#include "taler/taler_donau_service.h" +#include "taler/taler_signatures.h" #include "donau_api_handle.h" #include "donau_api_curl_defaults.h" #include "backoff.h" -#include "taler_curl_lib.h" +#include "taler/taler_curl_lib.h" #include <gnunet/gnunet_crypto_lib.h> /** diff --git a/src/pq/test_pq.c b/src/pq/test_pq.c @@ -20,7 +20,7 @@ */ #include "taler/platform.h" #include <taler/taler_util.h> -#include "taler_pq_lib.h" +#include "taler/taler_pq_lib.h" /** diff --git a/src/testing/test_donau_api.c b/src/testing/test_donau_api.c @@ -25,15 +25,15 @@ */ #include "taler/platform.h" #include <taler/taler_util.h> -#include "taler_signatures.h" -#include "taler_donau_service.h" +#include "taler/taler_signatures.h" +#include "taler/taler_donau_service.h" #include "taler/taler_json_lib.h" #include <gnunet/gnunet_util_lib.h> #include <gnunet/gnunet_testing_lib.h> #include <microhttpd.h> -#include "taler_bank_service.h" -#include "taler_fakebank_lib.h" -#include "taler_testing_lib.h" +#include "taler/taler_bank_service.h" +#include "taler/taler_fakebank_lib.h" +#include "taler/taler_testing_lib.h" /** * Configuration file we use. One (big) configuration is used diff --git a/src/testing/testing_api_misc.c b/src/testing/testing_api_misc.c @@ -23,8 +23,8 @@ */ #include "taler/platform.h" #include <gnunet/gnunet_util_lib.h> -#include "taler_testing_lib.h" -#include "taler_fakebank_lib.h" +#include "taler/taler_testing_lib.h" +#include "taler/taler_fakebank_lib.h" bool