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

2 files changed, 14 insertions, 9 deletions

diff --git a/src/common/dns_utils.cpp b/src/common/dns_utils.cpp
index 2ad98ca27..6755a30b2 100644
--- a/src/common/dns_utils.cpp
+++ b/src/common/dns_utils.cpp
@@ -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()
diff --git a/src/common/dns_utils.h b/src/common/dns_utils.h
index ff54c1e07..e57e55861 100644
--- a/src/common/dns_utils.h
+++ b/src/common/dns_utils.h
@@ -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