WL#15130 Socket-level TLS patch mysql#3: ndb_socket_poller

In ndb_socket_poller, check read sockets for SSL pending data.

Change-Id: If3aa3897a5decaeaf2309031590f89bc27d4685c

Author: jdduncan

storage/ndb/include/portlib/ndb_socket_poller.h

@@ -39,6 +39,10 @@ class ndb_socket_poller {
   // Current number of fds in the list
   unsigned m_count;
 
+  // Number of sockets with SSL data ready to read when they
+  // were added to the list.
+  unsigned m_ssl_pending;
+
   // The list of pollfds, initial size is 1 and m_pfds will
   // then point at m_one_pfd. After dynamic expand points at
   // dynamic list of pollfds
@@ -56,6 +60,7 @@ class ndb_socket_poller {
 
   void clear(void) {
     m_count = 0;
+    m_ssl_pending = 0;
   }
 
   ~ndb_socket_poller() {
@@ -67,9 +72,7 @@ class ndb_socket_poller {
 
   unsigned add(ndb_socket_t sock, bool read, bool write);
 
-  unsigned add_readable(ndb_socket_t sock) {
-    return add(sock, true, false);
-  }
+  unsigned add_readable(ndb_socket_t sock, struct ssl_st *ssl = nullptr);
 
   unsigned add_writable(ndb_socket_t sock) {
     return add(sock, false, true);

storage/ndb/include/util/NdbSocket.h

@@ -263,7 +263,7 @@ void NdbSocket::close_with_reset(bool with_reset) {
 /* ndb_socket_poller.h */
 inline
 uint NdbSocket::add_readable(ndb_socket_poller * poller) const {
-  return poller->add_readable(s);
+  return poller->add_readable(s, ssl);
 }
 
 inline
@@ -274,7 +274,7 @@ uint NdbSocket::add_writable(ndb_socket_poller * poller) const {
 inline
 int NdbSocket::poll_readable(int timeout) const {
   ndb_socket_poller poller;
-  poller.add_readable(s);
+  poller.add_readable(s, ssl);
   return poller.poll(timeout);
 }
 

storage/ndb/src/common/portlib/ndb_socket_poller.cpp

@@ -47,6 +47,22 @@ bool ndb_socket_poller::set_max_count(unsigned count)
   return true;
 }
 
+unsigned int
+ndb_socket_poller::add_readable(ndb_socket_t sock, SSL * ssl)
+{
+  if(ssl && SSL_pending(ssl))
+  {
+    assert(m_count < m_max_count);
+    const unsigned index = m_count;
+    m_ssl_pending++;
+    posix_poll_fd &pfd = m_pfds[m_count++];
+    pfd.events = 0;        // don't actually poll
+    pfd.revents = POLLIN;  // show that socket is ready to read
+    return index;
+  }
+
+  return add(sock, true, false);
+}
 
 unsigned int
 ndb_socket_poller::add(ndb_socket_t sock, bool read, bool write)
@@ -73,14 +89,18 @@ ndb_socket_poller::add(ndb_socket_t sock, bool read, bool write)
 int
 ndb_socket_poller::poll(int timeout)
 {
+  if(m_ssl_pending > 0 && m_ssl_pending == m_count)
+    return m_ssl_pending; // no need to actually poll
 
   do
   {
     const NDB_TICKS start = NdbTick_getCurrentTicks();
 
     const int res = poll_unsafe(timeout);
     if (likely(res >= 0))
-      return res;
+      return res + m_ssl_pending;
+    else if(m_ssl_pending)
+      return m_ssl_pending;
 
     const int error = ndb_socket_errno();
     if (res == -1 && (error == EINTR || error == EAGAIN))