database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-12-07 17:42:39 +03:00
Code Activity

Incorporate Jonas Orland's suggestions.

Browse Source 
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
This commit is contained in:
unknown
2005-01-10 10:57:43 +11:00
parent 69da579aeb
commit c7341b2e92
1 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
ndb/src/common/util/SocketServer.cpp
View File

@@ -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",