Merge branch 'master' of ssh://taler.net:/var/git/mint

1 files changed, 17 insertions, 7 deletions

diff --git a/src/mint/taler-mint-httpd_tracking.c b/src/mint/taler-mint-httpd_tracking.c
index 59d029429..a6b41cf86 100644
--- a/src/mint/taler-mint-httpd_tracking.c
+++ b/src/mint/taler-mint-httpd_tracking.c
@@ -1,6 +1,6 @@
 /*
   This file is part of TALER
-  Copyright (C) 2014, 2015 GNUnet e.V.
+  Copyright (C) 2014, 2015, 2016 GNUnet e.V.
 
   TALER is free software; you can redistribute it and/or modify it under the
   terms of the GNU Affero General Public License as published by the Free Software
@@ -46,8 +46,19 @@ TMH_TRACKING_handler_wire_deposits (struct TMH_RequestHandler *rh,
                                     const char *upload_data,
                                     size_t *upload_data_size)
 {
-  GNUNET_break (0); // not implemented
-  return MHD_NO;
+  struct TALER_WireTransferIdentifierRawP wtid;
+  int res;
+
+  res = TMH_PARSE_mhd_request_arg_data (connection,
+                                        "wtid",
+                                        &wtid,
+                                        sizeof (struct TALER_WireTransferIdentifierRawP));
+  if (GNUNET_SYSERR == res)
+    return MHD_NO; /* internal error */
+  if (GNUNET_NO == res)
+    return MHD_YES; /* parse error */
+  return TMH_DB_execute_wire_deposits (connection,
+                                       &wtid);
 }
 
 
@@ -57,7 +68,7 @@ TMH_TRACKING_handler_wire_deposits (struct TMH_RequestHandler *rh,
  *
  * @param connection the MHD connection to handle
  * @param tps signed request to execute
- * @param merchant_pub public key from the merchant 
+ * @param merchant_pub public key from the merchant
  * @param merchant_sig signature from the merchant (to be checked)
  * @param transaction_id transaction ID (in host byte order)
  * @return MHD result code
@@ -110,13 +121,12 @@ TMH_TRACKING_handler_deposit_wtid (struct TMH_RequestHandler *rh,
   struct TALER_DepositTrackPS tps;
   uint64_t transaction_id;
   struct TALER_MerchantSignatureP merchant_sig;
-  struct TALER_MerchantPublicKeyP merchant_pub;
   struct TMH_PARSE_FieldSpecification spec[] = {
     TMH_PARSE_member_fixed ("H_wire", &tps.h_wire),
     TMH_PARSE_member_fixed ("H_contract", &tps.h_contract),
     TMH_PARSE_member_fixed ("coin_pub", &tps.coin_pub),
     TMH_PARSE_member_uint64 ("transaction_id", &transaction_id),
-    TMH_PARSE_member_fixed ("merchant_pub", &merchant_pub),
+    TMH_PARSE_member_fixed ("merchant_pub", &tps.merchant),
     TMH_PARSE_member_fixed ("merchant_sig", &merchant_sig),
     TMH_PARSE_MEMBER_END
   };
@@ -143,7 +153,7 @@ TMH_TRACKING_handler_deposit_wtid (struct TMH_RequestHandler *rh,
   tps.transaction_id = GNUNET_htonll (transaction_id);
   res = check_and_handle_deposit_wtid_request (connection,
 					       &tps,
-					       &merchant_pub,
+					       &tps.merchant,
 					       &merchant_sig,
 					       transaction_id);
   TMH_PARSE_release_data (spec);