X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/655719367ac5e131d9642e5783f3ecf64d1a3385..42ef83fa71e14e4fcbb537dd0da7bd9ef9701f49:/src/unix/gsocket.cpp

diff --git a/src/unix/gsocket.cpp b/src/unix/gsocket.cpp
index 28bbb98194..81c6a62fad 100644
--- 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
@@ -159,82 +161,73 @@ int _System soclose(int);
 #  define GSocket_Debug(args)
 #endif /* __GSOCKET_DEBUG__ */
 
-///////////////////////////////////////////////////////////////////////////
-// GSocketBSDGUIShim
-struct GSocketGUIFunctionsTable *GSocketBSDGUIShim::ms_gui_functions = NULL;
+/* Table of GUI-related functions. We must call them indirectly because
+ * of wxBase and GUI separation: */
 
-void GSocket_SetGUIFunctions(struct GSocketGUIFunctionsTable *guifunc)
-{
-  GSocketBSDGUIShim::ms_gui_functions = guifunc;
-}
-         
-inline bool GSocketBSDGUIShim::UseGUI()
-{
-    return ms_gui_functions;
-}
-
-inline bool GSocketBSDGUIShim::GUI_Init()
-{
-    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);
-}
+static struct GSocketGUIFunctionsTable *gs_gui_functions;
 
-void GSocketBSDGUIShim::EventLoop_Disable_Events()
+class GSocketGUIFunctionsTableNull: public GSocketGUIFunctionsTable
 {
-    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(struct 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)
 {
-    return GSocketBSDGUIShim::GUI_Init();
+  if (!gs_gui_functions)
+  {
+    static class GSocketGUIFunctionsTableNull table;
+    gs_gui_functions = &table;
+  }
+  if ( !gs_gui_functions->OnInit() )
+    return 0;
+  return 1;
 }
 
 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;
 
@@ -255,23 +248,32 @@ GSocketBSD::GSocketBSD()
                                 /* 10 minutes * 60 sec * 1000 millisec */
   m_establishing        = FALSE;
 
-  m_functions           = &gs_base_functions;
-
-  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;
 }
 
-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);
@@ -284,7 +286,7 @@ GSocketBSD::~GSocketBSD()
  *  Disallow further read/write operations on this socket, close
  *  the fd and disable all callbacks.
  */
-void GSocketBSD::Shutdown()
+void GSocket::Shutdown()
 {
   int evt;
 
@@ -320,7 +322,7 @@ void GSocketBSD::Shutdown()
  *    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);
 
@@ -346,7 +348,7 @@ GSocketError GSocketBSD::SetLocal(GAddress *address)
   return GSOCK_NOERROR;
 }
 
-GSocketError GSocketBSD::SetPeer(GAddress *address)
+GSocketError GSocket::SetPeer(GAddress *address)
 {
   assert(this);
 
@@ -365,7 +367,7 @@ GSocketError GSocketBSD::SetPeer(GAddress *address)
   return GSOCK_NOERROR;
 }
 
-GAddress *GSocketBSD::GetLocal()
+GAddress *GSocket::GetLocal()
 {
   GAddress *address;
   struct sockaddr addr;
@@ -410,7 +412,7 @@ GAddress *GSocketBSD::GetLocal()
   return address;
 }
 
-GAddress *GSocketBSD::GetPeer()
+GAddress *GSocket::GetPeer()
 {
   assert(this);
 
@@ -427,13 +429,13 @@ GAddress *GSocketBSD::GetPeer()
  *  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. 
+ *    GSOCK_IOERR   - low-level error.
  */
-GSocketError GSocketBSD::SetServer()
+GSocketError GSocket::SetServer()
 {
   int arg = 1;
 
@@ -456,7 +458,6 @@ GSocketError GSocketBSD::SetServer()
   /* Initialize all fields */
   m_stream   = TRUE;
   m_server   = TRUE;
-  m_oriented = TRUE;
 
   /* Create the socket */
   m_fd = socket(m_local->m_realfamily, SOCK_STREAM, 0);
@@ -471,12 +472,13 @@ GSocketError GSocketBSD::SetServer()
 #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.
    */
-  setsockopt(m_fd, SOL_SOCKET, SO_REUSEADDR, (const char*)&arg, sizeof(u_long));
+  if (m_reusable)
+    setsockopt(m_fd, SOL_SOCKET, SO_REUSEADDR, (const char*)&arg, sizeof(u_long));
 
   /* Bind to the local address,
    * retrieve the actual address bound,
@@ -506,9 +508,9 @@ GSocketError GSocketBSD::SetServer()
  *    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. 
+ *    GSOCK_IOERR      - low-level error.
  */
-GSocket *GSocketBSD::WaitConnection()
+GSocket *GSocket::WaitConnection()
 {
   struct sockaddr from;
   SOCKLEN_T fromlen = sizeof(from);
@@ -533,7 +535,6 @@ GSocket *GSocketBSD::WaitConnection()
 
   if (!connection)
   {
-    delete connection;
     m_error = GSOCK_MEMERR;
     return NULL;
   }
@@ -541,7 +542,7 @@ GSocket *GSocketBSD::WaitConnection()
   /* Wait for a connection (with timeout) */
   if (Input_Timeout() == GSOCK_TIMEDOUT)
   {
-    delete connection;
+    GSocket_destroy(connection);
     /* m_error set by _GSocket_Input_Timeout */
     return NULL;
   }
@@ -555,20 +556,19 @@ GSocket *GSocketBSD::WaitConnection()
     else
       m_error = GSOCK_IOERR;
 
-    delete connection;
+    GSocket_destroy(connection);
     return NULL;
   }
 
   /* Initialize all fields */
   connection->m_server   = FALSE;
   connection->m_stream   = TRUE;
-  connection->m_oriented = TRUE;
 
   /* Setup the peer address field */
   connection->m_peer = GAddress_new();
   if (!connection->m_peer)
   {
-    delete connection;
+    GSocket_destroy(connection);
     m_error = GSOCK_MEMERR;
     return NULL;
   }
@@ -576,7 +576,7 @@ GSocket *GSocketBSD::WaitConnection()
   if (err != GSOCK_NOERROR)
   {
     GAddress_destroy(connection->m_peer);
-    delete connection;
+    GSocket_destroy(connection);
     m_error = err;
     return NULL;
   }
@@ -585,11 +585,21 @@ GSocket *GSocketBSD::WaitConnection()
 #else
   ioctl(connection->m_fd, FIONBIO, &arg);
 #endif
-  connection->EventLoop_Enable_Events();
+  gs_gui_functions->Enable_Events(connection);
 
   return connection;
 }
 
+int GSocket::SetReusable()
+{
+    /* socket must not be null, and must not be in use/already bound */
+    if (this && m_fd == INVALID_SOCKET) {
+        m_reusable = TRUE;
+        return TRUE;
+    }
+    return FALSE;
+}
+
 /* Client specific parts */
 
 /* GSocket_Connect:
@@ -613,9 +623,9 @@ GSocket *GSocketBSD::WaitConnection()
  *    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. 
+ *    GSOCK_IOERR      - low-level error.
  */
-GSocketError GSocketBSD::Connect(GSocketStream stream)
+GSocketError GSocket::Connect(GSocketStream stream)
 {
   int err, ret;
   int arg = 1;
@@ -639,7 +649,6 @@ GSocketError GSocketBSD::Connect(GSocketStream stream)
 
   /* Streamed or dgram socket? */
   m_stream   = (stream == GSOCK_STREAMED);
-  m_oriented = TRUE;
   m_server   = FALSE;
   m_establishing = FALSE;
 
@@ -657,7 +666,7 @@ GSocketError GSocketBSD::Connect(GSocketStream stream)
 #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);
@@ -728,7 +737,7 @@ GSocketError GSocketBSD::Connect(GSocketStream stream)
  *    GSOCK_INVADDR - the local address has not been set.
  *    GSOCK_IOERR   - low-level error.
  */
-GSocketError GSocketBSD::SetNonOriented()
+GSocketError GSocket::SetNonOriented()
 {
   int arg = 1;
 
@@ -749,7 +758,6 @@ GSocketError GSocketBSD::SetNonOriented()
   /* Initialize all fields */
   m_stream   = FALSE;
   m_server   = FALSE;
-  m_oriented = FALSE;
 
   /* Create the socket */
   m_fd = socket(m_local->m_realfamily, SOCK_DGRAM, 0);
@@ -764,7 +772,7 @@ GSocketError GSocketBSD::SetNonOriented()
 #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.
@@ -785,34 +793,33 @@ GSocketError GSocketBSD::SetNonOriented()
 /* Generic IO */
 
 /* Like recv(), send(), ... */
-int GSocketBSD::Read(char *buffer, int size)
+int GSocket::Read(char *buffer, int size)
 {
   int ret;
 
   assert(this);
 
-  /* When using CFSocket we MUST NOT reenable events until we finish reading */
-#ifndef __DARWIN__
-  /* Reenable INPUT events */
-  Enable(GSOCK_INPUT);
-#endif
-
   if (m_fd == INVALID_SOCKET || m_server)
   {
     m_error = GSOCK_INVSOCK;
     return -1;
   }
 
+  /* Disable events during query of socket status */
+  Disable(GSOCK_INPUT);
+
   /* If the socket is blocking, wait for data (with a timeout) */
   if (Input_Timeout() == GSOCK_TIMEDOUT)
-    return -1;
+    /* We no longer return here immediately, otherwise socket events would not be re-enabled! */
+    ret = -1;
+  else {
+    /* Read the data */
+    if (m_stream)
+      ret = Recv_Stream(buffer, size);
+    else
+      ret = Recv_Dgram(buffer, size);
+  }
 
-  /* Read the data */
-  if (m_stream)
-    ret = Recv_Stream(buffer, size);
-  else
-    ret = Recv_Dgram(buffer, size);
-    
   if (ret == -1)
   {
     if (errno == EWOULDBLOCK)
@@ -820,21 +827,19 @@ int GSocketBSD::Read(char *buffer, int size)
     else
       m_error = GSOCK_IOERR;
   }
-  
-#ifdef __DARWIN__
-  /* Reenable INPUT events */
+
+  /* Enable events again now that we are done processing */
   Enable(GSOCK_INPUT);
-#endif
 
   return ret;
 }
 
-int GSocketBSD::Write(const char *buffer, int size)
-{                        
+int GSocket::Write(const char *buffer, int size)
+{
   int ret;
 
   assert(this);
-  
+
   GSocket_Debug(( "GSocket_Write #1, size %d\n", size ));
 
   if (m_fd == INVALID_SOCKET || m_server)
@@ -856,7 +861,7 @@ int GSocketBSD::Write(const char *buffer, int size)
     ret = Send_Stream(buffer, size);
   else
     ret = Send_Dgram(buffer, size);
-    
+
   GSocket_Debug(( "GSocket_Write #4, size %d\n", size ));
 
   if (ret == -1)
@@ -880,7 +885,7 @@ int GSocketBSD::Write(const char *buffer, int size)
     Enable(GSOCK_OUTPUT);
     return -1;
   }
-  
+
   GSocket_Debug(( "GSocket_Write #5, size %d ret %d\n", size, ret ));
 
   return ret;
@@ -893,9 +898,9 @@ int GSocketBSD::Write(const char *buffer, int size)
  *  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;
@@ -904,17 +909,17 @@ GSocketEventFlags GSocketBSD::Select(GSocketEventFlags flags)
     fd_set exceptfds;
     struct timeval tv;
 
+    assert(this);
+
     /* Do not use a static struct, Linux can garble it */
     tv.tv_sec = m_timeout / 1000;
     tv.tv_usec = (m_timeout % 1000) / 1000;
 
-    assert(this);
-
     FD_ZERO(&readfds);
     FD_ZERO(&writefds);
     FD_ZERO(&exceptfds);
     FD_SET(m_fd, &readfds);
-    if (flags & GSOCK_OUTPUT_FLAG)
+    if (flags & GSOCK_OUTPUT_FLAG || flags & GSOCK_CONNECTION_FLAG)
       FD_SET(m_fd, &writefds);
     FD_SET(m_fd, &exceptfds);
 
@@ -958,7 +963,7 @@ GSocketEventFlags GSocketBSD::Select(GSocketEventFlags flags)
         {
           m_detected = GSOCK_LOST_FLAG;
           m_establishing = FALSE;
-      
+
           /* LOST event: Abort any further processing */
           return (GSOCK_LOST_FLAG & flags);
         }
@@ -1024,7 +1029,7 @@ GSocketEventFlags GSocketBSD::Select(GSocketEventFlags flags)
  *  Sets the socket to non-blocking mode. All IO calls will return
  *  immediately.
  */
-void GSocketBSD::SetNonBlocking(int non_block)
+void GSocket::SetNonBlocking(int non_block)
 {
   assert(this);
 
@@ -1037,7 +1042,7 @@ void GSocketBSD::SetNonBlocking(int non_block)
  *  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);
 
@@ -1049,7 +1054,7 @@ void GSocketBSD::SetTimeout(unsigned long millisec)
  *  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);
 
@@ -1063,7 +1068,7 @@ GSocketError GSocketBSD::GetError()
  *   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 
+ *   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
@@ -1086,7 +1091,7 @@ GSocketError GSocketBSD::GetError()
  *
  *  void function(GSocket *socket, GSocketEvent event, char *cdata)
  */
-void GSocketBSD::SetCallback(GSocketEventFlags flags,
+void GSocket::SetCallback(GSocketEventFlags flags,
                          GSocketCallback callback, char *cdata)
 {
   int count;
@@ -1107,7 +1112,7 @@ void GSocketBSD::SetCallback(GSocketEventFlags flags,
  *  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;
 
@@ -1123,31 +1128,50 @@ void GSocketBSD::UnsetCallback(GSocketEventFlags flags)
   }
 }
 
+GSocketError GSocket::GetSockOpt(int level, int optname,
+                                void *optval, int *optlen)
+{
+    if (getsockopt(m_fd, level, optname, optval, optlen) == 0)
+    {
+        return GSOCK_NOERROR;
+    }
+    return GSOCK_OPTERR;
+}
+
+GSocketError GSocket::SetSockOpt(int level, int optname,
+                                const void *optval, int optlen)
+{
+    if (setsockopt(m_fd, level, optname, optval, optlen) == 0)
+    {
+        return GSOCK_NOERROR;
+    }
+    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);
-  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);
-  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.
  */
-GSocketError GSocketBSD::Input_Timeout()
+GSocketError GSocket::Input_Timeout()
 {
   struct timeval tv;
   fd_set readfds;
@@ -1186,7 +1210,7 @@ GSocketError GSocketBSD::Input_Timeout()
  *  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;
@@ -1234,12 +1258,12 @@ GSocketError GSocketBSD::Output_Timeout()
   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);
 }
 
-int GSocketBSD::Recv_Dgram(char *buffer, int size)
+int GSocket::Recv_Dgram(char *buffer, int size)
 {
   struct sockaddr from;
   SOCKLEN_T fromlen = sizeof(from);
@@ -1275,7 +1299,7 @@ int GSocketBSD::Recv_Dgram(char *buffer, int size)
   return ret;
 }
 
-int GSocketBSD::Send_Stream(const char *buffer, int size)
+int GSocket::Send_Stream(const char *buffer, int size)
 {
   int ret;
 
@@ -1290,7 +1314,7 @@ int GSocketBSD::Send_Stream(const char *buffer, int size)
   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;
@@ -1323,7 +1347,7 @@ int GSocketBSD::Send_Dgram(const char *buffer, int size)
   return ret;
 }
 
-void GSocketBSD::Detected_Read()
+void GSocket::Detected_Read()
 {
   char c;
 
@@ -1334,30 +1358,30 @@ void GSocketBSD::Detected_Read()
   {
     m_establishing = FALSE;
 
-    CALL_CALLBACK(GSOCK_LOST);
+    CALL_CALLBACK(this, GSOCK_LOST);
     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)
     {
-      CALL_CALLBACK(GSOCK_CONNECTION);
+      CALL_CALLBACK(this, GSOCK_CONNECTION);
     }
     else
     {
-      CALL_CALLBACK(GSOCK_LOST);
+      CALL_CALLBACK(this, GSOCK_LOST);
       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.
@@ -1366,7 +1390,7 @@ void GSocketBSD::Detected_Write()
   {
     m_establishing = FALSE;
 
-    CALL_CALLBACK(GSOCK_LOST);
+    CALL_CALLBACK(this, GSOCK_LOST);
     Shutdown();
     return;
   }
@@ -1382,52 +1406,35 @@ void GSocketBSD::Detected_Write()
 
     if (error)
     {
-      CALL_CALLBACK(GSOCK_LOST);
+      CALL_CALLBACK(this, GSOCK_LOST);
       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.
        */
-      CALL_CALLBACK(GSOCK_OUTPUT);
+      CALL_CALLBACK(this, GSOCK_OUTPUT);
     }
   }
   else
   {
-    CALL_CALLBACK(GSOCK_OUTPUT);
+    CALL_CALLBACK(this, GSOCK_OUTPUT);
   }
 }
 
 /* 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;
 }
 
-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
@@ -1634,8 +1641,10 @@ GSocketError GAddress_INET_SetHostName(GAddress *address, const char *hostname)
   {
 #else
   /* Use gethostbyname by default */
-  int val = 1;  //VA doesn't like constants in conditional expressions at all
+#ifndef __WXMAC__
+  int val = 1;  /* VA doesn't like constants in conditional expressions */
   if (val)
+#endif
   {
 #endif
     struct in_addr *array_addr;
@@ -1669,7 +1678,7 @@ GSocketError GAddress_INET_SetHostAddress(GAddress *address,
   CHECK_ADDRESS(address, INET);
 
   addr = &(((struct sockaddr_in *)address->m_addr)->sin_addr);
-  addr->s_addr = hostaddr;
+  addr->s_addr = htonl(hostaddr);
 
   return GSOCK_NOERROR;
 }
@@ -1688,7 +1697,7 @@ GSocketError GAddress_INET_SetPortName(GAddress *address, const char *port,
     address->m_error = GSOCK_INVPORT;
     return GSOCK_INVPORT;
   }
- 
+
   se = getservbyname(port, protocol);
   if (!se)
   {
@@ -1720,7 +1729,7 @@ GSocketError GAddress_INET_SetPort(GAddress *address, unsigned short port)
 
   assert(address != NULL);
   CHECK_ADDRESS(address, INET);
- 
+
   addr = (struct sockaddr_in *)address->m_addr;
   addr->sin_port = htons(port);
 
@@ -1733,7 +1742,7 @@ GSocketError GAddress_INET_GetHostName(GAddress *address, char *hostname, size_t
   char *addr_buf;
   struct sockaddr_in *addr;
 
-  assert(address != NULL); 
+  assert(address != NULL);
   CHECK_ADDRESS(address, INET);
 
   addr = (struct sockaddr_in *)address->m_addr;
@@ -1755,20 +1764,20 @@ unsigned long GAddress_INET_GetHostAddress(GAddress *address)
 {
   struct sockaddr_in *addr;
 
-  assert(address != NULL); 
-  CHECK_ADDRESS_RETVAL(address, INET, 0); 
+  assert(address != NULL);
+  CHECK_ADDRESS_RETVAL(address, INET, 0);
 
   addr = (struct sockaddr_in *)address->m_addr;
 
-  return addr->sin_addr.s_addr;
+  return ntohl(addr->sin_addr.s_addr);
 }
 
 unsigned short GAddress_INET_GetPort(GAddress *address)
 {
   struct sockaddr_in *addr;
 
-  assert(address != NULL); 
-  CHECK_ADDRESS_RETVAL(address, INET, 0); 
+  assert(address != NULL);
+  CHECK_ADDRESS_RETVAL(address, INET, 0);
 
   addr = (struct sockaddr_in *)address->m_addr;
   return ntohs(addr->sin_port);
@@ -1805,9 +1814,9 @@ GSocketError GAddress_UNIX_SetPath(GAddress *address, const char *path)
 {
   struct sockaddr_un *addr;
 
-  assert(address != NULL); 
+  assert(address != NULL);
 
-  CHECK_ADDRESS(address, UNIX); 
+  CHECK_ADDRESS(address, UNIX);
 
   addr = ((struct sockaddr_un *)address->m_addr);
   strncpy(addr->sun_path, path, UNIX_SOCK_PATHLEN);