C++ comments in C files are fun but break the compilation (for the Nth time)

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

diff --git a/src/unix/gsocket.c b/src/unix/gsocket.c
index 55a198c16a71b9eef63d50e14e08a09b93dd992b..ad6dc22ce6a1d5ca028ecd6aa3bb15e57525933d 100644 (file)
--- a/src/unix/gsocket.c
+++ b/src/unix/gsocket.c
@@ -11,18 +11,23 @@
 #if wxUSE_SOCKETS
 
 #include <assert.h>
 #if wxUSE_SOCKETS
 
 #include <assert.h>

-#include <sys/ioctl.h>

 #include <sys/types.h>
 #include <sys/types.h>

-#ifdef vms
+#include <netdb.h>
+#include <sys/ioctl.h>
+#ifdef __VMS__

 #include <socket.h>
 #include <socket.h>

+struct sockaddr_un {
+       u_char  sun_len;                /* sockaddr len including null */
+       u_char  sun_family;             /* AF_UNIX */
+       char    sun_path[108];          /* path name (gag) */
+};

 #else
 #include <sys/socket.h>
 #else
 #include <sys/socket.h>

-#endif

 #include <sys/un.h>
 #include <sys/un.h>

+#endif

 #include <sys/time.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #include <sys/time.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>

-#include <netdb.h>

 #include <errno.h>
 
 #include <string.h>
 #include <errno.h>
 
 #include <string.h>


@@ -47,44 +52,30 @@
 
 #ifndef SOCKLEN_T
 
 
 #ifndef SOCKLEN_T
 

-#ifdef __GLIBC__
-#      if __GLIBC__ == 2
-#         define SOCKLEN_T socklen_t
-#      endif
+#ifdef VMS
+#  define SOCKLEN_T unsigned int

 #else
 #else

-#      define SOCKLEN_T int
+#  ifdef __GLIBC__
+#    if __GLIBC__ == 2
+#       define SOCKLEN_T socklen_t
+#    endif
+#  else
+#    define SOCKLEN_T int
+#  endif

 #endif
 
 #endif
 

-#endif
+#endif /* SOCKLEN_T */

 
 

-#define MASK_SIGNAL() \
-{ \
-  void (*old_handler)(int); \
-\
+#define MASK_SIGNAL()                       \
+{                                           \
+  void (*old_handler)(int);                 \
+                                            \

   old_handler = signal(SIGPIPE, SIG_IGN);
 
   old_handler = signal(SIGPIPE, SIG_IGN);
 

-#define UNMASK_SIGNAL() \
-  signal(SIGPIPE, old_handler); \
+#define UNMASK_SIGNAL()                     \
+  signal(SIGPIPE, old_handler);             \

 }
 
 }
 

-#define ENABLE_TIMEOUT(socket) \
-{ \
-  struct itimerval old_ival, new_ival; \
-  void (*old_timer_sig)(int); \
-\
-  old_timer_sig = signal(SIGALRM, SIG_DFL); \
-  siginterrupt(SIGALRM, 1); \
-  new_ival.it_value.tv_sec = socket->m_timeout / 1000; \
-  new_ival.it_value.tv_usec = (socket->m_timeout % 1000) * 1000; \
-  new_ival.it_interval.tv_sec = 0; \
-  new_ival.it_interval.tv_usec = 0; \
-  setitimer(ITIMER_REAL, &new_ival, &old_ival);
-
-#define DISABLE_TIMEOUT(socket) \
-  signal(SIGALRM, old_timer_sig); \
-  siginterrupt(SIGALRM, 0); \
-  setitimer(ITIMER_REAL, &old_ival, NULL); \
-}

 
 /* Global initialisers */
 
 
 /* Global initialisers */
 


@@ -110,10 +101,11 @@ GSocket *GSocket_new()
     return NULL;
 
   socket->m_fd                  = -1;
     return NULL;
 
   socket->m_fd                  = -1;

-  for (i=0;i<GSOCK_MAX_EVENT;i++) {
+  for (i=0;i<GSOCK_MAX_EVENT;i++)
+  {

     socket->m_cbacks[i]         = NULL;
     socket->m_cbacks[i]         = NULL;

-    socket->m_iocalls[i]        = FALSE;

   }
   }

+  socket->m_detected            = 0;

   socket->m_local               = NULL;
   socket->m_peer                = NULL;
   socket->m_error               = GSOCK_NOERROR;
   socket->m_local               = NULL;
   socket->m_peer                = NULL;
   socket->m_error               = GSOCK_NOERROR;


@@ -160,15 +152,19 @@ void GSocket_Shutdown(GSocket *socket)
   assert(socket != NULL);
 
   /* If socket has been created, we shutdown it */
   assert(socket != NULL);
 
   /* If socket has been created, we shutdown it */

-  if (socket->m_fd != -1) {
+  if (socket->m_fd != -1)
+  {

     shutdown(socket->m_fd, 2);
     close(socket->m_fd);
     socket->m_fd = -1;
   }
 
   /* We also disable GUI callbacks */
     shutdown(socket->m_fd, 2);
     close(socket->m_fd);
     socket->m_fd = -1;
   }
 
   /* We also disable GUI callbacks */

-  for (evt=0;evt<GSOCK_MAX_EVENT;evt++)
-    _GSocket_Uninstall_Callback(socket, evt);
+  for (evt = 0; evt < GSOCK_MAX_EVENT; evt++)
+    socket->m_cbacks[evt] = NULL;
+
+  socket->m_detected = 0;
+  _GSocket_Disable_Events(socket);

 }
 
 /* Address handling */
 }
 
 /* Address handling */


@@ -216,7 +212,7 @@ GAddress *GSocket_GetLocal(GSocket *socket)
 {
   GAddress *address;
   struct sockaddr addr;
 {
   GAddress *address;
   struct sockaddr addr;

-  SOCKLEN_T size;
+  SOCKLEN_T size = sizeof(addr);

   GSocketError err;
 
   assert(socket != NULL);
   GSocketError err;
 
   assert(socket != NULL);


@@ -231,7 +227,7 @@ GAddress *GSocket_GetLocal(GSocket *socket)
 
   size = sizeof(addr);
 
 
   size = sizeof(addr);
 

-  if (getsockname(socket->m_fd, &addr, &size) < 0) {
+  if (getsockname(socket->m_fd, &addr, (SOCKLEN_T *) &size) < 0) {

     socket->m_error = GSOCK_IOERR;
     return NULL;
   }
     socket->m_error = GSOCK_IOERR;
     return NULL;
   }


@@ -241,9 +237,10 @@ GAddress *GSocket_GetLocal(GSocket *socket)
     socket->m_error = GSOCK_MEMERR;
     return NULL;
   }
     socket->m_error = GSOCK_MEMERR;
     return NULL;
   }

-  socket->m_error = _GAddress_translate_from(address, &addr, size);
-  if (socket->m_error != GSOCK_NOERROR) {
+  err = _GAddress_translate_from(address, &addr, size); /*xxx*/
+  if (err != GSOCK_NOERROR) {

     GAddress_destroy(address);
     GAddress_destroy(address);

+    socket->m_error = err;

     return NULL;
   }
 
     return NULL;
   }
 


@@ -272,6 +269,7 @@ GAddress *GSocket_GetPeer(GSocket *socket)
 GSocketError GSocket_SetServer(GSocket *sck)
 {
   int type;
 GSocketError GSocket_SetServer(GSocket *sck)
 {
   int type;

+  int arg = 1;

 
   assert(sck != NULL);
 
 
   assert(sck != NULL);
 


@@ -297,6 +295,9 @@ GSocketError GSocket_SetServer(GSocket *sck)
     return GSOCK_IOERR;
   }
 
     return GSOCK_IOERR;
   }
 

+  ioctl(sck->m_fd, FIONBIO, &arg);
+  _GSocket_Enable_Events(sck);
+

   /* Bind the socket to the LOCAL address */
   if (bind(sck->m_fd, sck->m_local->m_addr, sck->m_local->m_len) < 0) {
     close(sck->m_fd);
   /* Bind the socket to the LOCAL address */
   if (bind(sck->m_fd, sck->m_local->m_addr, sck->m_local->m_len) < 0) {
     close(sck->m_fd);


@@ -313,10 +314,6 @@ GSocketError GSocket_SetServer(GSocket *sck)
     return GSOCK_IOERR;
   }
 
     return GSOCK_IOERR;
   }
 

-  _GSocket_Configure_Callbacks(sck);
-  GSocket_SetNonBlocking(sck, sck->m_non_blocking);
-  GSocket_SetTimeout(sck, sck->m_timeout);
-

   return GSOCK_NOERROR;
 }
 
   return GSOCK_NOERROR;
 }
 


@@ -325,55 +322,77 @@ GSocketError GSocket_SetServer(GSocket *sck)
  */
 GSocket *GSocket_WaitConnection(GSocket *socket)
 {
  */
 GSocket *GSocket_WaitConnection(GSocket *socket)
 {

+  struct sockaddr from;
+  SOCKLEN_T fromlen = sizeof(from);

   GSocket *connection;
   GSocket *connection;

+  GSocketError err;
+  int arg = 1;

 
   assert(socket != NULL);
 
 
   assert(socket != NULL);
 

+  /* Reenable CONNECTION events */
+  _GSocket_Enable(socket, GSOCK_CONNECTION);
+

   /* If the socket has already been created, we exit immediately */
   /* If the socket has already been created, we exit immediately */

-  if (socket->m_fd == -1 || !socket->m_server) {
+  if (socket->m_fd == -1 || !socket->m_server)
+  {

     socket->m_error = GSOCK_INVSOCK;
     return NULL;
   }
 
     socket->m_error = GSOCK_INVSOCK;
     return NULL;
   }
 

-  /* Reenable GSOCK_CONNECTION event */
-  _GSocket_Enable(socket, GSOCK_CONNECTION);
-

   /* Create a GSocket object for the new connection */
   connection = GSocket_new();
   /* Create a GSocket object for the new connection */
   connection = GSocket_new();

-  if (!connection) {
-    connection->m_error = GSOCK_MEMERR;
+  if (!connection)
+  {
+    socket->m_error = GSOCK_MEMERR;

     return NULL;
   }
 
   /* Accept the incoming connection */
     return NULL;
   }
 
   /* Accept the incoming connection */

-  ENABLE_TIMEOUT(connection);
-  connection->m_fd = accept(socket->m_fd, NULL, NULL);
-  DISABLE_TIMEOUT(connection);
-  if (connection->m_fd == -1) {
+  if (_GSocket_Input_Timeout(socket) == GSOCK_TIMEDOUT)
+  {
+    GSocket_destroy(connection);
+    /* socket->m_error set by _GSocket_Input_Timeout */
+    return NULL;
+  }
+
+  connection->m_fd = accept(socket->m_fd, &from, (SOCKLEN_T *) &fromlen);
+
+  if (connection->m_fd == -1)
+  {
+    if (errno == EWOULDBLOCK)
+      socket->m_error = GSOCK_WOULDBLOCK;
+    else
+      socket->m_error = GSOCK_IOERR;
+

     GSocket_destroy(connection);
     GSocket_destroy(connection);

-    switch(errno) {
-    case EINTR:
-    case ETIMEDOUT:
-      connection->m_error = GSOCK_TIMEDOUT;
-      break;
-    case EWOULDBLOCK:
-      connection->m_error = GSOCK_WOULDBLOCK;
-      break;
-    default:
-      connection->m_error = GSOCK_IOERR;
-      break;
-    }

     return NULL;
   }
 
   /* Initialize all fields */
     return NULL;
   }
 
   /* Initialize all fields */

-  connection->m_stream   = TRUE;

   connection->m_server   = FALSE;
   connection->m_server   = FALSE;

+  connection->m_stream   = TRUE;

   connection->m_oriented = TRUE;
 
   connection->m_oriented = TRUE;
 

-  _GSocket_Configure_Callbacks(connection);
-  GSocket_SetNonBlocking(connection, connection->m_non_blocking);
-  GSocket_SetTimeout(connection, connection->m_timeout);
+  /* Setup the peer address field */ /*xxx*/
+  connection->m_peer = GAddress_new();
+  if (!connection->m_peer)
+  {
+    GSocket_destroy(connection);
+    socket->m_error = GSOCK_MEMERR;
+    return NULL;
+  }
+  err = _GAddress_translate_from(connection->m_peer, &from, fromlen);
+  if (err != GSOCK_NOERROR)
+  {
+    GAddress_destroy(connection->m_peer);
+    GSocket_destroy(connection);
+    socket->m_error = err;
+    return NULL;
+  }
+
+  ioctl(connection->m_fd, FIONBIO, &arg);
+  _GSocket_Enable_Events(connection);

 
   return connection;
 }
 
   return connection;
 }


@@ -382,6 +401,8 @@ GSocket *GSocket_WaitConnection(GSocket *socket)
 
 GSocketError GSocket_SetNonOriented(GSocket *sck)
 {
 
 GSocketError GSocket_SetNonOriented(GSocket *sck)
 {

+  int arg = 1;
+

   assert(sck != NULL);
 
   if (sck->m_fd != -1) {
   assert(sck != NULL);
 
   if (sck->m_fd != -1) {


@@ -406,6 +427,9 @@ GSocketError GSocket_SetNonOriented(GSocket *sck)
     return GSOCK_IOERR;
   }
 
     return GSOCK_IOERR;
   }
 

+  ioctl(sck->m_fd, FIONBIO, &arg);
+  _GSocket_Enable_Events(sck);
+

   /* Bind it to the LOCAL address */
   if (bind(sck->m_fd, sck->m_local->m_addr, sck->m_local->m_len) < 0) {
     close(sck->m_fd);
   /* Bind it to the LOCAL address */
   if (bind(sck->m_fd, sck->m_local->m_addr, sck->m_local->m_len) < 0) {
     close(sck->m_fd);


@@ -414,10 +438,6 @@ GSocketError GSocket_SetNonOriented(GSocket *sck)
     return GSOCK_IOERR;
   }
 
     return GSOCK_IOERR;
   }
 

-  _GSocket_Configure_Callbacks(sck);
-  GSocket_SetNonBlocking(sck, sck->m_non_blocking);
-  GSocket_SetTimeout(sck, sck->m_timeout);
-

   return GSOCK_NOERROR;
 }
 
   return GSOCK_NOERROR;
 }
 


@@ -434,23 +454,31 @@ GSocketError GSocket_SetNonOriented(GSocket *sck)
  */
 GSocketError GSocket_Connect(GSocket *sck, GSocketStream stream)
 {
  */
 GSocketError GSocket_Connect(GSocket *sck, GSocketStream stream)
 {

-  int type, err;
+  int type, err, ret;
+  int arg = 1;

 
   assert(sck != NULL);
 
 
   assert(sck != NULL);
 

-  if (sck->m_fd != -1) {
+  /* Enable CONNECTION events (needed for nonblocking connections) */
+  _GSocket_Enable(sck, GSOCK_CONNECTION);
+
+  if (sck->m_fd != -1)
+  {

     sck->m_error = GSOCK_INVSOCK;
     return GSOCK_INVSOCK;
   }
 
     sck->m_error = GSOCK_INVSOCK;
     return GSOCK_INVSOCK;
   }
 

-  if (!sck->m_peer) {
+  if (!sck->m_peer)
+  {

     sck->m_error = GSOCK_INVADDR;
     return GSOCK_INVADDR;
   }
 
   /* Test whether we want the socket to be a stream (e.g. TCP) */
     sck->m_error = GSOCK_INVADDR;
     return GSOCK_INVADDR;
   }
 
   /* Test whether we want the socket to be a stream (e.g. TCP) */

-  sck->m_stream = (stream == GSOCK_STREAMED);
+  sck->m_stream   = (stream == GSOCK_STREAMED);

   sck->m_oriented = TRUE;
   sck->m_oriented = TRUE;

+  sck->m_server   = FALSE;
+  sck->m_establishing = FALSE;

 
   if (sck->m_stream)
     type = SOCK_STREAM;
 
   if (sck->m_stream)
     type = SOCK_STREAM;


@@ -465,35 +493,61 @@ GSocketError GSocket_Connect(GSocket *sck, GSocketStream stream)
     return GSOCK_IOERR;
   }
 
     return GSOCK_IOERR;
   }
 

-  _GSocket_Configure_Callbacks(sck);
-  GSocket_SetNonBlocking(sck, sck->m_non_blocking);
-  GSocket_SetTimeout(sck, sck->m_timeout);
+  ioctl(sck->m_fd, FIONBIO, &arg);
+  _GSocket_Enable_Events(sck);

 
   /* Connect it to the PEER address */
 
   /* Connect it to the PEER address */

-  ENABLE_TIMEOUT(sck);
-  err = connect(sck->m_fd, sck->m_peer->m_addr, sck->m_peer->m_len);
-  DISABLE_TIMEOUT(sck);
+  ret = connect(sck->m_fd, sck->m_peer->m_addr, sck->m_peer->m_len);
+
+  if (ret == -1)
+  {
+    err = errno;
+
+    /* If connect failed with EINPROGRESS and the GSocket object
+     * is in blocking mode, we select() for the specified timeout
+     * checking for writability to see if the connection request
+     * completes.
+     */
+    if ((err == EINPROGRESS) && (!sck->m_non_blocking))
+    {
+      if (_GSocket_Output_Timeout(sck) == GSOCK_TIMEDOUT)
+      {
+        close(sck->m_fd);
+        sck->m_fd = -1;
+        /* sck->m_error is set in _GSocket_Output_Timeout */
+        return GSOCK_TIMEDOUT;
+      }
+      else
+      {
+        return GSOCK_NOERROR;
+      }
+    }
+
+    /* If connect failed with EINPROGRESS and the GSocket object
+     * is set to nonblocking, we set m_error to GSOCK_WOULDBLOCK
+     * (and return GSOCK_WOULDBLOCK) but we don't close the socket;
+     * this way if the connection completes, a GSOCK_CONNECTION
+     * event will be generated, if enabled.
+     */
+    if ((err == EINPROGRESS) && (sck->m_non_blocking))
+    {
+      sck->m_error = GSOCK_WOULDBLOCK;
+      sck->m_establishing = TRUE;
+
+      return GSOCK_WOULDBLOCK;
+    }

 
 

-  if (err != 0 && errno != EINPROGRESS) {
+    /* If connect failed with an error other than EINPROGRESS,
+     * then the call to GSocket_Connect has failed.
+     */

     close(sck->m_fd);
     sck->m_fd = -1;
     close(sck->m_fd);
     sck->m_fd = -1;

-    switch (errno) {
-    case EINTR:
-    case ETIMEDOUT:
-      sck->m_error = GSOCK_TIMEDOUT;
-      break;
-    default:
-      sck->m_error = GSOCK_IOERR;
-      break;
-    }
+    sck->m_error = GSOCK_IOERR;
+

     return GSOCK_IOERR;
   }
     return GSOCK_IOERR;
   }

-  
-  /* It is not a server */
-  sck->m_server       = FALSE;
-  sck->m_establishing = (errno == EINPROGRESS);

 
 

-  return (sck->m_establishing) ? GSOCK_WOULDBLOCK : GSOCK_NOERROR;
+  return GSOCK_NOERROR;

 }
 
 /* Generic IO */
 }
 
 /* Generic IO */


@@ -501,38 +555,75 @@ GSocketError GSocket_Connect(GSocket *sck, GSocketStream stream)
 /* Like recv(), send(), ... */
 int GSocket_Read(GSocket *socket, char *buffer, int size)
 {
 /* Like recv(), send(), ... */
 int GSocket_Read(GSocket *socket, char *buffer, int size)
 {

+  int ret;
+

   assert(socket != NULL);
 
   assert(socket != NULL);
 

-  if (socket->m_fd == -1 || socket->m_server) {
+  /* Reenable INPUT events */
+  _GSocket_Enable(socket, GSOCK_INPUT);
+
+  if (socket->m_fd == -1 || socket->m_server)
+  {

     socket->m_error = GSOCK_INVSOCK;
     return -1;
   }
 
     socket->m_error = GSOCK_INVSOCK;
     return -1;
   }
 

-  /* Reenable GSOCK_INPUT event */
-  _GSocket_Enable(socket, GSOCK_INPUT);
+  if (_GSocket_Input_Timeout(socket) == GSOCK_TIMEDOUT)
+    return -1;

 
   if (socket->m_stream)
 
   if (socket->m_stream)

-    return _GSocket_Recv_Stream(socket, buffer, size);
+    ret = _GSocket_Recv_Stream(socket, buffer, size);

   else
   else

-    return _GSocket_Recv_Dgram(socket, buffer, size);
+    ret = _GSocket_Recv_Dgram(socket, buffer, size);
+    
+  if (ret == -1)
+  {
+    if (errno == EWOULDBLOCK)
+      socket->m_error = GSOCK_WOULDBLOCK;
+    else
+      socket->m_error = GSOCK_IOERR;
+  }
+  
+  return ret;

 }
 
 int GSocket_Write(GSocket *socket, const char *buffer,
                  int size)
 {
 }
 
 int GSocket_Write(GSocket *socket, const char *buffer,
                  int size)
 {

+  int ret;
+

   assert(socket != NULL);
 
   assert(socket != NULL);
 

-  if (socket->m_fd == -1 || socket->m_server) {
+  if (socket->m_fd == -1 || socket->m_server)
+  {

     socket->m_error = GSOCK_INVSOCK;
     return -1;
   }
 
     socket->m_error = GSOCK_INVSOCK;
     return -1;
   }
 

-  _GSocket_Enable(socket, GSOCK_OUTPUT);
+  if (_GSocket_Output_Timeout(socket) == GSOCK_TIMEDOUT)
+    return -1;

 
   if (socket->m_stream)
 
   if (socket->m_stream)

-    return _GSocket_Send_Stream(socket, buffer, size);
+    ret = _GSocket_Send_Stream(socket, buffer, size);

   else
   else

-    return _GSocket_Send_Dgram(socket, buffer, size);
+    ret = _GSocket_Send_Dgram(socket, buffer, size);
+    
+  if (ret == -1)
+  {
+    if (errno == EWOULDBLOCK)
+      socket->m_error = GSOCK_WOULDBLOCK;
+    else
+      socket->m_error = GSOCK_IOERR;
+
+    /* Only reenable OUTPUT events after an error (just like WSAAsyncSelect
+     * in MSW). Once the first OUTPUT event is received, users can assume
+     * that the socket is writable until a read operation fails. Only then
+     * will further OUTPUT events be posted.
+     */
+    _GSocket_Enable(socket, GSOCK_OUTPUT);
+  }
+  
+  return ret;

 }
 
 /* GSocket_Select:
 }
 
 /* GSocket_Select:


@@ -544,62 +635,9 @@ int GSocket_Write(GSocket *socket, const char *buffer,
  */
 GSocketEventFlags GSocket_Select(GSocket *socket, GSocketEventFlags flags)
 {
  */
 GSocketEventFlags GSocket_Select(GSocket *socket, GSocketEventFlags flags)
 {

-  fd_set readfds, writefds, exceptfds;
-  struct timeval tv;
-  GSocketEventFlags mask;
-  int error, len;
-

   assert(socket != NULL);
 
   assert(socket != NULL);
 

-  if (socket->m_fd == -1)
-  {
-    socket->m_error = GSOCK_INVSOCK;
-    return FALSE;
-  }
-
-  FD_ZERO(&readfds);
-  FD_ZERO(&writefds);
-  FD_ZERO(&exceptfds);
-  FD_SET(socket->m_fd, &readfds);
-  FD_SET(socket->m_fd, &writefds);
-  FD_SET(socket->m_fd, &exceptfds);
-
-  tv.tv_sec = 0;
-  tv.tv_usec = 0;
-  select(socket->m_fd + 1, &readfds, &writefds, &exceptfds, &tv);
-
-  mask = 0;
-
-  /* If select() says that the socket is readable, then we have
-   * no way to distinguish if that means 'data available' (to
-   * recv) or 'incoming connection' (to accept). The same goes
-   * for writability: we cannot distinguish between 'you can
-   * send data' and 'connection request completed'. So we will
-   * assume the following: if the flag was set upon entry,
-   * that means that the event was possible.
-   */
-  if (FD_ISSET(socket->m_fd, &readfds))
-  {
-    mask |= (flags & GSOCK_CONNECTION_FLAG);
-    mask |= (flags & GSOCK_INPUT_FLAG);
-  }
-  if (FD_ISSET(socket->m_fd, &writefds))
-  {
-    if (socket->m_establishing)
-    {
-      getsockopt(socket->m_fd, SOL_SOCKET, SO_ERROR, &error, &len);
-
-      if (error)
-        mask |= (flags & GSOCK_LOST_FLAG);
-      else
-        mask |= (flags & GSOCK_CONNECTION_FLAG);
-    }
-    mask |= (flags & GSOCK_OUTPUT_FLAG);
-  }
-  if (FD_ISSET(socket->m_fd, &exceptfds))
-    mask |= (flags & GSOCK_LOST_FLAG);
-
-  return mask;
+  return (flags & socket->m_detected);

 }
 
 /* Flags */
 }
 
 /* Flags */


@@ -613,9 +651,6 @@ void GSocket_SetNonBlocking(GSocket *socket, bool non_block)
   assert(socket != NULL);
 
   socket->m_non_blocking = non_block;
   assert(socket != NULL);
 
   socket->m_non_blocking = non_block;

-
-  if (socket->m_fd != -1)
-    ioctl(socket->m_fd, FIONBIO, &non_block);

 }
 
 /* GSocket_SetTimeout:
 }
 
 /* GSocket_SetTimeout:


@@ -670,17 +705,16 @@ void GSocket_SetCallback(GSocket *socket, GSocketEventFlags flags,
 {
   int count;
 
 {
   int count;
 

-  assert (socket != NULL);
+  assert(socket != NULL);

 
 

-  for (count=0;count<GSOCK_MAX_EVENT;count++) {
-    /* We test each flag and, if it is enabled, we enable the corresponding
-       event */
-    if ((flags & (1 << count)) != 0) {
+  for (count = 0; count < GSOCK_MAX_EVENT; count++)
+  {
+    if ((flags & (1 << count)) != 0)
+    {

       socket->m_cbacks[count] = callback;
       socket->m_data[count] = cdata;
     }
   }
       socket->m_cbacks[count] = callback;
       socket->m_data[count] = cdata;
     }
   }

-  _GSocket_Configure_Callbacks(socket);

 }
 
 /* GSocket_UnsetCallback:
 }
 
 /* GSocket_UnsetCallback:


@@ -693,44 +727,85 @@ void GSocket_UnsetCallback(GSocket *socket, GSocketEventFlags flags)
 
   assert(socket != NULL);
 
 
   assert(socket != NULL);
 

-  for (count=0;count<GSOCK_MAX_EVENT;count++) {
-    if ((flags & (1 << count)) != 0) {
+  for (count = 0; count < GSOCK_MAX_EVENT; count++)
+  {
+    if ((flags & (1 << count)) != 0)
+    {

       socket->m_cbacks[count] = NULL;
       socket->m_cbacks[count] = NULL;

+      socket->m_data[count] = NULL;

     }
   }
     }
   }

-  _GSocket_Configure_Callbacks(socket);

 }
 
 }
 

-#define CALL_CALLBACK(socket, event)                                \
-if (socket->m_iocalls[event] && socket->m_cbacks[event]) {          \
-  _GSocket_Disable(socket, event);                                  \
-  socket->m_cbacks[event](socket, event, socket->m_data[event]);    \
+#define CALL_CALLBACK(socket, event) {                                  \
+  _GSocket_Disable(socket, event);                                      \
+  if (socket->m_cbacks[event])                                          \
+    socket->m_cbacks[event](socket, event, socket->m_data[event]);      \

 }
 
 }
 

+

 void _GSocket_Enable(GSocket *socket, GSocketEvent event)
 {
 void _GSocket_Enable(GSocket *socket, GSocketEvent event)
 {

-  socket->m_iocalls[event] = TRUE;
-  if (socket->m_cbacks[event])
-    _GSocket_Install_Callback(socket, event);
+  socket->m_detected &= ~(1 << event);
+  _GSocket_Install_Callback(socket, event);

 }
 
 void _GSocket_Disable(GSocket *socket, GSocketEvent event)
 {
 }
 
 void _GSocket_Disable(GSocket *socket, GSocketEvent event)
 {

-  socket->m_iocalls[event] = FALSE;
-  if (socket->m_cbacks[event])
-    _GSocket_Uninstall_Callback(socket, event);
+  socket->m_detected |= (1 << event);
+  _GSocket_Uninstall_Callback(socket, event);

 }
 
 }
 

-void _GSocket_Configure_Callbacks(GSocket *socket)
+/* _GSocket_Input_Timeout:
+ *  For blocking sockets, wait until data is available or
+ *  until timeout ellapses.
+ */
+GSocketError _GSocket_Input_Timeout(GSocket *socket)

 {
 {

-  int count;
-  for (count=0;count<GSOCK_MAX_EVENT;count++) {
-    if ((socket->m_cbacks[count]) != NULL) {
-      _GSocket_Enable(socket, count);
-    } else {
-      _GSocket_Disable(socket, count);
+  struct timeval tv;
+  fd_set readfds;
+
+  /* Linux select() will overwrite the struct on return */
+  tv.tv_sec  = (socket->m_timeout / 1000);
+  tv.tv_usec = (socket->m_timeout % 1000) * 1000;
+
+  if (!socket->m_non_blocking)
+  {
+    FD_ZERO(&readfds);
+    FD_SET(socket->m_fd, &readfds);
+    if (select(socket->m_fd + 1, &readfds, NULL, NULL, &tv) == 0)
+    {
+      socket->m_error = GSOCK_TIMEDOUT;
+      return GSOCK_TIMEDOUT;

     }
   }
     }
   }

+  return GSOCK_NOERROR;
+}
+
+/* _GSocket_Output_Timeout:
+ *  For blocking sockets, wait until data can be sent without
+ *  blocking or until timeout ellapses.
+ */
+GSocketError _GSocket_Output_Timeout(GSocket *socket)
+{
+  struct timeval tv;
+  fd_set writefds;
+
+  /* Linux select() will overwrite the struct on return */
+  tv.tv_sec  = (socket->m_timeout / 1000);
+  tv.tv_usec = (socket->m_timeout % 1000) * 1000;
+
+  if (!socket->m_non_blocking)
+  {
+    FD_ZERO(&writefds);
+    FD_SET(socket->m_fd, &writefds);
+    if (select(socket->m_fd + 1, NULL, &writefds, NULL, &tv) == 0)
+    {
+      socket->m_error = GSOCK_TIMEDOUT;
+      return GSOCK_TIMEDOUT;
+    }
+  }
+  return GSOCK_NOERROR;

 }
 
 int _GSocket_Recv_Stream(GSocket *socket, char *buffer, int size)
 }
 
 int _GSocket_Recv_Stream(GSocket *socket, char *buffer, int size)


@@ -738,64 +813,41 @@ int _GSocket_Recv_Stream(GSocket *socket, char *buffer, int size)
   int ret;
 
   MASK_SIGNAL();
   int ret;
 
   MASK_SIGNAL();

-  ENABLE_TIMEOUT(socket);

   ret = recv(socket->m_fd, buffer, size, 0);
   ret = recv(socket->m_fd, buffer, size, 0);

-  DISABLE_TIMEOUT(socket);

   UNMASK_SIGNAL();
 
   UNMASK_SIGNAL();
 

-  if (ret == -1 &&
-      errno != ETIMEDOUT && errno != EWOULDBLOCK && errno != EINTR) {
-      socket->m_error = GSOCK_IOERR;
-      return -1;
-  }
-  if (errno == EWOULDBLOCK) {
-    socket->m_error = GSOCK_WOULDBLOCK;
-    return -1;
-  }
-  if (errno == ETIMEDOUT || errno == EINTR) {
-    socket->m_error = GSOCK_TIMEDOUT;
-    return -1;
-  }

   return ret;
 }
 
 int _GSocket_Recv_Dgram(GSocket *socket, char *buffer, int size)
 {
   struct sockaddr from;
   return ret;
 }
 
 int _GSocket_Recv_Dgram(GSocket *socket, char *buffer, int size)
 {
   struct sockaddr from;

-  SOCKLEN_T fromlen;
+  SOCKLEN_T fromlen = sizeof(from);

   int ret;
   GSocketError err;
 
   fromlen = sizeof(from);
 
   MASK_SIGNAL();
   int ret;
   GSocketError err;
 
   fromlen = sizeof(from);
 
   MASK_SIGNAL();

-  ENABLE_TIMEOUT(socket);
-  ret = recvfrom(socket->m_fd, buffer, size, 0, &from, &fromlen);
-  DISABLE_TIMEOUT(socket);
+  ret = recvfrom(socket->m_fd, buffer, size, 0, &from, (SOCKLEN_T *) &fromlen);

   UNMASK_SIGNAL();
   UNMASK_SIGNAL();

-  if (ret == -1 && errno != EWOULDBLOCK && errno != EINTR && errno != ETIMEDOUT) {
-    socket->m_error = GSOCK_IOERR;
-    return -1;
-  }
-  if (errno == EWOULDBLOCK) {
-    socket->m_error = GSOCK_WOULDBLOCK;
-    return -1;
-  }
-  if (errno == ETIMEDOUT || errno == EINTR) {
-    socket->m_error = GSOCK_TIMEDOUT;
+
+  if (ret == -1)

     return -1;
     return -1;

-  }

 
   /* Translate a system address into a GSocket address */
 
   /* Translate a system address into a GSocket address */

-  if (!socket->m_peer) {
+  if (!socket->m_peer)
+  {

     socket->m_peer = GAddress_new();
     socket->m_peer = GAddress_new();

-    if (!socket->m_peer) {
+    if (!socket->m_peer)
+    {

       socket->m_error = GSOCK_MEMERR;
       return -1;
     }
   }
   err = _GAddress_translate_from(socket->m_peer, &from, fromlen);
       socket->m_error = GSOCK_MEMERR;
       return -1;
     }
   }
   err = _GAddress_translate_from(socket->m_peer, &from, fromlen);

-  if (err != GSOCK_NOERROR) {
+  if (err != GSOCK_NOERROR)
+  {

     GAddress_destroy(socket->m_peer);
     socket->m_peer  = NULL;
     socket->m_error = err;
     GAddress_destroy(socket->m_peer);
     socket->m_peer  = NULL;
     socket->m_error = err;


@@ -808,25 +860,11 @@ int _GSocket_Recv_Dgram(GSocket *socket, char *buffer, int size)
 int _GSocket_Send_Stream(GSocket *socket, const char *buffer, int size)
 {
   int ret;
 int _GSocket_Send_Stream(GSocket *socket, const char *buffer, int size)
 {
   int ret;

-  GSocketError err;

 
   MASK_SIGNAL();
 
   MASK_SIGNAL();

-  ENABLE_TIMEOUT(socket);

   ret = send(socket->m_fd, buffer, size, 0);
   ret = send(socket->m_fd, buffer, size, 0);

-  DISABLE_TIMEOUT(socket);

   UNMASK_SIGNAL();
   UNMASK_SIGNAL();

-  if (ret == -1 && errno != EWOULDBLOCK && errno != ETIMEDOUT && errno != EINTR) {
-    socket->m_error = GSOCK_IOERR;
-    return -1;
-  }
-  if (errno == EWOULDBLOCK) {
-    socket->m_error = GSOCK_WOULDBLOCK;
-    return -1;
-  }
-  if (errno == ETIMEDOUT || errno == EINTR) {
-    socket->m_error = GSOCK_TIMEDOUT;
-    return -1;
-  }
+

   return ret;
 }
 
   return ret;
 }
 


@@ -848,23 +886,12 @@ int _GSocket_Send_Dgram(GSocket *socket, const char *buffer, int size)
   }
 
   MASK_SIGNAL();
   }
 
   MASK_SIGNAL();

-  ENABLE_TIMEOUT(socket);

   ret = sendto(socket->m_fd, buffer, size, 0, addr, len);
   ret = sendto(socket->m_fd, buffer, size, 0, addr, len);

-  DISABLE_TIMEOUT(socket);

   UNMASK_SIGNAL();
 
   /* Frees memory allocated from _GAddress_translate_to */
   free(addr);
 
   UNMASK_SIGNAL();
 
   /* Frees memory allocated from _GAddress_translate_to */
   free(addr);
 

-  if (ret == -1 && errno != EWOULDBLOCK) {
-    socket->m_error = GSOCK_IOERR;
-    return -1;
-  }
-  if (errno == EWOULDBLOCK) {
-    socket->m_error = GSOCK_WOULDBLOCK;
-    return -1;
-  }
-

   return ret;
 }
 
   return ret;
 }
 


@@ -873,17 +900,22 @@ void _GSocket_Detected_Read(GSocket *socket)
   char c;
   int ret;
 
   char c;
   int ret;
 

-  if (socket->m_stream) {
+  if (socket->m_stream)
+  {

     ret = recv(socket->m_fd, &c, 1, MSG_PEEK);
 
     ret = recv(socket->m_fd, &c, 1, MSG_PEEK);
 

-    if (ret < 0 && socket->m_server) {
+    if (ret < 0 && socket->m_server)
+    {

       CALL_CALLBACK(socket, GSOCK_CONNECTION);
       return;
     }
 
       CALL_CALLBACK(socket, GSOCK_CONNECTION);
       return;
     }
 

-    if (ret > 0) {
+    if (ret > 0)
+    {

       CALL_CALLBACK(socket, GSOCK_INPUT);
       CALL_CALLBACK(socket, GSOCK_INPUT);

-    } else {
+    }
+    else
+    {

       CALL_CALLBACK(socket, GSOCK_LOST);
     }
   }
       CALL_CALLBACK(socket, GSOCK_LOST);
     }
   }


@@ -891,23 +923,34 @@ void _GSocket_Detected_Read(GSocket *socket)
 
 void _GSocket_Detected_Write(GSocket *socket)
 {
 
 void _GSocket_Detected_Write(GSocket *socket)
 {

-  if (socket->m_establishing) {
+  if (socket->m_establishing && !socket->m_server)
+  {

     int error, len;
 
     int error, len;
 

-    len = sizeof(error);
-

     socket->m_establishing = FALSE;
     socket->m_establishing = FALSE;

-    getsockopt(socket->m_fd, SOL_SOCKET, SO_ERROR, &error, &len);

 
 

-    if (error) {
-      socket->m_error = GSOCK_IOERR;
-      GSocket_Shutdown(socket);
-    } else
-      socket->m_error = GSOCK_NOERROR;
+    len = sizeof(error);
+    getsockopt(socket->m_fd, SOL_SOCKET, SO_ERROR, (void*) &error,
+           (SOCKLEN_T *) &len);

 
 

-    CALL_CALLBACK(socket, GSOCK_CONNECTION);
-  } else
+    if (error)
+    {
+      CALL_CALLBACK(socket, GSOCK_LOST);
+    }
+    else
+    {
+      CALL_CALLBACK(socket, GSOCK_CONNECTION);
+      /* We have to fire this event by hand because CONNECTION (for clients)
+       * and OUTPUT are internally the same and we just disabled CONNECTION
+       * events with the above macro.
+       */
+      CALL_CALLBACK(socket, GSOCK_OUTPUT);
+    }
+  }
+  else
+  {

     CALL_CALLBACK(socket, GSOCK_OUTPUT);
     CALL_CALLBACK(socket, GSOCK_OUTPUT);

+  }

 }
 
 /*
 }
 
 /*


@@ -1056,18 +1099,22 @@ GSocketError _GAddress_translate_to(GAddress *address,
 
 GSocketError _GAddress_Init_INET(GAddress *address)
 {
 
 GSocketError _GAddress_Init_INET(GAddress *address)
 {

-  address->m_addr = (struct sockaddr *)malloc(sizeof(struct sockaddr_in));
-  if (address->m_addr == NULL) {
+  address->m_len  = sizeof(struct sockaddr_in);
+  address->m_addr = (struct sockaddr *)malloc(address->m_len);
+  if (address->m_addr == NULL)
+  {

     address->m_error = GSOCK_MEMERR;
     return GSOCK_MEMERR;
   }
 
     address->m_error = GSOCK_MEMERR;
     return GSOCK_MEMERR;
   }
 

-  address->m_len  = sizeof(struct sockaddr_in);
-

   address->m_family = GSOCK_INET;
   address->m_realfamily = PF_INET;
   ((struct sockaddr_in *)address->m_addr)->sin_family = AF_INET;
   address->m_family = GSOCK_INET;
   address->m_realfamily = PF_INET;
   ((struct sockaddr_in *)address->m_addr)->sin_family = AF_INET;

-  ((struct sockaddr_in *)address->m_addr)->sin_addr.s_addr   = INADDR_ANY;
+  /*
+     INADDR_BROADCAST is identical to INADDR_NONE which is not defined
+     on all unices. INADDR_BROADCAST should be fine to indicate an error.
+   */
+  ((struct sockaddr_in *)address->m_addr)->sin_addr.s_addr = INADDR_BROADCAST;

 
   return GSOCK_NOERROR;
 }
 
   return GSOCK_NOERROR;
 }


@@ -1085,18 +1132,22 @@ GSocketError GAddress_INET_SetHostName(GAddress *address, const char *hostname)
 
   /* If it is a numeric host name, convert it now */
 #if defined(HAVE_INET_ATON)
 
   /* If it is a numeric host name, convert it now */
 #if defined(HAVE_INET_ATON)

-  if (inet_aton(hostname, addr) == 0) {
+  if (inet_aton(hostname, addr) == 0)
+  {

 #elif defined(HAVE_INET_ADDR)
   /* Fix from Guillermo Rodriguez Garcia <guille@iies.es> */
 #elif defined(HAVE_INET_ADDR)
   /* Fix from Guillermo Rodriguez Garcia <guille@iies.es> */

-  if ( (addr->s_addr = inet_addr(hostname)) == -1 ) {
+  if ( (addr->s_addr = inet_addr(hostname)) == -1 )
+  {

 #else
   /* Use gethostbyname by default */
 #else
   /* Use gethostbyname by default */

-  if (1) {
+  if (1)
+  {

 #endif
     struct in_addr *array_addr;
 
     /* It is a real name, we solve it */
 #endif
     struct in_addr *array_addr;
 
     /* It is a real name, we solve it */

-    if ((he = gethostbyname(hostname)) == NULL) {
+    if ((he = gethostbyname(hostname)) == NULL)
+    {

       address->m_error = GSOCK_NOHOST;
       return GSOCK_NOHOST;
     }
       address->m_error = GSOCK_NOHOST;
       return GSOCK_NOHOST;
     }


@@ -1130,14 +1181,16 @@ GSocketError GAddress_INET_SetPortName(GAddress *address, const char *port,
   assert(address != NULL);
   CHECK_ADDRESS(address, INET, GSOCK_INVADDR);
 
   assert(address != NULL);
   CHECK_ADDRESS(address, INET, GSOCK_INVADDR);
 

-  if (!port) {
+  if (!port)
+  {

     address->m_error = GSOCK_INVPORT;
     return GSOCK_INVPORT;
   }
  
   se = getservbyname(port, protocol);
   if (!se) {
     address->m_error = GSOCK_INVPORT;
     return GSOCK_INVPORT;
   }
  
   se = getservbyname(port, protocol);
   if (!se) {

-    if (isdigit(port[0])) {
+    if (isdigit(port[0]))
+    {

       int port_int;
 
       port_int = atoi(port);
       int port_int;
 
       port_int = atoi(port);


@@ -1181,8 +1234,9 @@ GSocketError GAddress_INET_GetHostName(GAddress *address, char *hostname, size_t
   addr = (struct sockaddr_in *)address->m_addr;
   addr_buf = (char *)&(addr->sin_addr);
 
   addr = (struct sockaddr_in *)address->m_addr;
   addr_buf = (char *)&(addr->sin_addr);
 

-  he       = gethostbyaddr(addr_buf, sizeof(addr->sin_addr), AF_INET);
-  if (he == NULL) {
+  he = gethostbyaddr(addr_buf, sizeof(addr->sin_addr), AF_INET);
+  if (he == NULL)
+  {

     address->m_error = GSOCK_NOHOST;
     return GSOCK_NOHOST;
   }
     address->m_error = GSOCK_NOHOST;
     return GSOCK_NOHOST;
   }


@@ -1223,13 +1277,14 @@ unsigned short GAddress_INET_GetPort(GAddress *address)
 
 GSocketError _GAddress_Init_UNIX(GAddress *address)
 {
 
 GSocketError _GAddress_Init_UNIX(GAddress *address)
 {

+  address->m_len  = sizeof(struct sockaddr_un);

   address->m_addr = (struct sockaddr *)malloc(address->m_len);
   address->m_addr = (struct sockaddr *)malloc(address->m_len);

-  if (address->m_addr == NULL) {
+  if (address->m_addr == NULL)
+  {

     address->m_error = GSOCK_MEMERR;
     return GSOCK_MEMERR;
   }
 
     address->m_error = GSOCK_MEMERR;
     return GSOCK_MEMERR;
   }
 

-  address->m_len  = sizeof(struct sockaddr_un);

   address->m_family = GSOCK_UNIX;
   address->m_realfamily = PF_UNIX;
   ((struct sockaddr_un *)address->m_addr)->sun_family = AF_UNIX;
   address->m_family = GSOCK_UNIX;
   address->m_realfamily = PF_UNIX;
   ((struct sockaddr_un *)address->m_addr)->sun_family = AF_UNIX;


@@ -1268,3 +1323,4 @@ GSocketError GAddress_UNIX_GetPath(GAddress *address, char *path, size_t sbuf)
 
 #endif
   /* wxUSE_SOCKETS */
 
 #endif
   /* wxUSE_SOCKETS */

+