Git-Mirrors/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2025-08-19 21:47:58 -04:00
Code Issues Projects Releases Packages Wiki Activity

change to allow (at least a bit) for multiple TXT records

Browse source
This commit is contained in:
Thomas Winget 2014-09-17 17:38:54 -04:00 • committed by Riccardo Spagni
parent f437cb58bf
commit c14c7e1683
7 changed files with 57 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/common/dns_utils.cpp
View file

@ -89,7 +89,7 @@ std::vector<std::string> DNSResolver::get_ipv4(const std::string& url)
{
if (result.ptr->havedata)
{
for (int i=0; result.ptr->data[i] != NULL; i++)
for (size_t i=0; result.ptr->data[i] != NULL; i++)
{
char as_str[INET_ADDRSTRLEN];
@ -115,7 +115,7 @@ std::vector<std::string> DNSResolver::get_ipv6(const std::string& url)
{
if (result.ptr->havedata)
{
for (int i=0; result.ptr->data[i] != NULL; i++)
for (size_t i=0; result.ptr->data[i] != NULL; i++)
{
char as_str[INET6_ADDRSTRLEN];
@ -131,19 +131,24 @@ std::vector<std::string> DNSResolver::get_ipv6(const std::string& url)
return retval;
}
std::string DNSResolver::get_txt_record(const std::string& url)
std::vector<std::string> DNSResolver::get_txt_record(const std::string& url)
{
ub_result_ptr result;
std::vector<std::string> records;
// call DNS resolver, blocking. if return value not zero, something went wrong
if (!ub_resolve(m_data->m_ub_context, url.c_str(), LDNS_RR_TYPE_TXT, LDNS_RR_CLASS_IN, &(result.ptr)))
{
if (result.ptr->havedata)
{
return std::string(result.ptr->data[0]);
for (size_t i=0; result.ptr->data[i] != NULL; i++)
{
records.push_back(result.ptr->data[i]);
}
}
}
return std::string();
return records;
}
DNSResolver& DNSResolver::instance()

8
src/common/dns_utils.h
View file

@ -82,15 +82,15 @@ public:
std::vector<std::string> get_ipv6(const std::string& url);
/**
* @brief gets a TXT record from a DNS query for the supplied URL;
* if no TXT record present returns an empty string.
* @brief gets all TXT records from a DNS query for the supplied URL;
* if no TXT record present returns an empty vector.
*
* @param url A string containing a URL to query for
*
* @return A string containing a TXT record; or an empty string
* @return A vector of strings containing a TXT record; or an empty vector
*/
// TODO: modify this to accomodate DNSSEC
std::string get_txt_record(const std::string& url);
std::vector<std::string> get_txt_record(const std::string& url);
/**
* @brief Gets the singleton instance of DNSResolver