From c805e9cf20d39b17336a05c0879aac028de7488b Mon Sep 17 00:00:00 2001 From: Florian Dold Date: Sat, 18 Jan 2020 00:43:21 +0100 Subject: [PATCH] DCE: we never have to derrive the wire_gateway_url from the payto URI --- src/include/taler_util.h | 11 ---------- src/util/test_payto.c | 8 -------- src/util/util.c | 43 ---------------------------------------- 3 files changed, 62 deletions(-) diff --git a/src/include/taler_util.h b/src/include/taler_util.h index 2cc0e4940..37b6765a2 100644 --- a/src/include/taler_util.h +++ b/src/include/taler_util.h @@ -280,17 +280,6 @@ char * TALER_xtalerbank_base_url_from_payto (const char *payto); -/** - * Given an x-taler-bank payto:// URL, compute - * the HTTP(S) base URL of the account. - * - * @param payto the payto URL - * @return bank URL of the account, NULL if not x-taler-bak payto URL - */ -char * -TALER_xtalerbank_account_url_from_payto (const char *payto); - - /** * Obtain the account name from a payto URL. * diff --git a/src/util/test_payto.c b/src/util/test_payto.c index 28caac1ad..5807be20b 100644 --- a/src/util/test_payto.c +++ b/src/util/test_payto.c @@ -77,14 +77,6 @@ main (int argc, "payto://x-taler-bank/localhost:1080/bob"); CHECK ("http://localhost:1080/", r); - r = TALER_xtalerbank_account_url_from_payto ( - "payto://x-taler-bank/localhost/bob"); - CHECK ("https://localhost/bob", - r); - r = TALER_xtalerbank_account_url_from_payto ( - "payto://x-taler-bank/localhost:1080/alice"); - CHECK ("http://localhost:1080/alice", - r); r = TALER_xtalerbank_account_from_payto ( "payto://x-taler-bank/localhost:1080/alice"); CHECK ("alice", diff --git a/src/util/util.c b/src/util/util.c index f2ec95a98..36c6f440c 100644 --- a/src/util/util.c +++ b/src/util/util.c @@ -719,49 +719,6 @@ TALER_xtalerbank_base_url_from_payto (const char *payto) } -/** - * Given an x-taler-bank payto:// URL, compute - * the HTTP(S) base URL of the account. - * - * @param payto the payto URL - * @return bank URL of the account, NULL if not x-taler-bak payto URL - */ -char * -TALER_xtalerbank_account_url_from_payto (const char *payto) -{ - const char *start; - const char *end; - char *ret; - int https; - const char *colon; - unsigned int port; - - if (0 != strncasecmp (payto, - "payto://x-taler-bank/", - strlen ("payto://x-taler-bank/"))) - return NULL; - start = &payto[strlen ("payto://x-taler-bank/")]; - end = strchr (start, - '/'); - if (NULL == end) - end = &start[strlen (start)]; - colon = strrchr (start, - ':'); - https = GNUNET_YES; - if ( (NULL != colon) && - (1 == sscanf (colon + 1, - "%u", - &port)) && - (443 != port) ) - https = GNUNET_NO; - GNUNET_asprintf (&ret, - "%s://%s", - (https ? "https" : "http"), - start); - return ret; -} - - /** * Obtain the account name from a payto URL. *