precompiled headers fix

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

diff --git a/src/os2/gsocket.c b/src/os2/gsocket.c
index 1aa27bf4115dd5456b93d522dea99ba50df8ee63..b57aa868d27b6c2508d45c51e7f158c915bb46bc 100644 (file)
--- a/src/os2/gsocket.c
+++ b/src/os2/gsocket.c
@@ -3,7 +3,8 @@
  * Name:    gsocket.c
  * Authors: Guilhem Lavaux,
  *          Guillermo Rodriguez Garcia <guille@iies.es> (maintainer)
  * Name:    gsocket.c
  * Authors: Guilhem Lavaux,
  *          Guillermo Rodriguez Garcia <guille@iies.es> (maintainer)

- * Purpose: GSocket main Unix-style file
+ * Purpose: GSocket main Unix and OS/2 file
+ * Licence: The wxWindows licence

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


@@ -16,49 +17,66 @@
 #include "wx/setup.h"
 #endif
 
 #include "wx/setup.h"
 #endif
 

-#ifndef __EMX__
-/* I don't see, why this include is needed, but it seems to be necessary
-   sometimes. For EMX, including C++ headers into plain C source breaks
-   compilation, so don't do it there.                                   */
+#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"
 #include "wx/defs.h"

+#define BSD_SELECT /* use Berkley Sockets select */

 #endif
 
 #if wxUSE_SOCKETS || defined(__GSOCKET_STANDALONE__)
 
 #endif
 
 #if wxUSE_SOCKETS || defined(__GSOCKET_STANDALONE__)
 

-#define BSD_SELECT /* use Berkley Sockets select */
-

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

-#include <sys\types.h>
-#ifdef __EMX__
+#include <sys/types.h>
+#ifdef __VISAGECPP__
+#include <string.h>

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

+#include <types.h>

 #include <netinet/in.h>
 #include <netinet/in.h>

-#include <arpa/inet.h>
+#endif

 #include <netdb.h>
 #include <netdb.h>

+#include <sys/ioctl.h>
+
+#ifdef __VMS__
+#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>
+#include <sys/un.h>
+#endif
+
+#ifndef __VISAGECPP__
+#include <sys/time.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>

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

+#include <string.h>

 #include <unistd.h>
 #include <unistd.h>

-#include <sys/un.h>
-#define HAVE_INET_ADDR

 #else
 #else

-#include <utils.h>
-#include <sys\time.h>
-#include <types.h>
-#include <in.h>
-#include <netdb.h>

 #include <nerrno.h>
 #include <nerrno.h>

-#endif
-#if defined(__VISAGECPP__) && __IBMCPP__ < 400
-#include <machine\endian.h>
+#  if __IBMCPP__ < 400
+#include <machine/endian.h>

 #include <socket.h>
 #include <ioctl.h>
 #include <select.h>
 #include <unistd.h>
 #include <socket.h>
 #include <ioctl.h>
 #include <select.h>
 #include <unistd.h>

-#else
-#include <sys\socket.h>
-#include <sys\ioctl.h>
-#include <sys\select.h>
-#ifdef __EMX__
-#define soclose(a) close(a)
-#else
+
+#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 *,
 #define select(a,b,c,d,e) bsdselect(a,b,c,d,e)
 int _System bsdselect(int,
                       struct fd_set *,


@@ -66,33 +84,35 @@ int _System bsdselect(int,
                       struct fd_set *,
                       struct timeval *);
 int _System soclose(int);
                       struct fd_set *,
                       struct timeval *);
 int _System soclose(int);

-#endif
-#endif
-
-#include <string.h>
-#include <stdio.h>
-#if (defined(__VISAGECPP__) && __IBMCPP__ < 400) || defined(__EMX__)
-#  ifdef min
-#  undef min

 #  endif
 #  endif

-#  include <stdlib.h>

 #endif
 #endif

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

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

-
+#ifdef sun
+#  include <sys/filio.h>
+#endif
+#ifdef sgi
+#  include <bstring.h>
+#endif

 #include <signal.h>
 
 #ifndef SOCKLEN_T
 
 #include <signal.h>
 
 #ifndef SOCKLEN_T
 

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

 #else
 #else

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

 #endif
 
 #endif
 

-#endif
+#endif /* SOCKLEN_T */

 
 /*
  * MSW defines this, Unices don't.
 
 /*
  * MSW defines this, Unices don't.


@@ -101,6 +121,11 @@ int _System soclose(int);
 #define INVALID_SOCKET -1
 #endif
 
 #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.
 /*
  * INADDR_BROADCAST is identical to INADDR_NONE which is not defined
  * on all systems. INADDR_BROADCAST should be fine to indicate an error.


@@ -119,6 +144,7 @@ int _System soclose(int);
   signal(SIGPIPE, old_handler);             \
 }
 
   signal(SIGPIPE, old_handler);             \
 }
 

+

 #ifndef __GSOCKET_STANDALONE__
 #  include "wx/unix/gsockunx.h"
 #  include "wx/gsocket.h"
 #ifndef __GSOCKET_STANDALONE__
 #  include "wx/unix/gsockunx.h"
 #  include "wx/gsocket.h"


@@ -127,33 +153,67 @@ int _System soclose(int);
 #  include "gsocket.h"
 #endif /* __GSOCKET_STANDALONE__ */
 
 #  include "gsocket.h"
 #endif /* __GSOCKET_STANDALONE__ */
 

-/* redefine some GUI-only functions to do nothing in console mode */
-#if defined(wxUSE_GUI) && !wxUSE_GUI
-#  define _GSocket_GUI_Init(socket) (1)
-#  define _GSocket_GUI_Destroy(socket)
-#  define _GSocket_Enable_Events(socket)
-#  define _GSocket_Disable_Events(socket)
-#  define _GSocket_Install_Callback(socket, event)
-#  define _GSocket_Uninstall_Callback(socket, event)
-#endif /* wxUSE_GUI */
-

 /* debugging helpers */
 /* debugging helpers */

-#define  __GSOCKET_DEBUG__

 #ifdef __GSOCKET_DEBUG__
 #  define GSocket_Debug(args) printf args
 #else
 #  define GSocket_Debug(args)
 #endif /* __GSOCKET_DEBUG__ */
 
 #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 =
+{
+    _GSocket_Detected_Read,
+    _GSocket_Detected_Write
+};
+

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

+void GSocket_SetGUIFunctions(struct GSocketGUIFunctionsTable *guifunc)
+{
+  gs_gui_functions = guifunc;
+}
+         

 int GSocket_Init(void)
 {
 int GSocket_Init(void)
 {

+  if (gs_gui_functions)
+  {
+      if ( !gs_gui_functions->GUI_Init() )
+        return 0;
+  }

   return 1;
 }
 
 void GSocket_Cleanup(void)
 {
   return 1;
 }
 
 void GSocket_Cleanup(void)
 {

+  if (gs_gui_functions)
+  {
+      gs_gui_functions->GUI_Cleanup();
+  }

 }
 
 /* Constructors / Destructors for GSocket */
 }
 
 /* Constructors / Destructors for GSocket */


@@ -185,8 +245,10 @@ GSocket *GSocket_new(void)
                                 /* 10 minutes * 60 sec * 1000 millisec */
   socket->m_establishing        = FALSE;
 
                                 /* 10 minutes * 60 sec * 1000 millisec */
   socket->m_establishing        = FALSE;
 

+  socket->m_functions           = &gs_base_functions;
+

   /* Per-socket GUI-specific initialization */
   /* Per-socket GUI-specific initialization */

-  success = _GSocket_GUI_Init(socket);
+  success = _GSocket_GUI_Init_Socket(socket);

   if (!success)
   {
     free(socket);
   if (!success)
   {
     free(socket);


@@ -196,6 +258,13 @@ GSocket *GSocket_new(void)
   return socket;
 }
 
   return socket;
 }
 

+void GSocket_close(GSocket *socket)
+{
+    _GSocket_Disable_Events(socket);
+    close(socket->m_fd);
+    socket->m_fd = INVALID_SOCKET;
+}
+

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


@@ -205,7 +274,7 @@ void GSocket_destroy(GSocket *socket)
     GSocket_Shutdown(socket);
 
   /* Per-socket GUI-specific cleanup */
     GSocket_Shutdown(socket);
 
   /* Per-socket GUI-specific cleanup */

-  _GSocket_GUI_Destroy(socket);
+  _GSocket_GUI_Destroy_Socket(socket);

 
   /* Destroy private addresses */
   if (socket->m_local)
 
   /* Destroy private addresses */
   if (socket->m_local)


@@ -232,8 +301,7 @@ void GSocket_Shutdown(GSocket *socket)
   if (socket->m_fd != INVALID_SOCKET)
   {
     shutdown(socket->m_fd, 2);
   if (socket->m_fd != INVALID_SOCKET)
   {
     shutdown(socket->m_fd, 2);

-    soclose(socket->m_fd);
-    socket->m_fd = INVALID_SOCKET;
+    GSocket_close(socket);

   }
 
   /* Disable GUI callbacks */
   }
 
   /* Disable GUI callbacks */


@@ -241,7 +309,6 @@ void GSocket_Shutdown(GSocket *socket)
     socket->m_cbacks[evt] = NULL;
 
   socket->m_detected = GSOCK_LOST_FLAG;
     socket->m_cbacks[evt] = NULL;
 
   socket->m_detected = GSOCK_LOST_FLAG;

-  _GSocket_Disable_Events(socket);

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


@@ -406,8 +473,11 @@ GSocketError GSocket_SetServer(GSocket *sck)
     sck->m_error = GSOCK_IOERR;
     return GSOCK_IOERR;
   }
     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);
   ioctl(sck->m_fd, FIONBIO, &arg);

+#endif

   _GSocket_Enable_Events(sck);
 
   /* Bind to the local address,
   _GSocket_Enable_Events(sck);
 
   /* Bind to the local address,


@@ -420,8 +490,7 @@ GSocketError GSocket_SetServer(GSocket *sck)
                    (SOCKLEN_T *) &sck->m_local->m_len) != 0) ||
       (listen(sck->m_fd, 5) != 0))
   {
                    (SOCKLEN_T *) &sck->m_local->m_len) != 0) ||
       (listen(sck->m_fd, 5) != 0))
   {

-    soclose(sck->m_fd);
-    sck->m_fd = INVALID_SOCKET;
+    GSocket_close(sck);

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


@@ -512,8 +581,11 @@ GSocket *GSocket_WaitConnection(GSocket *socket)
     socket->m_error = err;
     return NULL;
   }
     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);
   ioctl(connection->m_fd, FIONBIO, &arg);

+#endif

   _GSocket_Enable_Events(connection);
 
   return connection;
   _GSocket_Enable_Events(connection);
 
   return connection;


@@ -581,15 +653,16 @@ GSocketError GSocket_Connect(GSocket *sck, GSocketStream stream)
     sck->m_error = GSOCK_IOERR;
     return GSOCK_IOERR;
   }
     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);
   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);
 
   _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);
 

-  printf("connect on %d to %X (%d) returned %d, errno = %d\n",
-        sck->m_fd, sck->m_peer->m_addr, sck->m_peer->m_len, ret, errno);

   if (ret == -1)
   {
     err = errno;
   if (ret == -1)
   {
     err = errno;


@@ -603,8 +676,7 @@ GSocketError GSocket_Connect(GSocket *sck, GSocketStream stream)
     {
       if (_GSocket_Output_Timeout(sck) == GSOCK_TIMEDOUT)
       {
     {
       if (_GSocket_Output_Timeout(sck) == GSOCK_TIMEDOUT)
       {

-        soclose(sck->m_fd);
-        sck->m_fd = INVALID_SOCKET;
+        GSocket_close(sck);

         /* sck->m_error is set in _GSocket_Output_Timeout */
         return GSOCK_TIMEDOUT;
       }
         /* sck->m_error is set in _GSocket_Output_Timeout */
         return GSOCK_TIMEDOUT;
       }


@@ -636,8 +708,7 @@ GSocketError GSocket_Connect(GSocket *sck, GSocketStream stream)
     /* If connect failed with an error other than EINPROGRESS,
      * then the call to GSocket_Connect has failed.
      */
     /* If connect failed with an error other than EINPROGRESS,
      * then the call to GSocket_Connect has failed.
      */

-    soclose(sck->m_fd);
-    sck->m_fd = INVALID_SOCKET;
+    GSocket_close(sck);

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


@@ -689,8 +760,11 @@ GSocketError GSocket_SetNonOriented(GSocket *sck)
     sck->m_error = GSOCK_IOERR;
     return GSOCK_IOERR;
   }
     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);
   ioctl(sck->m_fd, FIONBIO, &arg);

+#endif

   _GSocket_Enable_Events(sck);
 
   /* Bind to the local address,
   _GSocket_Enable_Events(sck);
 
   /* Bind to the local address,


@@ -701,8 +775,7 @@ GSocketError GSocket_SetNonOriented(GSocket *sck)
                    sck->m_local->m_addr,
                    (SOCKLEN_T *) &sck->m_local->m_len) != 0))
   {
                    sck->m_local->m_addr,
                    (SOCKLEN_T *) &sck->m_local->m_len) != 0))
   {

-    soclose(sck->m_fd);
-    sck->m_fd    = INVALID_SOCKET;
+    GSocket_close(sck);

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


@@ -815,104 +888,126 @@ int GSocket_Write(GSocket *socket, const char *buffer, int size)
  */
 GSocketEventFlags GSocket_Select(GSocket *socket, GSocketEventFlags flags)
 {
  */
 GSocketEventFlags GSocket_Select(GSocket *socket, GSocketEventFlags flags)
 {

-#if defined(wxUSE_GUI) && !wxUSE_GUI
+  if (!USE_GUI())
+  {

 
 

-  GSocketEventFlags result = 0;
-  fd_set readfds;
-  fd_set writefds;
-  fd_set exceptfds;
-  struct timeval tv;
+    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 = 0;
-  tv.tv_usec = 0;
+    /* Do not use a static struct, Linux can garble it */
+    tv.tv_sec = 0;
+    tv.tv_usec = 0;

 
 

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

 
 

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

 
 

-  /* Check known state first */
-  result |= (GSOCK_CONNECTION_FLAG & socket->m_detected & flags);
-  result |= (GSOCK_LOST_FLAG       & socket->m_detected & flags);
+    /* Check 'sticky' CONNECTION flag first */
+    result |= (GSOCK_CONNECTION_FLAG & socket->m_detected);

 
 

-  /* Try select now */
-  if (select(socket->m_fd + 1, &readfds, &writefds, &exceptfds, &tv) <= 0)
-    return result;
+    /* 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;

 
 

-  /* Check for readability */
-  if (FD_ISSET(socket->m_fd, &readfds))
-  {
-    char c;
+      return (GSOCK_LOST_FLAG & flags);
+    }

 
 

-    if (recv(socket->m_fd, &c, 1, MSG_PEEK) > 0)
+    /* Try select now */
+    if (select(socket->m_fd + 1, &readfds, &writefds, &exceptfds, &tv) <= 0)

     {
     {

-      result |= (GSOCK_INPUT_FLAG & flags);
+      /* What to do here? */
+      return (result & flags);

     }
     }

-    else
+
+    /* Check for readability */
+    if (FD_ISSET(socket->m_fd, &readfds))

     {
     {

-      if (socket->m_server && socket->m_stream)
+      char c;
+
+      if (recv(socket->m_fd, &c, 1, MSG_PEEK) > 0)

       {
       {

-        result |= (GSOCK_CONNECTION_FLAG & flags);
-        socket->m_detected |= GSOCK_CONNECTION_FLAG;
+        result |= GSOCK_INPUT_FLAG;

       }
       else
       {
       }
       else
       {

-        result |= (GSOCK_LOST_FLAG & flags);
-        socket->m_detected = GSOCK_LOST_FLAG;
+        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)
+    /* Check for writability */
+    if (FD_ISSET(socket->m_fd, &writefds))

     {
     {

-      int error;
-      SOCKLEN_T len = sizeof(error);
+      if (socket->m_establishing && !socket->m_server)
+      {
+        int error;
+        SOCKLEN_T len = sizeof(error);

 
 

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

 
 

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

 
 

-      if (error)
-      {
-        result |= (GSOCK_LOST_FLAG & flags);
-        socket->m_detected = GSOCK_LOST_FLAG;
+        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
       {
       }
       else
       {

-        result |= (GSOCK_CONNECTION_FLAG & flags);
-        socket->m_detected |= GSOCK_CONNECTION_FLAG;
+        result |= GSOCK_OUTPUT_FLAG;

       }
     }
       }
     }

-    else
+
+    /* Check for exceptions and errors (is this useful in Unices?) */
+    if (FD_ISSET(socket->m_fd, &exceptfds))

     {
     {

-      result |= (GSOCK_OUTPUT_FLAG & flags);
-    }
-  }
+      socket->m_establishing = FALSE;
+      socket->m_detected = GSOCK_LOST_FLAG;

 
 

-  /* Check for exceptions and errors (is this useful in Unices?) */
-  if (FD_ISSET(socket->m_fd, &exceptfds))
-  {
-    result |= (GSOCK_LOST_FLAG & flags);
-    socket->m_establishing = FALSE;
-    socket->m_detected = GSOCK_LOST_FLAG;
-  }
+      /* LOST event: Abort any further processing */
+      return (GSOCK_LOST_FLAG & flags);
+    }

 
 

-  return result;
+    return (result & flags);

 
 

-#else 
+  }
+  else
+  {

 
 

-  assert(socket != NULL);
-  return flags & socket->m_detected;
+    assert(socket != NULL);
+    return flags & socket->m_detected;

 
 

-#endif /* !wxUSE_GUI */
+  }

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


@@ -994,8 +1089,6 @@ void GSocket_SetCallback(GSocket *socket, GSocketEventFlags flags,
   {
     if ((flags & (1 << count)) != 0)
     {
   {
     if ((flags & (1 << count)) != 0)
     {

-      printf("Setting callback no %d for socket at %X to address %X,data %X\n",
-            count, socket, callback, cdata);

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


@@ -1016,8 +1109,6 @@ void GSocket_UnsetCallback(GSocket *socket, GSocketEventFlags flags)
   {
     if ((flags & (1 << count)) != 0)
     {
   {
     if ((flags & (1 << count)) != 0)
     {

-      printf("Removing callback no %d for socket at %X",
-            count, socket);

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


@@ -1027,11 +1118,8 @@ void GSocket_UnsetCallback(GSocket *socket, GSocketEventFlags flags)
 
 #define CALL_CALLBACK(socket, event) {                                  \
   _GSocket_Disable(socket, event);                                      \
 
 #define CALL_CALLBACK(socket, event) {                                  \
   _GSocket_Disable(socket, event);                                      \

-  if (socket->m_cbacks[event]){                                         \
-    printf("Call callback for event %d, socket %X: %X, %X\n", event,    \
-            socket, socket->m_cbacks[event], socket->m_data[event]);    \
+  if (socket->m_cbacks[event])                                          \

     socket->m_cbacks[event](socket, event, socket->m_data[event]);      \
     socket->m_cbacks[event](socket, event, socket->m_data[event]);      \

-  }                                                                     \

 }
 
 
 }
 
 


@@ -1075,10 +1163,10 @@ GSocketError _GSocket_Input_Timeout(GSocket *socket)
     if (ret == -1)
     {
       GSocket_Debug(( "GSocket_Input_Timeout, select returned -1\n" ));
     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" ));
+      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;
     }
       socket->m_error = GSOCK_TIMEDOUT;
       return GSOCK_TIMEDOUT;
     }


@@ -1116,17 +1204,19 @@ GSocketError _GSocket_Output_Timeout(GSocket *socket)
     if (ret == -1)
     {
       GSocket_Debug(( "GSocket_Output_Timeout, select returned -1\n" ));
     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" ));
+      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;
     }
       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" ));
+    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
   {
   }
   else
   {


@@ -1181,9 +1271,13 @@ 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();

+#else
+  ret = send(socket->m_fd, (char *)buffer, size, 0);
+#endif

 
   return ret;
 }
 
   return ret;
 }


@@ -1207,9 +1301,13 @@ int _GSocket_Send_Dgram(GSocket *socket, const char *buffer, int size)
     return -1;
   }
 
     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();

+#else
+  ret = sendto(socket->m_fd, (char *)buffer, size, 0, addr, len);
+#endif

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


@@ -1221,6 +1319,18 @@ void _GSocket_Detected_Read(GSocket *socket)
 {
   char c;
 
 {
   char c;
 

+  /* If we have already detected a LOST event, then don't try
+   * to do any further processing.
+   */
+  if ((socket->m_detected & GSOCK_LOST_FLAG) != 0)
+  {
+    socket->m_establishing = FALSE;
+
+    CALL_CALLBACK(socket, GSOCK_LOST);
+    GSocket_Shutdown(socket);
+    return;
+  }
+

   if (recv(socket->m_fd, &c, 1, MSG_PEEK) > 0)
   {
     CALL_CALLBACK(socket, GSOCK_INPUT);
   if (recv(socket->m_fd, &c, 1, MSG_PEEK) > 0)
   {
     CALL_CALLBACK(socket, GSOCK_INPUT);


@@ -1234,12 +1344,25 @@ void _GSocket_Detected_Read(GSocket *socket)
     else
     {
       CALL_CALLBACK(socket, GSOCK_LOST);
     else
     {
       CALL_CALLBACK(socket, GSOCK_LOST);

+      GSocket_Shutdown(socket);

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

+  /* If we have already detected a LOST event, then don't try
+   * to do any further processing.
+   */
+  if ((socket->m_detected & GSOCK_LOST_FLAG) != 0)
+  {
+    socket->m_establishing = FALSE;
+
+    CALL_CALLBACK(socket, GSOCK_LOST);
+    GSocket_Shutdown(socket);
+    return;
+  }
+

   if (socket->m_establishing && !socket->m_server)
   {
     int error;
   if (socket->m_establishing && !socket->m_server)
   {
     int error;


@@ -1252,6 +1375,7 @@ void _GSocket_Detected_Write(GSocket *socket)
     if (error)
     {
       CALL_CALLBACK(socket, GSOCK_LOST);
     if (error)
     {
       CALL_CALLBACK(socket, GSOCK_LOST);

+      GSocket_Shutdown(socket);

     }
     else
     {
     }
     else
     {


@@ -1332,7 +1456,7 @@ GAddress *GAddress_copy(GAddress *address)
 
   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);
     if (addr2->m_addr == NULL)
   {
     addr2->m_addr = (struct sockaddr *)malloc(addr2->m_len);
     if (addr2->m_addr == NULL)


@@ -1353,7 +1477,7 @@ void GAddress_destroy(GAddress *address)
   if (address->m_addr)
     free(address->m_addr);
 
   if (address->m_addr)
     free(address->m_addr);
 

-/*    free(address); */
+  free(address);

 }
 
 void GAddress_SetFamily(GAddress *address, GAddressType type)
 }
 
 void GAddress_SetFamily(GAddress *address, GAddressType type)


@@ -1475,7 +1599,8 @@ GSocketError GAddress_INET_SetHostName(GAddress *address, const char *hostname)
   {
 #else
   /* Use gethostbyname by default */
   {
 #else
   /* Use gethostbyname by default */

-  if (1)
+  int val = 1;  //VA doesn't like constants in conditional expressions at all
+  if (val)

   {
 #endif
     struct in_addr *array_addr;
   {
 #endif
     struct in_addr *array_addr;


@@ -1529,9 +1654,11 @@ GSocketError GAddress_INET_SetPortName(GAddress *address, const char *port,
     return GSOCK_INVPORT;
   }
  
     return GSOCK_INVPORT;
   }
  

-  se = getservbyname(port, protocol);
+  se = getservbyname(port, (char*)protocol);

   if (!se)
   {
   if (!se)
   {

+    /* the cast to int suppresses compiler warnings about subscript having the
+       type char */

     if (isdigit((int)port[0]))
     {
       int port_int;
     if (isdigit((int)port[0]))
     {
       int port_int;


@@ -1618,7 +1745,7 @@ unsigned short GAddress_INET_GetPort(GAddress *address)
  * -------------------------------------------------------------------------
  */
 
  * -------------------------------------------------------------------------
  */
 

-#ifdef __EMX__
+#ifndef __VISAGECPP__

 GSocketError _GAddress_Init_UNIX(GAddress *address)
 {
   address->m_len  = sizeof(struct sockaddr_un);
 GSocketError _GAddress_Init_UNIX(GAddress *address)
 {
   address->m_len  = sizeof(struct sockaddr_un);


@@ -1637,6 +1764,8 @@ GSocketError _GAddress_Init_UNIX(GAddress *address)
   return GSOCK_NOERROR;
 }
 
   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;
 GSocketError GAddress_UNIX_SetPath(GAddress *address, const char *path)
 {
   struct sockaddr_un *addr;


@@ -1646,7 +1775,8 @@ GSocketError GAddress_UNIX_SetPath(GAddress *address, const char *path)
   CHECK_ADDRESS(address, UNIX); 
 
   addr = ((struct sockaddr_un *)address->m_addr);
   CHECK_ADDRESS(address, UNIX); 
 
   addr = ((struct sockaddr_un *)address->m_addr);

-  memcpy(addr->sun_path, path, strlen(path));
+  strncpy(addr->sun_path, path, UNIX_SOCK_PATHLEN);
+  addr->sun_path[UNIX_SOCK_PATHLEN - 1] = '\0';

 
   return GSOCK_NOERROR;
 }
 
   return GSOCK_NOERROR;
 }


@@ -1664,8 +1794,6 @@ GSocketError GAddress_UNIX_GetPath(GAddress *address, char *path, size_t sbuf)
 
   return GSOCK_NOERROR;
 }
 
   return GSOCK_NOERROR;
 }

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