diff options
Diffstat (limited to 'ACE/ace/SSL/SSL_SOCK_Connector.cpp')
| -rw-r--r-- | ACE/ace/SSL/SSL_SOCK_Connector.cpp | 35 |
1 files changed, 0 insertions, 35 deletions
diff --git a/ACE/ace/SSL/SSL_SOCK_Connector.cpp b/ACE/ace/SSL/SSL_SOCK_Connector.cpp index d85fd545d27..45df4ef0404 100644 --- a/ACE/ace/SSL/SSL_SOCK_Connector.cpp +++ b/ACE/ace/SSL/SSL_SOCK_Connector.cpp @@ -10,10 +10,6 @@ #include <openssl/err.h> -#if defined (ACE_HAS_POLL) -# include "ace/OS_NS_poll.h" -#endif /* ACE_HAS_POLL */ - #if !defined (__ACE_INLINE__) #include "SSL_SOCK_Connector.inl" #endif /* __ACE_INLINE__ */ @@ -75,16 +71,10 @@ ACE_SSL_SOCK_Connector::ssl_connect (ACE_SSL_SOCK_Stream &new_stream, do { -#if defined (ACE_HAS_POLL) - struct pollfd fds; - ACE_OS::memset(&fds, 0, sizeof(fds)); - fds.revents = 0; -#else // These handle sets are used to set up for whatever SSL_connect // says it wants next. They're reset on each pass around the loop. ACE_Handle_Set rd_handle; ACE_Handle_Set wr_handle; -#endif /* ACE_HAS_POLL */ status = ::SSL_connect (ssl); switch (::SSL_get_error (ssl, status)) @@ -96,22 +86,12 @@ ACE_SSL_SOCK_Connector::ssl_connect (ACE_SSL_SOCK_Stream &new_stream, break; // Done case SSL_ERROR_WANT_WRITE: -#if defined (ACE_HAS_POLL) - fds.fd = handle; - fds.events = POLLOUT; -#else wr_handle.set_bit (handle); -#endif /* ACE_HAS_POLL */ status = 1; // Wait for more activity break; case SSL_ERROR_WANT_READ: -#if defined (ACE_HAS_POLL) - fds.fd = handle; - fds.events = POLLIN; -#else rd_handle.set_bit (handle); -#endif /* ACE_HAS_POLL */ status = 1; // Wait for more activity break; @@ -140,21 +120,11 @@ ACE_SSL_SOCK_Connector::ssl_connect (ACE_SSL_SOCK_Stream &new_stream, status = 1; // Wait for more activity if (SSL_want_write (ssl)) { -#if defined (ACE_HAS_POLL) - fds.fd = handle; - fds.events = POLLOUT; -#else wr_handle.set_bit (handle); -#endif /* ACE_HAS_POLL */ } else if (SSL_want_read (ssl)) { -#if defined (ACE_HAS_POLL) - fds.fd = handle; - fds.events = POLLIN; -#else rd_handle.set_bit (handle); -#endif /* ACE_HAS_POLL */ } else { @@ -176,10 +146,6 @@ ACE_SSL_SOCK_Connector::ssl_connect (ACE_SSL_SOCK_Stream &new_stream, if (status == 1) { -#if defined (ACE_HAS_POLL) - ACE_ASSERT(fds.fd != 0); - status = ACE_OS::poll(&fds, 1, timeout); -#else // Must have at least one handle to wait for at this point. ACE_ASSERT (rd_handle.num_set () == 1 || wr_handle.num_set () == 1); @@ -189,7 +155,6 @@ ACE_SSL_SOCK_Connector::ssl_connect (ACE_SSL_SOCK_Stream &new_stream, &wr_handle, 0, (timeout == 0 ? 0 : &t)); -#endif /* ACE_HAS_POLL */ (void) countdown.update (); |