Integrated fixes from latest UNIX version.

Removed some debug output.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@17145 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

src/os2/gsocket.c

@@ -131,6 +131,7 @@ int _System soclose(int);
   signal(SIGPIPE, old_handler);             \
 }
 
+
 #ifndef __GSOCKET_STANDALONE__
 #  include "wx/unix/gsockunx.h"
 #  include "wx/gsocket.h"
@@ -150,7 +151,6 @@ int _System soclose(int);
 #endif /* wxUSE_GUI */
 
 /* debugging helpers */
-#define  __GSOCKET_DEBUG__
 #ifdef __GSOCKET_DEBUG__
 #  define GSocket_Debug(args) printf args
 #else
@@ -208,6 +208,13 @@ GSocket *GSocket_new(void)
   return socket;
 }
 
+void GSocket_close(GSocket *socket)
+{
+    _GSocket_Disable_Events(socket);
+    soclose(socket->m_fd);
+    socket->m_fd = INVALID_SOCKET;
+}
+
 void GSocket_destroy(GSocket *socket)
 {
   assert(socket != NULL);
@@ -244,8 +251,7 @@ void GSocket_Shutdown(GSocket *socket)
   if (socket->m_fd != INVALID_SOCKET)
   {
     shutdown(socket->m_fd, 2);
-    soclose(socket->m_fd);
+    GSocket_close(socket);
-    socket->m_fd = INVALID_SOCKET;
   }
 
   /* Disable GUI callbacks */
@@ -432,8 +438,7 @@ GSocketError GSocket_SetServer(GSocket *sck)
                    (SOCKLEN_T *) &sck->m_local->m_len) != 0) ||
       (listen(sck->m_fd, 5) != 0))
   {
-    soclose(sck->m_fd);
+    GSocket_close(sck);
-    sck->m_fd = INVALID_SOCKET;
     sck->m_error = GSOCK_IOERR;
     return GSOCK_IOERR;
   }
@@ -600,8 +605,6 @@ GSocketError GSocket_Connect(GSocket *sck, GSocketStream stream)
   /* Connect it to the peer address, with a timeout (see below) */
   ret = connect(sck->m_fd, sck->m_peer->m_addr, sck->m_peer->m_len);
 
-  printf("connect on %d to %X (%d) returned %d, errno = %d\n",
-     sck->m_fd, sck->m_peer->m_addr, sck->m_peer->m_len, ret, errno);
   if (ret == -1)
   {
     err = errno;
@@ -615,8 +618,7 @@ GSocketError GSocket_Connect(GSocket *sck, GSocketStream stream)
     {
       if (_GSocket_Output_Timeout(sck) == GSOCK_TIMEDOUT)
       {
-        soclose(sck->m_fd);
+        GSocket_close(sck);
-        sck->m_fd = INVALID_SOCKET;
         /* sck->m_error is set in _GSocket_Output_Timeout */
         return GSOCK_TIMEDOUT;
       }
@@ -648,8 +650,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.
      */
-    soclose(sck->m_fd);
+    GSocket_close(sck);
-    sck->m_fd = INVALID_SOCKET;
     sck->m_error = GSOCK_IOERR;
     return GSOCK_IOERR;
   }
@@ -713,8 +714,7 @@ GSocketError GSocket_SetNonOriented(GSocket *sck)
                    sck->m_local->m_addr,
                    (SOCKLEN_T *) &sck->m_local->m_len) != 0))
   {
-    soclose(sck->m_fd);
+    GSocket_close(sck);
-    sck->m_fd    = INVALID_SOCKET;
     sck->m_error = GSOCK_IOERR;
     return GSOCK_IOERR;
   }
@@ -848,13 +848,25 @@ GSocketEventFlags GSocket_Select(GSocket *socket, GSocketEventFlags flags)
   FD_SET(socket->m_fd, &writefds);
   FD_SET(socket->m_fd, &exceptfds);
 
-  /* Check known state first */
+  /* Check 'sticky' CONNECTION flag first */
-  result |= (GSOCK_CONNECTION_FLAG & socket->m_detected & flags);
+  result |= (GSOCK_CONNECTION_FLAG & socket->m_detected);
-  result |= (GSOCK_LOST_FLAG       & socket->m_detected & flags);
+
+  /* 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))
@@ -863,19 +875,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);
       }
     }
   }
@@ -894,30 +909,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 
 
@@ -1006,8 +1025,6 @@ void GSocket_SetCallback(GSocket *socket, GSocketEventFlags flags,
   {
     if ((flags & (1 << count)) != 0)
     {
-      printf("Setting callback no %d for socket at %X to address %X,data %X\n",
-         count, socket, callback, cdata);
       socket->m_cbacks[count] = callback;
       socket->m_data[count] = cdata;
     }
@@ -1028,8 +1045,6 @@ void GSocket_UnsetCallback(GSocket *socket, GSocketEventFlags flags)
   {
     if ((flags & (1 << count)) != 0)
     {
-      printf("Removing callback no %d for socket at %X",
-         count, socket);
       socket->m_cbacks[count] = NULL;
       socket->m_data[count] = NULL;
     }
@@ -1039,11 +1054,8 @@ void GSocket_UnsetCallback(GSocket *socket, GSocketEventFlags flags)
 
 #define CALL_CALLBACK(socket, event) {                                  \
   _GSocket_Disable(socket, event);                                      \
-  if (socket->m_cbacks[event]){                                         \
+  if (socket->m_cbacks[event])                                          \
-    printf("Call callback for event %d, socket %X: %X, %X\n", event,    \
-            socket, socket->m_cbacks[event], socket->m_data[event]);    \
     socket->m_cbacks[event](socket, event, socket->m_data[event]);      \
-  }                                                                     \
 }
 
 
@@ -1240,6 +1252,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);
@@ -1253,12 +1277,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;
@@ -1271,6 +1308,7 @@ void _GSocket_Detected_Write(GSocket *socket)
     if (error)
     {
       CALL_CALLBACK(socket, GSOCK_LOST);
+      GSocket_Shutdown(socket);
     }
     else
     {
@@ -1351,7 +1389,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)
@@ -1553,6 +1591,8 @@ GSocketError GAddress_INET_SetPortName(GAddress *address, const char *port,
   se = getservbyname(port, protocol);
   if (!se)
   {
+    /* the cast to int suppresses compiler warnings about subscript having the
+       type char */
     if (isdigit((int)port[0]))
     {
       int port_int;
@@ -1658,6 +1698,8 @@ GSocketError _GAddress_Init_UNIX(GAddress *address)
   return GSOCK_NOERROR;
 }
 
+#define UNIX_SOCK_PATHLEN (sizeof(addr->sun_path)/sizeof(addr->sun_path[0]))
+
 GSocketError GAddress_UNIX_SetPath(GAddress *address, const char *path)
 {
   struct sockaddr_un *addr;
@@ -1667,7 +1709,8 @@ GSocketError GAddress_UNIX_SetPath(GAddress *address, const char *path)
   CHECK_ADDRESS(address, UNIX); 
 
   addr = ((struct sockaddr_un *)address->m_addr);
-  memcpy(addr->sun_path, path, strlen(path));
+  strncpy(addr->sun_path, path, UNIX_SOCK_PATHLEN);
+  addr->sun_path[UNIX_SOCK_PATHLEN - 1] = '\0';
 
   return GSOCK_NOERROR;
 }