X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/bb154f79f3aa04f9b7375764557be830e57886c2..222702b112dcc7bebe018d6f4d66fe469fefd02c:/src/unix/gsocket.cpp diff --git a/src/unix/gsocket.cpp b/src/unix/gsocket.cpp index fbd772f927..1328df7bde 100644 --- a/src/unix/gsocket.cpp +++ b/src/unix/gsocket.cpp @@ -1,12 +1,14 @@ /* ------------------------------------------------------------------------- - * Project: GSocket (Generic Socket) for WX - * Name: gsocket.c - * Authors: David Elliott (C++ conversion, maintainer) - * Guilhem Lavaux, - * Guillermo Rodriguez Garcia - * Purpose: GSocket main Unix and OS/2 file - * Licence: The wxWindows licence - * CVSID: $Id$ + * Project: GSocket (Generic Socket) for WX + * Name: gsocket.c + * Copyright: (c) Guilhem Lavaux + * Licence: wxWindows Licence + * Authors: David Elliott (C++ conversion, maintainer) + * Guilhem Lavaux, + * Guillermo Rodriguez Garcia + * Purpose: GSocket main Unix and OS/2 file + * Licence: The wxWindows licence + * CVSID: $Id$ * ------------------------------------------------------------------------- */ @@ -115,6 +117,8 @@ int _System soclose(int); # if __GLIBC__ == 2 # define SOCKLEN_T socklen_t # endif +# elif defined(__WXMAC__) +# define SOCKLEN_T socklen_t # else # define SOCKLEN_T int # endif @@ -126,18 +130,6 @@ int _System soclose(int); #define SOCKOPTLEN_T SOCKLEN_T #endif -/* - * OSX 10.2 has int args instead of SOCKLENXXX_T - */ -#if defined( __WXMAC__ ) || defined ( __WXCOCOA__ ) -# if ( MAC_OS_X_VERSION_MAX_ALLOWED <= MAC_OS_X_VERSION_10_2 ) -# undef SOCKOPTLEN_T -# undef SOCKLEN_T -# define SOCKOPTLEN_T int -# define SOCKLEN_T int -# endif -#endif - /* * MSW defines this, Unices don't. */ @@ -168,6 +160,10 @@ int _System soclose(int); signal(SIGPIPE, old_handler); \ } +/* If a SIGPIPE is issued by a socket call on a remotely closed socket, + the program will "crash" unless it explicitly handles the SIGPIPE. + By using MSG_NOSIGNAL, the SIGPIPE is suppressed. Later, we will + use SO_NOSIGPIPE (if available), the BSD equivalent. */ #ifdef MSG_NOSIGNAL # define GSOCKET_MSG_NOSIGNAL MSG_NOSIGNAL #else /* MSG_NOSIGNAL not available (FreeBSD including OS X) */ @@ -551,11 +547,6 @@ GSocket *GSocket::WaitConnection() assert(this); -#ifndef __DARWIN__ - /* Reenable CONNECTION events */ - Enable(GSOCK_CONNECTION); -#endif - /* If the socket has already been created, we exit immediately */ if (m_fd == INVALID_SOCKET || !m_server) { @@ -582,10 +573,8 @@ GSocket *GSocket::WaitConnection() connection->m_fd = accept(m_fd, &from, (SOCKLEN_T *) &fromlen); -#ifdef __DARWIN__ /* Reenable CONNECTION events */ Enable(GSOCK_CONNECTION); -#endif if (connection->m_fd == INVALID_SOCKET) { @@ -643,7 +632,7 @@ bool GSocket::SetReusable() * For stream (connection oriented) sockets, GSocket_Connect() tries * to establish a client connection to a server using the peer address * as established with GSocket_SetPeer(). Returns GSOCK_NOERROR if the - * connection has been succesfully established, or one of the error + * connection has been successfully established, or one of the error * codes listed below. Note that for nonblocking sockets, a return * value of GSOCK_WOULDBLOCK doesn't mean a failure. The connection * request can be completed later; you should use GSocket_Select() @@ -713,6 +702,8 @@ GSocketError GSocket::Connect(GSocketStream stream) /* Connect it to the peer address, with a timeout (see below) */ ret = connect(m_fd, m_peer->m_addr, m_peer->m_len); + /* We only call Enable_Events if we know e aren't shutting down the socket */ + if (m_non_blocking) { gs_gui_functions->Enable_Events(this); @@ -1101,7 +1092,7 @@ void GSocket::SetTimeout(unsigned long millisec) } /* GSocket_GetError: - * Returns the last error occured for this socket. Note that successful + * Returns the last error occurred for this socket. Note that successful * operations do not clear this back to GSOCK_NOERROR, so use it only * after an error. */ @@ -1126,7 +1117,7 @@ GSocketError WXDLLIMPEXP_NET GSocket::GetError() * assume that it can write since the first OUTPUT event, and no more * OUTPUT events will be generated unless an error occurs. * GSOCK_CONNECTION: - * Connection succesfully established, for client sockets, or incoming + * Connection successfully established, for client sockets, or incoming * client connection, for server sockets. Wait for this event (also watch * out for GSOCK_LOST) after you issue a nonblocking GSocket_Connect() call. * GSOCK_LOST: @@ -1315,7 +1306,7 @@ int GSocket::Recv_Stream(char *buffer, int size) do { ret = recv(m_fd, buffer, size, GSOCKET_MSG_NOSIGNAL); - } while (ret == -1 && errno == EINTR); + } while (ret == -1 && errno == EINTR); /* Loop until not interrupted */ return ret; } @@ -1331,7 +1322,7 @@ int GSocket::Recv_Dgram(char *buffer, int size) do { ret = recvfrom(m_fd, buffer, size, 0, &from, (SOCKLEN_T *) &fromlen); - } while (ret == -1 && errno == EINTR); + } while (ret == -1 && errno == EINTR); /* Loop until not interrupted */ if (ret == -1) return -1; @@ -1368,7 +1359,7 @@ int GSocket::Send_Stream(const char *buffer, int size) do { ret = send(m_fd, (char *)buffer, size, GSOCKET_MSG_NOSIGNAL); - } while (ret == -1 && errno == EINTR); + } while (ret == -1 && errno == EINTR); /* Loop until not interrupted */ #ifndef __VISAGECPP__ UNMASK_SIGNAL(); #endif @@ -1401,7 +1392,7 @@ int GSocket::Send_Dgram(const char *buffer, int size) do { ret = sendto(m_fd, (char *)buffer, size, 0, addr, len); - } while (ret == -1 && errno == EINTR); + } while (ret == -1 && errno == EINTR); /* Loop until not interrupted */ #ifndef __VISAGECPP__ UNMASK_SIGNAL(); #endif @@ -1448,6 +1439,7 @@ void GSocket::Detected_Read() } else { + /* Do not throw a lost event in cases where the socket isn't really lost */ if ((errno == EWOULDBLOCK) || (errno == EAGAIN) || (errno == EINTR)) { CALL_CALLBACK(this, GSOCK_INPUT); @@ -1717,7 +1709,7 @@ GSocketError GAddress_INET_SetHostName(GAddress *address, const char *hostname) if (inet_aton(hostname, addr) == 0) { #elif defined(HAVE_INET_ADDR) - if ( (addr->s_addr = inet_addr(hostname)) == (in_addr_t)-1 ) + if ( (addr->s_addr = inet_addr(hostname)) == (unsigned)-1 ) { #else /* Use gethostbyname by default */