removed Win16 code (patch 905241), last version with remains of Win16 support tagged...

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

diff --git a/src/unix/gsocket.c b/src/unix/gsocket.c
index f1af4f0c47aaeb43dce306ba3dcd4e691e84f1c1..16eae12743e6e4810bb1337bb8b35adefd85bd7c 100644 (file)
--- a/src/unix/gsocket.c
+++ b/src/unix/gsocket.c
@@ -1,117 +1,352 @@
 /* -------------------------------------------------------------------------
  * Project: GSocket (Generic Socket) for WX
  * Name:    gsocket.c
 /* -------------------------------------------------------------------------
  * Project: GSocket (Generic Socket) for WX
  * Name:    gsocket.c

- * Purpose: GSocket main Unix file
+ * Authors: Guilhem Lavaux,
+ *          Guillermo Rodriguez Garcia <guille@iies.es> (maintainer)
+ * Purpose: GSocket main Unix and OS/2 file
+ * Licence: The wxWindows licence

  * CVSID:   $Id$
  * -------------------------------------------------------------------------
  */
 
  * CVSID:   $Id$
  * -------------------------------------------------------------------------
  */
 

+/*
+ * PLEASE don't put C++ comments here - this is a C source file.
+ */
+
+#ifndef __GSOCKET_STANDALONE__
+#include "wx/setup.h"
+#endif
+
+#if defined(__VISAGECPP__)
+/* Seems to be needed by Visual Age C++, though I don't see how it manages
+   to not break on including a C++ header into a plain C source file      */
+#include "wx/defs.h"
+#define BSD_SELECT /* use Berkley Sockets select */
+#endif
+
+#if wxUSE_SOCKETS || defined(__GSOCKET_STANDALONE__)
+

 #include <assert.h>
 #include <assert.h>

-#include <sys/ioctl.h>

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

-#ifdef vms
+#ifdef __VISAGECPP__
+#include <string.h>
+#include <sys/time.h>
+#include <types.h>
+#include <netinet/in.h>
+#endif
+#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
+
+#ifndef __VISAGECPP__

 #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 <unistd.h>
 #include <string.h>
 #include <unistd.h>

+#else
+#include <nerrno.h>
+#  if __IBMCPP__ < 400
+#include <machine/endian.h>
+#include <socket.h>
+#include <ioctl.h>
+#include <select.h>
+#include <unistd.h>
+
+#define EBADF   SOCEBADF
+
+#    ifdef min
+#    undef min
+#    endif
+#  else
+#include <sys/socket.h>
+#include <sys/ioctl.h>
+#include <sys/select.h>
+
+#define close(a) soclose(a)
+#define select(a,b,c,d,e) bsdselect(a,b,c,d,e)
+int _System bsdselect(int,
+                      struct fd_set *,
+                      struct fd_set *,
+                      struct fd_set *,
+                      struct timeval *);
+int _System soclose(int);
+#  endif
+#endif

 #include <stdio.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <stdlib.h>

-
+#include <stddef.h>
+#include <ctype.h>

 #ifdef sun
 #ifdef sun

-#include <sys/filio.h>
+#  include <sys/filio.h>

 #endif
 #endif

-

 #ifdef sgi
 #ifdef sgi

-  #include <bstring.h>
+#  include <bstring.h>

 #endif
 #endif

-

 #include <signal.h>
 #include <signal.h>

-#include <wx/setup.h>
-#include <wx/gsocket.h>
-#include "gsockunx.h"

 
 #ifndef SOCKLEN_T
 
 #ifndef SOCKLEN_T

-#      define SOCKLEN_T int
+
+#ifdef VMS
+#  define SOCKLEN_T unsigned int
+#else
+#  ifdef __GLIBC__
+#    if __GLIBC__ == 2
+#      define SOCKLEN_T socklen_t
+#    endif
+#  else
+#    define SOCKLEN_T int
+#  endif
+#endif
+
+#endif /* SOCKLEN_T */
+
+/*
+ * MSW defines this, Unices don't.
+ */
+#ifndef INVALID_SOCKET
+#define INVALID_SOCKET -1
+#endif
+
+/* UnixWare reportedly needs this for FIONBIO definition */
+#ifdef __UNIXWARE__
+#include <sys/filio.h>
+#endif
+
+/*
+ * INADDR_BROADCAST is identical to INADDR_NONE which is not defined
+ * on all systems. INADDR_BROADCAST should be fine to indicate an error.
+ */
+#ifndef INADDR_NONE
+#define INADDR_NONE INADDR_BROADCAST

 #endif
 
 #endif
 

-/* Constructors / Destructors */
+#define MASK_SIGNAL()                       \
+{                                           \
+  void (*old_handler)(int);                 \
+                                            \
+  old_handler = signal(SIGPIPE, SIG_IGN);
+
+#define UNMASK_SIGNAL()                     \
+  signal(SIGPIPE, old_handler);             \
+}
+
+
+#ifndef __GSOCKET_STANDALONE__
+#  include "wx/unix/gsockunx.h"
+#  include "wx/gsocket.h"
+#else
+#  include "gsockunx.h"
+#  include "gsocket.h"
+#endif /* __GSOCKET_STANDALONE__ */

 
 

-GSocket *GSocket_new()
+/* debugging helpers */
+#ifdef __GSOCKET_DEBUG__
+#  define GSocket_Debug(args) printf args
+#else
+#  define GSocket_Debug(args)
+#endif /* __GSOCKET_DEBUG__ */
+
+/* Table of GUI-related functions. We must call them indirectly because
+ * of wxBase and GUI separation: */
+
+static struct GSocketGUIFunctionsTable *gs_gui_functions;
+
+#define USE_GUI() (gs_gui_functions != NULL)
+
+/* Define macros to simplify indirection: */
+#define _GSocket_GUI_Init() \
+    if (gs_gui_functions) gs_gui_functions->GUI_Init()
+#define _GSocket_GUI_Cleanup() \
+    if (gs_gui_functions) gs_gui_functions->GUI_Cleanup()
+#define _GSocket_GUI_Init_Socket(socket) \
+    (gs_gui_functions ? gs_gui_functions->GUI_Init_Socket(socket) : 1)
+#define _GSocket_GUI_Destroy_Socket(socket) \
+    if (gs_gui_functions) gs_gui_functions->GUI_Destroy_Socket(socket)
+#define _GSocket_Enable_Events(socket) \
+    if (gs_gui_functions) gs_gui_functions->Enable_Events(socket)
+#define _GSocket_Disable_Events(socket) \
+    if (gs_gui_functions) gs_gui_functions->Disable_Events(socket)
+#define _GSocket_Install_Callback(socket, event) \
+    if (gs_gui_functions) gs_gui_functions->Install_Callback(socket, event)
+#define _GSocket_Uninstall_Callback(socket, event) \
+    if (gs_gui_functions) gs_gui_functions->Uninstall_Callback(socket, event)
+
+static struct GSocketBaseFunctionsTable gs_base_functions =

 {
 {

-  int i;
+    _GSocket_Detected_Read,
+    _GSocket_Detected_Write
+};
+
+/* Global initialisers */
+
+void GSocket_SetGUIFunctions(struct GSocketGUIFunctionsTable *guifunc)
+{
+  gs_gui_functions = guifunc;
+}
+         
+int GSocket_Init(void)
+{
+  if (gs_gui_functions)
+  {
+      if ( !gs_gui_functions->GUI_Init() )
+        return 0;
+  }
+  return 1;
+}
+
+void GSocket_Cleanup(void)
+{
+  if (gs_gui_functions)
+  {
+      gs_gui_functions->GUI_Cleanup();
+  }
+}
+
+/* Constructors / Destructors for GSocket */
+
+GSocket *GSocket_new(void)
+{
+  int i, success;

   GSocket *socket;
 
   socket = (GSocket *)malloc(sizeof(GSocket));
 
   GSocket *socket;
 
   socket = (GSocket *)malloc(sizeof(GSocket));
 

-  socket->m_fd                  = -1;
-  for (i=0;i<GSOCK_MAX_EVENT;i++) {
-    socket->m_fbacks[i]         = NULL;
-    socket->m_iocalls[i]        = FALSE;
+  if (socket == NULL)
+    return NULL;
+
+  socket->m_fd                  = INVALID_SOCKET;
+  for (i=0;i<GSOCK_MAX_EVENT;i++)
+  {
+    socket->m_cbacks[i]         = NULL;

   }
   }

+  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;

-  socket->m_server             = FALSE;
-  socket->m_stream             = TRUE;
-  socket->m_gui_dependent      = NULL;
-  socket->m_blocking           = FALSE;
-
-  _GSocket_GUI_Init(socket);
+  socket->m_server              = FALSE;
+  socket->m_stream              = TRUE;
+  socket->m_gui_dependent       = NULL;
+  socket->m_non_blocking        = FALSE;
+  socket->m_timeout             = 10*60*1000;
+                                /* 10 minutes * 60 sec * 1000 millisec */
+  socket->m_establishing        = FALSE;
+
+  socket->m_functions           = &gs_base_functions;
+
+  /* Per-socket GUI-specific initialization */
+  success = _GSocket_GUI_Init_Socket(socket);
+  if (!success)
+  {
+    free(socket);
+    return NULL;
+  }

 
   return socket;
 }
 
 
   return socket;
 }
 

+void GSocket_close(GSocket *socket)
+{
+    _GSocket_Disable_Events(socket);
+    /* gsockosx.c calls CFSocketInvalidate which closes the socket for us */
+#if !(defined(__DARWIN__) && (defined(__WXMAC__) || defined(__WXCOCOA__)))
+    close(socket->m_fd);
+#endif
+    socket->m_fd = INVALID_SOCKET;
+}
+

 void GSocket_destroy(GSocket *socket)
 {
   assert(socket != NULL);
 
 void GSocket_destroy(GSocket *socket)
 {
   assert(socket != NULL);
 

-  if (socket->m_fd != -1)
+  /* Check that the socket is really shutdowned */
+  if (socket->m_fd != INVALID_SOCKET)

     GSocket_Shutdown(socket);
 
     GSocket_Shutdown(socket);
 

-  _GSocket_GUI_Destroy(socket);
+  /* Per-socket GUI-specific cleanup */
+  _GSocket_GUI_Destroy_Socket(socket);

 
 

+  /* Destroy private addresses */

   if (socket->m_local)
     GAddress_destroy(socket->m_local);
 
   if (socket->m_peer)
     GAddress_destroy(socket->m_peer);
 
   if (socket->m_local)
     GAddress_destroy(socket->m_local);
 
   if (socket->m_peer)
     GAddress_destroy(socket->m_peer);
 

+  /* Destroy the socket itself */

   free(socket);
 }
 
   free(socket);
 }
 

+/* GSocket_Shutdown:
+ *  Disallow further read/write operations on this socket, close
+ *  the fd and disable all callbacks.
+ */

 void GSocket_Shutdown(GSocket *socket)
 {
   int evt;
 
   assert(socket != NULL);
 
 void GSocket_Shutdown(GSocket *socket)
 {
   int evt;
 
   assert(socket != NULL);
 

-  if (socket->m_fd != -1) {
+  /* If socket has been created, shutdown it */
+  if (socket->m_fd != INVALID_SOCKET)
+  {

     shutdown(socket->m_fd, 2);
     shutdown(socket->m_fd, 2);

-    close(socket->m_fd);
-    socket->m_fd = -1;
+    GSocket_close(socket);

   }
 
   }
 

-  for (evt=0;evt<GSOCK_MAX_EVENT;evt++)
-    _GSocket_Uninstall_Fallback(socket, evt);
+  /* Disable GUI callbacks */
+  for (evt = 0; evt < GSOCK_MAX_EVENT; evt++)
+    socket->m_cbacks[evt] = NULL;
+
+  socket->m_detected = GSOCK_LOST_FLAG;

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

+/* GSocket_SetLocal:
+ * GSocket_GetLocal:
+ * GSocket_SetPeer:
+ * GSocket_GetPeer:
+ *  Set or get the local or peer address for this socket. The 'set'
+ *  functions return GSOCK_NOERROR on success, an error code otherwise.
+ *  The 'get' functions return a pointer to a GAddress object on success,
+ *  or NULL otherwise, in which case they set the error code of the
+ *  corresponding GSocket.
+ *
+ *  Error codes:
+ *    GSOCK_INVSOCK - the socket is not valid.
+ *    GSOCK_INVADDR - the address is not valid.
+ */

 GSocketError GSocket_SetLocal(GSocket *socket, GAddress *address)
 {
 GSocketError GSocket_SetLocal(GSocket *socket, GAddress *address)
 {

-  if (socket == NULL || (socket->m_fd != -1 && !socket->m_server))
+  assert(socket != NULL);
+
+  /* the socket must be initialized, or it must be a server */
+  if ((socket->m_fd != INVALID_SOCKET && !socket->m_server))
+  {
+    socket->m_error = GSOCK_INVSOCK;

     return GSOCK_INVSOCK;
     return GSOCK_INVSOCK;

+  }

 
 

+  /* check address */

   if (address == NULL || address->m_family == GSOCK_NOFAMILY)
   if (address == NULL || address->m_family == GSOCK_NOFAMILY)

+  {
+    socket->m_error = GSOCK_INVADDR;

     return GSOCK_INVADDR;
     return GSOCK_INVADDR;

+  }

 
   if (socket->m_local)
     GAddress_destroy(socket->m_local);
 
   if (socket->m_local)
     GAddress_destroy(socket->m_local);


@@ -123,10 +358,11 @@ GSocketError GSocket_SetLocal(GSocket *socket, GAddress *address)
 
 GSocketError GSocket_SetPeer(GSocket *socket, GAddress *address)
 {
 
 GSocketError GSocket_SetPeer(GSocket *socket, GAddress *address)
 {

-  if (socket == NULL)
-    return GSOCK_INVSOCK;
+  assert(socket != NULL);

 
 

-  if (address == NULL || address->m_family == GSOCK_NOFAMILY) {
+  /* check address */
+  if (address == NULL || address->m_family == GSOCK_NOFAMILY)
+  {

     socket->m_error = GSOCK_INVADDR;
     return GSOCK_INVADDR;
   }
     socket->m_error = GSOCK_INVADDR;
     return GSOCK_INVADDR;
   }


@@ -143,27 +379,43 @@ 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);
 
 
   assert(socket != NULL);
 

+  /* try to get it from the m_local var first */

   if (socket->m_local)
     return GAddress_copy(socket->m_local);
 
   if (socket->m_local)
     return GAddress_copy(socket->m_local);
 

-  if (socket->m_fd == -1) {
+  /* else, if the socket is initialized, try getsockname */
+  if (socket->m_fd == INVALID_SOCKET)
+  {

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

-  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;
   }
 

+  /* got a valid address from getsockname, create a GAddress object */

   address = GAddress_new();
   address = GAddress_new();

-  _GAddress_translate_from(address, &addr, size);
+  if (address == NULL)
+  {
+    socket->m_error = GSOCK_MEMERR;
+    return NULL;
+  }
+
+  err = _GAddress_translate_from(address, &addr, size);
+  if (err != GSOCK_NOERROR)
+  {
+    GAddress_destroy(address);
+    socket->m_error = err;
+    return NULL;
+  }

 
   return address;
 }
 
   return address;
 }


@@ -172,6 +424,7 @@ GAddress *GSocket_GetPeer(GSocket *socket)
 {
   assert(socket != NULL);
 
 {
   assert(socket != NULL);
 

+  /* try to get it from the m_peer var */

   if (socket->m_peer)
     return GAddress_copy(socket->m_peer);
 
   if (socket->m_peer)
     return GAddress_copy(socket->m_peer);
 


@@ -180,117 +433,290 @@ 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 the other cases, it returns GSOCK_INVADDR.
-*/
+/* GSocket_SetServer:
+ *  Sets up this socket as a server. The local address must have been
+ *  set with GSocket_SetLocal() before GSocket_SetServer() is called.
+ *  Returns GSOCK_NOERROR on success, one of the following otherwise:
+ * 
+ *  Error codes:
+ *    GSOCK_INVSOCK - the socket is in use.
+ *    GSOCK_INVADDR - the local address has not been set.
+ *    GSOCK_IOERR   - low-level error. 
+ */

 GSocketError GSocket_SetServer(GSocket *sck)
 {
 GSocketError GSocket_SetServer(GSocket *sck)
 {

-  int type;
+  int arg = 1;

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

-  if (sck->m_fd != -1) {
+  /* must not be in use */
+  if (sck->m_fd != INVALID_SOCKET)
+  {

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

-  if (!sck->m_local) {
+  /* the local addr must have been set */
+  if (!sck->m_local)
+  {

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

-  if (sck->m_stream)
-    type = SOCK_STREAM;
-  else
-    type = SOCK_DGRAM;
-
-  sck->m_fd = socket(sck->m_local->m_realfamily, type, 0);
+  /* Initialize all fields */
+  sck->m_stream   = TRUE;
+  sck->m_server   = TRUE;
+  sck->m_oriented = TRUE;

 
 

-  if (sck->m_fd == -1) {
-    sck->m_error = GSOCK_IOERR;
-    return GSOCK_IOERR;
-  }
+  /* Create the socket */
+  sck->m_fd = socket(sck->m_local->m_realfamily, SOCK_STREAM, 0);

 
 

-  if (bind(sck->m_fd, sck->m_local->m_addr, sck->m_local->m_len) < 0) {
-    close(sck->m_fd);
-    sck->m_fd = -1;
+  if (sck->m_fd == INVALID_SOCKET)
+  {

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

-
-  if (listen(sck->m_fd, 5) < 0) {
-    close(sck->m_fd);
-    sck->m_fd = -1;
+#if defined(__EMX__) || defined(__VISAGECPP__)
+  ioctl(sck->m_fd, FIONBIO, (char*)&arg, sizeof(arg));
+#else
+  ioctl(sck->m_fd, FIONBIO, &arg);
+#endif
+  _GSocket_Enable_Events(sck);
+
+  /* allow a socket to re-bind if the socket is in the TIME_WAIT
+     state after being previously closed.
+   */
+  setsockopt(sck->m_fd, SOL_SOCKET, SO_REUSEADDR, (const char*)&arg, sizeof(u_long));
+
+  /* Bind to the local address,
+   * retrieve the actual address bound,
+   * and listen up to 5 connections.
+   */
+  if ((bind(sck->m_fd, sck->m_local->m_addr, sck->m_local->m_len) != 0) ||
+      (getsockname(sck->m_fd,
+                   sck->m_local->m_addr,
+                   (SOCKLEN_T *) &sck->m_local->m_len) != 0) ||
+      (listen(sck->m_fd, 5) != 0))
+  {
+    GSocket_close(sck);

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

-  sck->m_server = TRUE;
-

   return GSOCK_NOERROR;
   return GSOCK_NOERROR;

-     

 }
 
 }
 

-/*
-  GSocket_WaitConnection() waits for an incoming client connection.
-*/
+/* GSocket_WaitConnection:
+ *  Waits for an incoming client connection. Returns a pointer to
+ *  a GSocket object, or NULL if there was an error, in which case
+ *  the last error field will be updated for the calling GSocket.
+ *
+ *  Error codes (set in the calling GSocket)
+ *    GSOCK_INVSOCK    - the socket is not valid or not a server.
+ *    GSOCK_TIMEDOUT   - timeout, no incoming connections.
+ *    GSOCK_WOULDBLOCK - the call would block and the socket is nonblocking.
+ *    GSOCK_MEMERR     - couldn't allocate memory.
+ *    GSOCK_IOERR      - low-level error. 
+ */

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

-  if (socket->m_fd == -1 || !socket->m_server) {
+  /* Reenable CONNECTION events */
+  _GSocket_Enable(socket, GSOCK_CONNECTION);
+
+  /* If the socket has already been created, we exit immediately */
+  if (socket->m_fd == INVALID_SOCKET || !socket->m_server)
+  {

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

-  _GSocket_Enable(socket, GSOCK_CONNECTION);
-
+  /* Create a GSocket object for the new connection */

   connection = GSocket_new();
 
   connection = GSocket_new();
 

-  connection->m_fd = accept(socket->m_fd, NULL, NULL);
-  if (connection->m_fd == -1) {
+  if (!connection)
+  {
+    socket->m_error = GSOCK_MEMERR;
+    return NULL;
+  }
+
+  /* Wait for a connection (with timeout) */
+  if (_GSocket_Input_Timeout(socket) == GSOCK_TIMEDOUT)
+  {

     GSocket_destroy(connection);
     GSocket_destroy(connection);

-    socket->m_error = GSOCK_IOERR;
+    /* socket->m_error set by _GSocket_Input_Timeout */

     return NULL;
   }
 
     return NULL;
   }
 

-  connection->m_stream   = TRUE;
+  connection->m_fd = accept(socket->m_fd, &from, (SOCKLEN_T *) &fromlen);
+
+  if (connection->m_fd == INVALID_SOCKET)
+  {
+    if (errno == EWOULDBLOCK)
+      socket->m_error = GSOCK_WOULDBLOCK;
+    else
+      socket->m_error = GSOCK_IOERR;
+
+    GSocket_destroy(connection);
+    return NULL;
+  }
+
+  /* Initialize all fields */

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

+  connection->m_stream   = TRUE;

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

+  /* Setup the peer address field */
+  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;
+  }
+#if defined(__EMX__) || defined(__VISAGECPP__)
+  ioctl(connection->m_fd, FIONBIO, (char*)&arg, sizeof(arg));
+#else
+  ioctl(connection->m_fd, FIONBIO, &arg);
+#endif
+  _GSocket_Enable_Events(connection);
+

   return connection;
 }
 
   return connection;
 }
 

-/* Non oriented connections */
+/* Client specific parts */

 
 

-GSocketError GSocket_SetNonOriented(GSocket *sck)
+/* GSocket_Connect:
+ *  For stream (connection oriented) sockets, GSocket_Connect() tries
+ *  to establish a client connection to a server using the peer address
+ *  as established with GSocket_SetPeer(). Returns GSOCK_NOERROR if the
+ *  connection has been succesfully established, or one of the error
+ *  codes listed below. Note that for nonblocking sockets, a return
+ *  value of GSOCK_WOULDBLOCK doesn't mean a failure. The connection
+ *  request can be completed later; you should use GSocket_Select()
+ *  to poll for GSOCK_CONNECTION | GSOCK_LOST, or wait for the
+ *  corresponding asynchronous events.
+ *
+ *  For datagram (non connection oriented) sockets, GSocket_Connect()
+ *  just sets the peer address established with GSocket_SetPeer() as
+ *  default destination.
+ *
+ *  Error codes:
+ *    GSOCK_INVSOCK    - the socket is in use or not valid.
+ *    GSOCK_INVADDR    - the peer address has not been established.
+ *    GSOCK_TIMEDOUT   - timeout, the connection failed.
+ *    GSOCK_WOULDBLOCK - connection in progress (nonblocking sockets only)
+ *    GSOCK_MEMERR     - couldn't allocate memory.
+ *    GSOCK_IOERR      - low-level error. 
+ */
+GSocketError GSocket_Connect(GSocket *sck, GSocketStream stream)

 {
 {

+  int 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 != INVALID_SOCKET)
+  {

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

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

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

-  sck->m_stream   = FALSE;
+  /* Streamed or dgram socket? */
+  sck->m_stream   = (stream == GSOCK_STREAMED);
+  sck->m_oriented = TRUE;

   sck->m_server   = FALSE;
   sck->m_server   = FALSE;

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

 
 

-  sck->m_fd = socket(sck->m_local->m_realfamily, SOCK_DGRAM, 0);
+  /* Create the socket */
+  sck->m_fd = socket(sck->m_peer->m_realfamily,
+                     sck->m_stream? SOCK_STREAM : SOCK_DGRAM, 0);

 
 

-  if (bind(sck->m_fd, sck->m_local->m_addr, sck->m_local->m_len) < 0) {
-    close(sck->m_fd);
-    sck->m_fd    = -1;
+  if (sck->m_fd == INVALID_SOCKET)
+  {
+    sck->m_error = GSOCK_IOERR;
+    return GSOCK_IOERR;
+  }
+#if defined(__EMX__) || defined(__VISAGECPP__)
+  ioctl(sck->m_fd, FIONBIO, (char*)&arg, sizeof(arg));
+#else
+  ioctl(sck->m_fd, FIONBIO, &arg);
+#endif
+  _GSocket_Enable_Events(sck);
+
+  /* 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);
+
+  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)
+      {
+        GSocket_close(sck);
+        /* sck->m_error is set in _GSocket_Output_Timeout */
+        return GSOCK_TIMEDOUT;
+      }
+      else
+      {
+        int error;
+        SOCKLEN_T len = sizeof(error);
+
+        getsockopt(sck->m_fd, SOL_SOCKET, SO_ERROR, (void*) &error, &len);
+
+        if (!error)
+          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_establishing = TRUE;
+      sck->m_error = GSOCK_WOULDBLOCK;
+      return GSOCK_WOULDBLOCK;
+    }
+
+    /* If connect failed with an error other than EINPROGRESS,
+     * then the call to GSocket_Connect has failed.
+     */
+    GSocket_close(sck);

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


@@ -298,53 +724,69 @@ GSocketError GSocket_SetNonOriented(GSocket *sck)
   return GSOCK_NOERROR;
 }
 
   return GSOCK_NOERROR;
 }
 

-/* 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.
-*/
-GSocketError GSocket_Connect(GSocket *sck, GSocketStream stream)
+/* Datagram sockets */
+
+/* GSocket_SetNonOriented:
+ *  Sets up this socket as a non-connection oriented (datagram) socket.
+ *  Before using this function, the local address must have been set
+ *  with GSocket_SetLocal(), or the call will fail. Returns GSOCK_NOERROR
+ *  on success, or one of the following otherwise.
+ *
+ *  Error codes:
+ *    GSOCK_INVSOCK - the socket is in use.
+ *    GSOCK_INVADDR - the local address has not been set.
+ *    GSOCK_IOERR   - low-level error.
+ */
+GSocketError GSocket_SetNonOriented(GSocket *sck)

 {
 {

-  int type;
+  int arg = 1;

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

-  if (sck->m_fd != -1) {
+  if (sck->m_fd != INVALID_SOCKET)
+  {

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

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

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

-  sck->m_stream = (stream == GSOCK_STREAMED);
-  sck->m_oriented = TRUE;
-
-  if (sck->m_stream)
-    type = SOCK_STREAM;
-  else
-    type = SOCK_DGRAM;
+  /* Initialize all fields */
+  sck->m_stream   = FALSE;
+  sck->m_server   = FALSE;
+  sck->m_oriented = FALSE;

 
 

-  sck->m_fd = socket(sck->m_peer->m_realfamily, type, 0);
+  /* Create the socket */
+  sck->m_fd = socket(sck->m_local->m_realfamily, SOCK_DGRAM, 0);

 
 

-  if (sck->m_fd == -1) {
+  if (sck->m_fd == INVALID_SOCKET)
+  {

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

-
-  if (connect(sck->m_fd, sck->m_peer->m_addr,
-              sck->m_peer->m_len) != 0) {
-    close(sck->m_fd);
-    sck->m_fd = -1;
+#if defined(__EMX__) || defined(__VISAGECPP__)
+  ioctl(sck->m_fd, FIONBIO, (char*)&arg, sizeof(arg));
+#else
+  ioctl(sck->m_fd, FIONBIO, &arg);
+#endif
+  _GSocket_Enable_Events(sck);
+
+  /* Bind to the local address,
+   * and retrieve the actual address bound.
+   */
+  if ((bind(sck->m_fd, sck->m_local->m_addr, sck->m_local->m_len) != 0) ||
+      (getsockname(sck->m_fd,
+                   sck->m_local->m_addr,
+                   (SOCKLEN_T *) &sck->m_local->m_len) != 0))
+  {
+    GSocket_close(sck);

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

-  
-  sck->m_server = FALSE;

 
   return GSOCK_NOERROR;
 }
 
   return GSOCK_NOERROR;
 }


@@ -354,82 +796,268 @@ 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) {
+  /* When using CFSocket we MUST NOT reenable events until we finish reading */
+#ifndef __DARWIN__
+  /* Reenable INPUT events */
+  _GSocket_Enable(socket, GSOCK_INPUT);
+#endif
+
+  if (socket->m_fd == INVALID_SOCKET || socket->m_server)
+  {

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

-  _GSocket_Enable(socket, GSOCK_INPUT);
+  /* If the socket is blocking, wait for data (with a timeout) */
+  if (_GSocket_Input_Timeout(socket) == GSOCK_TIMEDOUT)
+    return -1;

 
 

-  if (socket->m_oriented)
-    return _GSocket_Recv_Stream(socket, buffer, size);
+  /* Read the data */
+  if (socket->m_stream)
+    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;
+  }
+  
+#ifdef __DARWIN__
+  /* Reenable INPUT events */
+  _GSocket_Enable(socket, GSOCK_INPUT);
+#endif
+
+  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);

+  
+  GSocket_Debug(( "GSocket_Write #1, size %d\n", size ));

 
 

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

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

-  _GSocket_Enable(socket, GSOCK_OUTPUT);
+  GSocket_Debug(( "GSocket_Write #2, size %d\n", size ));
+
+  /* If the socket is blocking, wait for writability (with a timeout) */
+  if (_GSocket_Output_Timeout(socket) == GSOCK_TIMEDOUT)
+    return -1;
+
+  GSocket_Debug(( "GSocket_Write #3, size %d\n", size ));

 
 

-  if (socket->m_oriented)
-    return _GSocket_Send_Stream(socket, buffer, size);
+  /* Write the data */
+  if (socket->m_stream)
+    ret = _GSocket_Send_Stream(socket, buffer, size);

   else
   else

-    return _GSocket_Send_Dgram(socket, buffer, size);
+    ret = _GSocket_Send_Dgram(socket, buffer, size);
+    
+  GSocket_Debug(( "GSocket_Write #4, size %d\n", size ));
+
+  if (ret == -1)
+  {
+    if (errno == EWOULDBLOCK)
+    {
+      socket->m_error = GSOCK_WOULDBLOCK;
+      GSocket_Debug(( "GSocket_Write error WOULDBLOCK\n" ));
+    }
+    else
+    {
+      socket->m_error = GSOCK_IOERR;
+      GSocket_Debug(( "GSocket_Write error IOERR\n" ));
+    }
+
+    /* 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 -1;
+  }
+  
+  GSocket_Debug(( "GSocket_Write #5, size %d ret %d\n", size, ret ));
+
+  return ret;

 }
 
 }
 

-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;
-  struct timeval tv;
+  if (!USE_GUI())
+  {
+
+    GSocketEventFlags result = 0;
+    fd_set readfds;
+    fd_set writefds;
+    fd_set exceptfds;
+    struct timeval tv;
+
+    /* Do not use a static struct, Linux can garble it */
+    tv.tv_sec = socket->m_timeout / 1000;
+    tv.tv_usec = (socket->m_timeout % 1000) / 1000;
+
+    assert(socket != NULL);
+
+    FD_ZERO(&readfds);
+    FD_ZERO(&writefds);
+    FD_ZERO(&exceptfds);
+    FD_SET(socket->m_fd, &readfds);
+    if (flags & GSOCK_OUTPUT_FLAG)
+      FD_SET(socket->m_fd, &writefds);
+    FD_SET(socket->m_fd, &exceptfds);
+
+    /* 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);
+    }

 
 

-  assert(socket != NULL);
+    /* Try select now */
+    if (select(socket->m_fd + 1, &readfds, &writefds, &exceptfds, &tv) <= 0)
+    {
+      /* What to do here? */
+      return (result & flags);
+    }

 
 

-  if (socket->m_fd == -1 || socket->m_server) {
-    socket->m_error = GSOCK_INVSOCK;
-    return FALSE;
-  }
+    /* Check for readability */
+    if (FD_ISSET(socket->m_fd, &readfds))
+    {
+      char c;
+
+      if (recv(socket->m_fd, &c, 1, MSG_PEEK) > 0)
+      {
+        result |= GSOCK_INPUT_FLAG;
+      }
+      else
+      {
+        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 */
+    if (FD_ISSET(socket->m_fd, &writefds))
+    {
+      if (socket->m_establishing && !socket->m_server)
+      {
+        int error;
+        SOCKLEN_T len = sizeof(error);
+
+        socket->m_establishing = FALSE;
+
+        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;
+      }
+    }

 
 

-  FD_ZERO(&read_set);
-  FD_SET(socket->m_fd, &read_set);
+    /* Check for exceptions and errors (is this useful in Unices?) */
+    if (FD_ISSET(socket->m_fd, &exceptfds))
+    {
+      socket->m_establishing = FALSE;
+      socket->m_detected = GSOCK_LOST_FLAG;

 
 

-  tv.tv_sec = 0;
-  tv.tv_usec = 0;
+      /* LOST event: Abort any further processing */
+      return (GSOCK_LOST_FLAG & flags);
+    }
+
+    return (result & flags);
+
+  }
+  else
+  {

 
 

-  select(socket->m_fd+1, &read_set, NULL, NULL, &tv);
+    assert(socket != NULL);
+    return flags & socket->m_detected;

 
 

-  return FD_ISSET(socket->m_fd, &read_set);
+  }

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

-/*
-  GSocket_SetBlocking() puts the socket in non-blocking mode. This is useful
-  if we don't want to wait.
-*/
-void GSocket_SetBlocking(GSocket *socket, bool block)
+/* GSocket_SetNonBlocking:
+ *  Sets the socket to non-blocking mode. All IO calls will return
+ *  immediately.
+ */
+void GSocket_SetNonBlocking(GSocket *socket, int non_block)

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

-  socket->m_blocking = block;
+  GSocket_Debug( ("GSocket_SetNonBlocking: %d\n", (int)non_block) );

 
 

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

 }
 
 }
 

-/*
-  GSocket_GetError() returns the last error occured on the socket stream.
-*/
+/* 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;
+}

 
 

+/* GSocket_GetError:
+ *  Returns the last error occured for this socket. Note that successful
+ *  operations do not clear this back to GSOCK_NOERROR, so use it only
+ *  after an error.
+ */

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


@@ -439,126 +1067,219 @@ 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
-
-   SetFallback 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_SetFallback(GSocket *socket, GSocketEventFlags event,
-                        GSocketFallback fallback, char *cdata)
+/* GSOCK_INPUT:
+ *   There is data to be read in the input buffer. If, after a read
+ *   operation, there is still data available, the callback function will
+ *   be called again.
+ * GSOCK_OUTPUT:
+ *   The socket is available for writing. That is, the next write call 
+ *   won't block. This event is generated only once, when the connection is
+ *   first established, and then only if a call failed with GSOCK_WOULDBLOCK,
+ *   when the output buffer empties again. This means that the app should
+ *   assume that it can write since the first OUTPUT event, and no more
+ *   OUTPUT events will be generated unless an error occurs.
+ * GSOCK_CONNECTION:
+ *   Connection succesfully established, for client sockets, or incoming
+ *   client connection, for server sockets. Wait for this event (also watch
+ *   out for GSOCK_LOST) after you issue a nonblocking GSocket_Connect() call.
+ * GSOCK_LOST:
+ *   The connection is lost (or a connection request failed); this could
+ *   be due to a failure, or due to the peer closing it gracefully.
+ */
+
+/* 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;
 

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

 
 

-  for (count=0;count<GSOCK_MAX_EVENT;count++) {
-    if ((event & (1 << count)) != 0) {
-      socket->m_fbacks[count] = fallback;
+  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_data[count] = cdata;

-
-      _GSocket_Install_Fallback(socket, count);
-      _GSocket_Enable(socket, count);

     }
   }
 }
 
     }
   }
 }
 

-/*
-  UnsetFallback will disables all fallbacks specified by "event".
-  NOTE: event may be a combination of flags
-*/
-void GSocket_UnsetFallback(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);
 
 
   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;
-      _GSocket_Uninstall_Fallback(socket, count);
+  for (count = 0; count < GSOCK_MAX_EVENT; count++)
+  {
+    if ((flags & (1 << count)) != 0)
+    {
+      socket->m_cbacks[count] = NULL;
+      socket->m_data[count] = NULL;

     }
   }
 }
 
     }
   }
 }
 

-#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); \
+#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_fbacks[event])
-    _GSocket_Install_Fallback(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_fbacks[event])
-    _GSocket_Uninstall_Fallback(socket, event);
+  socket->m_detected |= (1 << event);
+  _GSocket_Uninstall_Callback(socket, event);

 }
 
 }
 

-int _GSocket_Recv_Stream(GSocket *socket, char *buffer, int size)
+/* _GSocket_Input_Timeout:
+ *  For blocking sockets, wait until data is available or
+ *  until timeout ellapses.
+ */
+GSocketError _GSocket_Input_Timeout(GSocket *socket)

 {
 {

+  struct timeval tv;
+  fd_set readfds;

   int ret;
 
   int ret;
 

-  MASK_SIGNAL();
-  ret = recv(socket->m_fd, buffer, size, 0);
-  UNMASK_SIGNAL();
-  if (ret == -1) {
-    socket->m_error = GSOCK_IOERR;
-    return -1;
+  /* 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);
+    ret = select(socket->m_fd + 1, &readfds, NULL, NULL, &tv);
+    if (ret == 0)
+    {
+      GSocket_Debug(( "GSocket_Input_Timeout, select returned 0\n" ));
+      socket->m_error = GSOCK_TIMEDOUT;
+      return GSOCK_TIMEDOUT;
+    }
+    if (ret == -1)
+    {
+      GSocket_Debug(( "GSocket_Input_Timeout, select returned -1\n" ));
+      if (errno == EBADF) { GSocket_Debug(( "Invalid file descriptor\n" )); }
+      if (errno == EINTR) { GSocket_Debug(( "A non blocked signal was caught\n" )); }
+      if (errno == EINVAL) { GSocket_Debug(( "The highest number descriptor is negative\n" )); }
+      if (errno == ENOMEM) { GSocket_Debug(( "Not enough memory\n" )); }
+      socket->m_error = GSOCK_TIMEDOUT;
+      return GSOCK_TIMEDOUT;
+    }

   }
   }

-  return ret;
+  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;
+  int ret;
+
+  /* Linux select() will overwrite the struct on return */
+  tv.tv_sec  = (socket->m_timeout / 1000);
+  tv.tv_usec = (socket->m_timeout % 1000) * 1000;
+
+  GSocket_Debug( ("m_non_blocking has: %d\n", (int)socket->m_non_blocking) );
+
+  if (!socket->m_non_blocking)
+  {
+    FD_ZERO(&writefds);
+    FD_SET(socket->m_fd, &writefds);
+    ret = select(socket->m_fd + 1, NULL, &writefds, NULL, &tv);
+    if (ret == 0)
+    {
+      GSocket_Debug(( "GSocket_Output_Timeout, select returned 0\n" ));
+      socket->m_error = GSOCK_TIMEDOUT;
+      return GSOCK_TIMEDOUT;
+    }
+    if (ret == -1)
+    {
+      GSocket_Debug(( "GSocket_Output_Timeout, select returned -1\n" ));
+      if (errno == EBADF) { GSocket_Debug(( "Invalid file descriptor\n" )); }
+      if (errno == EINTR) { GSocket_Debug(( "A non blocked signal was caught\n" )); }
+      if (errno == EINVAL) { GSocket_Debug(( "The highest number descriptor is negative\n" )); }
+      if (errno == ENOMEM) { GSocket_Debug(( "Not enough memory\n" )); }
+      socket->m_error = GSOCK_TIMEDOUT;
+      return GSOCK_TIMEDOUT;
+    }
+    if ( ! FD_ISSET(socket->m_fd, &writefds) ) {
+        GSocket_Debug(( "GSocket_Output_Timeout is buggy!\n" ));
+    }
+    else {
+        GSocket_Debug(( "GSocket_Output_Timeout seems correct\n" ));
+    }
+  }
+  else
+  {
+    GSocket_Debug(( "GSocket_Output_Timeout, didn't try select!\n" ));
+  }
+
+  return GSOCK_NOERROR;
+}
+
+int _GSocket_Recv_Stream(GSocket *socket, char *buffer, int size)
+{
+  return recv(socket->m_fd, buffer, size, 0);

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

-  int fromlen, ret;
+  SOCKLEN_T fromlen = sizeof(from);
+  int ret;
+  GSocketError err;

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

-  MASK_SIGNAL();
-  ret = recvfrom(socket->m_fd, buffer, size, 0, &from, &fromlen);
-  UNMASK_SIGNAL();
-  if (ret == -1) {
-    socket->m_error = GSOCK_IOERR;
+  ret = recvfrom(socket->m_fd, buffer, size, 0, &from, (SOCKLEN_T *) &fromlen);
+
+  if (ret == -1)

     return -1;
     return -1;

-  }

 
 

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

-  _GAddress_translate_from(socket->m_peer, &from, fromlen);
+    if (!socket->m_peer)
+    {
+      socket->m_error = GSOCK_MEMERR;
+      return -1;
+    }
+  }
+  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 ret;
 }
 
   return ret;
 }


@@ -567,13 +1288,14 @@ int _GSocket_Send_Stream(GSocket *socket, const char *buffer, int size)
 {
   int ret;
 
 {
   int ret;
 

+#ifndef __VISAGECPP__

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

-  if (ret == -1) {
-    socket->m_error = GSOCK_IOERR;
-    return -1;
-  }
+#else
+  ret = send(socket->m_fd, (char *)buffer, size, 0);
+#endif
+

   return ret;
 }
 
   return ret;
 }
 


@@ -581,22 +1303,30 @@ 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) {
+  if (!socket->m_peer)
+  {

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

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

 
 

+#ifndef __VISAGECPP__

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

-  if (ret == -1) {
-    socket->m_error = GSOCK_IOERR;
-    return -1;
-  }
+#else
+  ret = sendto(socket->m_fd, (char *)buffer, size, 0, addr, len);
+#endif

 
 

+  /* Frees memory allocated from _GAddress_translate_to */

   free(addr);
 
   return ret;
   free(addr);
 
   return ret;


@@ -605,32 +1335,80 @@ int _GSocket_Send_Dgram(GSocket *socket, const char *buffer, int size)
 void _GSocket_Detected_Read(GSocket *socket)
 {
   char c;
 void _GSocket_Detected_Read(GSocket *socket)
 {
   char c;

-  int ret;

 
 

-  if (socket->m_stream) {
-    ret = recv(socket->m_fd, &c, 1, MSG_PEEK);
+  /* 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;

 
 

-    if (ret < 0 && socket->m_server) {
-      CALL_FALLBACK(socket, GSOCK_CONNECTION);
-      return;
-    }
+    CALL_CALLBACK(socket, GSOCK_LOST);
+    GSocket_Shutdown(socket);
+    return;
+  }

 
 

-    if (ret > 0) {
-      CALL_FALLBACK(socket, GSOCK_INPUT);
-    } else {
-      CALL_FALLBACK(socket, GSOCK_LOST);
+  if (recv(socket->m_fd, &c, 1, MSG_PEEK) > 0)
+  {
+    CALL_CALLBACK(socket, GSOCK_INPUT);
+  }
+  else
+  {
+    if (socket->m_server && socket->m_stream)
+    {
+      CALL_CALLBACK(socket, GSOCK_CONNECTION);
+    }
+    else
+    {
+      CALL_CALLBACK(socket, GSOCK_LOST);
+      GSocket_Shutdown(socket);

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

-  CALL_FALLBACK(socket, GSOCK_OUTPUT);
-}
+  /* 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;
+    SOCKLEN_T len = sizeof(error);

 
 

-#undef CALL_FALLBACK 
-#undef MASK_SIGNAL
-#undef UNMASK_SIGNAL
+    socket->m_establishing = FALSE;
+
+    getsockopt(socket->m_fd, SOL_SOCKET, SO_ERROR, (void*)&error, &len);
+
+    if (error)
+    {
+      CALL_CALLBACK(socket, GSOCK_LOST);
+      GSocket_Shutdown(socket);
+    }
+    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);
+  }
+}

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


@@ -638,21 +1416,44 @@ void _GSocket_Detected_Write(GSocket *socket)
  * -------------------------------------------------------------------------
  */
 
  * -------------------------------------------------------------------------
  */
 

-#define CHECK_ADDRESS(address, family, retval) \
-{ \
-  if (address->m_family == GSOCK_NOFAMILY) \
-    _GAddress_Init_##family(address); \
-  if (address->m_family != GSOCK_##family) {\
-    address->m_error = GSOCK_INVADDR; \
-    return retval; \
-  } \
+/* CHECK_ADDRESS verifies that the current address family is either
+ * GSOCK_NOFAMILY or GSOCK_*family*, and if it is GSOCK_NOFAMILY, it
+ * initalizes it to be a GSOCK_*family*. In other cases, it returns
+ * an appropiate error code.
+ *
+ * CHECK_ADDRESS_RETVAL does the same but returning 'retval' on error.
+ */
+#define CHECK_ADDRESS(address, family)                              \
+{                                                                   \
+  if (address->m_family == GSOCK_NOFAMILY)                          \
+    if (_GAddress_Init_##family(address) != GSOCK_NOERROR)          \
+      return address->m_error;                                      \
+  if (address->m_family != GSOCK_##family)                          \
+  {                                                                 \
+    address->m_error = GSOCK_INVADDR;                               \
+    return GSOCK_INVADDR;                                           \
+  }                                                                 \
+}
+
+#define CHECK_ADDRESS_RETVAL(address, family, retval)               \
+{                                                                   \
+  if (address->m_family == GSOCK_NOFAMILY)                          \
+    if (_GAddress_Init_##family(address) != GSOCK_NOERROR)          \
+      return retval;                                                \
+  if (address->m_family != GSOCK_##family)                          \
+  {                                                                 \
+    address->m_error = GSOCK_INVADDR;                               \
+    return retval;                                                  \
+  }                                                                 \

 }
 
 }
 

-GAddress *GAddress_new()
+
+GAddress *GAddress_new(void)

 {
   GAddress *address;
 
 {
   GAddress *address;
 

-  address = (GAddress *)malloc(sizeof(GAddress));
+  if ((address = (GAddress *) malloc(sizeof(GAddress))) == NULL)
+    return NULL;

 
   address->m_family  = GSOCK_NOFAMILY;
   address->m_addr    = NULL;
 
   address->m_family  = GSOCK_NOFAMILY;
   address->m_addr    = NULL;


@@ -667,11 +1468,19 @@ GAddress *GAddress_copy(GAddress *address)
 
   assert(address != NULL);
 
 
   assert(address != NULL);
 

-  addr2 = (GAddress *)malloc(sizeof(GAddress));
+  if ((addr2 = (GAddress *) malloc(sizeof(GAddress))) == NULL)
+    return NULL;
+

   memcpy(addr2, address, sizeof(GAddress));
 
   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);
     addr2->m_addr = (struct sockaddr *)malloc(addr2->m_len);

+    if (addr2->m_addr == NULL)
+    {
+      free(addr2);
+      return NULL;
+    }

     memcpy(addr2->m_addr, address->m_addr, addr2->m_len);
   }
 
     memcpy(addr2->m_addr, address->m_addr, addr2->m_len);
   }
 


@@ -682,6 +1491,9 @@ void GAddress_destroy(GAddress *address)
 {
   assert(address != NULL);
 
 {
   assert(address != NULL);
 

+  if (address->m_addr)
+    free(address->m_addr);
+

   free(address);
 }
 
   free(address);
 }
 


@@ -699,23 +1511,28 @@ GAddressType GAddress_GetFamily(GAddress *address)
   return address->m_family;
 }
 
   return address->m_family;
 }
 

-void _GAddress_translate_from(GAddress *address, struct sockaddr *addr, int len){
+GSocketError _GAddress_translate_from(GAddress *address,
+                                      struct sockaddr *addr, int len)
+{

   address->m_realfamily = addr->sa_family;
   address->m_realfamily = addr->sa_family;

-  switch (addr->sa_family) {
-  case AF_INET:
-    address->m_family = GSOCK_INET;
-    break;
-  case AF_UNIX:
-    address->m_family = GSOCK_UNIX;
-    break;
+  switch (addr->sa_family)
+  {
+    case AF_INET:
+      address->m_family = GSOCK_INET;
+      break;
+    case AF_UNIX:
+      address->m_family = GSOCK_UNIX;
+      break;

 #ifdef AF_INET6
 #ifdef AF_INET6

-  case AF_INET6:
-    address->m_family = GSOCK_INET6;
-    break;
+    case AF_INET6:
+      address->m_family = GSOCK_INET6;
+      break;

 #endif
 #endif

-  default:
-
-    /* TODO error */
+    default:
+    {
+      address->m_error = GSOCK_INVOP;
+      return GSOCK_INVOP;
+    }

   }
 
   if (address->m_addr)
   }
 
   if (address->m_addr)


@@ -723,20 +1540,36 @@ void _GAddress_translate_from(GAddress *address, struct sockaddr *addr, int len)
 
   address->m_len  = len;
   address->m_addr = (struct sockaddr *)malloc(len);
 
   address->m_len  = len;
   address->m_addr = (struct sockaddr *)malloc(len);

+
+  if (address->m_addr == NULL)
+  {
+    address->m_error = GSOCK_MEMERR;
+    return GSOCK_MEMERR;
+  }

   memcpy(address->m_addr, addr, len);
   memcpy(address->m_addr, addr, len);

+
+  return GSOCK_NOERROR;

 }
 
 }
 

-void _GAddress_translate_to(GAddress *address,
-                            struct sockaddr **addr, int *len)
+GSocketError _GAddress_translate_to(GAddress *address,
+                                    struct sockaddr **addr, int *len)

 {
 {

-  if (!address->m_addr) {
-    /* TODO error */
-    return;
+  if (!address->m_addr)
+  {
+    address->m_error = GSOCK_INVADDR;
+    return GSOCK_INVADDR;

   }
 
   *len = address->m_len;
   *addr = (struct sockaddr *)malloc(address->m_len);
   }
 
   *len = address->m_len;
   *addr = (struct sockaddr *)malloc(address->m_len);

+  if (*addr == NULL)
+  {
+    address->m_error = GSOCK_MEMERR;
+    return GSOCK_MEMERR;
+  }
+

   memcpy(*addr, address->m_addr, address->m_len);
   memcpy(*addr, address->m_addr, address->m_len);

+  return GSOCK_NOERROR;

 }
 
 /*
 }
 
 /*


@@ -745,14 +1578,22 @@ void _GAddress_translate_to(GAddress *address,
  * -------------------------------------------------------------------------
  */
 
  * -------------------------------------------------------------------------
  */
 

-void _GAddress_Init_INET(GAddress *address)
+GSocketError _GAddress_Init_INET(GAddress *address)

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

-  address->m_addr = (struct sockaddr *)malloc(address->m_len);
+  address->m_addr = (struct sockaddr *) malloc(address->m_len);
+  if (address->m_addr == NULL)
+  {
+    address->m_error = GSOCK_MEMERR;
+    return GSOCK_MEMERR;
+  }
+

   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;
+  ((struct sockaddr_in *)address->m_addr)->sin_addr.s_addr = INADDR_ANY;
+
+  return GSOCK_NOERROR;

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


@@ -762,15 +1603,32 @@ GSocketError GAddress_INET_SetHostName(GAddress *address, const char *hostname)
 
   assert(address != NULL);
 
 
   assert(address != NULL);
 

-  CHECK_ADDRESS(address, INET, GSOCK_INVADDR);
+  CHECK_ADDRESS(address, INET);

 
   addr = &(((struct sockaddr_in *)address->m_addr)->sin_addr);
 
 
   addr = &(((struct sockaddr_in *)address->m_addr)->sin_addr);
 

-  /* only name for the moment */
-  if (inet_aton(hostname, addr) == 0) {
+  /* If it is a numeric host name, convert it now */
+#if defined(HAVE_INET_ATON)
+  if (inet_aton(hostname, addr) == 0)
+  {
+#elif defined(HAVE_INET_ADDR)
+  if ( (addr->s_addr = inet_addr(hostname)) == -1 )
+  {
+#else
+  /* Use gethostbyname by default */
+#ifndef __WXMAC__
+  int val = 1;  /* VA doesn't like constants in conditional expressions */
+  if (val)
+#endif
+  {
+#endif

     struct in_addr *array_addr;
 
     struct in_addr *array_addr;
 

-    if ((he = gethostbyname(hostname)) == NULL) {
+    /* It is a real name, we solve it */
+    if ((he = gethostbyname(hostname)) == NULL)
+    {
+      /* Reset to invalid address */
+      addr->s_addr = INADDR_NONE;

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


@@ -780,6 +1638,11 @@ GSocketError GAddress_INET_SetHostName(GAddress *address, const char *hostname)
   return GSOCK_NOERROR;
 }
 
   return GSOCK_NOERROR;
 }
 

+GSocketError GAddress_INET_SetAnyAddress(GAddress *address)
+{
+  return GAddress_INET_SetHostAddress(address, INADDR_ANY);
+}
+

 GSocketError GAddress_INET_SetHostAddress(GAddress *address,
                                           unsigned long hostaddr)
 {
 GSocketError GAddress_INET_SetHostAddress(GAddress *address,
                                           unsigned long hostaddr)
 {


@@ -787,7 +1650,7 @@ GSocketError GAddress_INET_SetHostAddress(GAddress *address,
 
   assert(address != NULL);
 
 
   assert(address != NULL);
 

-  CHECK_ADDRESS(address, INET, GSOCK_INVADDR);
+  CHECK_ADDRESS(address, INET);

 
   addr = &(((struct sockaddr_in *)address->m_addr)->sin_addr);
   addr->s_addr = hostaddr;
 
   addr = &(((struct sockaddr_in *)address->m_addr)->sin_addr);
   addr->s_addr = hostaddr;


@@ -795,23 +1658,28 @@ GSocketError GAddress_INET_SetHostAddress(GAddress *address,
   return GSOCK_NOERROR;
 }
 
   return GSOCK_NOERROR;
 }
 

-GSocketError GAddress_INET_SetPortName(GAddress *address, const char *port)
+GSocketError GAddress_INET_SetPortName(GAddress *address, const char *port,
+                                       const char *protocol)

 {
   struct servent *se;
   struct sockaddr_in *addr;
 
   assert(address != NULL);
 {
   struct servent *se;
   struct sockaddr_in *addr;
 
   assert(address != NULL);

-  CHECK_ADDRESS(address, INET, GSOCK_INVADDR);
+  CHECK_ADDRESS(address, INET);

 
 

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

     address->m_error = GSOCK_INVPORT;
     address->m_error = GSOCK_INVPORT;

-    return GSOCK_INVOP;
+    return GSOCK_INVPORT;

   }
  
   }
  

-  /* TODO: TCP or UDP */
-  se = getservbyname(port, "tcp");
-  if (!se) {
-    if (isdigit(port[0])) {
+  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;
 
       port_int = atoi(port);
       int port_int;
 
       port_int = atoi(port);


@@ -835,7 +1703,7 @@ GSocketError GAddress_INET_SetPort(GAddress *address, unsigned short port)
   struct sockaddr_in *addr;
 
   assert(address != NULL);
   struct sockaddr_in *addr;
 
   assert(address != NULL);

-  CHECK_ADDRESS(address, INET, GSOCK_INVADDR);
+  CHECK_ADDRESS(address, INET);

  
   addr = (struct sockaddr_in *)address->m_addr;
   addr->sin_port = htons(port);
  
   addr = (struct sockaddr_in *)address->m_addr;
   addr->sin_port = htons(port);


@@ -850,13 +1718,14 @@ GSocketError GAddress_INET_GetHostName(GAddress *address, char *hostname, size_t
   struct sockaddr_in *addr;
 
   assert(address != NULL); 
   struct sockaddr_in *addr;
 
   assert(address != NULL); 

-  CHECK_ADDRESS(address, INET, GSOCK_INVADDR);
+  CHECK_ADDRESS(address, INET);

 
   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;
   }


@@ -871,7 +1740,7 @@ unsigned long GAddress_INET_GetHostAddress(GAddress *address)
   struct sockaddr_in *addr;
 
   assert(address != NULL); 
   struct sockaddr_in *addr;
 
   assert(address != NULL); 

-  CHECK_ADDRESS(address, INET, 0); 
+  CHECK_ADDRESS_RETVAL(address, INET, 0); 

 
   addr = (struct sockaddr_in *)address->m_addr;
 
 
   addr = (struct sockaddr_in *)address->m_addr;
 


@@ -883,7 +1752,7 @@ unsigned short GAddress_INET_GetPort(GAddress *address)
   struct sockaddr_in *addr;
 
   assert(address != NULL); 
   struct sockaddr_in *addr;
 
   assert(address != NULL); 

-  CHECK_ADDRESS(address, INET, 0); 
+  CHECK_ADDRESS_RETVAL(address, INET, 0); 

 
   addr = (struct sockaddr_in *)address->m_addr;
   return ntohs(addr->sin_port);
 
   addr = (struct sockaddr_in *)address->m_addr;
   return ntohs(addr->sin_port);


@@ -895,26 +1764,38 @@ unsigned short GAddress_INET_GetPort(GAddress *address)
  * -------------------------------------------------------------------------
  */
 
  * -------------------------------------------------------------------------
  */
 

-void _GAddress_Init_UNIX(GAddress *address)
+#ifndef __VISAGECPP__
+GSocketError _GAddress_Init_UNIX(GAddress *address)

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

+  if (address->m_addr == NULL)
+  {
+    address->m_error = GSOCK_MEMERR;
+    return GSOCK_MEMERR;
+  }
+

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

+
+  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;
 
   assert(address != NULL); 
 
 GSocketError GAddress_UNIX_SetPath(GAddress *address, const char *path)
 {
   struct sockaddr_un *addr;
 
   assert(address != NULL); 
 

-  CHECK_ADDRESS(address, UNIX, GSOCK_INVADDR); 
+  CHECK_ADDRESS(address, UNIX); 

 
   addr = ((struct sockaddr_un *)address->m_addr);
 
   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;
 }
 
   return GSOCK_NOERROR;
 }


@@ -924,7 +1805,7 @@ GSocketError GAddress_UNIX_GetPath(GAddress *address, char *path, size_t sbuf)
   struct sockaddr_un *addr;
 
   assert(address != NULL);
   struct sockaddr_un *addr;
 
   assert(address != NULL);

-  CHECK_ADDRESS(address, UNIX, GSOCK_INVADDR);
+  CHECK_ADDRESS(address, UNIX);

 
   addr = (struct sockaddr_un *)address->m_addr;
 
 
   addr = (struct sockaddr_un *)address->m_addr;
 


@@ -932,3 +1813,6 @@ GSocketError GAddress_UNIX_GetPath(GAddress *address, char *path, size_t sbuf)
 
   return GSOCK_NOERROR;
 }
 
   return GSOCK_NOERROR;
 }

+#endif  /* !defined(__VISAGECPP__) */
+#endif  /* wxUSE_SOCKETS || defined(__GSOCKET_STANDALONE__) */
+