handle correctly never/always shown scrollbars in GetClientSize()

[wxWidgets.git] / src / common / socket.cpp

diff --git a/src/common/socket.cpp b/src/common/socket.cpp
index 32689fe50ddf3768b191ee10f5706573d6717c61..d17ce8f2ed1cf7afe5e1cddc3777173d2cccaa1e 100644 (file)
--- a/src/common/socket.cpp
+++ b/src/common/socket.cpp
@@ -1,1291 +1,1904 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:       socket.cpp
+// Name:       src/common/socket.cpp

 // Purpose:    Socket handler classes
 // Authors:    Guilhem Lavaux, Guillermo Rodriguez Garcia
 // Created:    April 1997
 // Purpose:    Socket handler classes
 // Authors:    Guilhem Lavaux, Guillermo Rodriguez Garcia
 // Created:    April 1997

-// Updated:    September 1999
-// Copyright:  (C) 1999, 1998, 1997, Guilhem Lavaux
-//             (C) 1999, Guillermo Rodriguez Garcia
+// Copyright:  (C) 1999-1997, Guilhem Lavaux
+//             (C) 1999-2000, Guillermo Rodriguez Garcia
+//             (C) 2008 Vadim Zeitlin

 // RCS_ID:     $Id$
 // RCS_ID:     $Id$

-// License:    see wxWindows license
+// License:    wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
-#pragma implementation "socket.h"
-#endif
+// ==========================================================================
+// Declarations
+// ==========================================================================

 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__

-#pragma hdrstop
+    #pragma hdrstop

 #endif
 
 #if wxUSE_SOCKETS
 
 #endif
 
 #if wxUSE_SOCKETS
 

-/////////////////////////////////////////////////////////////////////////////
-// wxWindows headers
-/////////////////////////////////////////////////////////////////////////////
-#include "wx/defs.h"
-#include "wx/object.h"
-#include "wx/string.h"
-#include "wx/timer.h"
-#include "wx/utils.h"
-#include "wx/module.h"
-#include "wx/log.h"
-
-#include <stdlib.h>
-#include <string.h>
-#include <ctype.h>
+#include "wx/socket.h"

 
 

-/////////////////////////////////////////////////////////////////////////////
-// wxSocket headers
-/////////////////////////////////////////////////////////////////////////////
+#ifndef WX_PRECOMP
+    #include "wx/object.h"
+    #include "wx/string.h"
+    #include "wx/intl.h"
+    #include "wx/log.h"
+    #include "wx/event.h"
+    #include "wx/app.h"
+    #include "wx/utils.h"
+    #include "wx/timer.h"
+    #include "wx/module.h"
+#endif
+
+#include "wx/apptrait.h"

 #include "wx/sckaddr.h"
 #include "wx/sckaddr.h"

-#include "wx/socket.h"
+#include "wx/stopwatch.h"
+#include "wx/thread.h"
+#include "wx/evtloop.h"
+
+#include "wx/private/fd.h"
+#include "wx/private/socket.h"
+
+// DLL options compatibility check:
+#include "wx/build.h"
+WX_CHECK_BUILD_OPTIONS("wxNet")
+
+// --------------------------------------------------------------------------
+// macros and constants
+// --------------------------------------------------------------------------

 
 

+// discard buffer
+#define MAX_DISCARD_SIZE (10 * 1024)

 
 

-#if defined(__WXMSW__)
-#define PROCESS_EVENTS() wxYield()
-#elif defined(__WXGTK__)
-#include <gtk/gtk.h>
-#define PROCESS_EVENTS() gtk_main_iteration()
-#endif  
+#define wxTRACE_Socket _T("wxSocket")

 
 

+// --------------------------------------------------------------------------
+// wxWin macros
+// --------------------------------------------------------------------------

 
 

-// --------------------------------------------------------------
-// ClassInfos
-// --------------------------------------------------------------
-#if !USE_SHARED_LIBRARY

 IMPLEMENT_CLASS(wxSocketBase, wxObject)
 IMPLEMENT_CLASS(wxSocketServer, wxSocketBase)
 IMPLEMENT_CLASS(wxSocketClient, wxSocketBase)
 IMPLEMENT_CLASS(wxSocketBase, wxObject)
 IMPLEMENT_CLASS(wxSocketServer, wxSocketBase)
 IMPLEMENT_CLASS(wxSocketClient, wxSocketBase)

+IMPLEMENT_CLASS(wxDatagramSocket, wxSocketBase)

 IMPLEMENT_DYNAMIC_CLASS(wxSocketEvent, wxEvent)
 IMPLEMENT_DYNAMIC_CLASS(wxSocketEvent, wxEvent)

-#endif
+
+// --------------------------------------------------------------------------
+// private classes
+// --------------------------------------------------------------------------

 
 class wxSocketState : public wxObject
 {
 public:
 
 class wxSocketState : public wxObject
 {
 public:

-  bool notify_state;
-  GSocketEventFlags evt_notify_state;
-  wxSocketBase::wxSockFlags socket_flags;
-  wxSocketBase::wxSockCbk c_callback;
-  char *c_callback_data;
+    wxSocketFlags            m_flags;
+    wxSocketEventFlags       m_eventmask;
+    bool                     m_notify;
+    void                    *m_clientData;

 
 public:
 
 public:

-  wxSocketState() : wxObject() {}
+    wxSocketState() : wxObject() {}
+
+    DECLARE_NO_COPY_CLASS(wxSocketState)
+};
+
+// Conditionally make the socket non-blocking for the lifetime of this object.
+class wxSocketUnblocker
+{
+public:
+    wxSocketUnblocker(wxSocketImpl *socket, bool unblock = true)
+        : m_impl(socket),
+          m_unblock(unblock)
+    {
+        if ( m_unblock )
+            m_impl->SetNonBlocking(true);
+    }
+
+    ~wxSocketUnblocker()
+    {
+        if ( m_unblock )
+            m_impl->SetNonBlocking(false);
+    }
+
+private:
+    wxSocketImpl * const m_impl;
+    bool m_unblock;
+
+    DECLARE_NO_COPY_CLASS(wxSocketUnblocker)

 };
 
 };
 

-// --------------------------------------------------------------
-// wxSocketBase ctor and dtor
-// --------------------------------------------------------------
+// ============================================================================
+// wxSocketManager
+// ============================================================================
+
+wxSocketManager *wxSocketManager::ms_manager = NULL;
+
+/* static */
+void wxSocketManager::Set(wxSocketManager *manager)
+{
+    wxASSERT_MSG( !ms_manager, "too late to set manager now" );
+
+    ms_manager = manager;
+}

 
 

-wxSocketBase::wxSocketBase(wxSocketBase::wxSockFlags _flags,
-         wxSocketBase::wxSockType _type) :
-  wxEvtHandler(),
-  m_socket(NULL), m_id(-1),
-  m_flags(_flags), m_type(_type),
-  m_neededreq(0), m_notify_state(FALSE),
-  m_connected(FALSE), m_establishing(FALSE),
-  m_reading(FALSE), m_writing(FALSE),
-  m_error(FALSE), m_lcount(0), m_timeout(600), m_states(),
-  m_unread(NULL), m_unrd_size(0), m_unrd_cur(0),
-  m_defering(NO_DEFER), m_defer_buffer(NULL), m_defer_timer(NULL),
-  m_cbk(NULL), m_cdata(NULL)
+/* static */
+void wxSocketManager::Init()

 {
 {

+    wxASSERT_MSG( !ms_manager, "shouldn't be initialized twice" );
+
+    /*
+        Details: Initialize() creates a hidden window as a sink for socket
+        events, such as 'read completed'. wxMSW has only one message loop
+        for the main thread. If Initialize is called in a secondary thread,
+        the socket window will be created for the secondary thread, but
+        since there is no message loop on this thread, it will never
+        receive events and all socket operations will time out.
+        BTW, the main thread must not be stopped using sleep or block
+        on a semaphore (a bad idea in any case) or socket operations
+        will time out.
+
+        On the Mac side, Initialize() stores a pointer to the CFRunLoop for
+        the main thread. Because secondary threads do not have run loops,
+        adding event notifications to the "Current" loop would have no
+        effect at all, events would never fire.
+    */
+    wxASSERT_MSG( wxIsMainThread(),
+                    "sockets must be initialized from the main thread" );
+
+    wxAppConsole * const app = wxAppConsole::GetInstance();
+    wxCHECK_RET( app, "sockets can't be initialized without wxApp" );
+
+    ms_manager = app->GetTraits()->GetSocketManager();

 }
 
 }
 

-wxSocketBase::wxSocketBase() :
-  wxEvtHandler(),
-  m_socket(NULL), m_id(-1),
-  m_flags(NONE), m_type(SOCK_UNINIT),
-  m_neededreq(0), m_notify_state(FALSE),
-  m_connected(FALSE), m_establishing(FALSE),
-  m_reading(FALSE), m_writing(FALSE),
-  m_error(FALSE), m_lcount(0), m_timeout(600), m_states(),
-  m_unread(NULL), m_unrd_size(0), m_unrd_cur(0),
-  m_defering(NO_DEFER), m_defer_buffer(NULL), m_defer_timer(NULL),
-  m_cbk(NULL), m_cdata(NULL)
+// ==========================================================================
+// wxSocketImpl
+// ==========================================================================
+
+wxSocketImpl::wxSocketImpl(wxSocketBase& wxsocket)
+    : m_wxsocket(&wxsocket)

 {
 {

+    m_fd              = INVALID_SOCKET;
+    m_detected        = 0;
+    m_local           = NULL;
+    m_peer            = NULL;
+    m_error           = wxSOCKET_NOERROR;
+    m_server          = false;
+    m_stream          = true;
+    m_non_blocking    = false;
+
+    SetTimeout(wxsocket.GetTimeout() * 1000);
+
+    m_establishing    = false;
+    m_reusable        = false;
+    m_broadcast       = false;
+    m_dobind          = true;
+    m_initialRecvBufferSize = -1;
+    m_initialSendBufferSize = -1;

 }
 
 }
 

-wxSocketBase::~wxSocketBase()
+wxSocketImpl::~wxSocketImpl()

 {
 {

-  if (m_unread)
-    free(m_unread);
+    if (m_fd != INVALID_SOCKET)
+        Shutdown();

 
 

-  // Shutdown and close the socket
-  Close();
+    if (m_local)
+        GAddress_destroy(m_local);

 
 

-  // Destroy the GSocket object
-  if (m_socket)
-    GSocket_destroy(m_socket);
+    if (m_peer)
+        GAddress_destroy(m_peer);

 }
 
 }
 

-bool wxSocketBase::Close()
+bool wxSocketImpl::PreCreateCheck(GAddress *addr)

 {
 {

-  if (m_socket)
-  {
-    // Disable callbacks
-    GSocket_UnsetCallback(m_socket, GSOCK_INPUT_FLAG | GSOCK_OUTPUT_FLAG |
-                                    GSOCK_LOST_FLAG | GSOCK_CONNECTION_FLAG);
-
-    // Shutdown the connection
-    GSocket_Shutdown(m_socket);
-    m_connected = FALSE;
-    m_establishing = FALSE;
-  }
+    if ( m_fd != INVALID_SOCKET )
+    {
+        m_error = wxSOCKET_INVSOCK;
+        return false;
+    }

 
 

-  return TRUE;
+    if ( !addr || !addr->m_addr )
+    {
+        m_error = wxSOCKET_INVADDR;
+        return false;
+    }
+
+    return true;

 }
 
 }
 

-// --------------------------------------------------------------
-// wxSocketBase basic IO operations
-// --------------------------------------------------------------
+void wxSocketImpl::PostCreation()
+{
+    // FreeBSD variants can't use MSG_NOSIGNAL, and instead use a socket option
+#ifdef SO_NOSIGPIPE
+    EnableSocketOption(SO_NOSIGPIPE);
+#endif

 
 

-// All IO operations {Read, Write, ReadMsg, WriteMsg, Peek,
-// Unread, Discard} update m_error and m_lcount.
-//
-// TODO: Should Connect, Accept and AcceptWith update m_error?
+    if ( m_reusable )
+        EnableSocketOption(SO_REUSEADDR);

 
 

-class _wxSocketInternalTimer: public wxTimer
-{
-public:
-  int *m_state;
-  unsigned long m_new_val;
+    if ( m_broadcast )
+    {
+        wxASSERT_MSG( !m_stream, "broadcasting is for datagram sockets only" );

 
 

-  void Notify()
-  {
-    *m_state = m_new_val;  // Change the value
-  }
-};
+        EnableSocketOption(SO_BROADCAST);
+    }
+
+    if ( m_initialRecvBufferSize >= 0 )
+        SetSocketOption(SO_RCVBUF, m_initialRecvBufferSize);
+    if ( m_initialSendBufferSize >= 0 )
+        SetSocketOption(SO_SNDBUF, m_initialSendBufferSize);

 
 

-wxUint32 wxSocketBase::DeferRead(char *buffer, wxUint32 nbytes)
+    // FIXME: shouldn't we check for m_non_blocking here? as it is now, all our
+    //        sockets are non-blocking
+    UnblockAndRegisterWithEventLoop();
+}
+
+wxSocketError wxSocketImpl::UpdateLocalAddress()

 {
 {

-  // Timer for timeout
-  _wxSocketInternalTimer timer;
+    WX_SOCKLEN_T lenAddr;
+    if ( getsockname(m_fd, m_local->m_addr, &lenAddr) != 0 )
+    {
+        Close();
+        m_error = wxSOCKET_IOERR;
+        return m_error;
+    }

 
 

-  //wxLogMessage("Entrando a DeferRead, nbytes = %d", nbytes);
-  wxASSERT(m_defering == NO_DEFER);
+    m_local->m_len = lenAddr;

 
 

-  // Set the defering mode to READ.
-  m_defering = DEFER_READ;
+    return wxSOCKET_NOERROR;
+}

 
 

-  // Set the current buffer.
-  m_defer_buffer = buffer;
-  m_defer_nbytes = nbytes;
-  m_defer_timer  = &timer;
+wxSocketError wxSocketImpl::CreateServer()
+{
+    if ( !PreCreateCheck(m_local) )
+        return m_error;

 
 

-  timer.m_state = (int *)&m_defer_buffer;
-  timer.m_new_val = 0;
+    m_server = true;
+    m_stream = true;

 
 

-  timer.Start(m_timeout * 1000, FALSE);
+    // do create the socket
+    m_fd = socket(m_local->m_realfamily, SOCK_STREAM, 0);

 
 

-  // If the socket is readable, call DoDefer for the first time
-  if (GSocket_Select(m_socket, GSOCK_INPUT_FLAG))
-  {
-    //wxLogMessage("Llamando al primer DoDefer");
-    DoDefer();
-  }
+    if ( m_fd == INVALID_SOCKET )
+    {
+        m_error = wxSOCKET_IOERR;
+        return wxSOCKET_IOERR;
+    }

 
 

-  // Wait for buffer completion. 
-  while (m_defer_buffer != NULL)
-    PROCESS_EVENTS();
+    PostCreation();

 
 

-  timer.Stop();
+    // and then bind to and listen on it
+    //
+    // FIXME: should we test for m_dobind here?
+    if ( bind(m_fd, m_local->m_addr, m_local->m_len) != 0 )
+        m_error = wxSOCKET_IOERR;

 
 

-  // Disable defering mode.
-  m_defering = NO_DEFER;
-  m_defer_timer = NULL;
+    if ( IsOk() )
+    {
+        if ( listen(m_fd, 5) != 0 )
+            m_error = wxSOCKET_IOERR;
+    }

 
 

-  // Return the number of bytes read from the socket.
-  //wxLogMessage("Saliendo de DeferRead: total: %d bytes", nbytes - m_defer_nbytes);
-  return nbytes-m_defer_nbytes;
+    if ( !IsOk() )
+    {
+        Close();
+        return m_error;
+    }
+
+    // finally retrieve the address we effectively bound to
+    return UpdateLocalAddress();

 }
 
 }
 

-wxSocketBase& wxSocketBase::Read(char* buffer, wxUint32 nbytes)
+wxSocketError wxSocketImpl::CreateClient()

 {
 {

-  // Mask read events
-  m_reading = TRUE;
+    if ( !PreCreateCheck(m_peer) )
+        return m_error;
+
+    m_fd = socket(m_peer->m_realfamily, SOCK_STREAM, 0);

 
 

-  m_lcount = _Read(buffer, nbytes);
+    if ( m_fd == INVALID_SOCKET )
+    {
+      m_error = wxSOCKET_IOERR;
+      return wxSOCKET_IOERR;
+    }

 
 

-  // If in WAITALL mode, all bytes should have been read.
-  if (m_flags & WAITALL)
-    m_error = (m_lcount != nbytes);
-  else
-    m_error = (m_lcount == 0);
+    PostCreation();

 
 

-  // Trigger another read event if there is still data available.
-  m_reading = FALSE;
-  // TODO: TriggerRead
+    // If a local address has been set, then bind to it before calling connect
+    if ( m_local && m_local->m_addr )
+    {
+        if ( bind(m_fd, m_local->m_addr, m_local->m_len) != 0 )
+        {
+            Close();
+            m_error = wxSOCKET_IOERR;
+            return m_error;
+        }
+    }

 
 

-  return *this;
+    // Connect to the peer and handle the EWOULDBLOCK return value in
+    // platform-specific code
+    return DoHandleConnect(connect(m_fd, m_peer->m_addr, m_peer->m_len));

 }
 
 }
 

-wxUint32 wxSocketBase::_Read(char* buffer, wxUint32 nbytes)
+
+wxSocketError wxSocketImpl::CreateUDP()

 {
 {

-  int total;
-  int ret = 1;
+    if ( !PreCreateCheck(m_local) )
+        return m_error;

 
 

-  // we try this even if the connection has already been closed.
-  total = GetPushback(buffer, nbytes, FALSE);
-  nbytes -= total;
-  buffer += total;
+    m_stream = false;
+    m_server = false;

 
 

-  // If the socket is not connected, or we have got the whole
-  // needed buffer, return immedately
-  if (!m_connected || !m_socket || !nbytes) 
-    return total;
+    m_fd = socket(m_local->m_realfamily, SOCK_DGRAM, 0);

 
 

-  // Possible combinations (they are checked in this order)
-  // NOWAIT
-  // SPEED | WAITALL
-  // SPEED          
-  // WAITALL
-  // NONE
-  //
-  if (m_flags & NOWAIT)                 // NOWAIT
-  {
-    GSocket_SetNonBlocking(m_socket, TRUE);
-    ret = GSocket_Read(m_socket, buffer, nbytes);
-    GSocket_SetNonBlocking(m_socket, FALSE);
+    if ( m_fd == INVALID_SOCKET )
+    {
+        m_error = wxSOCKET_IOERR;
+        return wxSOCKET_IOERR;
+    }

 
 

-    if (ret > 0)
-      total += ret;
-  }
-  else if ((m_flags & SPEED) && (m_flags & WAITALL))    // SPEED, WAITALL
-  {
-    while (ret > 0 && nbytes > 0)
+    PostCreation();
+
+    if ( m_dobind )

     {
     {

-      ret = GSocket_Read(m_socket, buffer, nbytes);
-      total += ret;
-      buffer += ret;
-      nbytes -= ret;
+        if ( bind(m_fd, m_local->m_addr, m_local->m_len) != 0 )
+        {
+            Close();
+            m_error = wxSOCKET_IOERR;
+            return m_error;
+        }
+
+        return UpdateLocalAddress();

     }
     }

-    // In case the last call was an error ...
-    if (ret < 0)
-      total++;
-  }
-  else if (m_flags & SPEED)             // SPEED, !WAITALL
-  {
-    ret = GSocket_Read(m_socket, buffer, nbytes);

 
 

-    if (ret > 0)
-      total += ret;
-  }
-  else                                  // NONE or WAITALL
-  {
-    ret = DeferRead(buffer, nbytes);
+    return wxSOCKET_NOERROR;
+}

 
 

-    if (ret > 0)
-      total += ret;
-  }

 
 

-  return total;
+void wxSocketImpl::Close()
+{
+    if ( m_fd != INVALID_SOCKET )
+    {
+        DoClose();
+        m_fd = INVALID_SOCKET;
+    }

 }
 
 }
 

-wxSocketBase& wxSocketBase::ReadMsg(char* buffer, wxUint32 nbytes)
+/*
+ *  Disallow further read/write operations on this socket, close
+ *  the fd and disable all callbacks.
+ */
+void wxSocketImpl::Shutdown()

 {
 {

-#define MAX_DISCARD_SIZE (10 * 1024)
+    if ( m_fd != INVALID_SOCKET )
+    {
+        shutdown(m_fd, 1 /* SD_SEND */);
+        Close();
+    }
+
+    m_detected = wxSOCKET_LOST_FLAG;
+}
+
+/*
+ *  Sets the timeout for blocking calls. Time is expressed in
+ *  milliseconds.
+ */
+void wxSocketImpl::SetTimeout(unsigned long millis)
+{
+    m_timeout.tv_sec  = (millis / 1000);
+    m_timeout.tv_usec = (millis % 1000) * 1000;
+}

 
 

-  wxUint32 len, len2, sig, total;
-  bool error;
-  int old_flags;
-  struct
+void wxSocketImpl::NotifyOnStateChange(wxSocketNotify event)
+{
+    m_wxsocket->OnRequest(event);
+}
+
+/* Address handling */
+
+/*
+ *  Set or get the local or peer address for this socket. The 'set'
+ *  functions return wxSOCKET_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 socket.
+ *
+ *  Error codes:
+ *    wxSOCKET_INVSOCK - the socket is not valid.
+ *    wxSOCKET_INVADDR - the address is not valid.
+ */
+wxSocketError wxSocketImpl::SetLocal(GAddress *address)
+{
+  /* the socket must be initialized, or it must be a server */
+  if (m_fd != INVALID_SOCKET && !m_server)

   {
   {

-    unsigned char sig[4];
-    unsigned char len[4];
-  } msg;
+    m_error = wxSOCKET_INVSOCK;
+    return wxSOCKET_INVSOCK;
+  }

 
 

-  // Mask read events
-  m_reading = TRUE;
+  /* check address */
+  if (address == NULL || address->m_family == wxSOCKET_NOFAMILY)
+  {
+    m_error = wxSOCKET_INVADDR;
+    return wxSOCKET_INVADDR;
+  }

 
 

-  total = 0;
-  error = TRUE;
-  old_flags = m_flags;
-  SetFlags((m_flags & SPEED) | WAITALL);
+  if (m_local)
+    GAddress_destroy(m_local);

 
 

-  if (_Read((char *)&msg, sizeof(msg)) != sizeof(msg))
-    goto exit;
+  m_local = GAddress_copy(address);

 
 

-  sig = (wxUint32)msg.sig[0];
-  sig |= (wxUint32)(msg.sig[1] << 8);
-  sig |= (wxUint32)(msg.sig[2] << 16);
-  sig |= (wxUint32)(msg.sig[3] << 24);
+  return wxSOCKET_NOERROR;
+}

 
 

-  if (sig != 0xfeeddead)
+wxSocketError wxSocketImpl::SetPeer(GAddress *address)
+{
+  /* check address */
+  if (address == NULL || address->m_family == wxSOCKET_NOFAMILY)

   {
   {

-    wxLogMessage(_T("Warning: invalid signature returned to ReadMsg"));
-    goto exit;
+    m_error = wxSOCKET_INVADDR;
+    return wxSOCKET_INVADDR;

   }
 
   }
 

-  len = (wxUint32)msg.len[0];
-  len |= (wxUint32)(msg.len[1] << 8);
-  len |= (wxUint32)(msg.len[2] << 16);
-  len |= (wxUint32)(msg.len[3] << 24);
+  if (m_peer)
+    GAddress_destroy(m_peer);
+
+  m_peer = GAddress_copy(address);
+
+  return wxSOCKET_NOERROR;
+}
+
+GAddress *wxSocketImpl::GetLocal()
+{
+  GAddress *address;
+  wxSockAddr addr;
+  WX_SOCKLEN_T size = sizeof(addr);
+  wxSocketError err;

 
 

-  //wxLogMessage("Readmsg: %d  %d  %d  %d -> len == %d",
-  //  msg.len[0], msg.len[1], msg.len[2], msg.len[3], len);
+  /* try to get it from the m_local var first */
+  if (m_local)
+    return GAddress_copy(m_local);

 
 

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

   {
   {

-    len2 = len - nbytes;
-    len = nbytes;
+    m_error = wxSOCKET_INVSOCK;
+    return NULL;

   }
   }

-  else
-    len2 = 0;

 
 

-  // This check is necessary so that we don't attemp to read if
-  // the msg was zero bytes long.
-  if (len)
+  if (getsockname(m_fd, (sockaddr*)&addr, &size) == SOCKET_ERROR)

   {
   {

-    total = _Read(buffer, len);
+    m_error = wxSOCKET_IOERR;
+    return NULL;
+  }

 
 

-    if (total != len)
-      goto exit;
+  /* got a valid address from getsockname, create a GAddress object */
+  if ((address = GAddress_new()) == NULL)
+  {
+     m_error = wxSOCKET_MEMERR;
+     return NULL;

   }
   }

-  if (len2)
+
+  if ((err = _GAddress_translate_from(address, (sockaddr*)&addr, size)) != wxSOCKET_NOERROR)

   {
   {

-    char *discard_buffer = new char[MAX_DISCARD_SIZE];
-    long discard_len;
+     GAddress_destroy(address);
+     m_error = err;
+     return NULL;
+  }

 
 

-    // NOTE: discarded bytes don't add to m_lcount.
-    do
-    {
-      discard_len = ((len2 > MAX_DISCARD_SIZE)? MAX_DISCARD_SIZE : len2);
-      discard_len = _Read(discard_buffer, discard_len);
-      len2 -= discard_len;
-    }
-    while ((discard_len > 0) && len2);
+  return address;
+}

 
 

-    delete [] discard_buffer;
+GAddress *wxSocketImpl::GetPeer()
+{
+  /* try to get it from the m_peer var */
+  if (m_peer)
+    return GAddress_copy(m_peer);

 
 

-    if (len2 != 0)
-      goto exit;
-  }
-  if (_Read((char *)&msg, sizeof(msg)) != sizeof(msg))
-    goto exit;
+  return NULL;
+}

 
 

-  sig = (wxUint32)msg.sig[0];
-  sig |= (wxUint32)(msg.sig[1] << 8);
-  sig |= (wxUint32)(msg.sig[2] << 16);
-  sig |= (wxUint32)(msg.sig[3] << 24);
+// ==========================================================================
+// wxSocketBase
+// ==========================================================================

 
 

-  if (sig != 0xdeadfeed)
-  {
-    //wxLogMessage(_T("Warning: invalid signature returned to ReadMsg"));
-    goto exit;
-  }
+// --------------------------------------------------------------------------
+// Initialization and shutdown
+// --------------------------------------------------------------------------

 
 

-  // everything was OK
-  error = FALSE;
+// FIXME-MT: all this is MT-unsafe, of course, we should protect all accesses
+//           to m_countInit with a crit section
+size_t wxSocketBase::m_countInit = 0;

 
 

-exit:
-  m_error = error;
-  m_lcount = total;
-  m_reading = FALSE;
-  SetFlags(old_flags);
+bool wxSocketBase::IsInitialized()
+{
+    return m_countInit > 0;
+}
+
+bool wxSocketBase::Initialize()
+{
+    if ( !m_countInit++ )
+    {
+        wxSocketManager * const manager = wxSocketManager::Get();
+        if ( !manager || !manager->OnInit() )
+        {
+            m_countInit--;

 
 

-  // TODO: TriggerRead
-  return *this;
+            return false;
+        }
+    }

 
 

-#undef MAX_DISCARD_SIZE
+    return true;

 }
 
 }
 

-wxSocketBase& wxSocketBase::Peek(char* buffer, wxUint32 nbytes)
+void wxSocketBase::Shutdown()

 {
 {

-  // Mask read events
-  m_reading = TRUE;
+    // we should be initialized
+    wxASSERT_MSG( m_countInit > 0, _T("extra call to Shutdown()") );
+    if ( --m_countInit == 0 )
+    {
+        wxSocketManager * const manager = wxSocketManager::Get();
+        wxCHECK_RET( manager, "should have a socket manager" );

 
 

-  m_lcount = _Read(buffer, nbytes);
-  Pushback(buffer, nbytes);
+        manager->OnExit();
+    }
+}

 
 

-  // If in WAITALL mode, all bytes should have been read.
-  if (m_flags & WAITALL)
-    m_error = (m_lcount != nbytes);
-  else
-    m_error = (m_lcount == 0);
+// --------------------------------------------------------------------------
+// Ctor and dtor
+// --------------------------------------------------------------------------

 
 

-  // Trigger another read event if there is still data available.
-  m_reading = FALSE;
+void wxSocketBase::Init()
+{
+    m_impl       = NULL;
+    m_type         = wxSOCKET_UNINIT;
+
+    // state
+    m_flags        = 0;
+    m_connected    =
+    m_establishing =
+    m_reading      =
+    m_writing      =
+    m_error        =
+    m_closed       = false;
+    m_lcount       = 0;
+    m_timeout      = 600;
+    m_beingDeleted = false;
+
+    // pushback buffer
+    m_unread       = NULL;
+    m_unrd_size    = 0;
+    m_unrd_cur     = 0;
+
+    // events
+    m_id           = wxID_ANY;
+    m_handler      = NULL;
+    m_clientData   = NULL;
+    m_notify       = false;
+    m_eventmask    = 0;
+
+    if ( !IsInitialized() )
+    {
+        // this Initialize() will be undone by wxSocketModule::OnExit(), all
+        // the other calls to it should be matched by a call to Shutdown()
+        Initialize();
+    }
+}

 
 

-  // TODO: TriggerRead
-  return *this;
+wxSocketBase::wxSocketBase()
+{
+    Init();

 }
 
 }
 

-wxUint32 wxSocketBase::DeferWrite(const char *buffer, wxUint32 nbytes)
+wxSocketBase::wxSocketBase(wxSocketFlags flags, wxSocketType type)

 {
 {

-  // Timer for timeout
-  _wxSocketInternalTimer timer;
+    Init();
+
+    SetFlags(flags);

 
 

-  wxASSERT(m_defering == NO_DEFER);
-  //wxLogMessage("Entrando a DeferWrite");
+    m_type = type;
+}

 
 

-  m_defering = DEFER_WRITE;
+wxSocketBase::~wxSocketBase()
+{
+    // Just in case the app called Destroy() *and* then deleted the socket
+    // immediately: don't leave dangling pointers.
+    wxAppTraits *traits = wxTheApp ? wxTheApp->GetTraits() : NULL;
+    if ( traits )
+        traits->RemoveFromPendingDelete(this);
+
+    // Shutdown and close the socket
+    if (!m_beingDeleted)
+        Close();
+
+    // Destroy the implementation object
+    delete m_impl;
+
+    // Free the pushback buffer
+    if (m_unread)
+        free(m_unread);
+}

 
 

-  // Set the current buffer
-  m_defer_buffer = (char *)buffer;
-  m_defer_nbytes = nbytes;
-  m_defer_timer  = &timer;
+bool wxSocketBase::Destroy()
+{
+    // Delayed destruction: the socket will be deleted during the next idle
+    // loop iteration. This ensures that all pending events have been
+    // processed.
+    m_beingDeleted = true;

 
 

-  // Start timer
-  timer.m_state   = (int *)&m_defer_buffer;
-  timer.m_new_val = 0;
+    // Shutdown and close the socket
+    Close();

 
 

-  timer.Start(m_timeout * 1000, FALSE);
+    // Supress events from now on
+    Notify(false);

 
 

-  // If the socket is writable, call DoDefer for the first time
-  if (GSocket_Select(m_socket, GSOCK_OUTPUT_FLAG))
-  {
-    //wxLogMessage("Llamando al primer DoDefer");
-    DoDefer();
-  }
+    // schedule this object for deletion
+    wxAppTraits *traits = wxTheApp ? wxTheApp->GetTraits() : NULL;
+    if ( traits )
+    {
+        // let the traits object decide what to do with us
+        traits->ScheduleForDestroy(this);
+    }
+    else // no app or no traits
+    {
+        // in wxBase we might have no app object at all, don't leak memory
+        delete this;
+    }
+
+    return true;
+}

 
 

-  // Wait for buffer completion. 
-  while (m_defer_buffer != NULL)
-    PROCESS_EVENTS();
+// ----------------------------------------------------------------------------
+// simply accessors
+// ----------------------------------------------------------------------------

 
 

-  timer.Stop();
+wxSocketError wxSocketBase::LastError() const
+{
+    return m_impl->GetError();
+}
+
+// --------------------------------------------------------------------------
+// Basic IO calls
+// --------------------------------------------------------------------------
+
+// The following IO operations update m_error and m_lcount:
+// {Read, Write, ReadMsg, WriteMsg, Peek, Unread, Discard}
+//
+// TODO: Should Connect, Accept and AcceptWith update m_error?

 
 

-  // Disable defering mode
-  m_defer_timer = NULL;
-  m_defering = NO_DEFER;
+bool wxSocketBase::Close()
+{
+    // Interrupt pending waits
+    InterruptWait();

 
 

-  wxString s;
-  s.Printf("Saliendo de DeferWrite: total %d bytes", nbytes-m_defer_nbytes);
-  //wxLogMessage(s);
+    if (m_impl)
+        m_impl->Shutdown();

 
 

-  return nbytes-m_defer_nbytes;
+    m_connected = false;
+    m_establishing = false;
+    return true;

 }
 
 }
 

-wxSocketBase& wxSocketBase::Write(const char *buffer, wxUint32 nbytes)
+wxSocketBase& wxSocketBase::Read(void* buffer, wxUint32 nbytes)

 {
 {

-  // Mask write events
-  m_writing = TRUE;
+    // Mask read events
+    m_reading = true;

 
 

-  m_lcount = _Write(buffer, nbytes);
+    m_lcount = DoRead(buffer, nbytes);

 
 

-  // If in WAITALL mode, all bytes should have been written.
-  if (m_flags & WAITALL)
-    m_error = (m_lcount != nbytes);
-  else
-    m_error = (m_lcount == 0);
+    // If in wxSOCKET_WAITALL mode, all bytes should have been read.
+    if (m_flags & wxSOCKET_WAITALL)
+        m_error = (m_lcount != nbytes);
+    else
+        m_error = (m_lcount == 0);

 
 

-  // Trigger another write event if the socket is still writable
-  m_writing = FALSE;
+    // Allow read events from now on
+    m_reading = false;

 
 

-  // TODO: TriggerWrite
-  return *this;
+    return *this;

 }
 
 }
 

-wxUint32 wxSocketBase::_Write(const char *buffer, wxUint32 nbytes)
+wxUint32 wxSocketBase::DoRead(void* buffer_, wxUint32 nbytes)

 {
 {

-  wxUint32 total = 0;
-  int ret = 1;
+    // We use pointer arithmetic here which doesn't work with void pointers.
+    char *buffer = static_cast<char *>(buffer_);

 
 

-  if (!m_connected || !m_socket)
-    return 0;
+    // Try the push back buffer first, even before checking whether the socket
+    // is valid to allow reading previously pushed back data from an already
+    // closed socket.
+    wxUint32 total = GetPushback(buffer, nbytes, false);
+    nbytes -= total;
+    buffer += total;

 
 

-  // Possible combinations (they are checked in this order)
-  // NOWAIT
-  // SPEED | WAITALL
-  // SPEED          
-  // WAITALL
-  // NONE
-  //
-  if (m_flags & NOWAIT)                 // NOWAIT
-  {
-    GSocket_SetNonBlocking(m_socket, TRUE);
-    ret = GSocket_Write(m_socket, buffer, nbytes);
-    GSocket_SetNonBlocking(m_socket, FALSE);
+    // If it's indeed closed or if read everything, there is nothing more to do.
+    if ( !m_impl || !nbytes )
+        return total;

 
 

-    if (ret > 0)
-      total = ret;
-  }
-  else if ((m_flags & SPEED) && (m_flags & WAITALL))    // SPEED, WAITALL
-  {
-    while (ret > 0 && nbytes > 0)
-    {
-      ret = GSocket_Write(m_socket, buffer, nbytes);
-      total += ret;
-      buffer += ret;
-      nbytes -= ret;
-    }
-    // In case the last call was an error ...
-    if (ret < 0)
-      total ++;
-  }
-  else if (m_flags & SPEED)             // SPEED, !WAITALL
-  {
-    ret = GSocket_Write(m_socket, buffer, nbytes);
+    wxCHECK_MSG( buffer, 0, "NULL buffer" );

 
 

-    if (ret > 0)
-      total = ret;
-  }
-  else                                  // NONE or WAITALL
-  {
-    ret = DeferWrite(buffer, nbytes);

 
 

-    if (ret > 0)
-      total = ret;
-  }
+    // wxSOCKET_NOWAIT overrides all the other flags and means that we are
+    // polling the socket and don't block at all.
+    if ( m_flags & wxSOCKET_NOWAIT )
+    {
+        wxSocketUnblocker unblock(m_impl);
+        int ret = m_impl->Read(buffer, nbytes);
+        if ( ret < 0 )
+            return 0;

 
 

-  return total;
+        total += ret;
+    }
+    else // blocking socket
+    {
+        for ( ;; )
+        {
+            // Wait until socket becomes ready for reading dispatching the GUI
+            // events in the meanwhile unless wxSOCKET_BLOCK was explicitly
+            // specified to disable this.
+            if ( !(m_flags & wxSOCKET_BLOCK) && !WaitForRead() )
+                break;
+
+            const int ret = m_impl->Read(buffer, nbytes);
+            if ( ret == 0 )
+            {
+                // for connection-oriented (e.g. TCP) sockets we can only read
+                // 0 bytes if the other end has been closed, and for
+                // connectionless ones (UDP) this flag doesn't make sense
+                // anyhow so we can set it to true too without doing any harm
+                m_closed = true;
+                break;
+            }
+
+            if ( ret < 0 )
+            {
+                // this will be always interpreted as error by Read()
+                return 0;
+            }
+
+            total += ret;
+
+            // If wxSOCKET_WAITALL is not set, we can leave now as we did read
+            // something and we don't need to wait for all nbytes bytes to be
+            // read.
+            if ( !(m_flags & wxSOCKET_WAITALL) )
+                break;
+
+            // Otherwise continue reading until we do read everything.
+            nbytes -= ret;
+            if ( !nbytes )
+                break;
+
+            buffer += ret;
+        }
+    }
+
+    return total;

 }
 
 }
 

-wxSocketBase& wxSocketBase::WriteMsg(const char *buffer, wxUint32 nbytes)
+wxSocketBase& wxSocketBase::ReadMsg(void* buffer, wxUint32 nbytes)

 {
 {

-  wxUint32 total;
-  bool error;
-  int old_flags;
-  struct {
-    unsigned char sig[4];
-    unsigned char len[4];
-  } msg;
+    wxUint32 len, len2, sig, total;
+    bool error;
+    int old_flags;
+    struct
+    {
+        unsigned char sig[4];
+        unsigned char len[4];
+    } msg;
+
+    // Mask read events
+    m_reading = true;

 
 

-  // Mask write events
-  m_writing = TRUE;
+    total = 0;
+    error = true;
+    old_flags = m_flags;
+    SetFlags((m_flags & wxSOCKET_BLOCK) | wxSOCKET_WAITALL);

 
 

-  error = TRUE;
-  total = 0;
-  old_flags = m_flags;
-  SetFlags((m_flags & SPEED) | WAITALL);
+    if (DoRead(&msg, sizeof(msg)) != sizeof(msg))
+        goto exit;

 
 

-  // warning about 'cast truncates constant value'
-#ifdef __VISUALC__
-#  pragma warning(disable: 4310)
-#endif // __VISUALC__
+    sig = (wxUint32)msg.sig[0];
+    sig |= (wxUint32)(msg.sig[1] << 8);
+    sig |= (wxUint32)(msg.sig[2] << 16);
+    sig |= (wxUint32)(msg.sig[3] << 24);

 
 

-  msg.sig[0] = (unsigned char) 0xad;
-  msg.sig[1] = (unsigned char) 0xde;
-  msg.sig[2] = (unsigned char) 0xed;
-  msg.sig[3] = (unsigned char) 0xfe;
+    if (sig != 0xfeeddead)
+    {
+        wxLogWarning(_("wxSocket: invalid signature in ReadMsg."));
+        goto exit;
+    }

 
 

-  msg.len[0] = (unsigned char) nbytes & 0xff;
-  msg.len[1] = (unsigned char) (nbytes >> 8) & 0xff;
-  msg.len[2] = (unsigned char) (nbytes >> 16) & 0xff;
-  msg.len[3] = (unsigned char) (nbytes >> 24) & 0xff;
+    len = (wxUint32)msg.len[0];
+    len |= (wxUint32)(msg.len[1] << 8);
+    len |= (wxUint32)(msg.len[2] << 16);
+    len |= (wxUint32)(msg.len[3] << 24);

 
 

-  //wxLogMessage("Writemsg: %d  %d  %d  %d -> %d",
-  //  nbytes & 0xff,
-  //  (nbytes >> 8) & 0xff,
-  //  (nbytes >> 16) & 0xff,
-  //  (nbytes >> 24) & 0xff,
-  //  nbytes
-  //  );
+    if (len > nbytes)
+    {
+        len2 = len - nbytes;
+        len = nbytes;
+    }
+    else
+        len2 = 0;

 
 

-  if (_Write((char *)&msg, sizeof(msg)) < sizeof(msg))
-    goto exit;
+    // Don't attempt to read if the msg was zero bytes long.
+    if (len)
+    {
+        total = DoRead(buffer, len);

 
 

-  total = _Write(buffer, nbytes);
+        if (total != len)
+            goto exit;
+    }

 
 

-  if (total < nbytes)
-    goto exit;
+    if (len2)
+    {
+        char *discard_buffer = new char[MAX_DISCARD_SIZE];
+        long discard_len;
+
+        // NOTE: discarded bytes don't add to m_lcount.
+        do
+        {
+            discard_len = ((len2 > MAX_DISCARD_SIZE)? MAX_DISCARD_SIZE : len2);
+            discard_len = DoRead(discard_buffer, (wxUint32)discard_len);
+            len2 -= (wxUint32)discard_len;
+        }
+        while ((discard_len > 0) && len2);
+
+        delete [] discard_buffer;
+
+        if (len2 != 0)
+            goto exit;
+    }
+    if (DoRead(&msg, sizeof(msg)) != sizeof(msg))
+        goto exit;

 
 

-  msg.sig[0] = (unsigned char) 0xed;
-  msg.sig[1] = (unsigned char) 0xfe;
-  msg.sig[2] = (unsigned char) 0xad;
-  msg.sig[3] = (unsigned char) 0xde;
-  msg.len[0] = msg.len[1] = msg.len[2] = msg.len[3] = (char) 0;
+    sig = (wxUint32)msg.sig[0];
+    sig |= (wxUint32)(msg.sig[1] << 8);
+    sig |= (wxUint32)(msg.sig[2] << 16);
+    sig |= (wxUint32)(msg.sig[3] << 24);

 
 

-  if ((_Write((char *)&msg, sizeof(msg))) < sizeof(msg))
-    goto exit;
+    if (sig != 0xdeadfeed)
+    {
+        wxLogWarning(_("wxSocket: invalid signature in ReadMsg."));
+        goto exit;
+    }

 
 

-  // everything was OK
-  error = FALSE;
+    // everything was OK
+    error = false;

 
 exit:
 
 exit:

-  m_error = error;
-  m_lcount = total;
-  m_writing = FALSE;
-
-  // TODO: TriggerWrite
-  return *this;
+    m_error = error;
+    m_lcount = total;
+    m_reading = false;
+    SetFlags(old_flags);

 
 

-#ifdef __VISUALC__
-#  pragma warning(default: 4310)
-#endif // __VISUALC__
+    return *this;

 }
 
 }
 

-wxSocketBase& wxSocketBase::Unread(const char *buffer, wxUint32 nbytes)
+wxSocketBase& wxSocketBase::Peek(void* buffer, wxUint32 nbytes)

 {
 {

-  if (nbytes != 0)
-    Pushback(buffer, nbytes);
+    // Mask read events
+    m_reading = true;

 
 

-  m_error = FALSE;
-  m_lcount = nbytes;
+    m_lcount = DoRead(buffer, nbytes);
+    Pushback(buffer, m_lcount);

 
 

-  return *this;
+    // If in wxSOCKET_WAITALL mode, all bytes should have been read.
+    if (m_flags & wxSOCKET_WAITALL)
+        m_error = (m_lcount != nbytes);
+    else
+        m_error = (m_lcount == 0);
+
+    // Allow read events again
+    m_reading = false;
+
+    return *this;

 }
 
 }
 

-void wxSocketBase::DoDefer()
+wxSocketBase& wxSocketBase::Write(const void *buffer, wxUint32 nbytes)

 {
 {

-  int ret;
-
-  if (!m_defer_buffer)
-    return;
+    // Mask write events
+    m_writing = true;

 
 

-  switch(m_defering)
-  {
-    case DEFER_READ:
-      ret = GSocket_Read(m_socket, m_defer_buffer, m_defer_nbytes);
-      break;
-    case DEFER_WRITE:
-      ret = GSocket_Write(m_socket, m_defer_buffer, m_defer_nbytes);
-      break;
-    default:
-      ret = -1;
-  }
+    m_lcount = DoWrite(buffer, nbytes);

 
 

-  if (ret >= 0)
-    m_defer_nbytes -= ret;
+    // If in wxSOCKET_WAITALL mode, all bytes should have been written.
+    if (m_flags & wxSOCKET_WAITALL)
+        m_error = (m_lcount != nbytes);
+    else
+        m_error = (m_lcount == 0);

 
 

-  // If we are waiting for all bytes to be acquired, keep the defering
-  // mode enabled.
-  if (!(m_flags & WAITALL) || !m_defer_nbytes || ret < 0)
-  {
-    m_defer_buffer = NULL;
-  }
-  else
-  {
-    m_defer_buffer += ret;
-    m_defer_timer->Start(m_timeout * 1000, FALSE);
-  }
+    // Allow write events again
+    m_writing = false;

 
 

-  //wxLogMessage("DoDefer ha transferido %d bytes", ret);
+    return *this;

 }
 
 }
 

-wxSocketBase& wxSocketBase::Discard()
+// This function is a mirror image of DoRead() except that it doesn't use the
+// push back buffer, please see comments there
+wxUint32 wxSocketBase::DoWrite(const void *buffer_, wxUint32 nbytes)

 {
 {

-#define MAX_BUFSIZE (10*1024)
+    const char *buffer = static_cast<const char *>(buffer_);

 
 

-  int old_flags;
-  char *my_data = new char[MAX_BUFSIZE];
-  wxUint32 recv_size = MAX_BUFSIZE;
-  wxUint32 total = 0;
+    // Return if there is nothing to read or the socket is (already?) closed.
+    if ( !m_impl || !nbytes )
+        return 0;

 
 

-  // Mask read events
-  m_reading = TRUE;
+    wxCHECK_MSG( buffer, 0, "NULL buffer" );

 
 

-  old_flags = m_flags;
-  SetFlags(NOWAIT);
+    wxUint32 total = 0;
+    if ( m_flags & wxSOCKET_NOWAIT )
+    {
+        wxSocketUnblocker unblock(m_impl);
+        const int ret = m_impl->Write(buffer, nbytes);
+        if ( ret > 0 )
+            total += ret;
+    }
+    else // blocking socket
+    {
+        for ( ;; )
+        {
+            if ( !(m_flags & wxSOCKET_BLOCK) && !WaitForWrite() )
+                break;
+
+            const int ret = m_impl->Write(buffer, nbytes);
+            if ( ret == 0 )
+            {
+                m_closed = true;
+                break;
+            }
+
+            if ( ret < 0 )
+                return 0;
+
+            total += ret;
+            if ( !(m_flags & wxSOCKET_WAITALL) )
+                break;
+
+            nbytes -= ret;
+            if ( !nbytes )
+                break;
+
+            buffer += ret;
+        }
+    }

 
 

-  while (recv_size == MAX_BUFSIZE)
-  {
-    recv_size = _Read(my_data, MAX_BUFSIZE);
-    total += recv_size;
-  }
+    return total;
+}

 
 

-  delete [] my_data;
-  m_lcount = total;
-  m_error = FALSE;
+wxSocketBase& wxSocketBase::WriteMsg(const void *buffer, wxUint32 nbytes)
+{
+    wxUint32 total;
+    bool error;
+    struct
+    {
+        unsigned char sig[4];
+        unsigned char len[4];
+    } msg;

 
 

-  // Trigger another read event if there is still data available.
-  m_reading = FALSE;
+    // Mask write events
+    m_writing = true;

 
 

-  // TODO: TriggerRead
-  return *this;
-  
-#undef MAX_BUFSIZE
-}
+    error = true;
+    total = 0;
+    SetFlags((m_flags & wxSOCKET_BLOCK) | wxSOCKET_WAITALL);

 
 

-// --------------------------------------------------------------
-// wxSocketBase get local or peer addresses
-// --------------------------------------------------------------
+    msg.sig[0] = (unsigned char) 0xad;
+    msg.sig[1] = (unsigned char) 0xde;
+    msg.sig[2] = (unsigned char) 0xed;
+    msg.sig[3] = (unsigned char) 0xfe;

 
 

-bool wxSocketBase::GetPeer(wxSockAddress& addr_man) const
-{
-  GAddress *peer;
+    msg.len[0] = (unsigned char) (nbytes & 0xff);
+    msg.len[1] = (unsigned char) ((nbytes >> 8) & 0xff);
+    msg.len[2] = (unsigned char) ((nbytes >> 16) & 0xff);
+    msg.len[3] = (unsigned char) ((nbytes >> 24) & 0xff);

 
 

-  if (!m_socket)
-    return FALSE;
+    if (DoWrite(&msg, sizeof(msg)) < sizeof(msg))
+        goto exit;

 
 

-  peer = GSocket_GetPeer(m_socket);
-  addr_man.SetAddress(peer);
-  GAddress_destroy(peer);
+    total = DoWrite(buffer, nbytes);

 
 

-  return TRUE;
-}
+    if (total < nbytes)
+        goto exit;

 
 

-bool wxSocketBase::GetLocal(wxSockAddress& addr_man) const
-{
-  GAddress *local;
+    msg.sig[0] = (unsigned char) 0xed;
+    msg.sig[1] = (unsigned char) 0xfe;
+    msg.sig[2] = (unsigned char) 0xad;
+    msg.sig[3] = (unsigned char) 0xde;
+    msg.len[0] =
+    msg.len[1] =
+    msg.len[2] =
+    msg.len[3] = (char) 0;

 
 

-  if (!m_socket)
-    return FALSE;
+    if ((DoWrite(&msg, sizeof(msg))) < sizeof(msg))
+        goto exit;

 
 

-  local = GSocket_GetLocal(m_socket);
-  addr_man.SetAddress(local);
-  GAddress_destroy(local);
+    // everything was OK
+    error = false;

 
 

-  return TRUE;
-}
+exit:
+    m_error = error;
+    m_lcount = total;
+    m_writing = false;

 
 

-// --------------------------------------------------------------
-// wxSocketBase save and restore socket state
-// --------------------------------------------------------------
+    return *this;
+}

 
 

-void wxSocketBase::SaveState()
+wxSocketBase& wxSocketBase::Unread(const void *buffer, wxUint32 nbytes)

 {
 {

-  wxSocketState *state;
-
-  state = new wxSocketState();
+    if (nbytes != 0)
+        Pushback(buffer, nbytes);

 
 

-  state->notify_state     = m_notify_state;
-  state->evt_notify_state = m_neededreq;
-  state->socket_flags     = m_flags;
-  state->c_callback       = m_cbk;
-  state->c_callback_data  = m_cdata;
+    m_error = false;
+    m_lcount = nbytes;

 
 

-  m_states.Append(state);
+    return *this;

 }
 
 }
 

-void wxSocketBase::RestoreState()
+wxSocketBase& wxSocketBase::Discard()

 {
 {

-  wxNode *node;
-  wxSocketState *state;
+    char *buffer = new char[MAX_DISCARD_SIZE];
+    wxUint32 ret;
+    wxUint32 total = 0;

 
 

-  node = m_states.Last();
-  if (!node)
-    return;
+    // Mask read events
+    m_reading = true;

 
 

-  state = (wxSocketState *)node->Data();
+    SetFlags(wxSOCKET_NOWAIT);

 
 

-  SetFlags(state->socket_flags);
-  m_neededreq = state->evt_notify_state;
-  m_cbk       = state->c_callback;
-  m_cdata     = state->c_callback_data;
-  Notify(state->notify_state);
+    do
+    {
+        ret = DoRead(buffer, MAX_DISCARD_SIZE);
+        total += ret;
+    }
+    while (ret == MAX_DISCARD_SIZE);

 
 

-  delete node;
-  delete state;
-}
+    delete[] buffer;
+    m_lcount = total;
+    m_error  = false;

 
 

+    // Allow read events again
+    m_reading = false;

 
 

-// --------------------------------------------------------------
-// wxSocketBase Wait functions
-// --------------------------------------------------------------
+    return *this;
+}

 
 

-// GRG: I have completely rewritten this family of functions
-// so that they don't depend on event notifications; instead,
-// they poll the socket, using GSocket_Select(), to check for
-// the specified combination of event flags, until an event
-// occurs or until the timeout ellapses. The polling loop
-// calls PROCESS_EVENTS(), so this won't block the GUI.
+// --------------------------------------------------------------------------
+// Wait functions
+// --------------------------------------------------------------------------

 
 

-bool wxSocketBase::_Wait(long seconds, long milliseconds, wxSocketEventFlags flags)
+/*
+ *  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.
+ */
+wxSocketEventFlags wxSocketImpl::Select(wxSocketEventFlags flags)

 {
 {

-  GSocketEventFlags result;
-  _wxSocketInternalTimer timer;
-  long timeout;
-  int state = -1;
+  assert(this);
+
+  wxSocketEventFlags result = 0;
+  fd_set readfds;
+  fd_set writefds;
+  fd_set exceptfds;
+  struct timeval tv;
+
+  if (m_fd == -1)
+    return (wxSOCKET_LOST_FLAG & flags);
+
+  /* Do not use a static struct, Linux can garble it */
+  tv.tv_sec = 0;
+  tv.tv_usec = 0;
+
+  wxFD_ZERO(&readfds);
+  wxFD_ZERO(&writefds);
+  wxFD_ZERO(&exceptfds);
+  wxFD_SET(m_fd, &readfds);
+  if (flags & wxSOCKET_OUTPUT_FLAG || flags & wxSOCKET_CONNECTION_FLAG)
+    wxFD_SET(m_fd, &writefds);
+  wxFD_SET(m_fd, &exceptfds);
+
+  /* Check 'sticky' CONNECTION flag first */
+  result |= wxSOCKET_CONNECTION_FLAG & m_detected;
+
+  /* If we have already detected a LOST event, then don't try
+   * to do any further processing.
+   */
+  if ((m_detected & wxSOCKET_LOST_FLAG) != 0)
+  {
+    m_establishing = false;
+    return (wxSOCKET_LOST_FLAG & flags);
+  }

 
 

-  // Check for valid socket
-  if (!m_socket)
-    return FALSE;
+  /* Try select now */
+  if (select(m_fd + 1, &readfds, &writefds, &exceptfds, &tv) < 0)
+  {
+    /* What to do here? */
+    return (result & flags);
+  }

 
 

-  // If it is not a server, it must be connected or establishing connection
-  if ((m_type != SOCK_SERVER) && (!m_connected && !m_establishing))
-    return FALSE;
+  /* Check for exceptions and errors */
+  if (wxFD_ISSET(m_fd, &exceptfds))
+  {
+    m_establishing = false;
+    m_detected = wxSOCKET_LOST_FLAG;

 
 

-  // Check for valid timeout value
-  if (seconds != -1)
-    timeout = seconds * 1000 + milliseconds;
-  else
-    timeout = m_timeout * 1000;
+    /* LOST event: Abort any further processing */
+    return (wxSOCKET_LOST_FLAG & flags);
+  }

 
 

-  // Activate timer
-  if (timeout)
+  /* Check for readability */
+  if (wxFD_ISSET(m_fd, &readfds))

   {
   {

-    timer.m_state = &state;
-    timer.m_new_val = 0;
-    timer.Start(timeout, TRUE);
+    result |= wxSOCKET_INPUT_FLAG;
+
+    if (m_server && m_stream)
+    {
+      /* This is a TCP server socket that detected a connection.
+         While the INPUT_FLAG is also set, it doesn't matter on
+         this kind of  sockets, as we can only Accept() from them. */
+      m_detected |= wxSOCKET_CONNECTION_FLAG;
+    }

   }
 
   }
 

-  // Active polling (without using events)
-  //
-  // NOTE: this duplicates some of the code in OnRequest (lost
-  // connection and connection establishment handling) but this
-  // doesn't hurt. It has to be here because the event might
-  // be a bit delayed, and it has to be in OnRequest as well
-  // because maybe the WaitXXX functions are not being used.
-  //
-  // Do this at least once (important if timeout == 0, when
-  // we are just polling)
-  do
+  /* Check for writability */
+  if (wxFD_ISSET(m_fd, &writefds))

   {
   {

-    result = GSocket_Select(m_socket, flags | GSOCK_LOST_FLAG);
+    if (m_establishing && !m_server)
+    {
+      int error;
+      SOCKOPTLEN_T len = sizeof(error);
+      m_establishing = false;
+      getsockopt(m_fd, SOL_SOCKET, SO_ERROR, (char*)&error, &len);
+
+      if (error)
+      {
+        m_detected = wxSOCKET_LOST_FLAG;

 
 

-    // Connection lost
-    if (result & GSOCK_LOST_FLAG)
+        /* LOST event: Abort any further processing */
+        return (wxSOCKET_LOST_FLAG & flags);
+      }
+      else
+      {
+        m_detected |= wxSOCKET_CONNECTION_FLAG;
+      }
+    }
+    else

     {
     {

-      timer.Stop();
-      m_defer_buffer = NULL;
-      Close();
-      return TRUE;
+      result |= wxSOCKET_OUTPUT_FLAG;

     }
     }

+  }
+
+  return (result | m_detected) & flags;
+}

 
 

-    // Incoming connection (server) or connection established (client)
-    if (result & GSOCK_CONNECTION_FLAG)
+// All Wait functions poll the socket using Select() to
+// check for the specified combination of conditions, until one
+// of these conditions become true, an error occurs, or the
+// timeout elapses. The polling loop runs the event loop so that
+// this won't block the GUI.
+
+bool
+wxSocketBase::DoWait(long seconds, long milliseconds, wxSocketEventFlags flags)
+{
+    wxCHECK_MSG( m_impl, false, "can't wait on invalid socket" );
+
+    // This can be set to true from Interrupt() to exit this function a.s.a.p.
+    m_interrupt = false;
+
+
+    // Use either the provided timeout or the default timeout value associated
+    // with this socket.
+    //
+    // TODO: allow waiting forever, see #9443
+    const long timeout = seconds == -1 ? m_timeout * 1000
+                                       : seconds * 1000 + milliseconds;
+    const wxMilliClock_t timeEnd = wxGetLocalTimeMillis() + timeout;
+
+    // Get the active event loop which we'll use for the message dispatching
+    // when running in the main thread
+    wxEventLoopBase *eventLoop;
+    if ( wxIsMainThread() )

     {
     {

-      timer.Stop();
-      m_connected = TRUE;
-      m_establishing = FALSE;
-      return TRUE;
+        eventLoop = wxEventLoop::GetActive();

     }
     }

-
-    // If we are in the middle of a R/W operation, do not propagate
-    // to users.
-    if ( ((result & GSOCK_INPUT_FLAG) || (result & GSOCK_OUTPUT_FLAG))
-         && (!m_writing) && (!m_reading) )
+    else // in worker thread

     {
     {

-/* TODO: remove this
-      if (m_defer_buffer == NULL)
-*/
-      {
-        timer.Stop();
-        return TRUE;
-      }
+        // We never dispatch messages from threads other than the main one.
+        eventLoop = NULL;

     }
 
     }
 

-    if (timeout != 0)
-      PROCESS_EVENTS();
-  }
-  while ((state == -1) && timeout);
+    // Wait in an active polling loop: notice that the loop is executed at
+    // least once, even if timeout is 0 (i.e. polling).
+    bool gotEvent = false;
+    for ( ;; )
+    {
+        // We always stop waiting when the connection is lost as it doesn't
+        // make sense to continue further, even if wxSOCKET_LOST_FLAG is not
+        // specified in flags to wait for.
+        const wxSocketEventFlags
+            result = m_impl->Select(flags | wxSOCKET_LOST_FLAG);
+
+        // Incoming connection (server) or connection established (client)?
+        if ( result & wxSOCKET_CONNECTION_FLAG )
+        {
+            m_connected = true;
+            m_establishing = false;
+            gotEvent = true;
+            break;
+        }
+
+        // Data available or output buffer ready?
+        if ( (result & wxSOCKET_INPUT_FLAG) || (result & wxSOCKET_OUTPUT_FLAG) )
+        {
+            gotEvent = true;
+            break;
+        }
+
+        // Connection lost
+        if ( result & wxSOCKET_LOST_FLAG )
+        {
+            m_connected = false;
+            m_establishing = false;
+            if ( flags & wxSOCKET_LOST_FLAG )
+                gotEvent = true;
+            break;
+        }
+
+        if ( m_interrupt )
+            break;
+
+        // Wait more?
+        const wxMilliClock_t timeNow = wxGetLocalTimeMillis();
+        if ( timeNow >= timeEnd )
+            break;
+
+        if ( eventLoop )
+        {
+            // This function is only called if wxSOCKET_BLOCK flag was not used
+            // and so we should dispatch the events if there is an event loop
+            // capable of doing it.
+            if ( eventLoop->Pending() )
+                eventLoop->Dispatch();
+        }
+#if wxUSE_THREADS
+        else // no event loop or waiting in another thread
+        {
+            // We're busy waiting but at least give up the rest of our current
+            // time slice.
+            wxThread::Yield();
+        }
+#endif // wxUSE_THREADS
+    }

 
 

-  timer.Stop();
-  return FALSE;
+    return gotEvent;

 }
 
 bool wxSocketBase::Wait(long seconds, long milliseconds)
 {
 }
 
 bool wxSocketBase::Wait(long seconds, long milliseconds)
 {

-  return _Wait(seconds, milliseconds, GSOCK_INPUT_FLAG |
-                                      GSOCK_OUTPUT_FLAG |
-                                      GSOCK_CONNECTION_FLAG |
-                                      GSOCK_LOST_FLAG);
+    return DoWait(seconds, milliseconds,
+            wxSOCKET_INPUT_FLAG |
+            wxSOCKET_OUTPUT_FLAG |
+            wxSOCKET_CONNECTION_FLAG |
+            wxSOCKET_LOST_FLAG
+        );

 }
 
 bool wxSocketBase::WaitForRead(long seconds, long milliseconds)
 {
 }
 
 bool wxSocketBase::WaitForRead(long seconds, long milliseconds)
 {

-  // Check pushback buffer
-  if (m_unread)
-    return TRUE;
-
-  return _Wait(seconds, milliseconds, GSOCK_INPUT_FLAG);
+    // Check pushback buffer before entering DoWait
+    if ( m_unread )
+        return true;
+
+    // Note that wxSOCKET_INPUT_LOST has to be explicitly passed to DoWait
+    // because of the semantics of WaitForRead: a return value of true means
+    // that a Read call will return immediately, not that there is
+    // actually data to read.
+    return DoWait(seconds, milliseconds, wxSOCKET_INPUT_FLAG | wxSOCKET_LOST_FLAG);

 }
 
 }
 

+

 bool wxSocketBase::WaitForWrite(long seconds, long milliseconds)
 {
 bool wxSocketBase::WaitForWrite(long seconds, long milliseconds)
 {

-  return _Wait(seconds, milliseconds, GSOCK_OUTPUT_FLAG);
+    return DoWait(seconds, milliseconds, wxSOCKET_OUTPUT_FLAG | wxSOCKET_LOST_FLAG);

 }
 
 bool wxSocketBase::WaitForLost(long seconds, long milliseconds)
 {
 }
 
 bool wxSocketBase::WaitForLost(long seconds, long milliseconds)
 {

-  return _Wait(seconds, milliseconds, GSOCK_LOST_FLAG);
+    return DoWait(seconds, milliseconds, wxSOCKET_LOST_FLAG);

 }
 
 }
 

-void wxSocketBase::SetTimeout(long seconds)
+// --------------------------------------------------------------------------
+// Miscellaneous
+// --------------------------------------------------------------------------
+
+//
+// Get local or peer address
+//
+
+bool wxSocketBase::GetPeer(wxSockAddress& addr_man) const

 {
 {

-  m_timeout = seconds;
+    GAddress *peer;

 
 

-  if (m_socket)
-    GSocket_SetTimeout(m_socket, m_timeout);
-}
+    if (!m_impl)
+        return false;

 
 

-// --------------------------------------------------------------
-// wxSocketBase flags
-// --------------------------------------------------------------
+    peer = m_impl->GetPeer();

 
 

-void wxSocketBase::SetFlags(wxSockFlags _flags)
-{
-  m_flags = _flags;
-}
-                    
-// --------------------------------------------------------------
-// wxSocketBase callback management
-// --------------------------------------------------------------
+    // copying a null address would just trigger an assert anyway

 
 

-wxSocketBase::wxSockCbk wxSocketBase::Callback(wxSockCbk cbk_)
-{
-  wxSockCbk old_cbk = cbk_;
+    if (!peer)
+        return false;
+
+    addr_man.SetAddress(peer);
+    GAddress_destroy(peer);

 
 

-  m_cbk = cbk_;
-  return old_cbk;
+    return true;

 }
 
 }
 

-char *wxSocketBase::CallbackData(char *data)
+bool wxSocketBase::GetLocal(wxSockAddress& addr_man) const

 {
 {

-  char *old_data = m_cdata;
+    GAddress *local;

 
 

-  m_cdata = data;
-  return old_data;
-}
+    if (!m_impl)
+        return false;

 
 

-// --------------------------------------------------------------
-// wxSocketBase automatic notifier
-// --------------------------------------------------------------
+    local = m_impl->GetLocal();
+    addr_man.SetAddress(local);
+    GAddress_destroy(local);

 
 

-// All events (INPUT, OUTPUT, CONNECTION, LOST) are now always
-// internally watched; but users will only be notified of those
-// events they are interested in.
+    return true;
+}

 
 

-static void LINKAGEMODE wx_socket_callback(GSocket * WXUNUSED(socket),
-                                           GSocketEvent event, char *cdata)
+//
+// Save and restore socket state
+//
+
+void wxSocketBase::SaveState()

 {
 {

-  wxSocketBase *sckobj = (wxSocketBase *)cdata;
+    wxSocketState *state;
+
+    state = new wxSocketState();

 
 

-  sckobj->OnRequest((wxSocketNotify)event);
+    state->m_flags      = m_flags;
+    state->m_notify     = m_notify;
+    state->m_eventmask  = m_eventmask;
+    state->m_clientData = m_clientData;
+
+    m_states.Append(state);

 }
 
 }
 

-wxSocketEventFlags wxSocketBase::EventToNotify(wxSocketNotify evt)
+void wxSocketBase::RestoreState()

 {
 {

-  switch (evt)
-  {
-    case GSOCK_INPUT:      return GSOCK_INPUT_FLAG;
-    case GSOCK_OUTPUT:     return GSOCK_OUTPUT_FLAG;
-    case GSOCK_CONNECTION: return GSOCK_CONNECTION_FLAG;
-    case GSOCK_LOST:       return GSOCK_LOST_FLAG;
-  }
-  return 0;
+    wxList::compatibility_iterator node;
+    wxSocketState *state;
+
+    node = m_states.GetLast();
+    if (!node)
+        return;
+
+    state = (wxSocketState *)node->GetData();
+
+    m_flags      = state->m_flags;
+    m_notify     = state->m_notify;
+    m_eventmask  = state->m_eventmask;
+    m_clientData = state->m_clientData;
+
+    m_states.Erase(node);
+    delete state;

 }
 
 }
 

-void wxSocketBase::SetNotify(wxSocketEventFlags flags)
+//
+// Timeout and flags
+//
+
+void wxSocketBase::SetTimeout(long seconds)

 {
 {

-  m_neededreq = flags;
+    m_timeout = seconds;
+
+    if (m_impl)
+        m_impl->SetTimeout(m_timeout * 1000);

 }
 
 }
 

-void wxSocketBase::Notify(bool notify)
+void wxSocketBase::SetFlags(wxSocketFlags flags)

 {
 {

-  m_notify_state = notify;
+    // Do some sanity checking on the flags used: not all values can be used
+    // together.
+    wxASSERT_MSG( !(flags & wxSOCKET_NOWAIT) ||
+                  !(flags & (wxSOCKET_WAITALL | wxSOCKET_BLOCK)),
+                  "Using wxSOCKET_WAITALL or wxSOCKET_BLOCK with "
+                  "wxSOCKET_NOWAIT doesn't make sense" );
+
+    m_flags = flags;

 }
 
 }
 

-void wxSocketBase::OnRequest(wxSocketNotify req_evt)
-{
-  wxSocketEvent event(m_id);
-  wxSocketEventFlags flag = EventToNotify(req_evt);

 
 

-  // fprintf(stderr, "%s: Entering OnRequest (evt %d)\n", (m_type == SOCK_CLIENT)? "client" : "server", req_evt);
+// --------------------------------------------------------------------------
+// Event handling
+// --------------------------------------------------------------------------

 
 

-  // NOTE: this duplicates some of the code in _Wait (lost
-  // connection and connection establishment handling) but
-  // this doesn't hurt. It has to be here because maybe the
-  // WaitXXX are not being used, and it has to be in _Wait
-  // as well because the event might be a bit delayed.
-  //
-  switch(req_evt)
-  {
-    case wxSOCKET_CONNECTION:
-      m_establishing = FALSE;
-      m_connected = TRUE;
-      break;
-    case wxSOCKET_LOST:
-      m_defer_buffer = NULL;
-      Close();
-      break;
-    case wxSOCKET_INPUT:
-    case wxSOCKET_OUTPUT:
-      if (m_defer_buffer)
-      {
-        // fprintf(stderr, "%s: Habia buffer, evt %d skipped\n", (m_type == SOCK_CLIENT)? "client" : "server", req_evt);
-        DoDefer();
-        // Do not notify to user
-        return;
-      }
-      break;
-  }
+void wxSocketBase::OnRequest(wxSocketNotify notification)
+{
+    switch(notification)
+    {
+        case wxSOCKET_CONNECTION:
+            m_establishing = false;
+            m_connected = true;
+            break;
+
+            // If we are in the middle of a R/W operation, do not
+            // propagate events to users. Also, filter 'late' events
+            // which are no longer valid.
+
+        case wxSOCKET_INPUT:
+            if (m_reading || !m_impl->Select(wxSOCKET_INPUT_FLAG))
+                return;
+            break;
+
+        case wxSOCKET_OUTPUT:
+            if (m_writing || !m_impl->Select(wxSOCKET_OUTPUT_FLAG))
+                return;
+            break;
+
+        case wxSOCKET_LOST:
+            m_connected = false;
+            m_establishing = false;
+            break;
+
+        case wxSOCKET_MAX_EVENT:
+            wxFAIL_MSG( "unexpected notification" );
+            return;
+    }

 
 

-  // If we are in the middle of a R/W operation, do not
-  // propagate events to users.
-  if (((req_evt == wxSOCKET_INPUT) && m_reading) ||
-      ((req_evt == wxSOCKET_OUTPUT) && m_writing))
-  {
-    // fprintf(stderr, "%s: Swallowed evt %d\n", (m_type == SOCK_CLIENT)? "client" : "server", req_evt);
-    return;
-  }
+    // Schedule the event

 
 

-  if (((m_neededreq & flag) == flag) && m_notify_state)
-  {
-    // fprintf(stderr, "%s: Evt %d delivered\n", (m_type == SOCK_CLIENT)? "client" : "server", req_evt);
-    event.m_socket = this;
-    event.m_skevt  = req_evt;
-    ProcessEvent(event);
-    OldOnNotify(req_evt);
-
-    if (m_cbk)
-      m_cbk(*this, req_evt, m_cdata);
-  }
+    wxSocketEventFlags flag = 0;
+    wxUnusedVar(flag);
+    switch (notification)
+    {
+        case wxSOCKET_INPUT:      flag = wxSOCKET_INPUT_FLAG; break;
+        case wxSOCKET_OUTPUT:     flag = wxSOCKET_OUTPUT_FLAG; break;
+        case wxSOCKET_CONNECTION: flag = wxSOCKET_CONNECTION_FLAG; break;
+        case wxSOCKET_LOST:       flag = wxSOCKET_LOST_FLAG; break;
+        default:
+                               wxLogWarning(_("wxSocket: unknown event!."));
+                               return;
+    }

 
 

-  // fprintf(stderr, "%s: Exiting OnRequest (evt %d)\n", (m_type == SOCK_CLIENT)? "client" : "server", req_evt);
+    if (((m_eventmask & flag) == flag) && m_notify)
+    {
+        if (m_handler)
+        {
+            wxSocketEvent event(m_id);
+            event.m_event      = notification;
+            event.m_clientData = m_clientData;
+            event.SetEventObject(this);
+
+            m_handler->AddPendingEvent(event);
+        }
+    }

 }
 
 }
 

-void wxSocketBase::OldOnNotify(wxSocketNotify WXUNUSED(evt))
+void wxSocketBase::Notify(bool notify)

 {
 {

+    m_notify = notify;
+    if (m_impl)
+        m_impl->Notify(notify);

 }
 
 }
 

-// --------------------------------------------------------------
-// wxSocketBase set event handler
-// --------------------------------------------------------------
+void wxSocketBase::SetNotify(wxSocketEventFlags flags)
+{
+    m_eventmask = flags;
+}

 
 

-void wxSocketBase::SetEventHandler(wxEvtHandler& h_evt, int id)
+void wxSocketBase::SetEventHandler(wxEvtHandler& handler, int id)

 {
 {

-  SetNextHandler(&h_evt);
-  m_id = id;
+    m_handler = &handler;
+    m_id      = id;

 }
 
 }
 

-// --------------------------------------------------------------
-// wxSocketBase pushback
-// --------------------------------------------------------------
+// --------------------------------------------------------------------------
+// Pushback buffer
+// --------------------------------------------------------------------------

 
 

-void wxSocketBase::Pushback(const char *buffer, wxUint32 size)
+void wxSocketBase::Pushback(const void *buffer, wxUint32 size)

 {
 {

-  if (m_unread == NULL)
-    m_unread = (char *)malloc(size);
-  else {
-    char *tmp;
+    if (!size) return;
+
+    if (m_unread == NULL)
+        m_unread = malloc(size);
+    else
+    {
+        void *tmp;

 
 

-    tmp = (char *)malloc(m_unrd_size + size);
-    memcpy(tmp+size, m_unread, m_unrd_size);
-    free(m_unread);
+        tmp = malloc(m_unrd_size + size);
+        memcpy((char *)tmp + size, m_unread, m_unrd_size);
+        free(m_unread);

 
 

-    m_unread = tmp;
-  }
+        m_unread = tmp;
+    }

 
 

-  m_unrd_size += size;
+    m_unrd_size += size;

 
 

-  memcpy(m_unread, buffer, size);
+    memcpy(m_unread, buffer, size);

 }
 
 }
 

-wxUint32 wxSocketBase::GetPushback(char *buffer, wxUint32 size, bool peek)
+wxUint32 wxSocketBase::GetPushback(void *buffer, wxUint32 size, bool peek)

 {
 {

-  if (!m_unrd_size)
-    return 0;
+    wxCHECK_MSG( buffer, 0, "NULL buffer" );
+
+    if (!m_unrd_size)
+        return 0;

 
 

-  if (size > (m_unrd_size-m_unrd_cur))
-    size = m_unrd_size-m_unrd_cur;
+    if (size > (m_unrd_size-m_unrd_cur))
+        size = m_unrd_size-m_unrd_cur;

 
 

-  memcpy(buffer, (m_unread+m_unrd_cur), size);
+    memcpy(buffer, (char *)m_unread + m_unrd_cur, size);

 
 

-  if (!peek) {
-    m_unrd_cur += size;
-    if (m_unrd_size == m_unrd_cur) {
-      free(m_unread);
-      m_unread = NULL;
-      m_unrd_size = 0;
-      m_unrd_cur  = 0;
+    if (!peek)
+    {
+        m_unrd_cur += size;
+        if (m_unrd_size == m_unrd_cur)
+        {
+            free(m_unread);
+            m_unread = NULL;
+            m_unrd_size = 0;
+            m_unrd_cur  = 0;
+        }

     }
     }

-  }

 
 

-  return size;
+    return size;

 }
 
 }
 

-// --------------------------------------------------------------
+
+// ==========================================================================

 // wxSocketServer
 // wxSocketServer

-// --------------------------------------------------------------
+// ==========================================================================

 
 

-// --------------------------------------------------------------
-// wxSocketServer ctor and dtor
-// --------------------------------------------------------------
+// --------------------------------------------------------------------------
+// Ctor
+// --------------------------------------------------------------------------

 
 

-wxSocketServer::wxSocketServer(wxSockAddress& addr_man,
-             wxSockFlags flags) :
-  wxSocketBase(flags, SOCK_SERVER)
+wxSocketServer::wxSocketServer(const wxSockAddress& addr_man,
+                               wxSocketFlags flags)
+              : wxSocketBase(flags, wxSOCKET_SERVER)

 {
 {

-  // Create the socket
-  m_socket = GSocket_new();
+    wxLogTrace( wxTRACE_Socket, _T("Opening wxSocketServer") );

 
 

-  if (!m_socket)
-    return;
+    m_impl = wxSocketImpl::Create(*this);

 
 

-  // Setup the socket as server
-  GSocket_SetLocal(m_socket, addr_man.GetAddress());
-  if (GSocket_SetServer(m_socket) != GSOCK_NOERROR)
-  {
-    GSocket_destroy(m_socket);
-    m_socket = NULL;
-    return;
-  }
+    if (!m_impl)
+    {
+        wxLogTrace( wxTRACE_Socket, _T("*** Failed to create m_impl") );
+        return;
+    }
+
+    // Setup the socket as server
+    m_impl->Notify(m_notify);
+    m_impl->SetLocal(addr_man.GetAddress());
+
+    if (GetFlags() & wxSOCKET_REUSEADDR) {
+        m_impl->SetReusable();
+    }
+    if (GetFlags() & wxSOCKET_BROADCAST) {
+        m_impl->SetBroadcast();
+    }
+    if (GetFlags() & wxSOCKET_NOBIND) {
+        m_impl->DontDoBind();
+    }
+
+    if (m_impl->CreateServer() != wxSOCKET_NOERROR)
+    {
+        delete m_impl;
+        m_impl = NULL;

 
 

-  GSocket_SetTimeout(m_socket, m_timeout);
-  GSocket_SetCallback(m_socket, GSOCK_INPUT_FLAG | GSOCK_OUTPUT_FLAG |
-                                GSOCK_LOST_FLAG | GSOCK_CONNECTION_FLAG,
-                                wx_socket_callback, (char *)this);
+        wxLogTrace( wxTRACE_Socket, _T("*** CreateServer() failed") );
+        return;
+    }

 
 

+    wxLogTrace( wxTRACE_Socket, _T("wxSocketServer on fd %d"), m_impl->m_fd );

 }
 
 }
 

-// --------------------------------------------------------------
-// wxSocketServer Accept
-// --------------------------------------------------------------
+// --------------------------------------------------------------------------
+// Accept
+// --------------------------------------------------------------------------

 
 bool wxSocketServer::AcceptWith(wxSocketBase& sock, bool wait)
 {
 
 bool wxSocketServer::AcceptWith(wxSocketBase& sock, bool wait)
 {

-  GSocket *child_socket;
+    if (!m_impl)
+        return false;

 
 

-  if (!m_socket)
-    return FALSE;
+    // If wait == false, then the call should be nonblocking.
+    // When we are finished, we put the socket to blocking mode
+    // again.
+    wxSocketUnblocker unblock(m_impl, !wait);
+    sock.m_impl = m_impl->WaitConnection(sock);

 
 

-  // GRG: If wait == FALSE, then the call should be nonblocking.
-  // When we are finished, we put the socket to blocking mode
-  // again.
+    if ( !sock.m_impl )
+        return false;

 
 

-  if (!wait)
-    GSocket_SetNonBlocking(m_socket, TRUE);
+    sock.m_type = wxSOCKET_BASE;
+    sock.m_connected = true;

 
 

-  child_socket = GSocket_WaitConnection(m_socket);
+    return true;
+}

 
 

-  if (!wait)
-    GSocket_SetNonBlocking(m_socket, FALSE);
+wxSocketBase *wxSocketServer::Accept(bool wait)
+{
+    wxSocketBase* sock = new wxSocketBase();

 
 

-  // GRG: this was not being handled!
-  if (child_socket == NULL)
-    return FALSE;
+    sock->SetFlags(m_flags);

 
 

-  sock.m_type = SOCK_INTERNAL;
-  sock.m_socket = child_socket;
-  sock.m_connected = TRUE;
+    if (!AcceptWith(*sock, wait))
+    {
+        sock->Destroy();
+        sock = NULL;
+    }

 
 

-  GSocket_SetTimeout(sock.m_socket, sock.m_timeout);
-  GSocket_SetCallback(sock.m_socket, GSOCK_INPUT_FLAG | GSOCK_OUTPUT_FLAG |
-                                     GSOCK_LOST_FLAG | GSOCK_CONNECTION_FLAG,
-                                     wx_socket_callback, (char *)&sock);
+    return sock;
+}

 
 

-  return TRUE;
+bool wxSocketServer::WaitForAccept(long seconds, long milliseconds)
+{
+    return DoWait(seconds, milliseconds, wxSOCKET_CONNECTION_FLAG);

 }
 
 }
 

-wxSocketBase *wxSocketServer::Accept(bool wait)
+bool wxSocketBase::GetOption(int level, int optname, void *optval, int *optlen)

 {
 {

-  wxSocketBase* sock = new wxSocketBase();
+    wxASSERT_MSG( m_impl, _T("Socket not initialised") );

 
 

-  sock->SetFlags((wxSockFlags)m_flags);
+    SOCKOPTLEN_T lenreal;
+    if ( getsockopt(m_impl->m_fd, level, optname,
+                    static_cast<char *>(optval), &lenreal) != 0 )
+        return false;

 
 

-  if (!AcceptWith(*sock, wait))
-    return NULL;
+    *optlen = lenreal;

 
 

-  return sock;
+    return true;

 }
 
 }
 

-bool wxSocketServer::WaitForAccept(long seconds, long milliseconds)
+bool
+wxSocketBase::SetOption(int level, int optname, const void *optval, int optlen)

 {
 {

-  return _Wait(seconds, milliseconds, GSOCK_CONNECTION_FLAG);
+    wxASSERT_MSG( m_impl, _T("Socket not initialised") );
+
+    return setsockopt(m_impl->m_fd, level, optname,
+                      static_cast<const char *>(optval), optlen) == 0;
+}
+
+bool wxSocketBase::SetLocal(const wxIPV4address& local)
+{
+    GAddress* la = local.GetAddress();
+
+    // If the address is valid, save it for use when we call Connect
+    if (la && la->m_addr)
+    {
+        m_localAddress = local;
+
+        return true;
+    }
+
+    return false;

 }
 
 }
 

-// --------------------------------------------------------------
+// ==========================================================================

 // wxSocketClient
 // wxSocketClient

-// --------------------------------------------------------------
+// ==========================================================================

 
 

-// --------------------------------------------------------------
-// wxSocketClient ctor and dtor
-// --------------------------------------------------------------
+// --------------------------------------------------------------------------
+// Ctor and dtor
+// --------------------------------------------------------------------------

 
 

-wxSocketClient::wxSocketClient(wxSockFlags _flags) :
-  wxSocketBase(_flags, SOCK_CLIENT)
+wxSocketClient::wxSocketClient(wxSocketFlags flags)
+              : wxSocketBase(flags, wxSOCKET_CLIENT)

 {
 {

+    m_initialRecvBufferSize =
+    m_initialSendBufferSize = -1;

 }
 
 wxSocketClient::~wxSocketClient()
 {
 }
 
 }
 
 wxSocketClient::~wxSocketClient()
 {
 }
 

-// --------------------------------------------------------------
-// wxSocketClient Connect functions
-// --------------------------------------------------------------
-bool wxSocketClient::Connect(wxSockAddress& addr_man, bool wait)
+// --------------------------------------------------------------------------
+// Connect
+// --------------------------------------------------------------------------
+
+bool wxSocketClient::DoConnect(const wxSockAddress& addr_man,
+                               const wxSockAddress* local,
+                               bool wait)

 {
 {

-  GSocketError err;
+    if (m_impl)
+    {
+        // Shutdown and destroy the socket
+        Close();
+        delete m_impl;
+    }

 
 

-  if (IsConnected())
-    Close();
+    m_impl = wxSocketImpl::Create(*this);
+    m_connected = false;
+    m_establishing = false;
+
+    if (!m_impl)
+        return false;
+
+    // If wait == false, then the call should be nonblocking. When we are
+    // finished, we put the socket to blocking mode again.
+    wxSocketUnblocker unblock(m_impl, !wait);
+
+    // Reuse makes sense for clients too, if we are trying to rebind to the same port
+    if (GetFlags() & wxSOCKET_REUSEADDR)
+    {
+        m_impl->SetReusable();
+    }
+    if (GetFlags() & wxSOCKET_BROADCAST)
+    {
+        m_impl->SetBroadcast();
+    }
+    if (GetFlags() & wxSOCKET_NOBIND)
+    {
+        m_impl->DontDoBind();
+    }

 
 

-  // This should never happen.
-  if (m_socket)
-    GSocket_destroy(m_socket);
+    // If no local address was passed and one has been set, use the one that was Set
+    if (!local && m_localAddress.GetAddress())
+    {
+        local = &m_localAddress;
+    }

 
 

-  // Initialize all socket stuff ...
-  m_socket = GSocket_new();
-  m_connected = FALSE;
-  m_establishing = FALSE;
+    // Bind to the local IP address and port, when provided
+    if (local)
+    {
+        GAddress* la = local->GetAddress();

 
 

-  if (!m_socket)
-    return FALSE;
+        if (la && la->m_addr)
+            m_impl->SetLocal(la);
+    }

 
 

-  GSocket_SetTimeout(m_socket, m_timeout);
-  GSocket_SetCallback(m_socket, GSOCK_INPUT_FLAG | GSOCK_OUTPUT_FLAG |
-                                GSOCK_LOST_FLAG | GSOCK_CONNECTION_FLAG,
-                                wx_socket_callback, (char *)this);
+    m_impl->SetInitialSocketBuffers(m_initialRecvBufferSize, m_initialSendBufferSize);

 
 

-  // GRG: If wait == FALSE, then the call should be nonblocking.
-  // When we are finished, we put the socket to blocking mode
-  // again.
+    m_impl->SetPeer(addr_man.GetAddress());
+    const wxSocketError err = m_impl->CreateClient();

 
 

-  if (!wait)
-    GSocket_SetNonBlocking(m_socket, TRUE);
+    //this will register for callbacks - must be called after m_impl->m_fd was initialized
+    m_impl->Notify(m_notify);

 
 

-  GSocket_SetPeer(m_socket, addr_man.GetAddress());
-  err = GSocket_Connect(m_socket, GSOCK_STREAMED);
+    if (err != wxSOCKET_NOERROR)
+    {
+        if (err == wxSOCKET_WOULDBLOCK)
+            m_establishing = true;

 
 

-  if (!wait)
-    GSocket_SetNonBlocking(m_socket, FALSE);
+        return false;
+    }

 
 

-  if (err != GSOCK_NOERROR)
-  {
-    if (err == GSOCK_WOULDBLOCK)
-      m_establishing = TRUE;
+    m_connected = true;
+    return true;
+}

 
 

-    return FALSE;
-  }
+bool wxSocketClient::Connect(const wxSockAddress& addr_man, bool wait)
+{
+    return DoConnect(addr_man, NULL, wait);
+}

 
 

-  m_connected = TRUE;
-  return TRUE;
+bool wxSocketClient::Connect(const wxSockAddress& addr_man,
+                             const wxSockAddress& local,
+                             bool wait)
+{
+    return DoConnect(addr_man, &local, wait);

 }
 
 bool wxSocketClient::WaitOnConnect(long seconds, long milliseconds)
 {
 }
 
 bool wxSocketClient::WaitOnConnect(long seconds, long milliseconds)
 {

-  if (m_connected)                      // Already connected
-    return TRUE;
+    if ( m_connected )
+    {
+        // this happens if the initial attempt to connect succeeded without
+        // blocking
+        return true;
+    }

 
 

-  if (!m_establishing || !m_socket)     // No connection in progress
-    return FALSE;
+    wxCHECK_MSG( m_establishing && m_impl, false,
+                 "No connection establishment attempt in progress" );

 
 

-  return _Wait(seconds, milliseconds, GSOCK_CONNECTION_FLAG);
+    // we must specify wxSOCKET_LOST_FLAG here explicitly because we must return
+    // true if the connection establishment process is finished, whether it is
+    // over because we successfully connected or because we were not able to
+    // connect
+    return DoWait(seconds, milliseconds,
+        wxSOCKET_CONNECTION_FLAG | wxSOCKET_LOST_FLAG);

 }
 
 }
 

-// --------------------------------------------------------------
-// wxSocketEvent
-// --------------------------------------------------------------
+// ==========================================================================
+// wxDatagramSocket
+// ==========================================================================

 
 

-wxSocketEvent::wxSocketEvent(int id)
-  : wxEvent(id)
+wxDatagramSocket::wxDatagramSocket( const wxSockAddress& addr,
+                                    wxSocketFlags flags )
+                : wxSocketBase( flags, wxSOCKET_DATAGRAM )

 {
 {

-  wxEventType type = (wxEventType)wxEVT_SOCKET;
+    // Create the socket
+    m_impl = wxSocketImpl::Create(*this);
+
+    if (!m_impl)
+        return;
+
+    m_impl->Notify(m_notify);
+    // Setup the socket as non connection oriented
+    m_impl->SetLocal(addr.GetAddress());
+    if (flags & wxSOCKET_REUSEADDR)
+    {
+        m_impl->SetReusable();
+    }
+    if (GetFlags() & wxSOCKET_BROADCAST)
+    {
+        m_impl->SetBroadcast();
+    }
+    if (GetFlags() & wxSOCKET_NOBIND)
+    {
+        m_impl->DontDoBind();
+    }

 
 

-  SetEventType(type);
+    if ( m_impl->CreateUDP() != wxSOCKET_NOERROR )
+    {
+        delete m_impl;
+        m_impl = NULL;
+        return;
+    }
+
+    // Initialize all stuff
+    m_connected = false;
+    m_establishing = false;

 }
 
 }
 

-void wxSocketEvent::CopyObject(wxObject& obj_d) const
+wxDatagramSocket& wxDatagramSocket::RecvFrom( wxSockAddress& addr,
+                                              void* buf,
+                                              wxUint32 nBytes )

 {
 {

-  wxSocketEvent *event = (wxSocketEvent *)&obj_d;
+    Read(buf, nBytes);
+    GetPeer(addr);
+    return (*this);
+}

 
 

-  wxEvent::CopyObject(obj_d);
+wxDatagramSocket& wxDatagramSocket::SendTo( const wxSockAddress& addr,
+                                            const void* buf,
+                                            wxUint32 nBytes )
+{
+    wxASSERT_MSG( m_impl, _T("Socket not initialised") );

 
 

-  event->m_skevt = m_skevt;
-  event->m_socket = m_socket;
+    m_impl->SetPeer(addr.GetAddress());
+    Write(buf, nBytes);
+    return (*this);

 }
 
 }
 

-// --------------------------------------------------------------------------
+// ==========================================================================

 // wxSocketModule
 // wxSocketModule

-// --------------------------------------------------------------------------
-class WXDLLEXPORT wxSocketModule: public wxModule {
-  DECLARE_DYNAMIC_CLASS(wxSocketModule)
- public:
-  bool OnInit() {
-    return GSocket_Init();
-  }
-  void OnExit() {
-    GSocket_Cleanup();
-  }
+// ==========================================================================
+
+class wxSocketModule : public wxModule
+{
+public:
+    virtual bool OnInit()
+    {
+        // wxSocketBase will call Initialize() itself only if sockets are
+        // really used, don't do it from here
+        return true;
+    }
+
+    virtual void OnExit()
+    {
+        if ( wxSocketBase::IsInitialized() )
+            wxSocketBase::Shutdown();
+    }
+
+private:
+    DECLARE_DYNAMIC_CLASS(wxSocketModule)

 };
 
 IMPLEMENT_DYNAMIC_CLASS(wxSocketModule, wxModule)
 
 };
 
 IMPLEMENT_DYNAMIC_CLASS(wxSocketModule, wxModule)
 

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