Commit 71f60680 authored by unknown's avatar unknown

fix hpux build problem and some ndb connect errors being missed


ndb/src/common/util/SocketClient.cpp:
  fix two problems recently introduced:
  - HPUX build problem
  - some connect errors not being detected properly
parent 964f502c
...@@ -109,7 +109,7 @@ SocketClient::connect(const char *toaddress, unsigned short toport) ...@@ -109,7 +109,7 @@ SocketClient::connect(const char *toaddress, unsigned short toport)
struct timeval tval; struct timeval tval;
int r; int r;
bool use_timeout; bool use_timeout;
socklen_t len; SOCKOPT_OPTLEN_TYPE len;
int flags; int flags;
if (m_sockfd == NDB_INVALID_SOCKET) if (m_sockfd == NDB_INVALID_SOCKET)
...@@ -168,7 +168,7 @@ SocketClient::connect(const char *toaddress, unsigned short toport) ...@@ -168,7 +168,7 @@ SocketClient::connect(const char *toaddress, unsigned short toport)
if (FD_ISSET(m_sockfd, &rset) || FD_ISSET(m_sockfd, &wset)) if (FD_ISSET(m_sockfd, &rset) || FD_ISSET(m_sockfd, &wset))
{ {
len= sizeof(r); len= sizeof(r);
if (getsockopt(m_sockfd, SOL_SOCKET, SO_ERROR, &r, &len) < 0) if (getsockopt(m_sockfd, SOL_SOCKET, SO_ERROR, &r, &len) < 0 || r)
{ {
// Solaris got an error... different than others // Solaris got an error... different than others
NDB_CLOSE_SOCKET(m_sockfd); NDB_CLOSE_SOCKET(m_sockfd);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment