amps-python-client 5.3.4.3__zip → 5.3.4.4__zip

{amps-python-client-5.3.4.3 → amps-python-client-5.3.4.4}/src/cpp/src/tcps.c

@@ -305,6 +305,47 @@ typedef struct
 }
 amps_tcps_t;
 
+// Function to close SSL* and fd that can be replaced by Python client
+int _amps_tcps_close_all(AMPS_SOCKET fd, _amps_SSL* ssl)
+{
+  int rc = 0;
+  if (ssl)
+  {
+    rc = _amps_SSL_shutdown(ssl);
+    if (rc == 0 && fd != AMPS_INVALID_SOCKET)
+    {
+      // attempt to wait for the server to send back the matching close notify.
+      struct timeval tv;
+      fd_set readfds, exceptfds;
+      tv.tv_sec = 0;
+      tv.tv_usec = 10000;
+      FD_ZERO(&readfds);
+      FD_SET(fd, &readfds);
+      FD_ZERO(&exceptfds);
+      FD_SET(fd, &exceptfds);
+#ifdef _WIN32
+      select(1, &readfds, 0, &exceptfds, &tv);
+#else
+      select(fd + 1, &readfds, 0, &exceptfds, &tv);
+#endif
+      rc = _amps_SSL_shutdown(ssl);
+    }
+  }
+  if (fd != AMPS_INVALID_SOCKET)
+  {
+    shutdown(fd, SHUT_RDWR);
+    AMPS_CLOSESOCKET(fd);
+  }
+  if (ssl)
+  {
+    _amps_SSL_free(ssl);
+  }
+  return rc;
+}
+
+// Pointer to function for closing SSL/fd that Python client redirects
+AMPSDLL int (*amps_tcps_close_all)(AMPS_SOCKET, _amps_SSL*) = _amps_tcps_close_all;
+
 const amps_char* amps_tcps_get_last_error(
   amps_handle transport)
 {
@@ -319,6 +360,13 @@ void amps_tcps_set_error(
   transport->lastErrorBuf[sizeof(transport->lastErrorBuf) - 1] = '\0';
 }
 
+// Allow python client to set transport errors during connect/close
+AMPSDLL void amps_tcps_set_external_error(void* transport,
+                                          const amps_char* buffer)
+{
+  amps_tcps_set_error((amps_tcps_t*)transport, buffer);
+}
+
 void amps_tcps_set_socket_error(
   amps_tcps_t* transport,
   int errorCode)
@@ -674,11 +722,10 @@ amps_tcps_apply_socket_properties(AMPS_SOCKET fd, const char* uri,
   return AMPS_E_OK;
 }
 
-int
-amps_tcps_apply_ssl_properties(_amps_SSL* ssl, const char* uri,
-                               size_t uriLength, amps_uri_state* uriState)
+// Retrieve server name indicator for use by SSL when connecting
+char* amps_tcps_get_sni_hostname(const char* uri, size_t uriLength,
+                                 amps_uri_state* uriState)
 {
-  int rc = 1;
   const char* key = NULL;
   size_t keyLength = 0;
   while (uriState->part_id < AMPS_URI_ERROR)
@@ -696,19 +743,92 @@ amps_tcps_apply_ssl_properties(_amps_SSL* ssl, const char* uri,
         char* hostname = (char*)malloc(uriState->part_length + 1);
         memcpy(hostname, uriState->part, uriState->part_length);
         hostname[uriState->part_length] = '\0';
-        rc = _amps_SSL_ctrl(ssl, AMPS_SSL_CTRL_SET_TLSEXT_HOSTNAME, AMPS_TLSEXT_NAMETYPE_host_name, hostname);
-        free(hostname);
-        if (rc != 1)
-        {
-          return rc;
-        }
+        return hostname;
       }
     }
   }
-  return rc;
+  return NULL;
 }
 
+// Normal initialization and connection of SSL around socket
+_amps_SSL* _amps_tcps_get_socket_and_ssl(AMPS_SOCKET fd_,
+                                         const char* address_, int port_,
+                                         struct addrinfo* pAddrInfo_,
+                                         char* hostname_, void* me_)
+{
+  amps_tcps_t* transport = (amps_tcps_t*)me_;
+  /* On first use, initialize an SSL context if one hasn't been created. */
+  if (!_amps_ssl_ctx)
+  {
+    if (amps_ssl_init(NULL))
+    {
+      return NULL;
+    }
+  }
+  // Create SSL wrapper for the socket
+  _amps_ERR_clear_error();
+  _amps_SSL* ssl = _amps_SSL_new(_amps_ssl_ctx);
+
+  int rc = _amps_SSL_set_fd(ssl, (int)(fd_));
+  int sysError = GET_ERRNO;
+  if (rc != 1)
+  {
+    transport->ssl = ssl;
+    amps_tcps_set_ssl_error(transport, rc, sysError);
+    _amps_SSL_free(ssl);
+    ssl = (_amps_SSL*)0;
+    transport->ssl = (_amps_SSL*)0;
+    return NULL;
+  }
+
+  // Connect socket
+  rc = connect(fd_, pAddrInfo_->ai_addr,
+               (socklen_t)pAddrInfo_->ai_addrlen);
+  sysError = GET_ERRNO;
+  if (rc == -1)
+  {
+    amps_tcps_set_socket_error(transport, sysError);
+    _amps_SSL_free(ssl);
+    return NULL;
+  }
+
+  // Set server name indicator if used
+  if (hostname_)
+  {
+    rc = _amps_SSL_ctrl(ssl, AMPS_SSL_CTRL_SET_TLSEXT_HOSTNAME,
+                        AMPS_TLSEXT_NAMETYPE_host_name, hostname_);
+    sysError = GET_ERRNO;
+    if (rc != 1)
+    {
+      amps_tcps_set_ssl_error(transport, rc, sysError);
+      _amps_SSL_free(ssl);
+      return NULL;
+    }
+  }
+
+  _amps_SSL_ctrl(ssl, AMPS_SSL_CTRL_MODE, AMPS_SSL_AUTO_RETRY, NULL);
+
+  // Complete SSL connect/handshake
+  rc = _amps_SSL_connect(ssl);
+  sysError = GET_ERRNO;
+  if (rc != 1)
+  {
+    amps_tcps_set_ssl_error(transport, rc, sysError);
+    _amps_SSL_free(ssl);
+    return NULL;
+  }
+  return ssl;
+}
+
+// Pointer to init/connect function for Python client to override
+AMPSDLL _amps_SSL* (*amps_tcps_get_socket_and_ssl)(AMPS_SOCKET fd_,
+                                                   const char* address_, int port_,
+                                                   struct addrinfo* pAddrInfo_,
+                                                   char* hostname_, void* me_) =
+                                                   _amps_tcps_get_socket_and_ssl;
+
 amps_result amps_tcps_set_idle_time(amps_handle transport, int idleTimeMillis);
+
 amps_result amps_tcps_connect(amps_handle transport, const amps_char* address)
 {
   AMPS_JOIN_DECLARE();
@@ -748,27 +868,15 @@ amps_result amps_tcps_connect(amps_handle transport, const amps_char* address)
   ssl = (_amps_SSL*)AMPS_IEX_GET(&me->ssl, 0);
 
   /* were we previously connected?  go ahead and close that. */
-  if (ssl)
-  {
-    rc = _amps_SSL_shutdown(ssl);
-    sysError = GET_ERRNO;
-    if (rc < 0)
-    {
-      amps_tcps_set_ssl_error(me, rc, sysError);
-    }
-  }
-  if (fd != AMPS_INVALID_SOCKET)
-  {
-    /* this is a reconnect */
-    shutdown(fd, SHUT_RDWR);
-    closesocket(fd);
-    fd = AMPS_INVALID_SOCKET;
-  }
+  // Use our close function to shutdown socket and SSL
+  rc = amps_tcps_close_all(fd, ssl);
+  sysError = GET_ERRNO;
   AMPS_JOIN(me->thread);
-  if (ssl)
+  fd = AMPS_INVALID_SOCKET;
+  ssl = NULL;
+  if (rc < 0)
   {
-    _amps_SSL_free(ssl);
-    ssl = 0;
+    amps_tcps_set_ssl_error(me, rc, sysError);
   }
 
   /* parse out the address */
@@ -873,106 +981,64 @@ amps_result amps_tcps_connect(amps_handle transport, const amps_char* address)
     goto error;
   }
 
-  me->fd = socket(pAddrInfo->ai_family, pAddrInfo->ai_socktype, pAddrInfo->ai_protocol);
+  // Get the socket we'll use
+  fd = socket(pAddrInfo->ai_family, pAddrInfo->ai_socktype, pAddrInfo->ai_protocol);
   sysError = GET_ERRNO;
-  if (me->fd == AMPS_INVALID_SOCKET)
+  if (fd == AMPS_INVALID_SOCKET)
   {
     freeaddrinfo(pAddrInfo);
     amps_tcps_set_socket_error(me, sysError);
     result = AMPS_E_CONNECTION_REFUSED;
     goto error;
   }
+  AMPS_IEX(&me->fd, fd);
 
   /* apply socket properties */
-  if (amps_tcps_apply_socket_properties(me->fd, address, address_length, &uri_state_socket_props) != AMPS_E_OK)
+  if (me->destroying
+      || amps_tcps_apply_socket_properties(me->fd, address, address_length, &uri_state_socket_props) != AMPS_E_OK)
   {
     freeaddrinfo(pAddrInfo);
-    fd = AMPS_IEX_GET(&me->fd, AMPS_INVALID_SOCKET);
+    if (!me->destroying)
+    {
+      fd = AMPS_IEX_GET(&me->fd, AMPS_INVALID_SOCKET);
+    }
     amps_tcps_set_error(me, "The URI specified invalid properties.");
     result = AMPS_E_URI;
     goto error;
   }
 #ifdef __APPLE__
   rc = 1; /* Set NOSIGPIPE to ON */
-  if (setsockopt(me->fd, SOL_SOCKET, SO_NOSIGPIPE, &rc, sizeof(rc)) < 0)
+  if (me->destroying
+      || setsockopt(me->fd, SOL_SOCKET, SO_NOSIGPIPE, &rc, sizeof(rc)) < 0)
   {
     freeaddrinfo(pAddrInfo);
-    fd = AMPS_IEX_GET(&me->fd, AMPS_INVALID_SOCKET);
+    if (!me->destroying)
+    {
+      fd = AMPS_IEX_GET(&me->fd, AMPS_INVALID_SOCKET);
+    }
     amps_tcps_set_error(me, "Failed to set no SIGPIPE.");
     result = AMPS_E_CONNECTION;
     goto error;
   }
 #endif
 
-  rc = connect(me->fd, pAddrInfo->ai_addr,
-               (socklen_t)pAddrInfo->ai_addrlen);
-  sysError = GET_ERRNO;
+  // Call function to do SSL init and connect
+  char* hostname = amps_tcps_get_sni_hostname(address, address_length, &uri_state_ssl_props);
+  int portNum = atoi(port);
+  me->ssl = amps_tcps_get_socket_and_ssl((AMPS_SOCKET)(me->fd), host, portNum, pAddrInfo, hostname, (void*)me);
   freeaddrinfo(pAddrInfo);
-  if (rc == -1)
+  if (me->destroying || me->ssl == 0)
   {
-    fd = AMPS_IEX_GET(&me->fd, AMPS_INVALID_SOCKET);
-    amps_tcps_set_socket_error(me, sysError);
-    result = AMPS_E_CONNECTION_REFUSED;
-    goto error;
-  }
-
-  /* On first use, initialize an SSL context if one hasn't been created. */
-  if (!_amps_ssl_ctx)
-  {
-    rc = amps_ssl_init(NULL);
-    if (rc)
+    if (!me->destroying)
     {
       fd = AMPS_IEX_GET(&me->fd, AMPS_INVALID_SOCKET);
-      amps_tcps_set_error(me, "Could not initialize an SSL context.");
-      result = AMPS_E_SSL;
-      goto error;
     }
-  }
-  /* Handshake via SSL */
-  _amps_ERR_clear_error();
-  if (!me->ssl)
-  {
-    me->ssl = _amps_SSL_new(_amps_ssl_ctx);
-  }
-  if (me->ssl == 0)
-  {
-    fd = AMPS_IEX_GET(&me->fd, AMPS_INVALID_SOCKET);
     amps_tcps_set_error_stack_error(me);
-    result = AMPS_E_SSL;
-    goto error;
-  }
-
-  rc = _amps_SSL_set_fd(me->ssl, (int)me->fd);
-  sysError = GET_ERRNO;
-  if (rc != 1)
-  {
-    fd = AMPS_IEX_GET(&me->fd, AMPS_INVALID_SOCKET);
-    ssl = (_amps_SSL*)AMPS_IEX_GET(&me->ssl, 0);
-    amps_tcps_set_ssl_error(me, rc, sysError);
-    result = AMPS_E_SSL;
-    goto error;
-  }
-
-  rc = amps_tcps_apply_ssl_properties(me->ssl, address, address_length, &uri_state_ssl_props);
-  sysError = GET_ERRNO;
-  if (rc != 1)
-  {
-    fd = AMPS_IEX_GET(&me->fd, AMPS_INVALID_SOCKET);
-    ssl = (_amps_SSL*)AMPS_IEX_GET(&me->ssl, 0);
-    amps_tcps_set_ssl_error(me, rc, sysError);
-    result = AMPS_E_SSL;
-    goto error;
-  }
-
-  _amps_SSL_ctrl(me->ssl, AMPS_SSL_CTRL_MODE, AMPS_SSL_AUTO_RETRY, NULL);
-
-  rc = _amps_SSL_connect(me->ssl);
-  sysError = GET_ERRNO;
-  if (rc != 1)
-  {
-    fd = AMPS_IEX_GET(&me->fd, AMPS_INVALID_SOCKET);
-    ssl = (_amps_SSL*)AMPS_IEX_GET(&me->ssl, 0);
-    amps_tcps_set_ssl_error(me, rc, sysError);
+    // The error string should already be set, but just in case
+    if (!amps_tcps_get_last_error(me))
+    {
+      amps_tcps_set_error(me, "Could not initialize an SSL context or SSL.");
+    }
     result = AMPS_E_SSL;
     goto error;
   }
@@ -1044,24 +1110,11 @@ amps_result amps_tcps_connect(amps_handle transport, const amps_char* address)
 error:
   if (result != AMPS_E_OK)
   {
-    if (ssl)
-    {
-      rc = _amps_SSL_shutdown(ssl);
-      sysError = GET_ERRNO;
-      if (rc < 0)
-      {
-        amps_tcps_set_ssl_error(me, rc, sysError);
-      }
-    }
-    if (fd != AMPS_INVALID_SOCKET)
-    {
-      shutdown(fd, SHUT_RDWR);
-      closesocket(fd);
-    }
-    if (ssl)
+    // Use our close function to shutdown socket and SSL
+    int rc = amps_tcps_close_all(fd, ssl);
+    if (rc < 0)
     {
-      _amps_SSL_free(ssl);
-      ssl = 0;
+      amps_tcps_set_ssl_error(me, rc, sysError);
     }
 #ifdef _WIN32
     me->thread = 0;
@@ -1129,41 +1182,12 @@ void amps_tcps_close(amps_handle transport)
 #ifndef _WIN32
   pthread_cleanup_push(amps_cleanup_unlock_mutex, (void*)&me->lock);
 #endif
-  if (ssl)
+  // Use our close function to shutdown socket and SSL
+  int rc = amps_tcps_close_all(fd, ssl);
+  if (rc < 0)
   {
-    int rc = _amps_SSL_shutdown(ssl);
     int sysError = GET_ERRNO;
-    if (rc == 0 && fd != AMPS_INVALID_SOCKET)
-    {
-      // attempt to wait for the server to send back the matching close notify.
-      struct timeval tv;
-      fd_set readfds, exceptfds;
-      tv.tv_sec = 0;
-      tv.tv_usec = 10000;
-      FD_ZERO(&readfds);
-      FD_SET(fd, &readfds);
-      FD_ZERO(&exceptfds);
-      FD_SET(fd, &exceptfds);
-#ifdef _WIN32
-      select(1, &readfds, 0, &exceptfds, &tv);
-#else
-      select(fd + 1, &readfds, 0, &exceptfds, &tv);
-#endif
-      rc = _amps_SSL_shutdown(ssl);
-    }
-    if (rc < 0)
-    {
-      amps_tcps_set_ssl_error(me, rc, sysError);
-    }
-  }
-  if (fd != AMPS_INVALID_SOCKET)
-  {
-    shutdown(fd, SHUT_RDWR);
-    closesocket(fd);
-  }
-  if (ssl)
-  {
-    _amps_SSL_free(ssl);
+    amps_tcps_set_ssl_error(me, rc, sysError);
   }
   AMPS_UNLOCK(&me->lock);
 #ifndef _WIN32
@@ -1200,41 +1224,12 @@ void amps_tcps_destroy(amps_handle transport)
   AMPS_IEX_LONG(&me->destroying, 1);
   AMPS_IEX_LONG(&me->disconnecting, 1);
 #endif
-  if (ssl)
+  // Use our close function to shutdown socket and SSL
+  int rc = amps_tcps_close_all(fd, ssl);
+  if (rc < 0)
   {
-    int rc = _amps_SSL_shutdown(ssl);
     int sysError = GET_ERRNO;
-    if (rc == 0 && fd != AMPS_INVALID_SOCKET)
-    {
-      // attempt to wait for the server to send back the matching close notify.
-      struct timeval tv;
-      fd_set readfds, exceptfds;
-      tv.tv_sec = 0;
-      tv.tv_usec = 10000;
-      FD_ZERO(&readfds);
-      FD_SET(fd, &readfds);
-      FD_ZERO(&exceptfds);
-      FD_SET(fd, &exceptfds);
-#ifdef _WIN32
-      select(1, &readfds, 0, &exceptfds, &tv);
-#else
-      select(fd + 1, &readfds, 0, &exceptfds, &tv);
-#endif
-      rc = _amps_SSL_shutdown(ssl);
-    }
-    if (rc < 0)
-    {
-      amps_tcps_set_ssl_error(me, rc, sysError);
-    }
-  }
-  if (fd != AMPS_INVALID_SOCKET)
-  {
-    shutdown(fd, SHUT_RDWR);
-    closesocket(fd);
-  }
-  if (ssl)
-  {
-    _amps_SSL_free(ssl);
+    amps_tcps_set_ssl_error(me, rc, sysError);
   }
 
   AMPS_UNLOCK(&me->lock);
@@ -1273,42 +1268,12 @@ amps_result amps_tcps_handle_disconnect(
 #ifndef _WIN32
   pthread_cleanup_pop(0);
 #endif
-  /* close what we have right now. */
-  if (ssl)
+  // Use our close function to shutdown socket and SSL
+  int rc = amps_tcps_close_all(fd, ssl);
+  if (rc < 0)
   {
-    int rc = _amps_SSL_shutdown(ssl);
     int sysError = GET_ERRNO;
-    if (rc == 0 && fd != AMPS_INVALID_SOCKET)
-    {
-      // attempt to wait for the server to send back the matching close notify.
-      struct timeval tv;
-      fd_set readfds, exceptfds;
-      tv.tv_sec = 0;
-      tv.tv_usec = 10000;
-      FD_ZERO(&readfds);
-      FD_SET(fd, &readfds);
-      FD_ZERO(&exceptfds);
-      FD_SET(fd, &exceptfds);
-#ifdef _WIN32
-      select(1, &readfds, 0, &exceptfds, &tv);
-#else
-      select(fd + 1, &readfds, 0, &exceptfds, &tv);
-#endif
-      rc = _amps_SSL_shutdown(ssl);
-    }
-    if (rc < 0)
-    {
-      amps_tcps_set_ssl_error(me, rc, sysError);
-    }
-  }
-  if (fd != AMPS_INVALID_SOCKET)
-  {
-    shutdown(fd, SHUT_RDWR);
-    closesocket(fd);
-  }
-  if (ssl)
-  {
-    _amps_SSL_free(ssl);
+    amps_tcps_set_ssl_error(me, rc, sysError);
   }
 
   /* first let waiters know that we've failed. */
@@ -1561,12 +1526,13 @@ int amps_tcps_locked_read(amps_tcps_t* me_,
     FD_SET(fd, &exceptfds);
     AMPS_UNLOCK(&me_->sendLock);
 #ifdef _WIN32
-    if (select(1, &readfds, 0, &exceptfds, &tv) == 0)
+    rc  = select(1, &readfds, 0, &exceptfds, &tv);
 #else
-    if (select(fd + 1, &readfds, 0, &exceptfds, &tv) == 0)
+    rc = select(fd + 1, &readfds, 0, &exceptfds, &tv);
 #endif
+    if (rc <= 0)
     {
-      return 0;
+      return rc;
     }
     AMPS_LOCK(&me_->sendLock);
     if (me_->disconnecting || fd != me_->fd || !me_->ssl
@@ -1593,6 +1559,7 @@ int amps_tcps_locked_read(amps_tcps_t* me_,
   {
     if (*pErrorcode_ == AMPS_SSL_ERROR_WANT_READ)
     {
+      *pErrorcode_ = 0;
       return 0;
     }
     // End of stream
@@ -1729,7 +1696,7 @@ void* amps_tcps_threaded_reader(void* userData)
     else
     {
       // errorcode could be an ssl error code, so check for errno
-      int sysError = GET_ERRNO;
+      int sysError = received ? GET_ERRNO : 0;
       if (sysError)
       {
         errorcode = sysError;
@@ -1744,7 +1711,8 @@ void* amps_tcps_threaded_reader(void* userData)
            && ((errorcode != SOCK_ERRORCODE(ETIMEDOUT)
                 && errorcode != SOCK_ERRORCODE(EWOULDBLOCK))
               || me->idleTimeMillis == 0))
-           || (me->readTimeoutMillis && amps_now() - lastReadTime > me->readTimeoutMillis))
+           || (me->readTimeoutMillis
+              && amps_now() - lastReadTime > me->readTimeoutMillis))
       {
         if (!me->disconnecting)
         {

{amps-python-client-5.3.4.3 → amps-python-client-5.3.4.4}/src/cpp/src/unix.c

@@ -408,7 +408,7 @@ amps_result amps_unix_connect(amps_handle transport, amps_char* address)
   {
     /* this is a reconnect */
     shutdown(fd, SHUT_RDWR);
-    closesocket(fd);
+    AMPS_CLOSESOCKET(fd);
     fd = AMPS_INVALID_SOCKET;
   }
   AMPS_JOIN(me->thread);
@@ -503,7 +503,7 @@ error:
     if (fd != AMPS_INVALID_SOCKET)
     {
       shutdown(fd, SHUT_RDWR);
-      closesocket(fd);
+      AMPS_CLOSESOCKET(fd);
     }
     AMPS_JOIN(me->thread);
   }
@@ -549,7 +549,7 @@ void amps_unix_close(amps_handle transport)
   if (fd != AMPS_INVALID_SOCKET)
   {
     shutdown(fd, SHUT_RDWR);
-    closesocket(fd);
+    AMPS_CLOSESOCKET(fd);
   }
   AMPS_UNLOCK(&me->lock);
   pthread_cleanup_pop(0);
@@ -569,7 +569,7 @@ void amps_unix_destroy(amps_handle transport)
   if (fd != AMPS_INVALID_SOCKET)
   {
     shutdown(fd, SHUT_RDWR);
-    closesocket(fd);
+    AMPS_CLOSESOCKET(fd);
   }
 
   AMPS_UNLOCK(&me->lock);
@@ -596,7 +596,7 @@ amps_result amps_unix_handle_disconnect(
   if (fd != AMPS_INVALID_SOCKET)
   {
     shutdown(fd, SHUT_RDWR);
-    closesocket(fd);
+    AMPS_CLOSESOCKET(fd);
   }
 
   /* first let waiters know that we've failed. */

{amps-python-client-5.3.4.3 → amps-python-client-5.3.4.4}/src/haclient.cpp

@@ -83,7 +83,7 @@ namespace ampspy
     std::string returnedStr(returnValue);
     if (returnedStr.find("tcps:") == 0)
     {
-      PyObject* initResult = ampspy::ssl_init_internal(NULL);
+      PyObject* initResult = ampspy::ampspy_ssl_init(NULL, NULL);
       if (initResult == NULL)
       {
         exc::throwError();