Removed some superflous #defines already added by plaform.h, simplified a bit

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

diff --git a/src/msw/gsocket.c b/src/msw/gsocket.c
index ad714a64eca86363dd019c1c896ce3d52490021d..6493dbfcec3078692f917369ab0f2554fce282c5 100644 (file)
--- a/src/msw/gsocket.c
+++ b/src/msw/gsocket.c
@@ -26,6 +26,7 @@
 #  pragma warning(disable:4100)
 #endif /* _MSC_VER */
 
+#include <winsock.h>
 
 #ifndef __GSOCKET_STANDALONE__
 #  include "wx/defs.h"
@@ -50,7 +51,6 @@
 #  define _GSocket_Disable_Events(socket)
 #endif /* wxUSE_GUI */
 
-
 #include <assert.h>
 #include <string.h>
 #include <stdio.h>
@@ -58,8 +58,6 @@
 #include <stddef.h>
 #include <ctype.h>
 
-#include <winsock.h>
-
 /* if we use configure for MSW SOCKLEN_T will be already defined */
 #ifndef SOCKLEN_T
 #  define SOCKLEN_T int
@@ -714,22 +712,51 @@ 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))
   {
-    /* Assume that closure of the socket is always reported via exceptfds */
-    if (socket->m_server && socket->m_stream)
-      result |= (GSOCK_CONNECTION_FLAG & flags);
+    char c;
+
+    if (recv(socket->m_fd, &c, 1, MSG_PEEK) > 0)
+    {
+      result |= GSOCK_INPUT_FLAG;
+    }
     else
-      result |= (GSOCK_INPUT_FLAG & flags);
+    {
+      if (socket->m_server && socket->m_stream)
+      {
+        result |= GSOCK_CONNECTION_FLAG;
+        socket->m_detected |= GSOCK_CONNECTION_FLAG;
+      }
+      else
+      {
+        socket->m_detected = GSOCK_LOST_FLAG;
+        socket->m_establishing = FALSE;
+    
+        /* LOST event: Abort any further processing */
+        return (GSOCK_LOST_FLAG & flags);
+      }
+    }
   }
 
   /* Check for writability */
@@ -737,23 +764,43 @@ GSocketEventFlags GSocket_Select(GSocket *socket, GSocketEventFlags flags)
   {
     if (socket->m_establishing && !socket->m_server)
     {
-      result |= (GSOCK_CONNECTION_FLAG & flags);
+      int error;
+      SOCKLEN_T len = sizeof(error);
+
       socket->m_establishing = FALSE;
-      socket->m_detected |= GSOCK_CONNECTION_FLAG;
+
+      getsockopt(socket->m_fd, SOL_SOCKET, SO_ERROR, (void*)&error, &len);
+
+      if (error)
+      {
+        socket->m_detected = GSOCK_LOST_FLAG;
+
+        /* LOST event: Abort any further processing */
+        return (GSOCK_LOST_FLAG & flags);
+      }
+      else
+      {
+        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 */
+  /* 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
 
@@ -1382,4 +1429,3 @@ typedef void (*wxDummy)();
 
 #endif  /* wxUSE_SOCKETS || defined(__GSOCKET_STANDALONE__) */
 
-// vi:sts=4:sw=4:et