Fix CYGWIN socket compilo

[wxWidgets.git] / src / unix / gsocket.cpp

diff --git a/src/unix/gsocket.cpp b/src/unix/gsocket.cpp
index 3d3c1424214a5d282de40adfb0877df1c684c2e5..5ff4d214428cc22b18218132c17d600934ff3dc2 100644 (file)
--- a/src/unix/gsocket.cpp
+++ b/src/unix/gsocket.cpp
@@ -126,28 +126,6 @@ int _System soclose(int);
 #define SOCKOPTLEN_T SOCKLEN_T
 #endif
 
 #define SOCKOPTLEN_T SOCKLEN_T
 #endif
 

-/*
- * OSX 10.2 has int args instead of SOCKLENXXX_T
- */
-#if defined( __WXMAC__ ) && ( 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
-
-/*
- * 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.
  */
 /*
  * MSW defines this, Unices don't.
  */


@@ -178,6 +156,10 @@ int _System soclose(int);
   signal(SIGPIPE, old_handler);             \
 }
 
   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) */
 #ifdef MSG_NOSIGNAL
 #  define GSOCKET_MSG_NOSIGNAL MSG_NOSIGNAL
 #else /* MSG_NOSIGNAL not available (FreeBSD including OS X) */


@@ -561,11 +543,6 @@ GSocket *GSocket::WaitConnection()
 
   assert(this);
 
 
   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)
   {
   /* If the socket has already been created, we exit immediately */
   if (m_fd == INVALID_SOCKET || !m_server)
   {


@@ -592,10 +569,8 @@ GSocket *GSocket::WaitConnection()
 
   connection->m_fd = accept(m_fd, &from, (SOCKLEN_T *) &fromlen);
 
 
   connection->m_fd = accept(m_fd, &from, (SOCKLEN_T *) &fromlen);
 

-#ifdef __DARWIN__

   /* Reenable CONNECTION events */
   Enable(GSOCK_CONNECTION);
   /* Reenable CONNECTION events */
   Enable(GSOCK_CONNECTION);

-#endif

 
   if (connection->m_fd == INVALID_SOCKET)
   {
 
   if (connection->m_fd == INVALID_SOCKET)
   {


@@ -723,6 +698,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);
 
   /* 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);
   if (m_non_blocking)
   {
     gs_gui_functions->Enable_Events(this);


@@ -1325,7 +1302,7 @@ int GSocket::Recv_Stream(char *buffer, int size)
   do 
   {
     ret = recv(m_fd, buffer, size, GSOCKET_MSG_NOSIGNAL);
   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;
 }
 
   return ret;
 }
 


@@ -1341,7 +1318,7 @@ int GSocket::Recv_Dgram(char *buffer, int size)
   do 
   {
     ret = recvfrom(m_fd, buffer, size, 0, &from, (SOCKLEN_T *) &fromlen);
   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;
 
   if (ret == -1)
     return -1;


@@ -1378,7 +1355,7 @@ int GSocket::Send_Stream(const char *buffer, int size)
   do 
   {
     ret = send(m_fd, (char *)buffer, size, GSOCKET_MSG_NOSIGNAL);
   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
 #ifndef __VISAGECPP__
   UNMASK_SIGNAL();
 #endif


@@ -1411,7 +1388,7 @@ int GSocket::Send_Dgram(const char *buffer, int size)
   do 
   {
     ret = sendto(m_fd, (char *)buffer, size, 0, addr, len);
   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
 #ifndef __VISAGECPP__
   UNMASK_SIGNAL();
 #endif


@@ -1458,6 +1435,7 @@ void GSocket::Detected_Read()
     }
     else
     {
     }
     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);
       if ((errno == EWOULDBLOCK) || (errno == EAGAIN) || (errno == EINTR)) 
       {
         CALL_CALLBACK(this, GSOCK_INPUT);


@@ -1727,7 +1705,7 @@ GSocketError GAddress_INET_SetHostName(GAddress *address, const char *hostname)
   if (inet_aton(hostname, addr) == 0)
   {
 #elif defined(HAVE_INET_ADDR)
   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 */
   {
 #else
   /* Use gethostbyname by default */