Warning fixes found under hardest mode of OpenWatcom. Seems clean in Borland, MinGW...

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

diff --git a/src/unix/gsocket.cpp b/src/unix/gsocket.cpp
index 0a73055c7bb7eee40599179448a520badf9eda24..f857c3c176107eb621662be1b9eeb355fd3d8410 100644 (file)
--- a/src/unix/gsocket.cpp
+++ b/src/unix/gsocket.cpp
@@ -10,11 +10,13 @@
  * -------------------------------------------------------------------------
  */
 
  * -------------------------------------------------------------------------
  */
 

-#include "wx/wxprec.h"
-#ifndef WX_PRECOMP
-    #include "wx/app.h"
-    #include "wx/apptrait.h"
-#endif //ndef WX_PRECOMP
+/*
+ * 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
 
 #if defined(__VISAGECPP__)
 /* Seems to be needed by Visual Age C++, though I don't see how it manages


@@ -85,6 +87,10 @@ int _System bsdselect(int,
 int _System soclose(int);
 #  endif
 #endif
 int _System soclose(int);
 #  endif
 #endif

+#ifdef __EMX__
+#include <sys/select.h>
+#endif
+

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


@@ -111,6 +117,12 @@ int _System soclose(int);
 #  endif
 #endif
 
 #  endif
 #endif
 

+#else 
+   /* undefine for OSX - its really an int */
+#  ifdef __DARWIN__
+#    undef SOCKLEN_T
+#    define SOCKLEN_T int
+#  endif

 #endif /* SOCKLEN_T */
 
 /*
 #endif /* SOCKLEN_T */
 
 /*


@@ -159,82 +171,73 @@ int _System soclose(int);
 #  define GSocket_Debug(args)
 #endif /* __GSOCKET_DEBUG__ */
 
 #  define GSocket_Debug(args)
 #endif /* __GSOCKET_DEBUG__ */
 

-///////////////////////////////////////////////////////////////////////////
-// GSocketBSDGUIShim
-struct GSocketGUIFunctionsTable *GSocketBSDGUIShim::ms_gui_functions = NULL;
-
-void GSocket_SetGUIFunctions(struct GSocketGUIFunctionsTable *guifunc)
-{
-  GSocketBSDGUIShim::ms_gui_functions = guifunc;
-}
+/* Table of GUI-related functions. We must call them indirectly because
+ * of wxBase and GUI separation: */

 
 

-inline bool GSocketBSDGUIShim::UseGUI()
-{
-    return ms_gui_functions;
-}
+static GSocketGUIFunctionsTable *gs_gui_functions;

 
 

-inline bool GSocketBSDGUIShim::GUI_Init()
+class GSocketGUIFunctionsTableNull: public GSocketGUIFunctionsTable

 {
 {

-    return (ms_gui_functions)?ms_gui_functions->GUI_Init():true;
-}
-
-inline void GSocketBSDGUIShim::GUI_Cleanup()
-{
-    if (ms_gui_functions) ms_gui_functions->GUI_Cleanup();
-}
-
-GSocketBSDGUIShim::GSocketBSDGUIShim()
-{
-    m_ok = (ms_gui_functions ? ms_gui_functions->GUI_Init_Socket(this) : true);
-}
-
-GSocketBSDGUIShim::~GSocketBSDGUIShim()
-{
-    if (ms_gui_functions) ms_gui_functions->GUI_Destroy_Socket(this);
-}
-
-void GSocketBSDGUIShim::EventLoop_Enable_Events()
-{
-    if (ms_gui_functions) ms_gui_functions->Enable_Events(this);
-}
-
-void GSocketBSDGUIShim::EventLoop_Disable_Events()
-{
-    if (ms_gui_functions) ms_gui_functions->Disable_Events(this);
-}
+public:
+    virtual bool OnInit();
+    virtual void OnExit();
+    virtual bool CanUseEventLoop();
+    virtual bool Init_Socket(GSocket *socket);
+    virtual void Destroy_Socket(GSocket *socket);
+    virtual void Install_Callback(GSocket *socket, GSocketEvent event);
+    virtual void Uninstall_Callback(GSocket *socket, GSocketEvent event);
+    virtual void Enable_Events(GSocket *socket);
+    virtual void Disable_Events(GSocket *socket);
+};

 
 

-void GSocketBSDGUIShim::EventLoop_Install_Callback(GSocketEvent event)
-{
-    if (ms_gui_functions) ms_gui_functions->Install_Callback(this, event);
-}
+bool GSocketGUIFunctionsTableNull::OnInit()
+{   return true; }
+void GSocketGUIFunctionsTableNull::OnExit()
+{}
+bool GSocketGUIFunctionsTableNull::CanUseEventLoop()
+{   return false; }
+bool GSocketGUIFunctionsTableNull::Init_Socket(GSocket *socket)
+{   return true; }
+void GSocketGUIFunctionsTableNull::Destroy_Socket(GSocket *socket)
+{}
+void GSocketGUIFunctionsTableNull::Install_Callback(GSocket *socket, GSocketEvent event)
+{}
+void GSocketGUIFunctionsTableNull::Uninstall_Callback(GSocket *socket, GSocketEvent event)
+{}
+void GSocketGUIFunctionsTableNull::Enable_Events(GSocket *socket)
+{}
+void GSocketGUIFunctionsTableNull::Disable_Events(GSocket *socket)
+{}
+/* Global initialisers */

 
 

-void GSocketBSDGUIShim::EventLoop_Uninstall_Callback(GSocketEvent event)
+void GSocket_SetGUIFunctions(GSocketGUIFunctionsTable *guifunc)

 {
 {

-    if (ms_gui_functions) ms_gui_functions->Uninstall_Callback(this, event);
+  gs_gui_functions = guifunc;

 }
 
 }
 

-///////////////////////////////////////////////////////////////////////////
-// GSocketBSD
-
-static struct GSocketBaseFunctionsTable gs_base_functions =
-{
-    GSocketBSD::_GSocket_Detected_Read,
-    GSocketBSD::_GSocket_Detected_Write
-};
-
-/* Global initialisers */
-

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

-    return GSocketBSDGUIShim::GUI_Init();
+  if (!gs_gui_functions)
+  {
+    static GSocketGUIFunctionsTableNull table;
+    gs_gui_functions = &table;
+  }
+  if ( !gs_gui_functions->OnInit() )
+    return 0;
+  return 1;

 }
 
 void GSocket_Cleanup(void)
 {
 }
 
 void GSocket_Cleanup(void)
 {

-    GSocketBSDGUIShim::GUI_Cleanup();
+  if (gs_gui_functions)
+  {
+      gs_gui_functions->OnExit();
+  }

 }
 
 }
 

-GSocketBSD::GSocketBSD()
+/* Constructors / Destructors for GSocket */
+
+GSocket::GSocket()

 {
   int i;
 
 {
   int i;
 


@@ -247,31 +250,41 @@ GSocketBSD::GSocketBSD()
   m_local               = NULL;
   m_peer                = NULL;
   m_error               = GSOCK_NOERROR;
   m_local               = NULL;
   m_peer                = NULL;
   m_error               = GSOCK_NOERROR;

-  m_server              = FALSE;
-  m_stream              = TRUE;
+  m_server              = false;
+  m_stream              = true;

   m_gui_dependent       = NULL;
   m_gui_dependent       = NULL;

-  m_non_blocking        = FALSE;
+  m_non_blocking        = false;
+  m_reusable            = false;

   m_timeout             = 10*60*1000;
                                 /* 10 minutes * 60 sec * 1000 millisec */
   m_timeout             = 10*60*1000;
                                 /* 10 minutes * 60 sec * 1000 millisec */

-  m_establishing        = FALSE;
-
-  m_functions           = &gs_base_functions;
+  m_establishing        = false;

 
 

-  m_ok = true;
+  assert(gs_gui_functions);
+  /* Per-socket GUI-specific initialization */
+  m_ok = gs_gui_functions->Init_Socket(this);

 }
 
 }
 

-void GSocketBSD::Close()
+void GSocket::Close()

 {
 {

-    EventLoop_Disable_Events();
-// gsockosx.c calls CFSocketInvalidate which closes the socket for us
+    gs_gui_functions->Disable_Events(this);
+    /* gsockosx.c calls CFSocketInvalidate which closes the socket for us */

 #if !(defined(__DARWIN__) && (defined(__WXMAC__) || defined(__WXCOCOA__)))
     close(m_fd);
 #endif
     m_fd = INVALID_SOCKET;
 }
 
 #if !(defined(__DARWIN__) && (defined(__WXMAC__) || defined(__WXCOCOA__)))
     close(m_fd);
 #endif
     m_fd = INVALID_SOCKET;
 }
 

-GSocketBSD::~GSocketBSD()
+GSocket::~GSocket()

 {
 {

+  assert(this);
+
+  /* Check that the socket is really shutdowned */
+  if (m_fd != INVALID_SOCKET)
+    Shutdown();
+
+  /* Per-socket GUI-specific cleanup */
+  gs_gui_functions->Destroy_Socket(this);
+

   /* Destroy private addresses */
   if (m_local)
     GAddress_destroy(m_local);
   /* Destroy private addresses */
   if (m_local)
     GAddress_destroy(m_local);


@@ -284,7 +297,7 @@ GSocketBSD::~GSocketBSD()
  *  Disallow further read/write operations on this socket, close
  *  the fd and disable all callbacks.
  */
  *  Disallow further read/write operations on this socket, close
  *  the fd and disable all callbacks.
  */

-void GSocketBSD::Shutdown()
+void GSocket::Shutdown()

 {
   int evt;
 
 {
   int evt;
 


@@ -320,7 +333,7 @@ void GSocketBSD::Shutdown()
  *    GSOCK_INVSOCK - the socket is not valid.
  *    GSOCK_INVADDR - the address is not valid.
  */
  *    GSOCK_INVSOCK - the socket is not valid.
  *    GSOCK_INVADDR - the address is not valid.
  */

-GSocketError GSocketBSD::SetLocal(GAddress *address)
+GSocketError GSocket::SetLocal(GAddress *address)

 {
   assert(this);
 
 {
   assert(this);
 


@@ -346,7 +359,7 @@ GSocketError GSocketBSD::SetLocal(GAddress *address)
   return GSOCK_NOERROR;
 }
 
   return GSOCK_NOERROR;
 }
 

-GSocketError GSocketBSD::SetPeer(GAddress *address)
+GSocketError GSocket::SetPeer(GAddress *address)

 {
   assert(this);
 
 {
   assert(this);
 


@@ -365,7 +378,7 @@ GSocketError GSocketBSD::SetPeer(GAddress *address)
   return GSOCK_NOERROR;
 }
 
   return GSOCK_NOERROR;
 }
 

-GAddress *GSocketBSD::GetLocal()
+GAddress *GSocket::GetLocal()

 {
   GAddress *address;
   struct sockaddr addr;
 {
   GAddress *address;
   struct sockaddr addr;


@@ -410,7 +423,7 @@ GAddress *GSocketBSD::GetLocal()
   return address;
 }
 
   return address;
 }
 

-GAddress *GSocketBSD::GetPeer()
+GAddress *GSocket::GetPeer()

 {
   assert(this);
 
 {
   assert(this);
 


@@ -433,7 +446,7 @@ GAddress *GSocketBSD::GetPeer()
  *    GSOCK_INVADDR - the local address has not been set.
  *    GSOCK_IOERR   - low-level error.
  */
  *    GSOCK_INVADDR - the local address has not been set.
  *    GSOCK_IOERR   - low-level error.
  */

-GSocketError GSocketBSD::SetServer()
+GSocketError GSocket::SetServer()

 {
   int arg = 1;
 
 {
   int arg = 1;
 


@@ -454,8 +467,8 @@ GSocketError GSocketBSD::SetServer()
   }
 
   /* Initialize all fields */
   }
 
   /* Initialize all fields */

-  m_stream   = TRUE;
-  m_server   = TRUE;
+  m_stream   = true;
+  m_server   = true;

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


@@ -470,12 +483,12 @@ GSocketError GSocketBSD::SetServer()
 #else
   ioctl(m_fd, FIONBIO, &arg);
 #endif
 #else
   ioctl(m_fd, FIONBIO, &arg);
 #endif

-  EventLoop_Enable_Events();
+  gs_gui_functions->Enable_Events(this);

 
   /* allow a socket to re-bind if the socket is in the TIME_WAIT
      state after being previously closed.
    */
 
   /* allow a socket to re-bind if the socket is in the TIME_WAIT
      state after being previously closed.
    */

-  if(m_reusable)
+  if (m_reusable)

     setsockopt(m_fd, SOL_SOCKET, SO_REUSEADDR, (const char*)&arg, sizeof(u_long));
 
   /* Bind to the local address,
     setsockopt(m_fd, SOL_SOCKET, SO_REUSEADDR, (const char*)&arg, sizeof(u_long));
 
   /* Bind to the local address,


@@ -508,7 +521,7 @@ GSocketError GSocketBSD::SetServer()
  *    GSOCK_MEMERR     - couldn't allocate memory.
  *    GSOCK_IOERR      - low-level error.
  */
  *    GSOCK_MEMERR     - couldn't allocate memory.
  *    GSOCK_IOERR      - low-level error.
  */

-GSocket *GSocketBSD::WaitConnection()
+GSocket *GSocket::WaitConnection()

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


@@ -533,7 +546,6 @@ GSocket *GSocketBSD::WaitConnection()
 
   if (!connection)
   {
 
   if (!connection)
   {

-    delete connection;

     m_error = GSOCK_MEMERR;
     return NULL;
   }
     m_error = GSOCK_MEMERR;
     return NULL;
   }


@@ -560,8 +572,8 @@ GSocket *GSocketBSD::WaitConnection()
   }
 
   /* Initialize all fields */
   }
 
   /* Initialize all fields */

-  connection->m_server   = FALSE;
-  connection->m_stream   = TRUE;
+  connection->m_server   = false;
+  connection->m_stream   = true;

 
   /* Setup the peer address field */
   connection->m_peer = GAddress_new();
 
   /* Setup the peer address field */
   connection->m_peer = GAddress_new();


@@ -584,19 +596,19 @@ GSocket *GSocketBSD::WaitConnection()
 #else
   ioctl(connection->m_fd, FIONBIO, &arg);
 #endif
 #else
   ioctl(connection->m_fd, FIONBIO, &arg);
 #endif

-  connection->EventLoop_Enable_Events();
+  gs_gui_functions->Enable_Events(connection);

 
   return connection;
 }
 
 
   return connection;
 }
 

-int GSocketBSD::SetReusable()
+bool GSocket::SetReusable()

 {
     /* socket must not be null, and must not be in use/already bound */
 {
     /* socket must not be null, and must not be in use/already bound */

-    if (NULL != this && m_fd == INVALID_SOCKET) {
-        m_reusable = TRUE;
-        return TRUE;
+    if (this && m_fd == INVALID_SOCKET) {
+        m_reusable = true;
+        return true;

     }
     }

-    return FALSE;
+    return false;

 }
 
 /* Client specific parts */
 }
 
 /* Client specific parts */


@@ -624,7 +636,7 @@ int GSocketBSD::SetReusable()
  *    GSOCK_MEMERR     - couldn't allocate memory.
  *    GSOCK_IOERR      - low-level error.
  */
  *    GSOCK_MEMERR     - couldn't allocate memory.
  *    GSOCK_IOERR      - low-level error.
  */

-GSocketError GSocketBSD::Connect(GSocketStream stream)
+GSocketError GSocket::Connect(GSocketStream stream)

 {
   int err, ret;
   int arg = 1;
 {
   int err, ret;
   int arg = 1;


@@ -648,8 +660,8 @@ GSocketError GSocketBSD::Connect(GSocketStream stream)
 
   /* Streamed or dgram socket? */
   m_stream   = (stream == GSOCK_STREAMED);
 
   /* Streamed or dgram socket? */
   m_stream   = (stream == GSOCK_STREAMED);

-  m_server   = FALSE;
-  m_establishing = FALSE;
+  m_server   = false;
+  m_establishing = false;

 
   /* Create the socket */
   m_fd = socket(m_peer->m_realfamily,
 
   /* Create the socket */
   m_fd = socket(m_peer->m_realfamily,


@@ -665,7 +677,7 @@ GSocketError GSocketBSD::Connect(GSocketStream stream)
 #else
   ioctl(m_fd, FIONBIO, &arg);
 #endif
 #else
   ioctl(m_fd, FIONBIO, &arg);
 #endif

-  EventLoop_Enable_Events();
+  gs_gui_functions->Enable_Events(this);

 
   /* Connect it to the peer address, with a timeout (see below) */
   ret = connect(m_fd, m_peer->m_addr, m_peer->m_len);
 
   /* Connect it to the peer address, with a timeout (see below) */
   ret = connect(m_fd, m_peer->m_addr, m_peer->m_len);


@@ -707,7 +719,7 @@ GSocketError GSocketBSD::Connect(GSocketStream stream)
      */
     if ((err == EINPROGRESS) && (m_non_blocking))
     {
      */
     if ((err == EINPROGRESS) && (m_non_blocking))
     {

-      m_establishing = TRUE;
+      m_establishing = true;

       m_error = GSOCK_WOULDBLOCK;
       return GSOCK_WOULDBLOCK;
     }
       m_error = GSOCK_WOULDBLOCK;
       return GSOCK_WOULDBLOCK;
     }


@@ -736,7 +748,7 @@ GSocketError GSocketBSD::Connect(GSocketStream stream)
  *    GSOCK_INVADDR - the local address has not been set.
  *    GSOCK_IOERR   - low-level error.
  */
  *    GSOCK_INVADDR - the local address has not been set.
  *    GSOCK_IOERR   - low-level error.
  */

-GSocketError GSocketBSD::SetNonOriented()
+GSocketError GSocket::SetNonOriented()

 {
   int arg = 1;
 
 {
   int arg = 1;
 


@@ -755,8 +767,8 @@ GSocketError GSocketBSD::SetNonOriented()
   }
 
   /* Initialize all fields */
   }
 
   /* Initialize all fields */

-  m_stream   = FALSE;
-  m_server   = FALSE;
+  m_stream   = false;
+  m_server   = false;

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


@@ -771,7 +783,7 @@ GSocketError GSocketBSD::SetNonOriented()
 #else
   ioctl(m_fd, FIONBIO, &arg);
 #endif
 #else
   ioctl(m_fd, FIONBIO, &arg);
 #endif

-  EventLoop_Enable_Events();
+  gs_gui_functions->Enable_Events(this);

 
   /* Bind to the local address,
    * and retrieve the actual address bound.
 
   /* Bind to the local address,
    * and retrieve the actual address bound.


@@ -792,7 +804,7 @@ GSocketError GSocketBSD::SetNonOriented()
 /* Generic IO */
 
 /* Like recv(), send(), ... */
 /* Generic IO */
 
 /* Like recv(), send(), ... */

-int GSocketBSD::Read(char *buffer, int size)
+int GSocket::Read(char *buffer, int size)

 {
   int ret;
 
 {
   int ret;
 


@@ -833,7 +845,7 @@ int GSocketBSD::Read(char *buffer, int size)
   return ret;
 }
 
   return ret;
 }
 

-int GSocketBSD::Write(const char *buffer, int size)
+int GSocket::Write(const char *buffer, int size)

 {
   int ret;
 
 {
   int ret;
 


@@ -897,9 +909,9 @@ int GSocketBSD::Write(const char *buffer, int size)
  *  performed. This function won't block, regardless of the
  *  mode (blocking | nonblocking) of the socket.
  */
  *  performed. This function won't block, regardless of the
  *  mode (blocking | nonblocking) of the socket.
  */

-GSocketEventFlags GSocketBSD::Select(GSocketEventFlags flags)
+GSocketEventFlags GSocket::Select(GSocketEventFlags flags)

 {
 {

-  if (!GSocketBSDGUIShim::UseGUI())
+  if (!gs_gui_functions->CanUseEventLoop())

   {
 
     GSocketEventFlags result = 0;
   {
 
     GSocketEventFlags result = 0;


@@ -912,7 +924,7 @@ GSocketEventFlags GSocketBSD::Select(GSocketEventFlags flags)
 
     /* Do not use a static struct, Linux can garble it */
     tv.tv_sec = m_timeout / 1000;
 
     /* Do not use a static struct, Linux can garble it */
     tv.tv_sec = m_timeout / 1000;

-    tv.tv_usec = (m_timeout % 1000) / 1000;
+    tv.tv_usec = (m_timeout % 1000) * 1000;

 
     FD_ZERO(&readfds);
     FD_ZERO(&writefds);
 
     FD_ZERO(&readfds);
     FD_ZERO(&writefds);


@@ -930,7 +942,7 @@ GSocketEventFlags GSocketBSD::Select(GSocketEventFlags flags)
      */
     if ((m_detected & GSOCK_LOST_FLAG) != 0)
     {
      */
     if ((m_detected & GSOCK_LOST_FLAG) != 0)
     {

-      m_establishing = FALSE;
+      m_establishing = false;

 
       return (GSOCK_LOST_FLAG & flags);
     }
 
       return (GSOCK_LOST_FLAG & flags);
     }


@@ -961,7 +973,7 @@ GSocketEventFlags GSocketBSD::Select(GSocketEventFlags flags)
         else
         {
           m_detected = GSOCK_LOST_FLAG;
         else
         {
           m_detected = GSOCK_LOST_FLAG;

-          m_establishing = FALSE;
+          m_establishing = false;

 
           /* LOST event: Abort any further processing */
           return (GSOCK_LOST_FLAG & flags);
 
           /* LOST event: Abort any further processing */
           return (GSOCK_LOST_FLAG & flags);


@@ -977,7 +989,7 @@ GSocketEventFlags GSocketBSD::Select(GSocketEventFlags flags)
         int error;
         SOCKLEN_T len = sizeof(error);
 
         int error;
         SOCKLEN_T len = sizeof(error);
 

-        m_establishing = FALSE;
+        m_establishing = false;

 
         getsockopt(m_fd, SOL_SOCKET, SO_ERROR, (void*)&error, &len);
 
 
         getsockopt(m_fd, SOL_SOCKET, SO_ERROR, (void*)&error, &len);
 


@@ -1003,7 +1015,7 @@ GSocketEventFlags GSocketBSD::Select(GSocketEventFlags flags)
     /* Check for exceptions and errors (is this useful in Unices?) */
     if (FD_ISSET(m_fd, &exceptfds))
     {
     /* Check for exceptions and errors (is this useful in Unices?) */
     if (FD_ISSET(m_fd, &exceptfds))
     {

-      m_establishing = FALSE;
+      m_establishing = false;

       m_detected = GSOCK_LOST_FLAG;
 
       /* LOST event: Abort any further processing */
       m_detected = GSOCK_LOST_FLAG;
 
       /* LOST event: Abort any further processing */


@@ -1028,7 +1040,7 @@ GSocketEventFlags GSocketBSD::Select(GSocketEventFlags flags)
  *  Sets the socket to non-blocking mode. All IO calls will return
  *  immediately.
  */
  *  Sets the socket to non-blocking mode. All IO calls will return
  *  immediately.
  */

-void GSocketBSD::SetNonBlocking(int non_block)
+void GSocket::SetNonBlocking(bool non_block)

 {
   assert(this);
 
 {
   assert(this);
 


@@ -1041,7 +1053,7 @@ void GSocketBSD::SetNonBlocking(int non_block)
  *  Sets the timeout for blocking calls. Time is expressed in
  *  milliseconds.
  */
  *  Sets the timeout for blocking calls. Time is expressed in
  *  milliseconds.
  */

-void GSocketBSD::SetTimeout(unsigned long millisec)
+void GSocket::SetTimeout(unsigned long millisec)

 {
   assert(this);
 
 {
   assert(this);
 


@@ -1053,7 +1065,7 @@ void GSocketBSD::SetTimeout(unsigned long millisec)
  *  operations do not clear this back to GSOCK_NOERROR, so use it only
  *  after an error.
  */
  *  operations do not clear this back to GSOCK_NOERROR, so use it only
  *  after an error.
  */

-GSocketError GSocketBSD::GetError()
+GSocketError WXDLLIMPEXP_NET GSocket::GetError()

 {
   assert(this);
 
 {
   assert(this);
 


@@ -1090,7 +1102,7 @@ GSocketError GSocketBSD::GetError()
  *
  *  void function(GSocket *socket, GSocketEvent event, char *cdata)
  */
  *
  *  void function(GSocket *socket, GSocketEvent event, char *cdata)
  */

-void GSocketBSD::SetCallback(GSocketEventFlags flags,
+void GSocket::SetCallback(GSocketEventFlags flags,

                          GSocketCallback callback, char *cdata)
 {
   int count;
                          GSocketCallback callback, char *cdata)
 {
   int count;


@@ -1111,7 +1123,7 @@ void GSocketBSD::SetCallback(GSocketEventFlags flags,
  *  Disables all callbacks specified by 'flags', which may be a
  *  combination of flags OR'ed toghether.
  */
  *  Disables all callbacks specified by 'flags', which may be a
  *  combination of flags OR'ed toghether.
  */

-void GSocketBSD::UnsetCallback(GSocketEventFlags flags)
+void GSocket::UnsetCallback(GSocketEventFlags flags)

 {
   int count;
 
 {
   int count;
 


@@ -1127,18 +1139,17 @@ void GSocketBSD::UnsetCallback(GSocketEventFlags flags)
   }
 }
 
   }
 }
 

-
-GSocketError GSocketBSD::GetSockOpt(int level, int optname,
+GSocketError GSocket::GetSockOpt(int level, int optname,

                                 void *optval, int *optlen)
 {
                                 void *optval, int *optlen)
 {

-    if (getsockopt(m_fd, level, optname, optval, optlen) == 0)
+    if (getsockopt(m_fd, level, optname, optval, (SOCKLEN_T*)optlen) == 0)

     {
         return GSOCK_NOERROR;
     }
     return GSOCK_OPTERR;
 }
 
     {
         return GSOCK_NOERROR;
     }
     return GSOCK_OPTERR;
 }
 

-GSocketError GSocketBSD::SetSockOpt(int level, int optname,
+GSocketError GSocket::SetSockOpt(int level, int optname,

                                 const void *optval, int optlen)
 {
     if (setsockopt(m_fd, level, optname, optval, optlen) == 0)
                                 const void *optval, int optlen)
 {
     if (setsockopt(m_fd, level, optname, optval, optlen) == 0)


@@ -1148,30 +1159,30 @@ GSocketError GSocketBSD::SetSockOpt(int level, int optname,
     return GSOCK_OPTERR;
 }
 
     return GSOCK_OPTERR;
 }
 

-#define CALL_CALLBACK(event) {                                  \
-  Disable(event);                                      \
-  if (m_cbacks[event])                                          \
-    m_cbacks[event](this, event, m_data[event]);      \
+#define CALL_CALLBACK(socket, event) {                                  \
+  socket->Disable(event);                                               \
+  if (socket->m_cbacks[event])                                          \
+    socket->m_cbacks[event](socket, event, socket->m_data[event]);      \

 }
 
 
 }
 
 

-void GSocketBSD::Enable(GSocketEvent event)
+void GSocket::Enable(GSocketEvent event)

 {
   m_detected &= ~(1 << event);
 {
   m_detected &= ~(1 << event);

-  EventLoop_Install_Callback(event);
+  gs_gui_functions->Install_Callback(this, event);

 }
 
 }
 

-void GSocketBSD::Disable(GSocketEvent event)
+void GSocket::Disable(GSocketEvent event)

 {
   m_detected |= (1 << event);
 {
   m_detected |= (1 << event);

-  EventLoop_Uninstall_Callback(event);
+  gs_gui_functions->Uninstall_Callback(this, event);

 }
 
 /* _GSocket_Input_Timeout:
  *  For blocking sockets, wait until data is available or
  *  until timeout ellapses.
  */
 }
 
 /* _GSocket_Input_Timeout:
  *  For blocking sockets, wait until data is available or
  *  until timeout ellapses.
  */

-GSocketError GSocketBSD::Input_Timeout()
+GSocketError GSocket::Input_Timeout()

 {
   struct timeval tv;
   fd_set readfds;
 {
   struct timeval tv;
   fd_set readfds;


@@ -1210,7 +1221,7 @@ GSocketError GSocketBSD::Input_Timeout()
  *  For blocking sockets, wait until data can be sent without
  *  blocking or until timeout ellapses.
  */
  *  For blocking sockets, wait until data can be sent without
  *  blocking or until timeout ellapses.
  */

-GSocketError GSocketBSD::Output_Timeout()
+GSocketError GSocket::Output_Timeout()

 {
   struct timeval tv;
   fd_set writefds;
 {
   struct timeval tv;
   fd_set writefds;


@@ -1258,12 +1269,12 @@ GSocketError GSocketBSD::Output_Timeout()
   return GSOCK_NOERROR;
 }
 
   return GSOCK_NOERROR;
 }
 

-int GSocketBSD::Recv_Stream(char *buffer, int size)
+int GSocket::Recv_Stream(char *buffer, int size)

 {
   return recv(m_fd, buffer, size, 0);
 }
 
 {
   return recv(m_fd, buffer, size, 0);
 }
 

-int GSocketBSD::Recv_Dgram(char *buffer, int size)
+int GSocket::Recv_Dgram(char *buffer, int size)

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


@@ -1299,7 +1310,7 @@ int GSocketBSD::Recv_Dgram(char *buffer, int size)
   return ret;
 }
 
   return ret;
 }
 

-int GSocketBSD::Send_Stream(const char *buffer, int size)
+int GSocket::Send_Stream(const char *buffer, int size)

 {
   int ret;
 
 {
   int ret;
 


@@ -1314,7 +1325,7 @@ int GSocketBSD::Send_Stream(const char *buffer, int size)
   return ret;
 }
 
   return ret;
 }
 

-int GSocketBSD::Send_Dgram(const char *buffer, int size)
+int GSocket::Send_Dgram(const char *buffer, int size)

 {
   struct sockaddr *addr;
   int len, ret;
 {
   struct sockaddr *addr;
   int len, ret;


@@ -1347,7 +1358,7 @@ int GSocketBSD::Send_Dgram(const char *buffer, int size)
   return ret;
 }
 
   return ret;
 }
 

-void GSocketBSD::Detected_Read()
+void GSocket::Detected_Read()

 {
   char c;
 
 {
   char c;
 


@@ -1356,41 +1367,41 @@ void GSocketBSD::Detected_Read()
    */
   if ((m_detected & GSOCK_LOST_FLAG) != 0)
   {
    */
   if ((m_detected & GSOCK_LOST_FLAG) != 0)
   {

-    m_establishing = FALSE;
+    m_establishing = false;

 
 

-    CALL_CALLBACK(GSOCK_LOST);
+    CALL_CALLBACK(this, GSOCK_LOST);

     Shutdown();
     return;
   }
 
   if (recv(m_fd, &c, 1, MSG_PEEK) > 0)
   {
     Shutdown();
     return;
   }
 
   if (recv(m_fd, &c, 1, MSG_PEEK) > 0)
   {

-    CALL_CALLBACK(GSOCK_INPUT);
+    CALL_CALLBACK(this, GSOCK_INPUT);

   }
   else
   {
     if (m_server && m_stream)
     {
   }
   else
   {
     if (m_server && m_stream)
     {

-      CALL_CALLBACK(GSOCK_CONNECTION);
+      CALL_CALLBACK(this, GSOCK_CONNECTION);

     }
     else
     {
     }
     else
     {

-      CALL_CALLBACK(GSOCK_LOST);
+      CALL_CALLBACK(this, GSOCK_LOST);

       Shutdown();
     }
   }
 }
 
       Shutdown();
     }
   }
 }
 

-void GSocketBSD::Detected_Write()
+void GSocket::Detected_Write()

 {
   /* If we have already detected a LOST event, then don't try
    * to do any further processing.
    */
   if ((m_detected & GSOCK_LOST_FLAG) != 0)
   {
 {
   /* If we have already detected a LOST event, then don't try
    * to do any further processing.
    */
   if ((m_detected & GSOCK_LOST_FLAG) != 0)
   {

-    m_establishing = FALSE;
+    m_establishing = false;

 
 

-    CALL_CALLBACK(GSOCK_LOST);
+    CALL_CALLBACK(this, GSOCK_LOST);

     Shutdown();
     return;
   }
     Shutdown();
     return;
   }


@@ -1400,58 +1411,41 @@ void GSocketBSD::Detected_Write()
     int error;
     SOCKLEN_T len = sizeof(error);
 
     int error;
     SOCKLEN_T len = sizeof(error);
 

-    m_establishing = FALSE;
+    m_establishing = false;

 
     getsockopt(m_fd, SOL_SOCKET, SO_ERROR, (void*)&error, &len);
 
     if (error)
     {
 
     getsockopt(m_fd, SOL_SOCKET, SO_ERROR, (void*)&error, &len);
 
     if (error)
     {

-      CALL_CALLBACK(GSOCK_LOST);
+      CALL_CALLBACK(this, GSOCK_LOST);

       Shutdown();
     }
     else
     {
       Shutdown();
     }
     else
     {

-      CALL_CALLBACK(GSOCK_CONNECTION);
+      CALL_CALLBACK(this, 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.
        */
       /* 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(GSOCK_OUTPUT);
+      CALL_CALLBACK(this, GSOCK_OUTPUT);

     }
   }
   else
   {
     }
   }
   else
   {

-    CALL_CALLBACK(GSOCK_OUTPUT);
+    CALL_CALLBACK(this, GSOCK_OUTPUT);

   }
 }
 
 /* Compatibility functions for GSocket */
 GSocket *GSocket_new(void)
 {
   }
 }
 
 /* Compatibility functions for GSocket */
 GSocket *GSocket_new(void)
 {

-    GSocket *newsocket = new GSocketBSDGUIShim();
+    GSocket *newsocket = new GSocket();

     if(newsocket->IsOk())
         return newsocket;
     delete newsocket;
     return NULL;
 }
 
     if(newsocket->IsOk())
         return newsocket;
     delete newsocket;
     return NULL;
 }
 

-void GSocket_destroy(GSocket *socket)
-{
-    assert(socket);
-
-    /* Check that the socket is really shutdowned */
-    if (socket->m_fd != INVALID_SOCKET)
-      socket->Shutdown();
-
-    delete socket;
-}
-
-void GSocketBSD::_GSocket_Detected_Read(GSocket *socket)
-{   socket->Detected_Read(); }
-
-void GSocketBSD::_GSocket_Detected_Write(GSocket *socket)
-{   socket->Detected_Write(); }
-

 /*
  * -------------------------------------------------------------------------
  * GAddress
 /*
  * -------------------------------------------------------------------------
  * GAddress


@@ -1659,7 +1653,7 @@ GSocketError GAddress_INET_SetHostName(GAddress *address, const char *hostname)
 #else
   /* Use gethostbyname by default */
 #ifndef __WXMAC__
 #else
   /* Use gethostbyname by default */
 #ifndef __WXMAC__

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

   if (val)
 #endif
   {
   if (val)
 #endif
   {