WL#9266 Mysqlx IP version 6 conectivity

Support for binding X Plugin listen socket to IPv6 addresses,
to allow X Protocol over IPv6 connections.

Approved by Horst Hunger <[email protected]>

Author: lkotula

mysql-test/collections/mysql-5.7-stage.push

@@ -40,4 +40,5 @@ perl mysql-test-run.pl --timer --force  --parallel=auto --comment=eits-tests-inn
 perl mysql-test-run.pl --timer --force  --comment=memcached --vardir=var-memcached --experimental=collections/default.experimental --parallel=1 --retry=0 --suite=memcached --skip-test-list=collections/disabled-daily.list
 # test-sql-api-plugins
 perl mysql-test-run.pl --debug-server --timer --force --parallel=auto --comment=test_service_sql_api --vardir=var-test_service_sql_api --suite=test_service_sql_api --experimental=collections/default.experimental --skip-ndb
-
+# test x plugin
+perl mysql-test-run.pl --debug-server --timer --force --parallel=auto --comment=x --vardir=var-x --suite=x --experimental=collections/default.experimental

mysql-test/collections/mysql-trunk-stage.push

@@ -38,3 +38,5 @@ perl mysql-test-run.pl --timer --force   --parallel=auto  --comment=eits-tests-m
 perl mysql-test-run.pl --timer --force  --parallel=auto --comment=eits-tests-innodb-engine --experimental=collections/default.experimental --vardir=var-stmt-eits-tests-innodb-engine --suite=engines/iuds,engines/funcs  --max-test-fail=0 --retry-failure=0 --mysqld=--default-storage-engine=innodb --skip-test-list=collections/disabled-daily.list
 # Memcached tests
 perl mysql-test-run.pl --timer --force  --comment=memcached --vardir=var-memcached --experimental=collections/default.experimental --parallel=1 --retry=0 --suite=memcached --skip-test-list=collections/disabled-daily.list
+# test x plugin
+perl mysql-test-run.pl --debug-server --timer --force --parallel=auto --comment=x --vardir=var-x --suite=x --experimental=collections/default.experimental

mysql-test/include/default_my.cnf

@@ -18,4 +18,5 @@ disable-force-if-open
 [ENV]
 MASTER_MYPORT=           @mysqld.1.port
 MASTER_MYSOCK=           @mysqld.1.socket
+MASTER_X_MYPORT=         @mysqld.1.loose-mysqlx-port
 MASTER_X_MYSOCK=         @mysqld.1.loose-mysqlx-socket

rapid/plugin/x/mysqlxtest_src/mysqlx_connection.cc

@@ -86,25 +86,17 @@ Error Connection::connect_to_localhost(const std::string &named_pipe_or_unix_soc
   strncpy(addr.sun_path, named_pipe_or_unix_socket.c_str(), sizeof(addr.sun_path)-1);
   addr.sun_path[sizeof(addr.sun_path)-1] = 0;
 
-  return connect(&addr, sizeof(addr));
+  return connect((sockaddr*)&addr, sizeof(addr));
 #else
   return Error(CR_SOCKET_CREATE_ERROR, "Named pipes aren't supported on current OS");
 #endif // defined(HAVE_SYS_UN_H)
 }
 
-Error Connection::connect(sockaddr_un *addr, const std::size_t addr_size)
+Error Connection::connect(sockaddr *addr, const std::size_t addr_size)
 {
-#if defined(HAVE_SYS_UN_H)
-  my_socket s = socket(AF_UNIX, SOCK_STREAM, 0);
-  return connect(s, (sockaddr*)addr, addr_size);
-#else
-  return Error(CR_SOCKET_CREATE_ERROR, "Unix socket aren't supported on current OS");
-#endif // defined(HAVE_SYS_UN_H)
-}
-
-Error Connection::connect(sockaddr_in *addr, const std::size_t addr_size)
-{
-  my_socket s = ::socket(AF_INET, SOCK_STREAM, IPPROTO_TCP);
+  my_socket s = ::socket(addr->sa_family,
+                         SOCK_STREAM,
+                         addr->sa_family == AF_UNIX ? 0: IPPROTO_TCP);
 
   return connect(s, (sockaddr*)addr, addr_size);
 }

rapid/plugin/x/mysqlxtest_src/mysqlx_connection.h

@@ -72,8 +72,7 @@ class Connection
   ~Connection();
 
   Error connect_to_localhost(const std::string &named_pipe_or_unix_socket);
-  Error connect(sockaddr_in *sockaddr, const std::size_t addr_size);
-  Error connect(sockaddr_un *sockaddr, const std::size_t addr_size);
+  Error connect(sockaddr *sockaddr, const std::size_t addr_size);
   Error connect(my_socket s, sockaddr *sockaddr, const std::size_t addr_size);
 
   Error activate_tls();

rapid/plugin/x/mysqlxtest_src/mysqlx_crud.cc

@@ -17,13 +17,13 @@
  * 02110-1301  USA
  */
 
+#include "ngs_common/string_formatter.h"
 #include "mysqlx_crud.h"
 #include "mysqlx_session.h"
 #include "mysqlx_protocol.h"
 #include "mysqlx_parser.h"
 #include "mysqlx_resultset.h"
 
-#include <boost/algorithm/string.hpp>
 
 #define CONTENT_TYPE_GEOMETRY 0x0001
 #define CONTENT_TYPE_JSON 0x0002
@@ -142,7 +142,7 @@ void Statement::insert_bound_values(::google::protobuf::RepeatedPtrField< ::Mysq
   // First validates that all the placeholders have a bound value
   std::string str_undefined;
   if (m_placeholders.size() && !m_bound_values.size())
-    str_undefined = boost::algorithm::join(m_placeholders, ", ");
+    str_undefined = ngs::join(m_placeholders, ", ");
   else
   {
     std::vector<std::string> undefined;
@@ -152,7 +152,7 @@ void Statement::insert_bound_values(::google::protobuf::RepeatedPtrField< ::Mysq
         undefined.push_back(m_placeholders[index]);
     }
 
-    str_undefined = boost::algorithm::join(undefined, ", ");
+    str_undefined = ngs::join(undefined, ", ");
   }
 
   // Throws the error if needed
@@ -1035,4 +1035,4 @@ InsertStatement::InsertStatement(ngs::shared_ptr<Table> table)
   m_insert->set_data_model(Mysqlx::Crud::TABLE);
 }
 
-//--------------------------------------------------------------
+//--------------------------------------------------------------

rapid/plugin/x/mysqlxtest_src/mysqlx_protocol.cc

@@ -166,12 +166,16 @@ static void throw_server_error(const Mysqlx::Error &error)
 }
 
 
-XProtocol::XProtocol(const Ssl_config &ssl_config, const std::size_t timeout, const bool dont_wait_for_disconnect)
+XProtocol::XProtocol(const Ssl_config &ssl_config,
+                     const std::size_t timeout,
+                     const bool dont_wait_for_disconnect,
+                     const Internet_protocol ip_mode)
 : m_sync_connection(ssl_config.key, ssl_config.ca, ssl_config.ca_path,
                     ssl_config.cert, ssl_config.cipher, ssl_config.tls_version, timeout),
   m_client_id(0),
   m_trace_packets(false), m_closed(true),
-  m_dont_wait_for_disconnect(dont_wait_for_disconnect)
+  m_dont_wait_for_disconnect(dont_wait_for_disconnect),
+  m_ip_mode(ip_mode)
 {
   if (getenv("MYSQLX_TRACE_CONNECTION"))
     m_trace_packets = true;
@@ -225,15 +229,20 @@ void XProtocol::connect(const std::string &host, int port)
   memset(&hints, 0, sizeof(hints));
   hints.ai_socktype= SOCK_STREAM;
   hints.ai_protocol= IPPROTO_TCP;
-  hints.ai_family= AF_INET;
+  hints.ai_family= AF_UNSPEC;
+
+  if (IPv6 == m_ip_mode)
+    hints.ai_family = AF_INET6;
+  else if (IPv4 == m_ip_mode)
+    hints.ai_family = AF_INET;
 
   gai_errno= getaddrinfo(host.c_str(), port_buf, &hints, &res_lst);
   if (gai_errno != 0)
     throw Error(CR_UNKNOWN_HOST, "No such host is known '" + host + "'");
 
   for (t_res= res_lst; t_res; t_res= t_res->ai_next)
   {
-    error = m_sync_connection.connect((sockaddr_in*)t_res->ai_addr, t_res->ai_addrlen);
+    error = m_sync_connection.connect((sockaddr*)t_res->ai_addr, t_res->ai_addrlen);
 
     if (!error)
       break;

rapid/plugin/x/mysqlxtest_src/mysqlx_protocol.h

@@ -216,10 +216,17 @@ namespace mysqlx
     const char *tls_version;
   };
 
+  enum Internet_protocol
+  {
+    IP_any = 0,
+    IPv4,
+    IPv6,
+  };
+
   class MYSQLXTEST_PUBLIC XProtocol : public ngs::enable_shared_from_this<XProtocol>
   {
   public:
-    XProtocol(const Ssl_config &ssl_config, const std::size_t timeout, const bool dont_wait_for_disconnect = true);
+    XProtocol(const Ssl_config &ssl_config, const std::size_t timeout, const bool dont_wait_for_disconnect = true, const Internet_protocol ip_mode = IPv4);
     ~XProtocol();
 
     uint64_t client_id() const { return m_client_id; }
@@ -304,6 +311,7 @@ namespace mysqlx
     bool m_trace_packets;
     bool m_closed;
     const bool m_dont_wait_for_disconnect;
+    const Internet_protocol m_ip_mode;
     ngs::shared_ptr<Result> m_last_result;
   };