[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[taler-donau] branch master updated (73dd867 -> ae2b267)
|
From: |
gnunet |
|
Subject: |
[taler-donau] branch master updated (73dd867 -> ae2b267) |
|
Date: |
Thu, 30 Nov 2023 01:18:50 +0100 |
This is an automated email from the git hooks/post-receive script.
lukas-matyja pushed a change to branch master
in repository donau.
from 73dd867 [build] small changes
new 1d31446 [build] remove some warnings
new ae2b267 [build] remove warnings completely
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../{taler-donau-dbinit.c => donau-dbinit.c} | 0
.../{taler-donau-offline.c => donau-offline.c} | 0
src/donau-tools/taler-donau-dbinit.c | 2 +
src/donau-tools/taler-donau-offline.c | 79 +++++++++++-----------
src/donau/donau-httpd.c | 11 ++-
src/donau/donau-httpd_db.h | 2 +-
src/donau/donau-httpd_metrics.h | 1 -
src/donau/donau-httpd_responses.h | 36 ++--------
src/donau/donau-httpd_terms.c | 4 +-
src/donaudb/plugin_donaudb_common.h | 10 +--
src/donaudb/plugin_donaudb_postgres.c | 22 +++---
src/include/donaudb_plugin.h | 4 +-
src/pq/pq_result_helper.c | 18 ++---
13 files changed, 81 insertions(+), 108 deletions(-)
copy src/donau-tools/{taler-donau-dbinit.c => donau-dbinit.c} (100%)
copy src/donau-tools/{taler-donau-offline.c => donau-offline.c} (100%)
diff --git a/src/donau-tools/taler-donau-dbinit.c
b/src/donau-tools/donau-dbinit.c
similarity index 100%
copy from src/donau-tools/taler-donau-dbinit.c
copy to src/donau-tools/donau-dbinit.c
diff --git a/src/donau-tools/taler-donau-offline.c
b/src/donau-tools/donau-offline.c
similarity index 100%
copy from src/donau-tools/taler-donau-offline.c
copy to src/donau-tools/donau-offline.c
diff --git a/src/donau-tools/taler-donau-dbinit.c
b/src/donau-tools/taler-donau-dbinit.c
index 6f81404..faca297 100644
--- a/src/donau-tools/taler-donau-dbinit.c
+++ b/src/donau-tools/taler-donau-dbinit.c
@@ -175,6 +175,8 @@ main (int argc,
GNUNET_GETOPT_OPTION_END
};
enum GNUNET_GenericReturnValue ret;
+ (void)options; // delete me
+ ret = 1; //delete me
if (GNUNET_OK !=
GNUNET_STRINGS_get_utf8_args (argc, argv,
diff --git a/src/donau-tools/taler-donau-offline.c
b/src/donau-tools/taler-donau-offline.c
index f52c91e..56e9573 100644
--- a/src/donau-tools/taler-donau-offline.c
+++ b/src/donau-tools/taler-donau-offline.c
@@ -127,33 +127,33 @@
/**
* Our private key, initialized in #load_offline_key().
*/
-static struct TALER_MasterPrivateKeyP master_priv;
+// static struct TALER_MasterPrivateKeyP master_priv;
/**
* Our private key, initialized in #load_offline_key().
*/
-static struct TALER_MasterPublicKeyP master_pub;
+// static struct TALER_MasterPublicKeyP master_pub;
/**
* Our context for making HTTP requests.
*/
-static struct GNUNET_CURL_Context *ctx;
+// static struct GNUNET_CURL_Context *ctx;
/**
* Reschedule context for #ctx.
*/
-static struct GNUNET_CURL_RescheduleContext *rc;
+// static struct GNUNET_CURL_RescheduleContext *rc;
/**
* Handle to the donau's configuration
*/
-static const struct GNUNET_CONFIGURATION_Handle *kcfg;
+// static const struct GNUNET_CONFIGURATION_Handle *kcfg;
/**
* Age restriction configuration
*/
-static bool ar_enabled = false;
-static struct TALER_AgeRestrictionConfig ar_config = {0};
+// static bool ar_enabled = false;
+// static struct TALER_AgeRestrictionConfig ar_config = {0};
/**
* Return value from main().
@@ -163,23 +163,23 @@ static int global_ret;
/**
* Input to consume.
*/
-static json_t *in;
+// static json_t *in;
/**
* Array of actions to perform.
*/
-static json_t *out;
+// static json_t *out;
/**
* Currency we have configured.
*/
-static char *currency;
+// static char *currency;
/**
* URL of the donau we are interacting with
* as per our configuration.
*/
-static char *CFG_donau_url;
+// static char *CFG_donau_url;
/**
* A subcommand supported by this program.
@@ -569,133 +569,132 @@ struct PartnerAddRequest
/**
* Next work item to perform.
*/
-static struct GNUNET_SCHEDULER_Task *nxt;
+// static struct GNUNET_SCHEDULER_Task *nxt;
/**
* Handle for #do_download.
*/
-static struct DONAU_ManagementGetKeysHandle *mgkh;
-
+// static struct DONAU_ManagementGetKeysHandle *mgkh;
/**
* Active AML staff change requests.
*/
-static struct AmlStaffRequest *asr_head;
+// static struct AmlStaffRequest *asr_head;
/**
* Active AML staff change requests.
*/
-static struct AmlStaffRequest *asr_tail;
+// static struct AmlStaffRequest *asr_tail;
/**
* Active partner add requests.
*/
-static struct PartnerAddRequest *par_head;
+//static struct PartnerAddRequest *par_head;
/**
* Active partner add requests.
*/
-static struct PartnerAddRequest *par_tail;
+// static struct PartnerAddRequest *par_tail;
/**
* Active denomiantion revocation requests.
*/
-static struct DenomRevocationRequest *drr_head;
+// static struct DenomRevocationRequest *drr_head;
/**
* Active denomiantion revocation requests.
*/
-static struct DenomRevocationRequest *drr_tail;
+// static struct DenomRevocationRequest *drr_tail;
/**
* Active signkey revocation requests.
*/
-static struct SignkeyRevocationRequest *srr_head;
+// static struct SignkeyRevocationRequest *srr_head;
/**
* Active signkey revocation requests.
*/
-static struct SignkeyRevocationRequest *srr_tail;
+// static struct SignkeyRevocationRequest *srr_tail;
/**
* Active auditor add requests.
*/
-static struct AuditorAddRequest *aar_head;
+// static struct AuditorAddRequest *aar_head;
/**
* Active auditor add requests.
*/
-static struct AuditorAddRequest *aar_tail;
+//static struct AuditorAddRequest *aar_tail;
/**
* Active auditor del requests.
*/
-static struct AuditorDelRequest *adr_head;
+// static struct AuditorDelRequest *adr_head;
/**
* Active auditor del requests.
*/
-static struct AuditorDelRequest *adr_tail;
+// static struct AuditorDelRequest *adr_tail;
/**
* Active wire add requests.
*/
-static struct WireAddRequest *war_head;
+// static struct WireAddRequest *war_head;
/**
* Active wire add requests.
*/
-static struct WireAddRequest *war_tail;
+// static struct WireAddRequest *war_tail;
/**
* Active wire del requests.
*/
-static struct WireDelRequest *wdr_head;
+// static struct WireDelRequest *wdr_head;
/**
* Active wire del requests.
*/
-static struct WireDelRequest *wdr_tail;
+// static struct WireDelRequest *wdr_tail;
/**
* Active wire fee requests.
*/
-static struct WireFeeRequest *wfr_head;
+// static struct WireFeeRequest *wfr_head;
/**
* Active wire fee requests.
*/
-static struct WireFeeRequest *wfr_tail;
+//static struct WireFeeRequest *wfr_tail;
/**
* Active global fee requests.
*/
-static struct GlobalFeeRequest *gfr_head;
+//static struct GlobalFeeRequest *gfr_head;
/**
* Active global fee requests.
*/
-static struct GlobalFeeRequest *gfr_tail;
+//static struct GlobalFeeRequest *gfr_tail;
/**
* Active keys upload requests.
*/
-static struct UploadKeysRequest *ukr_head;
+//static struct UploadKeysRequest *ukr_head;
/**
* Active keys upload requests.
*/
-static struct UploadKeysRequest *ukr_tail;
+//static struct UploadKeysRequest *ukr_tail;
/**
* Active extensions upload requests.
*/
-static struct UploadExtensionsRequest *uer_head;
+//static struct UploadExtensionsRequest *uer_head;
/**
* Active extensions upload requests.
*/
-static struct UploadExtensionsRequest *uer_tail;
+//static struct UploadExtensionsRequest *uer_tail;
/**
* Active drain profits requests.
@@ -705,7 +704,7 @@ struct DrainProfitsRequest *dpr_head;
/**
* Active drain profits requests.
*/
-static struct DrainProfitsRequest *dpr_tail;
+//static struct DrainProfitsRequest *dpr_tail;
/**
@@ -5400,6 +5399,7 @@ main (int argc,
struct GNUNET_GETOPT_CommandLineOption options[] = {
GNUNET_GETOPT_OPTION_END
};
+ (void)options; // delete me
enum GNUNET_GenericReturnValue ret;
/* force linker to link against libtalerutil; if we do
@@ -5417,6 +5417,7 @@ main (int argc,
// gettext_noop ("Operations for offline signing for a Taler donau"),
// options,
// &run, NULL);
+ ret = 1; // delete me
GNUNET_free_nz ((void *) argv);
if (GNUNET_SYSERR == ret)
return EXIT_INVALIDARGUMENT;
diff --git a/src/donau/donau-httpd.c b/src/donau/donau-httpd.c
index d2d4871..ddb78e2 100644
--- a/src/donau/donau-httpd.c
+++ b/src/donau/donau-httpd.c
@@ -48,9 +48,9 @@
// /**
// * Above what request latency do we start to log?
// */
-// #define WARN_LATENCY GNUNET_TIME_relative_multiply ( \
-// GNUNET_TIME_UNIT_MILLISECONDS, 500)
-
+/* #define WARN_LATENCY GNUNET_TIME_relative_multiply ( \
+ GNUNET_TIME_UNIT_MILLISECONDS, 500)
+*/
// /**
// * Are clients allowed to request /keys for times other than the
// * current time? Allowing this could be abused in a DoS-attack
@@ -1445,7 +1445,6 @@ static char *input_filename;
// #endif
// }
-
/**
* The main function of the taler-donau-httpd server ("the donau").
*
@@ -1485,7 +1484,8 @@ main (int argc,
GNUNET_GETOPT_OPTION_END
};
enum GNUNET_GenericReturnValue ret;
-
+ (void)options[0]; // delete me
+ ret = 1; // delete me
// TALER_OS_init ();
// ret = GNUNET_PROGRAM_run (argc, argv,
// "taler-donau-httpd",
@@ -1500,5 +1500,4 @@ main (int argc,
return -1;
}
-
/* end of taler-donau-httpd.c */
\ No newline at end of file
diff --git a/src/donau/donau-httpd_db.h b/src/donau/donau-httpd_db.h
index 50977d5..67381d9 100644
--- a/src/donau/donau-httpd_db.h
+++ b/src/donau/donau-httpd_db.h
@@ -23,7 +23,7 @@
#include <microhttpd.h>
#include "donaudb_plugin.h"
-// #include "taler-donau-httpd_metrics.h"
+#include "donau-httpd_metrics.h"
#include <gnunet/gnunet_mhd_compat.h>
diff --git a/src/donau/donau-httpd_metrics.h b/src/donau/donau-httpd_metrics.h
index 12885d8..57d49b2 100644
--- a/src/donau/donau-httpd_metrics.h
+++ b/src/donau/donau-httpd_metrics.h
@@ -23,7 +23,6 @@
#include <gnunet/gnunet_util_lib.h>
#include <microhttpd.h>
-#include "taler-donau-httpd.h"
/**
diff --git a/src/donau/donau-httpd_responses.h
b/src/donau/donau-httpd_responses.h
index 86c3530..d2c4f41 100644
--- a/src/donau/donau-httpd_responses.h
+++ b/src/donau/donau-httpd_responses.h
@@ -30,6 +30,7 @@
#include "taler/taler_error_codes.h"
#include "donau-httpd.h"
#include "donau-httpd_db.h"
+#include "donaudb_lib.h"
#include <gnunet/gnunet_mhd_compat.h>
@@ -39,9 +40,9 @@
* @param rh reserve history to JSON-ify
* @return json representation of the @a rh, NULL on error
*/
-json_t *
-TEH_RESPONSE_compile_reserve_history (
- const struct DONAUDB_ReserveHistory *rh);
+//json_t *
+//TEH_RESPONSE_compile_reserve_history (
+// const struct DONAUDB_ReserveHistory *rh);
/**
@@ -75,35 +76,6 @@ TEH_RESPONSE_reply_reserve_insufficient_balance (
const struct TALER_Amount *balance_required,
const struct TALER_ReservePublicKeyP *reserve_pub);
-/**
- * Return error message indicating that a reserve requires age
- * restriction to be set during withdraw, that is: the age-withdraw
- * protocol MUST be used with commitment to an admissible age.
- *
- * @param connection connection to the client
- * @param maximum_allowed_age the balance required for the operation
- * @return MHD result code
- */
-MHD_RESULT
-TEH_RESPONSE_reply_reserve_age_restriction_required (
- struct MHD_Connection *connection,
- uint16_t maximum_allowed_age);
-
-
-/**
- * Send information that a KYC check must be
- * satisfied to proceed to client.
- *
- * @param connection connection to the client
- * @param h_payto account identifier to include in reply
- * @param kyc details about the KYC requirements
- * @return MHD result code
- */
-MHD_RESULT
-TEH_RESPONSE_reply_kyc_required (struct MHD_Connection *connection,
- const struct TALER_PaytoHashP *h_payto,
- const struct DONAUDB_KycStatus *kyc);
-
/**
* Send information that an AML process is blocking
diff --git a/src/donau/donau-httpd_terms.c b/src/donau/donau-httpd_terms.c
index 67dfef7..9ee48f9 100644
--- a/src/donau/donau-httpd_terms.c
+++ b/src/donau/donau-httpd_terms.c
@@ -29,13 +29,13 @@
/**
* Our terms of service.
*/
-static struct TALER_MHD_Legal *tos;
+//static struct TALER_MHD_Legal *tos;
/**
* Our privacy policy.
*/
-static struct TALER_MHD_Legal *pp;
+//static struct TALER_MHD_Legal *pp;
// MHD_RESULT
diff --git a/src/donaudb/plugin_donaudb_common.h
b/src/donaudb/plugin_donaudb_common.h
index 98b0b26..3d6cad3 100644
--- a/src/donaudb/plugin_donaudb_common.h
+++ b/src/donaudb/plugin_donaudb_common.h
@@ -21,7 +21,7 @@
#ifndef PLUGIN_DONAUDB_COMMON_H
#define PLUGIN_DONAUDB_COMMON_H
-#include "taler_util.h"
+#include "taler/taler_util.h"
#include "taler/taler_json_lib.h"
#include "donaudb_plugin.h"
@@ -44,9 +44,9 @@ TEH_COMMON_free_reserve_history (
* @param cls the @e cls of this struct with the plugin-specific state (unused)
* @param[in] tl list to free
*/
-void
-TEH_COMMON_free_coin_transaction_list (
- void *cls,
- struct DONAUDB_TransactionList *tl);
+// void
+// TEH_COMMON_free_coin_transaction_list (
+// void *cls,
+// struct DONAUDB_TransactionList *tl);
#endif
diff --git a/src/donaudb/plugin_donaudb_postgres.c
b/src/donaudb/plugin_donaudb_postgres.c
index df1a47d..3d63ff6 100644
--- a/src/donaudb/plugin_donaudb_postgres.c
+++ b/src/donaudb/plugin_donaudb_postgres.c
@@ -52,17 +52,17 @@
// * @param result PQ result object of the PQ operation that failed
// * @param conn SQL connection that was used
// */
-// #define BREAK_DB_ERR(result,conn) do { \
-// GNUNET_break (0); \
-// GNUNET_log (GNUNET_ERROR_TYPE_ERROR, \
-// "Database failure: %s/%s/%s/%s/%s", \
-// PQresultErrorField (result, PG_DIAG_MESSAGE_PRIMARY), \
-// PQresultErrorField (result, PG_DIAG_MESSAGE_DETAIL), \
-// PQresultErrorMessage (result), \
-// PQresStatus (PQresultStatus (result)), \
-// PQerrorMessage (conn)); \
-// } while (0)
-
+/*#define BREAK_DB_ERR(result,conn) do { \
+ GNUNET_break (0); \
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR, \
+ "Database failure: %s/%s/%s/%s/%s", \
+ PQresultErrorField (result, PG_DIAG_MESSAGE_PRIMARY), \
+ PQresultErrorField (result, PG_DIAG_MESSAGE_DETAIL), \
+ PQresultErrorMessage (result), \
+ PQresStatus (PQresultStatus (result)), \
+ PQerrorMessage (conn)); \
+ } while (0)
+*/
// /**
// * Connect to the database if the connection does not exist yet.
diff --git a/src/include/donaudb_plugin.h b/src/include/donaudb_plugin.h
index d74c719..4fbbdd7 100644
--- a/src/include/donaudb_plugin.h
+++ b/src/include/donaudb_plugin.h
@@ -107,7 +107,7 @@ typedef void
(*DONAUDB_DonationUnitsCallback)(
void *cls,
const struct DONAU_DonationUnitPublicKey *donation_unit_pub,
- const struct DONAUDB_DonationUnitKeyInformation *info);
+ const struct DONAUDB_DonationUnitKeyMetaData *info);
/**
@@ -121,7 +121,7 @@ typedef void
typedef void
(*DONAUDB_ActiveSignkeysCallback)(
void *cls,
- const struct DONAU_DonauPublicKeyP *donau_pub,
+ const struct DONAU_EddsaPublicKeyP *donau_pub,
const struct DONAUDB_SignkeyMetaData *meta);
diff --git a/src/pq/pq_result_helper.c b/src/pq/pq_result_helper.c
index 6451d14..6546164 100644
--- a/src/pq/pq_result_helper.c
+++ b/src/pq/pq_result_helper.c
@@ -1075,15 +1075,15 @@
// GNUNET_assert (NULL != dst);
// *((void **) dst) = NULL;
-// #define FAIL_IF(cond) \
-// do { \
-// if ((cond)) \
-// { \
-// GNUNET_break (! (cond)); \
-// goto FAIL; \
-// } \
-// } while (0)
-
+/* #define FAIL_IF(cond) \
+ do { \
+ if ((cond)) \
+ { \
+ GNUNET_break (! (cond)); \
+ goto FAIL; \
+ } \
+ } while (0)
+*/
// col_num = PQfnumber (result, fname);
// FAIL_IF (0 > col_num);
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.
- [taler-donau] branch master updated (73dd867 -> ae2b267),
gnunet <=