From a0fe18f63a38948ab2ed89db416a4a01bb6043d7 Mon Sep 17 00:00:00 2001 From: warptangent Date: Tue, 19 May 2015 01:51:15 -0700 Subject: Revert "Allow name@domain.tld for OpenAlias lookups" This reverts commit b18368b635ba08aea541ef52ebc74180822644a2. --- src/common/dns_utils.h | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'src/common/dns_utils.h') diff --git a/src/common/dns_utils.h b/src/common/dns_utils.h index 4e48acb09..a16c7eff7 100644 --- a/src/common/dns_utils.h +++ b/src/common/dns_utils.h @@ -112,14 +112,11 @@ private: /** * @brief Checks a string to see if it looks like a URL * - * If the address looks good, but contains one @ symbol, replace that with a . - * e.g. donate@getmonero.org becomes donate.getmonero.org - * * @param addr the string to be checked * * @return true if it looks enough like a URL, false if not */ - bool check_address_syntax(std::string& addr); + bool check_address_syntax(const std::string& addr); DNSResolverData *m_data; }; // class DNSResolver -- cgit v1.2.3 From fee8424938a6403bdd12d568037a3305cfcf5341 Mon Sep 17 00:00:00 2001 From: warptangent Date: Tue, 19 May 2015 02:33:30 -0700 Subject: Allow name@domain.tld for OpenAlias lookups Based on tewinget's update. Make OpenAlias address format independent of existing DNS functions. Add tests. Test: make debug-test cd build/debug/tests/unit_tests # test that regular DNS functions work, including IPv4 lookups. # also test function that converts OpenAlias address format make && ./unit_tests --gtest_filter=DNSResolver* # test that OpenAlias addresses like donate@getmonero.org work from # wallet tools make && ./unit_tests --gtest_filter=AddressFromURL.Success --- src/common/dns_utils.h | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'src/common/dns_utils.h') diff --git a/src/common/dns_utils.h b/src/common/dns_utils.h index a16c7eff7..d98523a30 100644 --- a/src/common/dns_utils.h +++ b/src/common/dns_utils.h @@ -100,6 +100,18 @@ public: // TODO: modify this to accomodate DNSSEC std::vector get_txt_record(const std::string& url, bool& dnssec_available, bool& dnssec_valid); + /** + * @brief Gets a DNS address from OpenAlias format + * + * If the address looks good, but contains one @ symbol, replace that with a . + * e.g. donate@getmonero.org becomes donate.getmonero.org + * + * @param oa_addr OpenAlias address + * + * @return dns_addr DNS address + */ + std::string get_dns_format_from_oa_address(const std::string& oa_addr); + /** * @brief Gets the singleton instance of DNSResolver * -- cgit v1.2.3