Commit c7341b2e authored by unknown's avatar unknown

Incorporate Jonas Orland's suggestions.


ndb/src/common/util/SocketServer.cpp:
  Check for errors from getsockname (and error display).
  
  use SOCKET_SIZE_TYPE (as discovered by configure) instead of socklen_t
parent 69da579a
...@@ -119,8 +119,19 @@ SocketServer::setup(SocketServer::Service * service, ...@@ -119,8 +119,19 @@ SocketServer::setup(SocketServer::Service * service,
NDB_CLOSE_SOCKET(sock); NDB_CLOSE_SOCKET(sock);
DBUG_RETURN(false); DBUG_RETURN(false);
} }
socklen_t sock_len = sizeof(servaddr);
getsockname(sock,(struct sockaddr*)&servaddr,&sock_len); /* Get the port we bound to */
SOCKET_SIZE_TYPE sock_len = sizeof(servaddr);
if(getsockname(sock,(struct sockaddr*)&servaddr,&sock_len)<0) {
char msg[100];
if(!strerror_r(errno,msg,sizeof(msg)))
strcpy(msg,"Unknown");
ndbout_c("An error occurred while trying to find out what"
" port we bound to. Error: %s",msg);
NDB_CLOSE_SOCKET(sock);
DBUG_RETURN(false);
}
DBUG_PRINT("info",("bound to %u",ntohs(servaddr.sin_port))); DBUG_PRINT("info",("bound to %u",ntohs(servaddr.sin_port)));
if (listen(sock, m_maxSessions) == -1){ if (listen(sock, m_maxSessions) == -1){
DBUG_PRINT("error",("listen() - %d - %s", DBUG_PRINT("error",("listen() - %d - %s",
......
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