//... => /* ... */

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

diff --git a/src/unix/gsocket.c b/src/unix/gsocket.c
index cdc731c3b730ee206ab396dff6443ac63eec3804..55a198c16a71b9eef63d50e14e08a09b93dd992b 100644 (file)
--- a/src/unix/gsocket.c
+++ b/src/unix/gsocket.c
@@ -43,7 +43,7 @@
 #include <signal.h>
 
 #include "wx/gsocket.h"
 #include <signal.h>
 
 #include "wx/gsocket.h"

-#include "gsockunx.h"
+#include "wx/unix/gsockunx.h"

 
 #ifndef SOCKLEN_T
 
 
 #ifndef SOCKLEN_T
 


@@ -57,13 +57,34 @@
 
 #endif
 
 
 #endif
 

-#if !defined(__LINUX__) && !defined(__FREEBSD__)
-#   define CAN_USE_TIMEOUT
-#elif defined(__GLIBC__) && defined(__GLIBC_MINOR__)
-#   if (__GLIBC__ == 2) && (__GLIBC_MINOR__ == 1)
-#      define CAN_USE_TIMEOUT
-#   endif
-#endif
+#define MASK_SIGNAL() \
+{ \
+  void (*old_handler)(int); \
+\
+  old_handler = signal(SIGPIPE, SIG_IGN);
+
+#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 */
 


@@ -90,18 +111,19 @@ GSocket *GSocket_new()
 
   socket->m_fd                  = -1;
   for (i=0;i<GSOCK_MAX_EVENT;i++) {
 
   socket->m_fd                  = -1;
   for (i=0;i<GSOCK_MAX_EVENT;i++) {

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

     socket->m_iocalls[i]        = FALSE;
   }
   socket->m_local               = NULL;
   socket->m_peer                = NULL;
   socket->m_error               = GSOCK_NOERROR;
     socket->m_iocalls[i]        = FALSE;
   }
   socket->m_local               = NULL;
   socket->m_peer                = NULL;
   socket->m_error               = GSOCK_NOERROR;

-  socket->m_server             = FALSE;
-  socket->m_stream             = TRUE;
-  socket->m_gui_dependent      = NULL;
-  socket->m_blocking           = FALSE;
+  socket->m_server              = FALSE;
+  socket->m_stream              = TRUE;
+  socket->m_gui_dependent       = NULL;
+  socket->m_non_blocking        = FALSE;

   socket->m_timeout             = 10*60*1000;
   socket->m_timeout             = 10*60*1000;

-                                      // 10 minutes * 60 sec * 1000 millisec
+                                /* 10 minutes * 60 sec * 1000 millisec */
+  socket->m_establishing        = FALSE;

 
   /* We initialize the GUI specific entries here */
   _GSocket_GUI_Init(socket);
 
   /* We initialize the GUI specific entries here */
   _GSocket_GUI_Init(socket);


@@ -195,6 +217,7 @@ GAddress *GSocket_GetLocal(GSocket *socket)
   GAddress *address;
   struct sockaddr addr;
   SOCKLEN_T size;
   GAddress *address;
   struct sockaddr addr;
   SOCKLEN_T size;

+  GSocketError err;

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


@@ -218,7 +241,8 @@ GAddress *GSocket_GetLocal(GSocket *socket)
     socket->m_error = GSOCK_MEMERR;
     return NULL;
   }
     socket->m_error = GSOCK_MEMERR;
     return NULL;
   }

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

     GAddress_destroy(address);
     return NULL;
   }
     GAddress_destroy(address);
     return NULL;
   }


@@ -238,13 +262,13 @@ GAddress *GSocket_GetPeer(GSocket *socket)
 
 /* Server specific parts */
 
 
 /* Server specific parts */
 

-/*
-  GSocket_SetServer() setup the socket as a server. It uses the "Local" field
-  of GSocket. "Local" must be set by GSocket_SetLocal() before
-  GSocket_SetServer() is called. GSOCK_INVSOCK if socket has been initialized.
-  In case, you haven't yet defined the local address, it returns GSOCK_INVADDR.
-  In the other cases it returns GSOCK_IOERR.
-*/
+/* GSocket_SetServer:
+ *  Sets up the socket as a server. It uses the "Local" field of GSocket.
+ *  "Local" must be set by GSocket_SetLocal() before GSocket_SetServer()
+ *  is called. Possible error codes are: GSOCK_INVSOCK if socket has not
+ *  been initialized, GSOCK_INVADDR if the local address has not been
+ *  defined and GSOCK_IOERR for other internal errors.
+ */

 GSocketError GSocket_SetServer(GSocket *sck)
 {
   int type;
 GSocketError GSocket_SetServer(GSocket *sck)
 {
   int type;


@@ -263,6 +287,7 @@ GSocketError GSocket_SetServer(GSocket *sck)
 
   /* We always have a stream here  */
   sck->m_stream = TRUE;
 
   /* We always have a stream here  */
   sck->m_stream = TRUE;

+  sck->m_server = TRUE;

 
   /* Create the socket */
   sck->m_fd = socket(sck->m_local->m_realfamily, SOCK_STREAM, 0);
 
   /* Create the socket */
   sck->m_fd = socket(sck->m_local->m_realfamily, SOCK_STREAM, 0);


@@ -288,15 +313,16 @@ GSocketError GSocket_SetServer(GSocket *sck)
     return GSOCK_IOERR;
   }
 
     return GSOCK_IOERR;
   }
 

-  GSocket_SetNonBlocking(sck, sck->m_blocking);
+  _GSocket_Configure_Callbacks(sck);
+  GSocket_SetNonBlocking(sck, sck->m_non_blocking);

   GSocket_SetTimeout(sck, sck->m_timeout);
 
   return GSOCK_NOERROR;
 }
 
   GSocket_SetTimeout(sck, sck->m_timeout);
 
   return GSOCK_NOERROR;
 }
 

-/*
-  GSocket_WaitConnection() waits for an incoming client connection.
-*/
+/* GSocket_WaitConnection:
+ *  Waits for an incoming client connection.
+ */

 GSocket *GSocket_WaitConnection(GSocket *socket)
 {
   GSocket *connection;
 GSocket *GSocket_WaitConnection(GSocket *socket)
 {
   GSocket *connection;


@@ -314,12 +340,29 @@ GSocket *GSocket_WaitConnection(GSocket *socket)
 
   /* 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;
+    return NULL;
+  }

 
   /* Accept the incoming connection */
 
   /* Accept the incoming connection */

+  ENABLE_TIMEOUT(connection);

   connection->m_fd = accept(socket->m_fd, NULL, NULL);
   connection->m_fd = accept(socket->m_fd, NULL, NULL);

+  DISABLE_TIMEOUT(connection);

   if (connection->m_fd == -1) {
     GSocket_destroy(connection);
   if (connection->m_fd == -1) {
     GSocket_destroy(connection);

-    socket->m_error = GSOCK_IOERR;
+    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;
   }
 
     return NULL;
   }
 


@@ -328,6 +371,10 @@ GSocket *GSocket_WaitConnection(GSocket *socket)
   connection->m_server   = FALSE;
   connection->m_oriented = TRUE;
 
   connection->m_server   = FALSE;
   connection->m_oriented = TRUE;
 

+  _GSocket_Configure_Callbacks(connection);
+  GSocket_SetNonBlocking(connection, connection->m_non_blocking);
+  GSocket_SetTimeout(connection, connection->m_timeout);
+

   return connection;
 }
 
   return connection;
 }
 


@@ -354,6 +401,11 @@ GSocketError GSocket_SetNonOriented(GSocket *sck)
   /* Create the socket */
   sck->m_fd = socket(sck->m_local->m_realfamily, SOCK_DGRAM, 0);
 
   /* Create the socket */
   sck->m_fd = socket(sck->m_local->m_realfamily, SOCK_DGRAM, 0);
 

+  if (sck->m_fd < 0) {
+    sck->m_error = GSOCK_IOERR;
+    return GSOCK_IOERR;
+  }
+

   /* 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);


@@ -362,7 +414,8 @@ GSocketError GSocket_SetNonOriented(GSocket *sck)
     return GSOCK_IOERR;
   }
 
     return GSOCK_IOERR;
   }
 

-  GSocket_SetNonBlocking(sck, sck->m_blocking);
+  _GSocket_Configure_Callbacks(sck);
+  GSocket_SetNonBlocking(sck, sck->m_non_blocking);

   GSocket_SetTimeout(sck, sck->m_timeout);
 
   return GSOCK_NOERROR;
   GSocket_SetTimeout(sck, sck->m_timeout);
 
   return GSOCK_NOERROR;


@@ -370,14 +423,18 @@ GSocketError GSocket_SetNonOriented(GSocket *sck)
 
 /* Client specific parts */
 
 
 /* Client specific parts */
 

-/*
-  GSocket_Connect() establishes a client connection to a server using the "Peer"
-  field of GSocket. "Peer" must be set by GSocket_SetPeer() before
-  GSocket_Connect() is called. In the other case, it returns GSOCK_INVADDR.
-*/
+/* GSocket_Connect:
+ *  Establishes a client connection to a server using the "Peer"
+ *  field of GSocket. "Peer" must be set by GSocket_SetPeer() before
+ *  GSocket_Connect() is called. Possible error codes are GSOCK_INVSOCK,
+ *  GSOCK_INVADDR, GSOCK_TIMEDOUT, GSOCK_WOULDBLOCK and GSOCK_IOERR.
+ *  If a socket is nonblocking and Connect() returns GSOCK_WOULDBLOCK,
+ *  the connection request can be completed later. Use GSocket_Select()
+ *  to check or wait for a GSOCK_CONNECTION event.
+ */

 GSocketError GSocket_Connect(GSocket *sck, GSocketStream stream)
 {
 GSocketError GSocket_Connect(GSocket *sck, GSocketStream stream)
 {

-  int type;
+  int type, err;

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


@@ -408,22 +465,35 @@ 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);
+

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

-  if (connect(sck->m_fd, sck->m_peer->m_addr,
-              sck->m_peer->m_len) != 0) {
+  ENABLE_TIMEOUT(sck);
+  err = connect(sck->m_fd, sck->m_peer->m_addr, sck->m_peer->m_len);
+  DISABLE_TIMEOUT(sck);
+
+  if (err != 0 && errno != EINPROGRESS) {

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

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

     return GSOCK_IOERR;
   }
   
   /* It is not a server */
     return GSOCK_IOERR;
   }
   
   /* It is not a server */

-  sck->m_server = FALSE;
-
-  GSocket_SetNonBlocking(sck, sck->m_blocking);
-  GSocket_SetTimeout(sck, sck->m_timeout);
+  sck->m_server       = FALSE;
+  sck->m_establishing = (errno == EINPROGRESS);

 
 

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

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


@@ -465,74 +535,103 @@ int GSocket_Write(GSocket *socket, const char *buffer,
     return _GSocket_Send_Dgram(socket, buffer, size);
 }
 
     return _GSocket_Send_Dgram(socket, buffer, size);
 }
 

-bool GSocket_DataAvailable(GSocket *socket)
+/* GSocket_Select:
+ *  Polls the socket to determine its status. This function will
+ *  check for the events specified in the 'flags' parameter, and
+ *  it will return a mask indicating which operations can be
+ *  performed. This function won't block, regardless of the
+ *  mode (blocking|nonblocking) of the socket.
+ */
+GSocketEventFlags GSocket_Select(GSocket *socket, GSocketEventFlags flags)

 {
 {

-  fd_set read_set;
+  fd_set readfds, writefds, exceptfds;

   struct timeval tv;
   struct timeval tv;

+  GSocketEventFlags mask;
+  int error, len;

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

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

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

-  FD_ZERO(&read_set);
-  FD_SET(socket->m_fd, &read_set);
+  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;
 
   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);

 
 

-  select(socket->m_fd+1, &read_set, NULL, NULL, &tv);
+      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 FD_ISSET(socket->m_fd, &read_set);
+  return mask;

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

-/*
-  GSocket_SetNonBlocking() puts the socket in non-blocking mode. This is useful
-  if we don't want to wait.
-*/
+/* GSocket_SetNonBlocking:
+ *  Sets the socket to non-blocking mode. This is useful if
+ *  we don't want to wait.
+ */

 void GSocket_SetNonBlocking(GSocket *socket, bool non_block)
 {
   assert(socket != NULL);
 
 void GSocket_SetNonBlocking(GSocket *socket, bool non_block)
 {
   assert(socket != NULL);
 

-  socket->m_blocking = non_block;
+  socket->m_non_blocking = non_block;

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

-/*
- * GSocket_SetTimeout()
+/* GSocket_SetTimeout:
+ *  Sets the timeout for blocking calls. Time is
+ *  expressed in milliseconds.

  */
  */

-

 void GSocket_SetTimeout(GSocket *socket, unsigned long millisec)
 {
   assert(socket != NULL);
 
   socket->m_timeout = millisec;
 void GSocket_SetTimeout(GSocket *socket, unsigned long millisec)
 {
   assert(socket != NULL);
 
   socket->m_timeout = millisec;

- /* Neither GLIBC 2.0 nor the kernel 2.0.36 define SO_SNDTIMEO or
-    SO_RCVTIMEO. The man pages, that these flags should exist but
-    are read only. RR. */
- /* OK, restrict this to GLIBC 2.1. GL. */
-#ifdef CAN_USE_TIMEOUT 
-  if (socket->m_fd != -1) {
-    struct timeval tval;
-
-    tval.tv_sec = millisec / 1000;
-    tval.tv_usec = (millisec % 1000) * 1000;
-    setsockopt(socket->m_fd, SOL_SOCKET, SO_SNDTIMEO, &tval, sizeof(tval));
-    setsockopt(socket->m_fd, SOL_SOCKET, SO_RCVTIMEO, &tval, sizeof(tval));
-  }
-#endif

 }
 
 }
 

-/*
-  GSocket_GetError() returns the last error occured on the socket stream.
-*/
-
+/* GSocket_GetError:
+ *  Returns the last error occured for this socket.
+ */

 GSocketError GSocket_GetError(GSocket *socket)
 {
   assert(socket != NULL);
 GSocketError GSocket_GetError(GSocket *socket)
 {
   assert(socket != NULL);


@@ -542,27 +641,32 @@ GSocketError GSocket_GetError(GSocket *socket)
 
 /* Callbacks */
 
 
 /* Callbacks */
 

-/* 
-   Only one fallback is possible for each event (INPUT, OUTPUT, CONNECTION)
-   INPUT: The function is called when there is at least a byte in the 
-          input buffer
-   OUTPUT: The function is called when the system is sure the next write call
-           will not block
-   CONNECTION: Two cases is possible:
-             Client socket -> the connection is established
-            Server socket -> a client request a connection
-   LOST: the connection is lost
-
-   SetCallback accepts a combination of these flags so a same callback can
-   receive different events.
-
-   An event is generated only once and its state is reseted when the relative
-   IO call is requested.
-   For example: INPUT -> GSocket_Read()
-                CONNECTION -> GSocket_Accept()
-*/
-void GSocket_SetCallback(GSocket *socket, GSocketEventFlags event,
-                        GSocketCallback fallback, char *cdata)
+/* Only one callback is possible for each event (INPUT, OUTPUT, CONNECTION
+ * and LOST). The callbacks are called in the following situations:
+ *
+ * INPUT: There is at least one byte in the input buffer
+ * OUTPUT: The system is sure that the next write call will not block
+ * CONNECTION: Two cases are possible:
+ *           Client socket -> the connection is established
+ *           Server socket -> a client requests a connection
+ * LOST: The connection is lost
+ *
+ * An event is generated only once and its state is reseted when the
+ * relative IO call is requested.
+ * For example: INPUT -> GSocket_Read()
+ *              CONNECTION -> GSocket_Accept()
+ */
+
+/* GSocket_SetCallback:
+ *  Enables the callbacks specified by 'flags'. Note that 'flags'
+ *  may be a combination of flags OR'ed toghether, so the same
+ *  callback function can be made to accept different events.
+ *  The callback function must have the following prototype:
+ *
+ *  void function(GSocket *socket, GSocketEvent event, char *cdata)
+ */
+void GSocket_SetCallback(GSocket *socket, GSocketEventFlags flags,
+                        GSocketCallback callback, char *cdata)

 {
   int count;
 
 {
   int count;
 


@@ -571,95 +675,64 @@ void GSocket_SetCallback(GSocket *socket, GSocketEventFlags event,
   for (count=0;count<GSOCK_MAX_EVENT;count++) {
     /* We test each flag and, if it is enabled, we enable the corresponding
        event */
   for (count=0;count<GSOCK_MAX_EVENT;count++) {
     /* We test each flag and, if it is enabled, we enable the corresponding
        event */

-    if ((event & (1 << count)) != 0) {
-      socket->m_fbacks[count] = fallback;
+    if ((flags & (1 << count)) != 0) {
+      socket->m_cbacks[count] = callback;

       socket->m_data[count] = cdata;
       socket->m_data[count] = cdata;

-      _GSocket_Enable(socket, count);

     }
   }
     }
   }

+  _GSocket_Configure_Callbacks(socket);

 }
 
 }
 

-/*
-  UnsetCallback will disables all fallbacks specified by "event".
-  NOTE: event may be a combination of flags
-*/
-void GSocket_UnsetCallback(GSocket *socket, GSocketEventFlags event)
+/* GSocket_UnsetCallback:
+ *  Disables all callbacks specified by 'flags', which may be a
+ *  combination of flags OR'ed toghether.
+ */
+void GSocket_UnsetCallback(GSocket *socket, GSocketEventFlags flags)

 {
 {

-  int count = 0;
+  int count;

 
   assert(socket != NULL);
 
   for (count=0;count<GSOCK_MAX_EVENT;count++) {
 
   assert(socket != NULL);
 
   for (count=0;count<GSOCK_MAX_EVENT;count++) {

-    if ((event & (1 << count)) != 0) {
-      _GSocket_Disable(socket, count);
-      socket->m_fbacks[count] = NULL;
+    if ((flags & (1 << count)) != 0) {
+      socket->m_cbacks[count] = NULL;

     }
   }
     }
   }

+  _GSocket_Configure_Callbacks(socket);

 }
 
 }
 

-#define CALL_FALLBACK(socket, event) \
-if (socket->m_iocalls[event] && \
-    socket->m_fbacks[event]) {\
-  _GSocket_Disable(socket, event); \
-  socket->m_fbacks[event](socket, event, \
-                   socket->m_data[event]); \
-}
-
-#define MASK_SIGNAL() \
-{ \
-  void (*old_handler)(int); \
-\
-  old_handler = signal(SIGPIPE, SIG_IGN);
-
-#define UNMASK_SIGNAL() \
-  signal(SIGPIPE, old_handler); \
-}
-
-#if 0
-#ifndef CAN_USE_TIMEOUT
-
-#define ENABLE_TIMEOUT(socket) \
-{ \
-  struct itimerval old_ival, new_ival; \
-  void (*old_timer_sig)(int); \
-\
-  new_ival.it_interval.tv_sec = socket->m_timeout / 1000; \
-  new_ival.it_interval.tv_usec = (socket->m_timeout % 1000) * 1000; \
-  setitimer(ITIMER_REAL, &new_ival, &old_ival); \
-  old_timer_sig = signal(SIGALRM, _GSocket_Timer);
-
-#define DISABLE_TIMEOUT(socket) \
-  signal(SIGALRM, old_timer_sig); \
-  setitimer(ITIMER_REAL, &old_ival, NULL); \
+#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]);    \

 }
 
 }
 

-#else
-
-#define ENABLE_TIMEOUT(s)
-#define DISABLE_TIMEOUT(s)
-
-#endif
-
-#endif
-
-/* Temporary */
-#define ENABLE_TIMEOUT(s)
-#define DISABLE_TIMEOUT(s)
-

 void _GSocket_Enable(GSocket *socket, GSocketEvent event)
 {
   socket->m_iocalls[event] = TRUE;
 void _GSocket_Enable(GSocket *socket, GSocketEvent event)
 {
   socket->m_iocalls[event] = TRUE;

-  if (socket->m_fbacks[event])
+  if (socket->m_cbacks[event])

     _GSocket_Install_Callback(socket, event);
 }
 
 void _GSocket_Disable(GSocket *socket, GSocketEvent event)
 {
   socket->m_iocalls[event] = FALSE;
     _GSocket_Install_Callback(socket, event);
 }
 
 void _GSocket_Disable(GSocket *socket, GSocketEvent event)
 {
   socket->m_iocalls[event] = FALSE;

-  if (socket->m_fbacks[event])
+  if (socket->m_cbacks[event])

     _GSocket_Uninstall_Callback(socket, event);
 }
 
     _GSocket_Uninstall_Callback(socket, event);
 }
 

+void _GSocket_Configure_Callbacks(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);
+    }
+  }
+}
+

 int _GSocket_Recv_Stream(GSocket *socket, char *buffer, int size)
 {
   int ret;
 int _GSocket_Recv_Stream(GSocket *socket, char *buffer, int size)
 {
   int ret;


@@ -670,12 +743,17 @@ int _GSocket_Recv_Stream(GSocket *socket, char *buffer, int size)
   DISABLE_TIMEOUT(socket);
   UNMASK_SIGNAL();
 
   DISABLE_TIMEOUT(socket);
   UNMASK_SIGNAL();
 

-  if (ret == -1 && errno != EAGAIN) {
-    socket->m_error = GSOCK_IOERR;
+  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;
   }
     return -1;
   }

-  if (errno == EAGAIN) {
-    socket->m_error = GSOCK_TRYAGAIN;
+  if (errno == ETIMEDOUT || errno == EINTR) {
+    socket->m_error = GSOCK_TIMEDOUT;

     return -1;
   }
   return ret;
     return -1;
   }
   return ret;


@@ -686,6 +764,7 @@ int _GSocket_Recv_Dgram(GSocket *socket, char *buffer, int size)
   struct sockaddr from;
   SOCKLEN_T fromlen;
   int ret;
   struct sockaddr from;
   SOCKLEN_T fromlen;
   int ret;

+  GSocketError err;

 
   fromlen = sizeof(from);
 
 
   fromlen = sizeof(from);
 


@@ -694,12 +773,16 @@ int _GSocket_Recv_Dgram(GSocket *socket, char *buffer, int size)
   ret = recvfrom(socket->m_fd, buffer, size, 0, &from, &fromlen);
   DISABLE_TIMEOUT(socket);
   UNMASK_SIGNAL();
   ret = recvfrom(socket->m_fd, buffer, size, 0, &from, &fromlen);
   DISABLE_TIMEOUT(socket);
   UNMASK_SIGNAL();

-  if (ret == -1 && errno != EAGAIN) {
+  if (ret == -1 && errno != EWOULDBLOCK && errno != EINTR && errno != ETIMEDOUT) {

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

-  if (errno == EAGAIN) {
-    socket->m_error = GSOCK_TRYAGAIN;
+  if (errno == EWOULDBLOCK) {
+    socket->m_error = GSOCK_WOULDBLOCK;
+    return -1;
+  }
+  if (errno == ETIMEDOUT || errno == EINTR) {
+    socket->m_error = GSOCK_TIMEDOUT;

     return -1;
   }
 
     return -1;
   }
 


@@ -711,8 +794,13 @@ int _GSocket_Recv_Dgram(GSocket *socket, char *buffer, int size)
       return -1;
     }
   }
       return -1;
     }
   }

-  if (_GAddress_translate_from(socket->m_peer, &from, fromlen) != GSOCK_NOERROR)
+  err = _GAddress_translate_from(socket->m_peer, &from, fromlen);
+  if (err != GSOCK_NOERROR) {
+    GAddress_destroy(socket->m_peer);
+    socket->m_peer  = NULL;
+    socket->m_error = err;

     return -1;
     return -1;

+  }

 
   return ret;
 }
 
   return ret;
 }


@@ -720,18 +808,23 @@ 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();
   ENABLE_TIMEOUT(socket);
   ret = send(socket->m_fd, buffer, size, 0);
   DISABLE_TIMEOUT(socket);
   UNMASK_SIGNAL();
 
   MASK_SIGNAL();
   ENABLE_TIMEOUT(socket);
   ret = send(socket->m_fd, buffer, size, 0);
   DISABLE_TIMEOUT(socket);
   UNMASK_SIGNAL();

-  if (ret == -1 && errno != EAGAIN) {
+  if (ret == -1 && errno != EWOULDBLOCK && errno != ETIMEDOUT && errno != EINTR) {

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

-  if (errno == EAGAIN) {
-    socket->m_error = GSOCK_TRYAGAIN;
+  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 -1;
   }
   return ret;


@@ -741,13 +834,16 @@ int _GSocket_Send_Dgram(GSocket *socket, const char *buffer, int size)
 {
   struct sockaddr *addr;
   int len, ret;
 {
   struct sockaddr *addr;
   int len, ret;

+  GSocketError err;

 
   if (!socket->m_peer) {
     socket->m_error = GSOCK_INVADDR;
     return -1;
   }
 
 
   if (!socket->m_peer) {
     socket->m_error = GSOCK_INVADDR;
     return -1;
   }
 

-  if (_GAddress_translate_to(socket->m_peer, &addr, &len) != GSOCK_NOERROR) {
+  err = _GAddress_translate_to(socket->m_peer, &addr, &len);
+  if (err != GSOCK_NOERROR) {
+    socket->m_error = err;

     return -1;
   }
 
     return -1;
   }
 


@@ -760,12 +856,12 @@ int _GSocket_Send_Dgram(GSocket *socket, const char *buffer, int size)
   /* Frees memory allocated from _GAddress_translate_to */
   free(addr);
 
   /* Frees memory allocated from _GAddress_translate_to */
   free(addr);
 

-  if (ret == -1 && errno != EAGAIN) {
+  if (ret == -1 && errno != EWOULDBLOCK) {

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

-  if (errno == EAGAIN) {
-    socket->m_error = GSOCK_TRYAGAIN;
+  if (errno == EWOULDBLOCK) {
+    socket->m_error = GSOCK_WOULDBLOCK;

     return -1;
   }
 
     return -1;
   }
 


@@ -781,26 +877,38 @@ void _GSocket_Detected_Read(GSocket *socket)
     ret = recv(socket->m_fd, &c, 1, MSG_PEEK);
 
     if (ret < 0 && socket->m_server) {
     ret = recv(socket->m_fd, &c, 1, MSG_PEEK);
 
     if (ret < 0 && socket->m_server) {

-      CALL_FALLBACK(socket, GSOCK_CONNECTION);
+      CALL_CALLBACK(socket, GSOCK_CONNECTION);

       return;
     }
 
     if (ret > 0) {
       return;
     }
 
     if (ret > 0) {

-      CALL_FALLBACK(socket, GSOCK_INPUT);
+      CALL_CALLBACK(socket, GSOCK_INPUT);

     } else {
     } else {

-      CALL_FALLBACK(socket, GSOCK_LOST);
+      CALL_CALLBACK(socket, GSOCK_LOST);

     }
   }
 }
 
 void _GSocket_Detected_Write(GSocket *socket)
 {
     }
   }
 }
 
 void _GSocket_Detected_Write(GSocket *socket)
 {

-  CALL_FALLBACK(socket, GSOCK_OUTPUT);
-}
+  if (socket->m_establishing) {
+    int error, len;
+
+    len = sizeof(error);

 
 

-#undef CALL_FALLBACK 
-#undef MASK_SIGNAL
-#undef UNMASK_SIGNAL
+    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;
+
+    CALL_CALLBACK(socket, GSOCK_CONNECTION);
+  } else
+    CALL_CALLBACK(socket, GSOCK_OUTPUT);
+}

 
 /*
  * -------------------------------------------------------------------------
 
 /*
  * -------------------------------------------------------------------------


@@ -961,7 +1069,7 @@ GSocketError _GAddress_Init_INET(GAddress *address)
   ((struct sockaddr_in *)address->m_addr)->sin_family = AF_INET;
   ((struct sockaddr_in *)address->m_addr)->sin_addr.s_addr   = INADDR_ANY;
 
   ((struct sockaddr_in *)address->m_addr)->sin_family = AF_INET;
   ((struct sockaddr_in *)address->m_addr)->sin_addr.s_addr   = INADDR_ANY;
 

-  return TRUE;
+  return GSOCK_NOERROR;

 }
 
 GSocketError GAddress_INET_SetHostName(GAddress *address, const char *hostname)
 }
 
 GSocketError GAddress_INET_SetHostName(GAddress *address, const char *hostname)


@@ -976,7 +1084,15 @@ GSocketError GAddress_INET_SetHostName(GAddress *address, const char *hostname)
   addr = &(((struct sockaddr_in *)address->m_addr)->sin_addr);
 
   /* If it is a numeric host name, convert it now */
   addr = &(((struct sockaddr_in *)address->m_addr)->sin_addr);
 
   /* 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> */
+  if ( (addr->s_addr = inet_addr(hostname)) == -1 ) {
+#else
+  /* Use gethostbyname by default */
+  if (1) {
+#endif

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


@@ -1150,4 +1266,5 @@ GSocketError GAddress_UNIX_GetPath(GAddress *address, char *path, size_t sbuf)
   return GSOCK_NOERROR;
 }
 
   return GSOCK_NOERROR;
 }
 

-#endif // wxUSE_SOCKETS
+#endif
+  /* wxUSE_SOCKETS */