Bug#35703454 NdbSocket refactoring - remove From::Existing [NOCLOSE]

Bug#35692840 Disable NDB SSL socket table

Remove NdbSocket::From enum and init_from_native and init_from_new
methods.

Remove the SSL socket table.

Change-Id: I6c0023ec1e3b06e519988d9388440d577e6f2e84

Author: zmur

storage/ndb/include/util/NdbSocket.h

@@ -29,25 +29,18 @@
 #include "portlib/ndb_socket.h"
 #include "portlib/ndb_socket_poller.h"
 #include "portlib/NdbMutex.h"
-#include "util/ssl_socket_table.h"
 
 static constexpr int TLS_BUSY_TRY_AGAIN = -2;
 
 class NdbSocket {
 public:
-  enum class From { New, Existing };
-
   NdbSocket() = default;
   NdbSocket(NdbSocket&& oth);
-  NdbSocket(ndb_socket_t ndbsocket, From fromType = From::New) {
-    ssl = socket_table_get_ssl(ndbsocket.s, (fromType == From::Existing));
-    init_from_native(ndbsocket.s);
-  }
+  // TODO: move ndb_socket_t into NdbSocket
+  NdbSocket(ndb_socket_t ndbsocket): s(ndbsocket) {}
   ~NdbSocket()                       { disable_locking(); }
   NdbSocket& operator=(NdbSocket &&);
 
-  void init_from_new(ndb_socket_t);
-  void init_from_native(socket_t fd) { ndb_socket_init_from_native(s, fd); }
   int is_valid() const               { return ndb_socket_valid(s); }
   bool has_tls() const               { return ssl; }
   ndb_socket_t ndb_socket() const    { return s; }
@@ -197,12 +190,6 @@ class NdbSocket {
   ndb_socket_t s{INVALID_SOCKET};
 };
 
-inline
-void NdbSocket::init_from_new(ndb_socket_t ndbsocket) {
-  assert(! socket_table_get_ssl(ndbsocket.s, false));
-  init_from_native(ndbsocket.s);
-}
-
 /*
  * There must not be any concurrent operations on the source object (oth) while
  * calling the move constructor.

storage/ndb/include/util/ssl_socket_table.h

@@ -59,7 +59,7 @@ Loopback_Transporter::connect_client()
     goto err;
   }
 
-  theSocket.init_from_new(pair[0]);
+  theSocket = NdbSocket{pair[0]};
   m_send_socket = pair[1];
 
   m_connected = true;

storage/ndb/src/common/transporter/Loopback_Transporter.cpp

@@ -72,7 +72,6 @@ ADD_CONVENIENCE_LIBRARY(ndbgeneral
   parse_mask.cpp
   random.cpp
   require.cpp
-  ssl_socket_table.cpp
   socket_io.cpp
   version.cpp
   LINK_LIBRARIES ndbtrace ndbportlib ext::zlib mysys

storage/ndb/src/common/util/CMakeLists.txt

@@ -99,7 +99,6 @@ bool NdbSocket::associate(SSL * new_ssl)
   if(ssl) return false; // already associated
   if(new_ssl == nullptr) return false;
   if(! SSL_set_fd(new_ssl, s.s)) return false;
-  socket_table_set_ssl(s.s, new_ssl);
   ssl = new_ssl;
   return true;
 }
@@ -143,7 +142,6 @@ void NdbSocket::ssl_close() {
   Guard2 guard(mutex);     // acquire mutex if non-null
   set_nonblocking(false);  // set to blocking
   SSL_shutdown(ssl);       // wait for close
-  socket_table_clear_ssl(s.s);
   SSL_free(ssl);
   ssl = nullptr;
 }

storage/ndb/src/common/util/NdbSocket.cpp

@@ -202,7 +202,7 @@ SocketClient::connect(ndb_sockaddr server_addr)
   ndb_socket_get_port(m_sockfd, &m_last_used_port);
 
   // Transfer the fd to the NdbSocket
-  NdbSocket secureSocket{m_sockfd, NdbSocket::From::New};
+  NdbSocket secureSocket{m_sockfd};
   ndb_socket_invalidate(&m_sockfd);
   return secureSocket;
 }

storage/ndb/src/common/util/SocketClient.cpp

@@ -215,7 +215,7 @@ SocketServer::doAccept()
     ServiceInstance & si = m_services[i];
     assert(m_services_poller.is_socket_equal(i, si.m_socket));
 
-    NdbSocket childSock{ndb_accept(si.m_socket, nullptr), NdbSocket::From::New};
+    NdbSocket childSock{ndb_accept(si.m_socket, nullptr)};
     if (!childSock.is_valid())
     {
       // Could not 'accept' socket(maybe at max fds), indicate error

storage/ndb/src/common/util/SocketServer.cpp

@@ -460,7 +460,7 @@ int SimpleCpcClient::open_connection() {
   sa.set_port(port);
 
   /* Create socket */
-  cpc_sock = NdbSocket(ndb_socket_create(sa.get_address_family()), NdbSocket::From::Existing);
+  cpc_sock = NdbSocket(ndb_socket_create(sa.get_address_family()));
   if (!cpc_sock.is_valid()) return -1;
 
   if (sa.need_dual_stack())