digital mars updated

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

diff --git a/src/unix/gsocket.c b/src/unix/gsocket.c
index 335fa5897a41d0cc38b1c526711fed09c8ccec49..5b7c2b23a9156837d6de39df33b4747dfc1a9f16 100644 (file)
--- a/src/unix/gsocket.c
+++ b/src/unix/gsocket.c
@@ -77,6 +77,11 @@ struct sockaddr_un
 #define INVALID_SOCKET -1
 #endif
 
+/* UnixWare reportedly needs this for FIONBIO definition */
+#ifdef __UNIXWARE__
+#include <sys/filio.h>
+#endif
+
 /*
  * INADDR_BROADCAST is identical to INADDR_NONE which is not defined
  * on all systems. INADDR_BROADCAST should be fine to indicate an error.
@@ -172,6 +177,13 @@ GSocket *GSocket_new(void)
   return socket;
 }
 
+void GSocket_close(GSocket *socket)
+{
+    _GSocket_Disable_Events(socket);
+    close(socket->m_fd);
+    socket->m_fd = INVALID_SOCKET;
+}
+
 void GSocket_destroy(GSocket *socket)
 {
   assert(socket != NULL);
@@ -208,8 +220,7 @@ void GSocket_Shutdown(GSocket *socket)
   if (socket->m_fd != INVALID_SOCKET)
   {
     shutdown(socket->m_fd, 2);
-    close(socket->m_fd);
-    socket->m_fd = INVALID_SOCKET;
+    GSocket_close(socket);
   }
 
   /* Disable GUI callbacks */
@@ -217,7 +228,6 @@ void GSocket_Shutdown(GSocket *socket)
     socket->m_cbacks[evt] = NULL;
 
   socket->m_detected = GSOCK_LOST_FLAG;
-  _GSocket_Disable_Events(socket);
 }
 
 /* Address handling */
@@ -396,8 +406,7 @@ GSocketError GSocket_SetServer(GSocket *sck)
                    (SOCKLEN_T *) &sck->m_local->m_len) != 0) ||
       (listen(sck->m_fd, 5) != 0))
   {
-    close(sck->m_fd);
-    sck->m_fd = INVALID_SOCKET;
+    GSocket_close(sck);
     sck->m_error = GSOCK_IOERR;
     return GSOCK_IOERR;
   }
@@ -577,8 +586,7 @@ GSocketError GSocket_Connect(GSocket *sck, GSocketStream stream)
     {
       if (_GSocket_Output_Timeout(sck) == GSOCK_TIMEDOUT)
       {
-        close(sck->m_fd);
-        sck->m_fd = INVALID_SOCKET;
+        GSocket_close(sck);
         /* sck->m_error is set in _GSocket_Output_Timeout */
         return GSOCK_TIMEDOUT;
       }
@@ -610,8 +618,7 @@ GSocketError GSocket_Connect(GSocket *sck, GSocketStream stream)
     /* If connect failed with an error other than EINPROGRESS,
      * then the call to GSocket_Connect has failed.
      */
-    close(sck->m_fd);
-    sck->m_fd = INVALID_SOCKET;
+    GSocket_close(sck);
     sck->m_error = GSOCK_IOERR;
     return GSOCK_IOERR;
   }
@@ -675,8 +682,7 @@ GSocketError GSocket_SetNonOriented(GSocket *sck)
                    sck->m_local->m_addr,
                    (SOCKLEN_T *) &sck->m_local->m_len) != 0))
   {
-    close(sck->m_fd);
-    sck->m_fd    = INVALID_SOCKET;
+    GSocket_close(sck);
     sck->m_error = GSOCK_IOERR;
     return GSOCK_IOERR;
   }
@@ -810,13 +816,25 @@ GSocketEventFlags GSocket_Select(GSocket *socket, GSocketEventFlags flags)
   FD_SET(socket->m_fd, &writefds);
   FD_SET(socket->m_fd, &exceptfds);
 
-  /* Check known state first */
-  result |= (GSOCK_CONNECTION_FLAG & socket->m_detected & flags);
-  result |= (GSOCK_LOST_FLAG       & socket->m_detected & flags);
+  /* Check 'sticky' CONNECTION flag first */
+  result |= (GSOCK_CONNECTION_FLAG & socket->m_detected);
+
+  /* If we have already detected a LOST event, then don't try
+   * to do any further processing.
+   */
+  if ((socket->m_detected & GSOCK_LOST_FLAG) != 0)
+  {
+    socket->m_establishing = FALSE;
+
+    return (GSOCK_LOST_FLAG & flags);
+  }
 
   /* Try select now */
   if (select(socket->m_fd + 1, &readfds, &writefds, &exceptfds, &tv) <= 0)
-    return result;
+  {
+    /* What to do here? */
+    return (result & flags);
+  }
 
   /* Check for readability */
   if (FD_ISSET(socket->m_fd, &readfds))
@@ -825,19 +843,22 @@ GSocketEventFlags GSocket_Select(GSocket *socket, GSocketEventFlags flags)
 
     if (recv(socket->m_fd, &c, 1, MSG_PEEK) > 0)
     {
-      result |= (GSOCK_INPUT_FLAG & flags);
+      result |= GSOCK_INPUT_FLAG;
     }
     else
     {
       if (socket->m_server && socket->m_stream)
       {
-        result |= (GSOCK_CONNECTION_FLAG & flags);
+        result |= GSOCK_CONNECTION_FLAG;
         socket->m_detected |= GSOCK_CONNECTION_FLAG;
       }
       else
       {
-        result |= (GSOCK_LOST_FLAG & flags);
         socket->m_detected = GSOCK_LOST_FLAG;
+        socket->m_establishing = FALSE;
+    
+        /* LOST event: Abort any further processing */
+        return (GSOCK_LOST_FLAG & flags);
       }
     }
   }
@@ -856,30 +877,34 @@ GSocketEventFlags GSocket_Select(GSocket *socket, GSocketEventFlags flags)
 
       if (error)
       {
-        result |= (GSOCK_LOST_FLAG & flags);
         socket->m_detected = GSOCK_LOST_FLAG;
+
+        /* LOST event: Abort any further processing */
+        return (GSOCK_LOST_FLAG & flags);
       }
       else
       {
-        result |= (GSOCK_CONNECTION_FLAG & flags);
+        result |= GSOCK_CONNECTION_FLAG;
         socket->m_detected |= GSOCK_CONNECTION_FLAG;
       }
     }
     else
     {
-      result |= (GSOCK_OUTPUT_FLAG & flags);
+      result |= GSOCK_OUTPUT_FLAG;
     }
   }
 
   /* Check for exceptions and errors (is this useful in Unices?) */
   if (FD_ISSET(socket->m_fd, &exceptfds))
   {
-    result |= (GSOCK_LOST_FLAG & flags);
     socket->m_establishing = FALSE;
     socket->m_detected = GSOCK_LOST_FLAG;
+
+    /* LOST event: Abort any further processing */
+    return (GSOCK_LOST_FLAG & flags);
   }
 
-  return result;
+  return (result & flags);
 
 #else 
 
@@ -1190,6 +1215,18 @@ void _GSocket_Detected_Read(GSocket *socket)
 {
   char c;
 
+  /* If we have already detected a LOST event, then don't try
+   * to do any further processing.
+   */
+  if ((socket->m_detected & GSOCK_LOST_FLAG) != 0)
+  {
+    socket->m_establishing = FALSE;
+
+    CALL_CALLBACK(socket, GSOCK_LOST);
+    GSocket_Shutdown(socket);
+    return;
+  }
+
   if (recv(socket->m_fd, &c, 1, MSG_PEEK) > 0)
   {
     CALL_CALLBACK(socket, GSOCK_INPUT);
@@ -1203,12 +1240,25 @@ void _GSocket_Detected_Read(GSocket *socket)
     else
     {
       CALL_CALLBACK(socket, GSOCK_LOST);
+      GSocket_Shutdown(socket);
     }
   }
 }
 
 void _GSocket_Detected_Write(GSocket *socket)
 {
+  /* If we have already detected a LOST event, then don't try
+   * to do any further processing.
+   */
+  if ((socket->m_detected & GSOCK_LOST_FLAG) != 0)
+  {
+    socket->m_establishing = FALSE;
+
+    CALL_CALLBACK(socket, GSOCK_LOST);
+    GSocket_Shutdown(socket);
+    return;
+  }
+
   if (socket->m_establishing && !socket->m_server)
   {
     int error;
@@ -1221,6 +1271,7 @@ void _GSocket_Detected_Write(GSocket *socket)
     if (error)
     {
       CALL_CALLBACK(socket, GSOCK_LOST);
+      GSocket_Shutdown(socket);
     }
     else
     {
@@ -1301,7 +1352,7 @@ GAddress *GAddress_copy(GAddress *address)
 
   memcpy(addr2, address, sizeof(GAddress));
 
-  if (address->m_addr)
+  if (address->m_addr && address->m_len > 0)
   {
     addr2->m_addr = (struct sockaddr *)malloc(addr2->m_len);
     if (addr2->m_addr == NULL)