Merge branch 'refs/heads/wl13497-devapi-multihost'

# Conflicts:
#	common/settings.h
#	include/mysqlx/common_constants.h
#	xapi/tests/xapi-t.cc

Author: rsomla1

cdk/core/session.cc

@@ -40,9 +40,10 @@ using std::unique_ptr;
 /*
   A class that creates a session from given data source.
 
-  Instances of this calss are callable objects which can be used as visitors
+  Instances of this class are callable objects which can be used as visitors
   for ds::Multi_source implementing in this case the failover logic.
 */
+
 struct Session_builder
 {
   using TLS   = cdk::connection::TLS;
@@ -398,7 +399,7 @@ Session::Session(ds::Multi_source &ds)
       throw_error(
         1 == sb.m_attempts ?
         "Could not connect to the given data source" :
-        "Could not connect ot any of the given data sources"
+        "Could not connect to any of the given data sources"
       );
   }
 

cdk/foundation/CMakeLists.txt

@@ -93,6 +93,11 @@ target_link_libraries(cdk_foundation
   PRIVATE SSL::ssl
 )
 
+IF(WIN32)
+target_link_libraries(cdk_foundation PRIVATE Dnsapi)
+ELSE()
+target_link_libraries(cdk_foundation PRIVATE resolv)
+ENDIF()
 
 IF(WIN32)
   target_link_libraries(cdk_foundation PRIVATE ws2_32)

cdk/foundation/connection_tcpip.cc

@@ -33,6 +33,7 @@
 #include <mysql/cdk/foundation/error.h>
 
 #include "connection_tcpip_base.h"
+#include <list>
 
 using namespace ::cdk::foundation;
 
@@ -167,6 +168,28 @@ std::string get_local_hostname()
 }
 
 
+SRV_host::SRV_host(detail::Srv_host_detail &&detail)
+  : prio(detail.prio)
+  , weight(detail.weight)
+  , port(detail.port)
+  , name(std::move(detail.name))
+{}
+
+
+std::forward_list<SRV_host> srv_list(const std::string &host_name)
+{
+ std::forward_list<SRV_host> list;
+ std::forward_list<SRV_host>::const_iterator it = list.before_begin();
+
+ for(auto &el : detail::srv_list(host_name))
+ {
+   it = list.insert_after(it, std::move(el));
+ }
+
+ return list;
+}
+
+
 TCPIP::TCPIP(const std::string& host,
              unsigned short port,
              const Options& opts)

cdk/foundation/socket_detail.cc

@@ -40,12 +40,20 @@ PUSH_SYS_WARNINGS_CDK
 #include <sstream>
 #include <mutex>
 #include <thread>
+#include <forward_list>
+#include <map>
+#include <functional>
+#include <iostream>
 
 #ifndef _WIN32
 #include <arpa/inet.h>
 #include <signal.h>
 #include <sys/un.h>
 #include <poll.h>
+#include <resolv.h>
+#include <arpa/nameser.h>
+#else
+#include <windns.h>
 #endif
 POP_SYS_WARNINGS_CDK
 
@@ -1045,5 +1053,96 @@ std::string get_local_hostname()
   return buf;
 }
 
+#ifdef _WIN32
+std::forward_list<Srv_host_detail> srv_list(const std::string &hostname)
+{
+  DNS_STATUS status;               //Return value of  DnsQuery_A() function.
+  PDNS_RECORD pDnsRecord =nullptr;          //Pointer to DNS_RECORD structure.
+
+  using Srv_list = std::forward_list<Srv_host_detail>;
+  Srv_list srv;
+  Srv_list::const_iterator srv_it = srv.before_begin();
+
+  status = DnsQuery(hostname.c_str(), DNS_TYPE_SRV, DNS_QUERY_STANDARD, nullptr, &pDnsRecord, nullptr);
+  if (!status)
+  {
+    PDNS_RECORD pRecord = pDnsRecord;
+    while (pRecord)
+    {
+      if (pRecord->wType == DNS_TYPE_SRV)
+      {
+        srv_it = srv.emplace_after(srv_it,
+          Srv_host_detail
+        {
+          pRecord->Data.Srv.wPriority,
+          pRecord->Data.Srv.wWeight,
+          pRecord->Data.Srv.wPort,
+          pRecord->Data.Srv.pNameTarget
+        }
+        );
+      }
+      pRecord = pRecord->pNext;
+    }
+
+    DnsRecordListFree(pDnsRecord, DnsFreeRecordListDeep);
+  }
+  return srv;
+}
+#else
+
+std::forward_list<Srv_host_detail> srv_list(const std::string &hostname)
+{
+  struct __res_state state {};
+  res_ninit(&state);
+
+  using Srv_list = std::forward_list<Srv_host_detail>;
+  Srv_list srv;
+  Srv_list::const_iterator srv_it = srv.before_begin();
+
+  unsigned char query_buffer[NS_PACKETSZ];
+
+
+  //let get
+  int res = res_nsearch(&state, hostname.c_str(), ns_c_in, ns_t_srv, query_buffer, sizeof (query_buffer) );
+
+  if (res >= 0)
+  {
+    ns_msg msg;
+    char name_buffer[NS_MAXDNAME];
+    Srv_host_detail host_data;
+    ns_initparse(query_buffer, res, &msg);
+
+
+    auto process = [&msg, &name_buffer, &host_data, &srv, &srv_it](const ns_rr &rr) -> void
+    {
+      const unsigned char* srv_data = ns_rr_rdata(rr);
+
+      //Each NS_GET16 call moves srv_data to next value
+      NS_GET16(host_data.prio, srv_data);
+      NS_GET16(host_data.weight, srv_data);
+      NS_GET16(host_data.port, srv_data);
+
+      dn_expand(ns_msg_base(msg), ns_msg_end(msg),
+                srv_data, name_buffer, sizeof(name_buffer));
+
+      host_data.name = name_buffer;
+
+      srv_it = srv.emplace_after(
+                 srv_it,
+                 std::move(host_data));
+    };
+
+    for(int x= 0; x < ns_msg_count(msg, ns_s_an); x++)
+    {
+          ns_rr rr;
+          ns_parserr(&msg, ns_s_an, x, &rr);
+          process(rr);
+    }
+  }
+  res_nclose(&state);
+
+  return srv;
+}
+#endif
 
 }}}} // cdk::foundation::connection::detail

cdk/foundation/socket_detail.h

@@ -31,6 +31,8 @@
 #ifndef CDK_FOUNDATION_SOCKET_DETAIL_H
 #define CDK_FOUNDATION_SOCKET_DETAIL_H
 #include <mysql/cdk/foundation/types.h>
+#include <forward_list>
+#include <string>
 
 PUSH_SYS_WARNINGS_CDK
 
@@ -447,6 +449,19 @@ size_t send_some(Socket socket, const byte *buffer, size_t buffer_size, bool wai
  */
 std::string get_local_hostname();
 
+/*
+   Retrieve host SRV record (target:port) list for specified service and protocol
+ */
+struct Srv_host_detail
+{
+  uint16_t prio;
+  uint16_t weight;
+  uint16_t port;
+  string name;
+};
+
+std::forward_list<Srv_host_detail> srv_list(const std::string &host_name);
+
 }}}} // cdk::foundation::connection::detail