merchant

commit bfb17daefaf3d136e0bef5baa672212afefb57cc
parent 07b1256ee50440dd7034b1c41cbaada5aa59fc1a
Author: Marcello Stanisci <marcello.stanisci@inria.fr>
Date:   Fri, 24 Jun 2016 14:20:43 +0200

receiver in /track context

Diffstat:
M
src/backend/taler-merchant-httpd_track-transaction.c
 | 
20
+++++++++++++++++++-

1 file changed, 19 insertions(+), 1 deletion(-)
diff --git a/src/backend/taler-merchant-httpd_track-transaction.c b/src/backend/taler-merchant-httpd_track-transaction.c
@@ -43,6 +43,10 @@
  */
 struct TrackTransactionContext;
 
+/**
+ * Merchant instance being tracked
+ */
+struct MerchantInstance;
 
 /**
  * Information we keep for each coin in a /track/transaction operation.
@@ -205,6 +209,11 @@ struct TrackTransactionContext
    */
   unsigned int response_code;
 
+  /**
+   * Which merchant instance is being tracked
+   */
+  struct MerchantInstance *mi;
+
 };
 
 
@@ -591,7 +600,7 @@ trace_coins (struct TrackTransactionContext *tctx)
     return;
   }
   tcc->dwh = TALER_EXCHANGE_track_transaction (tctx->eh,
-                                               &privkey,
+                                               &tctx->mi->privkey,
                                                &tctx->h_wire,
                                                &tctx->h_contract,
                                                &tcc->coin_pub,
@@ -752,6 +761,7 @@ coin_cb (void *cls,
                                           tcc));
 }
 
+extern struct MerchantInstance **instances;
 
 /**
  * Handle a "/track/transaction" request.
@@ -774,6 +784,7 @@ MH_handler_track_transaction (struct TMH_RequestHandler *rh,
   unsigned long long transaction_id;
   const char *str;
   const char *receiver;
+  unsigned int i;
   int ret;
 
   if (NULL == *connection_cls)
@@ -831,6 +842,13 @@ MH_handler_track_transaction (struct TMH_RequestHandler *rh,
   if (NULL == receiver)
     return TMH_RESPONSE_reply_bad_request (connection,
                                            "receiver argument missing");
+  tctx->mi = NULL;
+  for (i=0; NULL != instances[i]; i++)
+    if (0 == strcmp (receiver, instances[i]->id))
+      tctx->mi = instances[i];
+  if (NULL == tctx->mi)
+    return TMH_RESPONSE_reply_bad_request (connection,
+                                           "unknown receiver");
   if (1 !=
       sscanf (str,
               "%llu",