Commiting re-baked files after wxListCtrl OS X additions.

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

diff --git a/src/unix/gsocket.cpp b/src/unix/gsocket.cpp
index 829893896343af6a6667f4ea8e9ea1ae26dfc4c1..bf29390d94eda805ca845d63e90d887b405cf679 100644 (file)
--- a/src/unix/gsocket.cpp
+++ b/src/unix/gsocket.cpp
@@ -39,6 +39,10 @@
 #include <netdb.h>
 #include <sys/ioctl.h>
 
+#ifdef HAVE_SYS_SELECT_H
+#   include <sys/select.h>
+#endif
+
 #ifdef __VMS__
 #include <socket.h>
 struct sockaddr_un
@@ -235,7 +239,7 @@ struct hostent * wxGethostbyname_r(const char *hostname, struct hostent *h,
                                   void *buffer, int size, int *err)
 
 {
-  struct hostent *he;
+  struct hostent *he = NULL;
   *err = 0;
 #if defined(HAVE_FUNC_GETHOSTBYNAME_R_6)
   if (gethostbyname_r(hostname, h, (char*)buffer, size, &he, err))
@@ -268,7 +272,7 @@ struct hostent * wxGethostbyaddr_r(const char *addr_buf, int buf_size,
                                   int proto, struct hostent *h,
                                   void *buffer, int size, int *err)
 {
-  struct hostent *he;
+  struct hostent *he = NULL;
   *err = 0;
 #if defined(HAVE_FUNC_GETHOSTBYNAME_R_6)
   if (gethostbyaddr_r(addr_buf, buf_size, proto, h,
@@ -299,7 +303,7 @@ struct hostent * wxGethostbyaddr_r(const char *addr_buf, int buf_size,
   return he;
 }
 
-#if defined(HAVE_GETHOSTBYNAME)
+#if defined(HAVE_GETSERVBYNAME)
 static struct servent * deepCopyServent(struct servent *s,
                                        const struct servent *se,
                                        char *buffer, int size)
@@ -338,7 +342,7 @@ static struct servent * deepCopyServent(struct servent *s,
 struct servent *wxGetservbyname_r(const char *port, const char *protocol,
                                  struct servent *serv, void *buffer, int size)
 {
-  struct servent *se;
+  struct servent *se = NULL;
 #if defined(HAVE_FUNC_GETSERVBYNAME_R_6)
   if (getservbyname_r(port, protocol, serv, (char*)buffer, size, &se))
     se = NULL;
@@ -691,7 +695,12 @@ GSocketError GSocket::SetServer()
      state after being previously closed.
    */
   if (m_reusable)
+  {
     setsockopt(m_fd, SOL_SOCKET, SO_REUSEADDR, (const char*)&arg, sizeof(u_long));
+#ifdef SO_REUSEPORT
+    setsockopt(m_fd, SOL_SOCKET, SO_REUSEPORT, (const char*)&arg, sizeof(u_long));
+#endif
+  }
 
   /* Bind to the local address,
    * retrieve the actual address bound,
@@ -890,6 +899,21 @@ GSocketError GSocket::Connect(GSocketStream stream)
   ioctl(m_fd, FIONBIO, &arg);
 #endif
 
+  // If the reuse flag is set, use the applicable socket reuse flags(s)
+  if (m_reusable)
+  {
+    setsockopt(m_fd, SOL_SOCKET, SO_REUSEADDR, (const char*)&arg, sizeof(u_long));
+#ifdef SO_REUSEPORT
+    setsockopt(m_fd, SOL_SOCKET, SO_REUSEPORT, (const char*)&arg, sizeof(u_long));
+#endif
+  }
+
+  // If a local address has been set, then we need to bind to it before calling connect
+  if (m_local && m_local->m_addr)
+  {
+     bind(m_fd, m_local->m_addr, m_local->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);
 
@@ -1064,7 +1088,13 @@ int GSocket::Read(char *buffer, int size)
      * socket only if errno does _not_ indicate that there may be more data to read.
      */
     if (ret == 0)
+    {
       m_error = GSOCK_IOERR;
+      m_detected = GSOCK_LOST_FLAG;
+      Close();
+      // Signal an error for return
+      return -1;
+    }
     else if (ret == -1)
     {
       if ((errno == EWOULDBLOCK) || (errno == EAGAIN))
@@ -1193,37 +1223,28 @@ GSocketEventFlags GSocket::Select(GSocketEventFlags flags)
       return (result & flags);
     }
 
+    /* Check for exceptions and errors */
+    if (wxFD_ISSET(m_fd, &exceptfds))
+    {
+      m_establishing = false;
+      m_detected = GSOCK_LOST_FLAG;
+
+      /* LOST event: Abort any further processing */
+      return (GSOCK_LOST_FLAG & flags);
+    }
+
     /* Check for readability */
     if (wxFD_ISSET(m_fd, &readfds))
     {
-      char c;
+      result |= GSOCK_INPUT_FLAG;
 
-      int num = recv(m_fd, &c, 1, MSG_PEEK | GSOCKET_MSG_NOSIGNAL);
-
-      if (num > 0)
+      if (m_server && m_stream)
       {
-        result |= GSOCK_INPUT_FLAG;
-      }
-      else
-      {
-        if (m_server && m_stream)
-        {
-          result |= GSOCK_CONNECTION_FLAG;
-          m_detected |= GSOCK_CONNECTION_FLAG;
-        }
-        /* If recv returned zero, then the connection is lost, and errno is not set.
-         * Otherwise, recv has returned an error (-1), in which case we have lost the
-         * socket only if errno does _not_ indicate that there may be more data to read.
-         */
-        else if (num == 0 ||
-                 (errno != EWOULDBLOCK) && (errno != EAGAIN) && (errno != EINTR))
-        {
-          m_detected = GSOCK_LOST_FLAG;
-          m_establishing = false;
-
-          /* LOST event: Abort any further processing */
-          return (GSOCK_LOST_FLAG & flags);
-        }
+        /* This is a TCP server socket that detected a connection.
+          While the INPUT_FLAG is also set, it doesn't matter on
+          this kind of  sockets, as we can only Accept() from them. */        
+        result |= GSOCK_CONNECTION_FLAG;
+        m_detected |= GSOCK_CONNECTION_FLAG;
       }
     }
 
@@ -1258,16 +1279,6 @@ GSocketEventFlags GSocket::Select(GSocketEventFlags flags)
       }
     }
 
-    /* Check for exceptions and errors (is this useful in Unices?) */
-    if (wxFD_ISSET(m_fd, &exceptfds))
-    {
-      m_establishing = false;
-      m_detected = GSOCK_LOST_FLAG;
-
-      /* LOST event: Abort any further processing */
-      return (GSOCK_LOST_FLAG & flags);
-    }
-
     return (result & flags);
 
   }