diff options
| author | Marcello Stanisci <stanisci.m@gmail.com> | 2018-06-12 19:16:43 +0200 |
|---|---|---|
| committer | Marcello Stanisci <stanisci.m@gmail.com> | 2018-06-12 19:16:43 +0200 |
| commit | 6f579eb833be396b56903ff7252c3023ef46a92d (patch) | |
| tree | 449e83b49c02c88d72d91396c3dfb186412d511c /src/bank-lib/testing_api_cmd_history.c | |
| parent | 01f933bbdc69388eb6e0c7a476292a9b667d9027 (diff) | |
| download | exchange-6f579eb833be396b56903ff7252c3023ef46a92d.tar.gz exchange-6f579eb833be396b56903ff7252c3023ef46a92d.tar.bz2 exchange-6f579eb833be396b56903ff7252c3023ef46a92d.zip | |
From payto:// to base url.
The conversion prepends http// or https://
depending on the port given beside the hostname.
If port is 433, then prepends https://, otherwise
prepends http://.
For now, the conversion was only necessary at
the /history bank lib.
Diffstat (limited to 'src/bank-lib/testing_api_cmd_history.c')
| -rw-r--r-- | src/bank-lib/testing_api_cmd_history.c | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/src/bank-lib/testing_api_cmd_history.c b/src/bank-lib/testing_api_cmd_history.c index fa5e87395..c9f4960e7 100644 --- a/src/bank-lib/testing_api_cmd_history.c +++ b/src/bank-lib/testing_api_cmd_history.c @@ -380,6 +380,9 @@ build_history (struct TALER_TESTING_Interpreter *is, const struct TALER_TESTING_Command *pos = &is->commands[off]; int cancelled; const uint64_t *row_id; + char *bank_hostname; + const uint64_t *credit_account_no; + const uint64_t *debit_account_no; if (GNUNET_OK != TALER_TESTING_GET_TRAIT_ROW_ID (pos, &row_id)) @@ -408,8 +411,6 @@ build_history (struct TALER_TESTING_Interpreter *is, TALER_LOG_INFO ("hit limit specified by command\n"); break; } - const uint64_t *credit_account_no; - const uint64_t *debit_account_no; GNUNET_assert (GNUNET_OK == TALER_TESTING_GET_TRAIT_CREDIT_ACCOUNT @@ -444,6 +445,10 @@ build_history (struct TALER_TESTING_Interpreter *is, continue; } + bank_hostname = strchr (hs->bank_url, ':'); + GNUNET_assert (NULL != bank_hostname); + bank_hostname += 3; + if ( (0 != (hs->direction & TALER_BANK_DIRECTION_CREDIT)) && (hs->account_no == *credit_account_no)) { @@ -453,10 +458,10 @@ build_history (struct TALER_TESTING_Interpreter *is, GNUNET_asprintf (&h[total].details.account_url, - ('/' == hs->bank_url[strlen(hs->bank_url) -1]) + ('/' == bank_hostname[strlen(bank_hostname) -1]) ? "payto://x-taler-bank/%s%llu" : "payto://x-taler-bank/%s/%llu", - hs->bank_url, + bank_hostname, (unsigned long long) *debit_account_no); } if ( (0 != (hs->direction & TALER_BANK_DIRECTION_DEBIT)) && @@ -468,10 +473,10 @@ build_history (struct TALER_TESTING_Interpreter *is, GNUNET_asprintf (&h[total].details.account_url, - ('/' == hs->bank_url[strlen(hs->bank_url) -1]) + ('/' == bank_hostname[strlen(bank_hostname) -1]) ? "payto://x-taler-bank/%s%llu" : "payto://x-taler-bank/%s/%llu", - hs->bank_url, + bank_hostname, (unsigned long long) *credit_account_no); } if ( ( (0 != (hs->direction & TALER_BANK_DIRECTION_CREDIT)) && |