summaryrefslogtreecommitdiff
path: root/src/backend/taler-merchant-httpd_track-deposit.c
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2016-06-07 19:31:38 +0200
committerChristian Grothoff <christian@grothoff.org>2016-06-07 19:31:38 +0200
commit953f4b2cc94db1fc8e9a4c99887d6767137f43d2 (patch)
tree6a2d24c7a55959f00e9b54718f2551796616085c /src/backend/taler-merchant-httpd_track-deposit.c
parent2405096d434ba26f8eea18c05e9caf10942d70cc (diff)
parent8b9bd7bee4f288f36935a4d816247449780e79fb (diff)
downloadmerchant-953f4b2cc94db1fc8e9a4c99887d6767137f43d2.tar.gz
merchant-953f4b2cc94db1fc8e9a4c99887d6767137f43d2.tar.bz2
merchant-953f4b2cc94db1fc8e9a4c99887d6767137f43d2.zip
Merge branch 'master' of git+ssh://taler.net/var/git/merchant
Diffstat (limited to 'src/backend/taler-merchant-httpd_track-deposit.c')
-rw-r--r--src/backend/taler-merchant-httpd_track-deposit.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/backend/taler-merchant-httpd_track-deposit.c b/src/backend/taler-merchant-httpd_track-deposit.c
index c1d9b352..71bc18c5 100644
--- a/src/backend/taler-merchant-httpd_track-deposit.c
+++ b/src/backend/taler-merchant-httpd_track-deposit.c
@@ -234,6 +234,7 @@ check_deposit (void *cls,
*
* @param cls closure
* @param http_status HTTP status code we got, 0 on exchange protocol violation
+ * @param exchange_pub public key of the exchange used to sign @a json
* @param json original json reply (may include signatures, those have then been
* validated already)
* @param wtid extracted wire transfer identifier, or NULL if the exchange could
@@ -246,6 +247,7 @@ check_deposit (void *cls,
static void
wire_deposit_cb (void *cls,
unsigned int http_status,
+ const struct TALER_ExchangePublicKeyP *exchange_pub,
const json_t *json,
const struct GNUNET_HashCode *h_wire,
const struct TALER_Amount *total_amount,
@@ -272,6 +274,7 @@ wire_deposit_cb (void *cls,
db->store_transfer_to_proof (db->cls,
rctx->uri,
&rctx->wtid,
+ exchange_pub,
json))
{
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,