remove wxSOCKET_MAX_EVENT, it is not really necessary and results in gcc warnings...

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

diff --git a/src/common/socket.cpp b/src/common/socket.cpp
index 26bfa784b56c08cb9279d77850c2606ebff5741a..ba15840b28c2931ed99411c177a80deeb705f722 100644 (file)
--- a/src/common/socket.cpp
+++ b/src/common/socket.cpp
@@ -1,1171 +1,1935 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// 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:    July 1999
-// Copyright:  (C) 1999, 1998, 1997, Guilhem Lavaux
+// 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"
+
+#ifdef __UNIX__
+    #include <errno.h>
+#endif
+
+// we use MSG_NOSIGNAL to avoid getting SIGPIPE when sending data to a remote
+// host which closed the connection if it is available, otherwise we rely on
+// SO_NOSIGPIPE existency
+//
+// this should cover all the current Unix systems (Windows never sends any
+// signals anyhow) but if we find one that has neither we should explicitly
+// ignore SIGPIPE for it
+#ifdef MSG_NOSIGNAL
+    #define wxSOCKET_MSG_NOSIGNAL MSG_NOSIGNAL
+#else // MSG_NOSIGNAL not available (BSD including OS X)
+    #if defined(__UNIX__) && !defined(SO_NOSIGPIPE)
+        #error "Writing to socket could generate unhandled SIGPIPE."
+        #error "Please post information about your system to wx-dev."
+    #endif
+
+    #define wxSOCKET_MSG_NOSIGNAL 0
+#endif
+
+// DLL options compatibility check:
+#include "wx/build.h"
+WX_CHECK_BUILD_OPTIONS("wxNet")
+
+// --------------------------------------------------------------------------
+// macros and constants
+// --------------------------------------------------------------------------
+
+// discard buffer
+#define MAX_DISCARD_SIZE (10 * 1024)
+
+#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 functions
+// ----------------------------------------------------------------------------
+
+namespace
+{
+
+void SetTimeValFromMS(timeval& tv, unsigned long ms)
+{
+    tv.tv_sec  = (ms / 1000);
+    tv.tv_usec = (ms % 1000) * 1000;
+}
+
+} // anonymous namespace
+
+// --------------------------------------------------------------------------
+// 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)

 };
 
 };
 

-// --------------------------------------------------------------
-// wxSocketBase ctor and dtor
-// --------------------------------------------------------------
+// ============================================================================
+// wxSocketManager
+// ============================================================================
+
+wxSocketManager *wxSocketManager::ms_manager = NULL;

 
 

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

 {
 {

+    wxASSERT_MSG( !ms_manager, "too late to set manager now" );
+
+    ms_manager = manager;

 }
 
 }
 

-wxSocketBase::wxSocketBase() :
-  wxEvtHandler(),
-  m_socket(NULL), m_flags(WAITALL | SPEED), m_type(SOCK_UNINIT),
-  m_neededreq(0),
-  m_lcount(0), m_timeout(600),
-  m_unread(NULL), m_unrd_size(0), m_unrd_cur(0),
-  m_cbk(NULL), m_cdata(NULL),
-  m_connected(FALSE), m_establishing(FALSE),
-  m_notify_state(FALSE), m_id(-1),
-  m_defering(NO_DEFER), m_error(FALSE),
-  m_states()
+/* 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()
-{
-  if (m_unread)
-    free(m_unread);
+// ==========================================================================
+// wxSocketImpl
+// ==========================================================================

 
 

-  // Shutdown and close the socket
-  Close();
+wxSocketImpl::wxSocketImpl(wxSocketBase& wxsocket)
+    : m_wxsocket(&wxsocket)
+{
+    m_fd              = INVALID_SOCKET;
+    m_error           = wxSOCKET_NOERROR;
+    m_server          = false;
+    m_stream          = true;
+
+    SetTimeout(wxsocket.GetTimeout() * 1000);
+
+    m_establishing    = false;
+    m_reusable        = false;
+    m_broadcast       = false;
+    m_dobind          = true;
+    m_initialRecvBufferSize = -1;
+    m_initialSendBufferSize = -1;
+}

 
 

-  // Destroy the GSocket object
-  if (m_socket)
-    GSocket_destroy(m_socket);
+wxSocketImpl::~wxSocketImpl()
+{
+    if ( m_fd != INVALID_SOCKET )
+        Shutdown();

 }
 
 }
 

-bool wxSocketBase::Close()
+bool wxSocketImpl::PreCreateCheck(const wxSockAddressImpl& addr)

 {
 {

-  if (m_socket)
-  {
-    // Disable callbacks
-    GSocket_UnsetCallback(m_socket, GSOCK_INPUT_FLAG | GSOCK_OUTPUT_FLAG |
-                                    GSOCK_LOST_FLAG | GSOCK_CONNECTION_FLAG);
+    if ( m_fd != INVALID_SOCKET )
+    {
+        m_error = wxSOCKET_INVSOCK;
+        return false;
+    }

 
 

-    // Shutdown the connection
-    GSocket_Shutdown(m_socket);
-    m_connected = FALSE;
-    m_establishing = FALSE;
-  }
+    if ( !addr.IsOk() )
+    {
+        m_error = wxSOCKET_INVADDR;
+        return false;
+    }

 
 

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

 
 

-// GRG: I have made some changes to wxSocket internal event
-// system; now, all events (INPUT, OUTPUT, CONNECTION, LOST)
-// are always internally monitored; but users will only be
-// notified of these events they are interested in. So we
-// no longer have to change the event mask with SetNotify()
-// in internal functions like DeferRead, DeferWrite, and
-// the like. This solves a lot of problems.
+    if ( m_reusable )
+        EnableSocketOption(SO_REUSEADDR);

 
 

-// GRG: I added m_error handling to IO operations. Now,
-// wxSocketBase::Error() correctly indicates if the last
-// operation from {Read, Write, ReadMsg, WriteMsg, Peek,
-// Unread, Discard} failed. Note that now, every function
-// that updates m_lcount, also updates m_error. While I
-// was at it, also fixed an UGLY bug in ReadMsg.
+    if ( m_broadcast )
+    {
+        wxASSERT_MSG( !m_stream, "broadcasting is for datagram sockets only" );

 
 

-class _wxSocketInternalTimer: public wxTimer
-{
-public:
-  int *m_state;
-  unsigned long m_new_val;
+        EnableSocketOption(SO_BROADCAST);
+    }

 
 

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

 
 

-int wxSocketBase::DeferRead(char *buffer, wxUint32 nbytes)
+    // we always put our sockets in unblocked mode and handle blocking
+    // ourselves in DoRead/Write() if wxSOCKET_WAITALL is specified
+    UnblockAndRegisterWithEventLoop();
+}
+
+wxSocketError wxSocketImpl::UpdateLocalAddress()

 {
 {

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

 
 

-  wxASSERT(m_defering == NO_DEFER);
+    return wxSOCKET_NOERROR;
+}

 
 

-  // Set the defering mode to READ.
-  m_defering = DEFER_READ;
+wxSocketError wxSocketImpl::CreateServer()
+{
+    if ( !PreCreateCheck(m_local) )
+        return m_error;

 
 

-  // Set the current buffer.
-  m_defer_buffer = buffer;
-  m_defer_nbytes = nbytes;
-  m_defer_timer  = &timer;
+    m_server = true;
+    m_stream = true;

 
 

-  timer.m_state = (int *)&m_defer_buffer;
-  timer.m_new_val = 0;
+    // do create the socket
+    m_fd = socket(m_local.GetFamily(), SOCK_STREAM, 0);

 
 

-  timer.Start(m_timeout * 1000, FALSE);
+    if ( m_fd == INVALID_SOCKET )
+    {
+        m_error = wxSOCKET_IOERR;
+        return wxSOCKET_IOERR;
+    }

 
 

-  // If the socket is readable, call DoDefer for the first time
-  if (GSocket_Select(m_socket, GSOCK_INPUT_FLAG))
-    DoDefer();
+    PostCreation();

 
 

-  // Wait for buffer completion. 
-  while (m_defer_buffer != NULL)
-    wxYield();
+    // and then bind to and listen on it
+    //
+    // FIXME: should we test for m_dobind here?
+    if ( bind(m_fd, m_local.GetAddr(), m_local.GetLen()) != 0 )
+        m_error = wxSOCKET_IOERR;

 
 

-  timer.Stop();
+    if ( IsOk() )
+    {
+        if ( listen(m_fd, 5) != 0 )
+            m_error = wxSOCKET_IOERR;
+    }

 
 

-  // Disable defering mode.
-  m_defering = NO_DEFER;
-  m_defer_timer = NULL;
+    if ( !IsOk() )
+    {
+        Close();
+        return m_error;
+    }

 
 

-  // Return the number of bytes read from the socket.
-  return nbytes-m_defer_nbytes;
+    // finally retrieve the address we effectively bound to
+    return UpdateLocalAddress();

 }
 
 }
 

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

 {
 {

-  int ret = 1;
-
-  m_error = FALSE;
+    if ( !PreCreateCheck(m_peer) )
+        return m_error;

 
 

-  // we try this even if the connection has already been closed.
-  m_lcount = GetPushback(buffer, nbytes, FALSE);
-  nbytes -= m_lcount;
-  buffer += m_lcount;
+    m_fd = socket(m_peer.GetFamily(), SOCK_STREAM, 0);

 
 

-  if (!m_connected || !m_socket)
-  {
-    // if no data retrieved AND not connected, it is an error.
-    if (!m_lcount)
-      m_error = TRUE;
+    if ( m_fd == INVALID_SOCKET )
+    {
+        m_error = wxSOCKET_IOERR;
+        return wxSOCKET_IOERR;
+    }

 
 

-    return *this;
-  }
+    PostCreation();

 
 

-  // If we have got the whole needed buffer, return immediately
-  if (!nbytes)
-  {
-    return *this;
-  }
+    // If a local address has been set, then bind to it before calling connect
+    if ( m_local.IsOk() )
+    {
+        if ( bind(m_fd, m_local.GetAddr(), m_local.GetLen()) != 0 )
+        {
+            Close();
+            m_error = wxSOCKET_IOERR;
+            return m_error;
+        }
+    }

 
 

-  if (m_flags & SPEED & WAITALL)    // SPEED && WAITALL
-  {
-    while (ret > 0 && nbytes > 0)
+    // Do connect now
+    int rc = connect(m_fd, m_peer.GetAddr(), m_peer.GetLen());
+    if ( rc == SOCKET_ERROR )

     {
     {

-      ret = GSocket_Read(m_socket, buffer, nbytes);
-      m_lcount += ret;
-      buffer += ret;
-      nbytes -= ret;
+        wxSocketError err = GetLastError();
+        if ( err == wxSOCKET_WOULDBLOCK )
+        {
+            m_establishing = true;
+
+            // block waiting for connection if we should (otherwise just return
+            // wxSOCKET_WOULDBLOCK to the caller)
+            if ( wait )
+            {
+                err = SelectWithTimeout(wxSOCKET_CONNECTION_FLAG)
+                        ? wxSOCKET_NOERROR
+                        : wxSOCKET_TIMEDOUT;
+                m_establishing = false;
+            }
+        }
+
+        m_error = err;
+    }
+    else // connected
+    {
+        m_error = wxSOCKET_NOERROR;

     }
     }

-    // In case the last call was an error ...
-    if (ret < 0)
-      m_lcount ++;
-  }
-  else if (m_flags & SPEED)         // SPEED && !WAITALL
-  {
-    ret = GSocket_Read(m_socket, buffer, nbytes);
-
-    if (ret > 0)
-      m_lcount += ret;
-  }
-  else                              // !SPEED
-  {
-    ret = DeferRead(buffer, nbytes);
-
-    if (ret > 0)
-      m_lcount += ret;
-  }
-
-  // If we have read some data, then it is not an error, even
-  // when in WAITALL mode, the last low-level IO call might
-  // have failed.
-  if (!m_lcount)
-    m_error = TRUE;
-
-  return *this;
-}
-
-wxSocketBase& wxSocketBase::ReadMsg(char* buffer, wxUint32 nbytes)
-{
-#define MAX_BUFSIZE (10 * 1024)
-
-  int old_flags;
-  unsigned long len, len2, sig;
-  struct
-  {
-    char sig[4];
-    char len[4];
-  } msg;
-
-  // sig should be an explicit 32-bit unsigned integer; I've seen
-  // compilers in which wxUint32 was actually a 16-bit unsigned integer
-
-  old_flags = m_flags;
-  SetFlags(WAITALL | SPEED);
-
-  Read((char *)&msg, sizeof(msg));
-  if (m_lcount != sizeof(msg))
-  {
-    SetFlags(old_flags);
-    m_error = TRUE;
-    return *this;
-  }

 
 

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

 
 

-  if (sig != 0xfeeddead)
-  {
-    wxLogDebug(_T("Warning: invalid signature returned to ReadMsg\n"));
-    SetFlags(old_flags);
-    m_error = TRUE;
-    return *this;
-  }
-
-  len = msg.len[0] & 0xff;
-  len |= (wxUint32)(msg.len[1] & 0xff) << 8;
-  len |= (wxUint32)(msg.len[2] & 0xff) << 16;
-  len |= (wxUint32)(msg.len[3] & 0xff) << 24;
-
-  if (len > nbytes)
-  {
-    len2 = len - nbytes;
-    len = nbytes;
-  }
-  else
-    len2 = 0;
-
-  // The "len &&" in the following statements is necessary so 
-  // that we don't attempt to read (and possibly hang the system)
-  // if the message was zero bytes long
-  if (len && Read(buffer, len).LastCount() != len)
-  {
-    SetFlags(old_flags);
-    m_error = TRUE;
-    return *this;
-  }
-  if (len2)
-  {
-    char *discard_buffer = new char[MAX_BUFSIZE];
-    long discard_len;

 
 

-    do
+wxSocketError wxSocketImpl::CreateUDP()
+{
+    if ( !PreCreateCheck(m_local) )
+        return m_error;
+
+    m_stream = false;
+    m_server = false;
+
+    m_fd = socket(m_local.GetFamily(), SOCK_DGRAM, 0);
+
+    if ( m_fd == INVALID_SOCKET )

     {
     {

-      discard_len = ((len2 > MAX_BUFSIZE)? MAX_BUFSIZE : len2);
-      discard_len = Read(discard_buffer, discard_len).LastCount();
-      len2 -= discard_len;
+        m_error = wxSOCKET_IOERR;
+        return wxSOCKET_IOERR;

     }
     }

-    while ((discard_len > 0) && len2);

 
 

-    delete [] discard_buffer;
+    PostCreation();

 
 

-    if (len2 != 0)
+    if ( m_dobind )

     {
     {

-      SetFlags(old_flags);
-      m_error = TRUE;
-      return *this;
+        if ( bind(m_fd, m_local.GetAddr(), m_local.GetLen()) != 0 )
+        {
+            Close();
+            m_error = wxSOCKET_IOERR;
+            return m_error;
+        }
+
+        return UpdateLocalAddress();

     }
     }

-  }
-  if (Read((char *)&msg, sizeof(msg)).LastCount() != sizeof(msg))
-  {
-    SetFlags(old_flags);
-    m_error = TRUE;
-    return *this;
-  }

 
 

-  sig = msg.sig[0] & 0xff;
-  sig |= (wxUint32)(msg.sig[1] & 0xff) << 8;
-  sig |= (wxUint32)(msg.sig[2] & 0xff) << 16;
-  sig |= (wxUint32)(msg.sig[3] & 0xff) << 24;
+    return wxSOCKET_NOERROR;
+}
+
+wxSocketImpl *wxSocketImpl::Accept(wxSocketBase& wxsocket)
+{
+    wxSockAddressStorage from;
+    WX_SOCKLEN_T fromlen = sizeof(from);
+    const SOCKET fd = accept(m_fd, &from.addr, &fromlen);

 
 

-  if (sig != 0xdeadfeed)
-  {
-    m_error = TRUE;
-    wxLogDebug(_T("Warning: invalid signature returned to ReadMsg\n"));
-  }
+    if ( fd == INVALID_SOCKET )
+        return NULL;

 
 

-  SetFlags(old_flags);
-  return *this;
+    wxSocketImpl * const sock = Create(wxsocket);
+    sock->m_fd = fd;
+    sock->m_peer = wxSockAddressImpl(from.addr, fromlen);

 
 

-#undef MAX_BUFSIZE
+    sock->UnblockAndRegisterWithEventLoop();
+
+    return sock;

 }
 
 }
 

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

 {
 {

-  Read(buffer, nbytes);
-  CreatePushbackAfter(buffer, nbytes);
+    if ( m_fd != INVALID_SOCKET )
+    {
+        DoClose();
+        m_fd = INVALID_SOCKET;
+    }
+}

 
 

-  return *this;
+/*
+ *  Disallow further read/write operations on this socket, close
+ *  the fd and disable all callbacks.
+ */
+void wxSocketImpl::Shutdown()
+{
+    if ( m_fd != INVALID_SOCKET )
+    {
+        shutdown(m_fd, 1 /* SD_SEND */);
+        Close();
+    }

 }
 
 }
 

-int wxSocketBase::DeferWrite(const char *buffer, wxUint32 nbytes)
+/*
+ *  Sets the timeout for blocking calls. Time is expressed in
+ *  milliseconds.
+ */
+void wxSocketImpl::SetTimeout(unsigned long millis)

 {
 {

-  // Timer for timeout
-  _wxSocketInternalTimer timer;
+    SetTimeValFromMS(m_timeout, millis);
+}

 
 

-  wxASSERT(m_defering == NO_DEFER);
+void wxSocketImpl::NotifyOnStateChange(wxSocketNotify event)
+{
+    m_wxsocket->OnRequest(event);
+}

 
 

-  m_defering = DEFER_WRITE;
+/* Address handling */
+wxSocketError wxSocketImpl::SetLocal(const wxSockAddressImpl& local)
+{
+    /* the socket must be initialized, or it must be a server */
+    if (m_fd != INVALID_SOCKET && !m_server)
+    {
+        m_error = wxSOCKET_INVSOCK;
+        return wxSOCKET_INVSOCK;
+    }

 
 

-  // Set the current buffer
-  m_defer_buffer = (char *)buffer;
-  m_defer_nbytes = nbytes;
-  m_defer_timer  = &timer;
+    if ( !local.IsOk() )
+    {
+        m_error = wxSOCKET_INVADDR;
+        return wxSOCKET_INVADDR;
+    }

 
 

-  // Start timer
-  timer.m_state   = (int *)&m_defer_buffer;
-  timer.m_new_val = 0;
+    m_local = local;

 
 

-  timer.Start(m_timeout * 1000, FALSE);
+    return wxSOCKET_NOERROR;
+}

 
 

-  // If the socket is writable, call DoDefer for the first time
-  if (GSocket_Select(m_socket, GSOCK_OUTPUT_FLAG))
-    DoDefer();
+wxSocketError wxSocketImpl::SetPeer(const wxSockAddressImpl& peer)
+{
+    if ( !peer.IsOk() )
+    {
+        m_error = wxSOCKET_INVADDR;
+        return wxSOCKET_INVADDR;
+    }

 
 

-  // Wait for buffer completion. 
-  while (m_defer_buffer != NULL)
-    wxYield();
+    m_peer = peer;

 
 

-  // Stop timer
-  m_defer_timer = NULL;
-  timer.Stop();
+    return wxSOCKET_NOERROR;
+}

 
 

-  m_defering = NO_DEFER;
+const wxSockAddressImpl& wxSocketImpl::GetLocal()
+{
+    if ( !m_local.IsOk() )
+        UpdateLocalAddress();

 
 

-  return nbytes-m_defer_nbytes;
+    return m_local;

 }
 
 }
 

-wxSocketBase& wxSocketBase::Write(const char *buffer, wxUint32 nbytes)
+// ----------------------------------------------------------------------------
+// wxSocketImpl IO
+// ----------------------------------------------------------------------------
+
+// this macro wraps the given expression (normally a syscall) in a loop which
+// ignores any interruptions, i.e. reevaluates it again if it failed and errno
+// is EINTR
+#ifdef __UNIX__
+    #define DO_WHILE_EINTR( rc, syscall ) \
+        do { \
+            rc = (syscall); \
+        } \
+        while ( rc == -1 && errno == EINTR )
+#else
+    #define DO_WHILE_EINTR( rc, syscall ) rc = (syscall)
+#endif
+
+int wxSocketImpl::RecvStream(void *buffer, int size)

 {
 {

-  int ret = 1;
+    int ret;
+    DO_WHILE_EINTR( ret, recv(m_fd, static_cast<char *>(buffer), size, 0) );

 
 

-  m_lcount = 0;
-  m_error = FALSE;
+    if ( !ret )
+    {
+        // receiving 0 bytes for a TCP socket indicates that the connection was
+        // closed by peer so shut down our end as well (for UDP sockets empty
+        // datagrams are also possible)
+        m_establishing = false;
+        NotifyOnStateChange(wxSOCKET_LOST);

 
 

-  if (!m_connected || !m_socket)
-  {
-    m_error = TRUE;
-    return *this;
-  }
+        Shutdown();

 
 

-  if (m_flags & SPEED & WAITALL)    // SPEED && WAITALL
-  {
-    while (ret > 0 && nbytes > 0)
-    {
-      ret = GSocket_Write(m_socket, buffer, nbytes);
-      m_lcount += ret;
-      buffer += ret;
-      nbytes -= ret;
+        // do not return an error in this case however

     }
     }

-    // In case the last call was an error ...
-    if (ret < 0)
-      m_lcount ++;
-  }
-  else if (m_flags & SPEED)         // SPEED && !WAITALL
-  {
-    ret = GSocket_Write(m_socket, buffer, nbytes);
-
-    if (ret > 0)
-      m_lcount += ret;
-  }
-  else                              // !SPEED
-  {
-    ret = DeferWrite(buffer, nbytes);
-
-    if (ret > 0)
-      m_lcount += ret;
-  }
-
-  // If we have written some data, then it is not an error,
-  // even when in WAITALL mode, the last low-level IO call
-  // might have failed.
-  if (!m_lcount)
-    m_error = TRUE;
-
-  return *this;
-}
-
-wxSocketBase& wxSocketBase::WriteMsg(const char *buffer, wxUint32 nbytes)
-{
-  int old_flags;
-  struct {
-    char sig[4];
-    char len[4];
-  } msg;
-
-  // warning about 'cast truncates constant value'
-#ifdef __VISUALC__
-    #pragma warning(disable: 4310)
-#endif // __VISUALC__
-
-  msg.sig[0] = (char) 0xad;
-  msg.sig[1] = (char) 0xde;
-  msg.sig[2] = (char) 0xed;
-  msg.sig[3] = (char) 0xfe;
-
-  msg.len[0] = (char) nbytes & 0xff;
-  msg.len[1] = (char) (nbytes >> 8) & 0xff;
-  msg.len[2] = (char) (nbytes >> 16) & 0xff;
-  msg.len[3] = (char) (nbytes >> 24) & 0xff;
-
-  // GRG: We need WAITALL | SPEED
-  old_flags = m_flags;
-  SetFlags(WAITALL | SPEED);
-
-  if (Write((char *)&msg, sizeof(msg)).LastCount() < sizeof(msg))
-  {
-    SetFlags(old_flags);
-    m_error = TRUE;
-    return *this;
-  }
-  if (Write(buffer, nbytes).LastCount() < nbytes)
-  {
-    SetFlags(old_flags);
-    m_error = TRUE;
-    return *this;
-  }
-
-  msg.sig[0] = (char) 0xed;
-  msg.sig[1] = (char) 0xfe;
-  msg.sig[2] = (char) 0xad;
-  msg.sig[3] = (char) 0xde;
-  msg.len[0] = msg.len[1] = msg.len[2] = msg.len[3] = (char) 0;

 
 

-  if (Write((char *)&msg, sizeof(msg)).LastCount() < sizeof(msg))
-    m_error = TRUE;
+    return ret;
+}

 
 

-  SetFlags(old_flags);
-  return *this;
+int wxSocketImpl::SendStream(const void *buffer, int size)
+{
+    int ret;
+    DO_WHILE_EINTR( ret, send(m_fd, static_cast<const char *>(buffer), size,
+                              wxSOCKET_MSG_NOSIGNAL) );

 
 

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

 }
 
 }
 

-wxSocketBase& wxSocketBase::Unread(const char *buffer, wxUint32 nbytes)
+int wxSocketImpl::RecvDgram(void *buffer, int size)

 {
 {

-  m_error = FALSE;
-  m_lcount = 0;
+    wxSockAddressStorage from;
+    WX_SOCKLEN_T fromlen = sizeof(from);

 
 

-  if (nbytes != 0)
-  {
-    CreatePushbackAfter(buffer, nbytes);
-    m_lcount = nbytes;
-  }
-  return *this;
+    int ret;
+    DO_WHILE_EINTR( ret, recvfrom(m_fd, static_cast<char *>(buffer), size,
+                                  0, &from.addr, &fromlen) );
+
+    if ( ret == SOCKET_ERROR )
+        return SOCKET_ERROR;
+
+    m_peer = wxSockAddressImpl(from.addr, fromlen);
+    if ( !m_peer.IsOk() )
+        return -1;
+
+    return ret;

 }
 
 }
 

-bool wxSocketBase::IsData() const
+int wxSocketImpl::SendDgram(const void *buffer, int size)

 {
 {

-  if (!m_socket)
-    return FALSE;
+    if ( !m_peer.IsOk() )
+    {
+        m_error = wxSOCKET_INVADDR;
+        return -1;
+    }

 
 

-  return (GSocket_Select(m_socket, GSOCK_INPUT_FLAG));
+    int ret;
+    DO_WHILE_EINTR( ret, sendto(m_fd, static_cast<const char *>(buffer), size,
+                                0, m_peer.GetAddr(), m_peer.GetLen()) );
+
+    return ret;

 }
 
 }
 

-// GRG: DoDefer() no longer needs to know which event occured,
-// because this was only used to catch LOST events and set
-// m_defer_buffer = NULL; this is done in OnRequest() now.
+int wxSocketImpl::Read(void *buffer, int size)
+{
+    // server sockets can't be used for IO, only to accept new connections
+    if ( m_fd == INVALID_SOCKET || m_server )
+    {
+        m_error = wxSOCKET_INVSOCK;
+        return -1;
+    }
+
+    int ret = m_stream ? RecvStream(buffer, size)
+                       : RecvDgram(buffer, size);

 
 

-void wxSocketBase::DoDefer()
+    m_error = ret == SOCKET_ERROR ? GetLastError() : wxSOCKET_NOERROR;
+
+    return ret;
+}
+
+int wxSocketImpl::Write(const void *buffer, int size)

 {
 {

-  int ret;
+    if ( m_fd == INVALID_SOCKET || m_server )
+    {
+        m_error = wxSOCKET_INVSOCK;
+        return -1;
+    }

 
 

-  if (!m_defer_buffer)
-    return;
+    int ret = m_stream ? SendStream(buffer, size)
+                       : SendDgram(buffer, size);

 
 

-  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;
-      break;
-  }
+    m_error = ret == SOCKET_ERROR ? GetLastError() : wxSOCKET_NOERROR;

 
 

-  if (ret >= 0)
-    m_defer_nbytes -= ret;
+    return ret;
+}
+
+// ==========================================================================
+// wxSocketBase
+// ==========================================================================

 
 

-  // If we are waiting for all bytes to be acquired, keep the defering
-  // mode enabled.
-  if ((m_flags & WAITALL) == 0 || m_defer_nbytes == 0 || ret < 0)
-  {
-    m_defer_buffer = NULL;
-  }
-  else
-  {
-    m_defer_buffer += ret;
-    m_defer_timer->Start(m_timeout * 1000, FALSE);
-  }
+// --------------------------------------------------------------------------
+// Initialization and shutdown
+// --------------------------------------------------------------------------
+
+// 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;
+
+bool wxSocketBase::IsInitialized()
+{
+    return m_countInit > 0;

 }
 
 }
 

-void wxSocketBase::Discard()
+bool wxSocketBase::Initialize()

 {
 {

-#define MAX_BUFSIZE (10*1024)
+    if ( !m_countInit++ )
+    {
+        wxSocketManager * const manager = wxSocketManager::Get();
+        if ( !manager || !manager->OnInit() )
+        {
+            m_countInit--;

 
 

-  char *my_data = new char[MAX_BUFSIZE];
-  wxUint32 recv_size = MAX_BUFSIZE;
-  wxUint32 total = 0;
+            return false;
+        }
+    }

 
 

-  SaveState();
-  SetFlags(NOWAIT);     // GRG: SPEED was not needed here!
+    return true;
+}

 
 

-  while (recv_size == MAX_BUFSIZE)
-  {
-    recv_size = Read(my_data, MAX_BUFSIZE).LastCount();
-    total += recv_size;
-  }
+void wxSocketBase::Shutdown()
+{
+    // 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" );

 
 

-  RestoreState();
-  delete [] my_data;
+        manager->OnExit();
+    }
+}

 
 

-  m_lcount = total;
-  m_error = FALSE;
+// --------------------------------------------------------------------------
+// Ctor and dtor
+// --------------------------------------------------------------------------

 
 

-#undef MAX_BUFSIZE
+void wxSocketBase::Init()
+{
+    m_impl       = NULL;
+    m_type         = wxSOCKET_UNINIT;
+
+    // state
+    m_flags        = 0;
+    m_connected    =
+    m_establishing =
+    m_reading      =
+    m_writing      =
+    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    =
+    m_eventsgot    = 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();
+    }

 }
 
 }
 

-// --------------------------------------------------------------
-// wxSocketBase get local or peer addresses
-// --------------------------------------------------------------
+wxSocketBase::wxSocketBase()
+{
+    Init();
+}

 
 

-bool wxSocketBase::GetPeer(wxSockAddress& addr_man) const
+wxSocketBase::wxSocketBase(wxSocketFlags flags, wxSocketType type)

 {
 {

-  GAddress *peer;
+    Init();

 
 

-  if (!m_socket)
-    return FALSE;
+    SetFlags(flags);

 
 

-  peer = GSocket_GetPeer(m_socket);
-  addr_man.SetAddress(peer);
-  GAddress_destroy(peer);
+    m_type = type;
+}

 
 

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

 }
 
 }
 

-bool wxSocketBase::GetLocal(wxSockAddress& addr_man) const
+bool wxSocketBase::Destroy()

 {
 {

-  GAddress *local;
+    // 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;

 
 

-  if (!m_socket)
-    return FALSE;
+    // Shutdown and close the socket
+    Close();
+
+    // Suppress events from now on
+    Notify(false);

 
 

-  local = GSocket_GetLocal(m_socket);
-  addr_man.SetAddress(local);
-  GAddress_destroy(local);
+    // 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;
+    return true;

 }
 
 }
 

-// --------------------------------------------------------------
-// wxSocketBase save and restore socket state
-// --------------------------------------------------------------
+// ----------------------------------------------------------------------------
+// simple accessors
+// ----------------------------------------------------------------------------

 
 

-void wxSocketBase::SaveState()
+void wxSocketBase::SetError(wxSocketError error)

 {
 {

-  wxSocketState *state;
+    m_impl->m_error = error;
+}

 
 

-  state = new wxSocketState();
+wxSocketError wxSocketBase::LastError() const
+{
+    return m_impl->GetError();
+}

 
 

-  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;
+// --------------------------------------------------------------------------
+// Basic IO calls
+// --------------------------------------------------------------------------

 
 

-  m_states.Append(state);
+// The following IO operations update m_lcount:
+// {Read, Write, ReadMsg, WriteMsg, Peek, Unread, Discard}
+bool wxSocketBase::Close()
+{
+    // Interrupt pending waits
+    InterruptWait();
+
+    if (m_impl)
+        m_impl->Shutdown();
+
+    m_connected = false;
+    m_establishing = false;
+    return true;

 }
 
 }
 

-void wxSocketBase::RestoreState()
+wxSocketBase& wxSocketBase::Read(void* buffer, wxUint32 nbytes)

 {
 {

-  wxNode *node;
-  wxSocketState *state;
+    // Mask read events
+    m_reading = true;

 
 

-  node = m_states.Last();
-  if (!node)
-    return;
+    m_lcount = DoRead(buffer, nbytes);

 
 

-  state = (wxSocketState *)node->Data();
+    // Allow read events from now on
+    m_reading = false;

 
 

-  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);
-
-  delete node;
-  delete state;
+    return *this;

 }
 
 }
 

+wxUint32 wxSocketBase::DoRead(void* buffer_, wxUint32 nbytes)
+{
+    // We use pointer arithmetic here which doesn't work with void pointers.
+    char *buffer = static_cast<char *>(buffer_);
+
+    // 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;
+
+    // If it's indeed closed or if read everything, there is nothing more to do.
+    if ( !m_impl || !nbytes )
+        return total;
+
+    wxCHECK_MSG( buffer, 0, "NULL buffer" );

 
 

-// --------------------------------------------------------------
-// wxSocketBase Wait functions
-// --------------------------------------------------------------

 
 

-// 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 wxYield(), so this won't block the GUI.
+    // 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 )
+    {
+        int ret = m_impl->Read(buffer, nbytes);
+        if ( ret == -1 )
+        {
+            if ( m_impl->GetLastError() != wxSOCKET_WOULDBLOCK )
+                SetError(wxSOCKET_IOERR);
+        }
+        else // not an error, even if we didn't read anything
+        {
+            total += ret;
+        }
+    }
+    else // blocking socket
+    {
+        for ( ;; )
+        {
+            // Wait until socket becomes ready for reading
+            if ( !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 == -1 )
+            {
+                SetError(wxSOCKET_IOERR);
+                break;
+            }
+
+            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;
+        }
+
+        // it's an error to not read everything in wxSOCKET_WAITALL mode or to
+        // not read anything otherwise
+        if ( ((m_flags & wxSOCKET_WAITALL) && nbytes) || !total )
+            SetError(wxSOCKET_IOERR);
+    }

 
 

-bool wxSocketBase::_Wait(long seconds, long milliseconds, wxSocketEventFlags flags)
+    return total;
+}
+
+wxSocketBase& wxSocketBase::ReadMsg(void* buffer, wxUint32 nbytes)

 {
 {

-  GSocketEventFlags result;
-  _wxSocketInternalTimer timer;
-  long timeout;
-  int state = -1;
+    struct
+    {
+        unsigned char sig[4];
+        unsigned char len[4];
+    } msg;

 
 

-  // Check for valid socket
-  if ((!m_connected && !m_establishing) || !m_socket)
-    return FALSE;
+    // Mask read events
+    m_reading = true;

 
 

-  // Check for valid timeout value
-  if (seconds != -1)
-    timeout = seconds * 1000 + milliseconds;
-  else
-    timeout = m_timeout * 1000;
+    int old_flags = m_flags;
+    SetFlags((m_flags & wxSOCKET_BLOCK) | wxSOCKET_WAITALL);

 
 

-  // Activate timer
-  timer.m_state = &state;
-  timer.m_new_val = 0;
-  timer.Start(timeout, TRUE);
+    bool ok = false;
+    if ( DoRead(&msg, sizeof(msg)) == sizeof(msg) )
+    {
+        wxUint32 sig = (wxUint32)msg.sig[0];
+        sig |= (wxUint32)(msg.sig[1] << 8);
+        sig |= (wxUint32)(msg.sig[2] << 16);
+        sig |= (wxUint32)(msg.sig[3] << 24);
+
+        if ( sig == 0xfeeddead )
+        {
+            wxUint32 len = (wxUint32)msg.len[0];
+            len |= (wxUint32)(msg.len[1] << 8);
+            len |= (wxUint32)(msg.len[2] << 16);
+            len |= (wxUint32)(msg.len[3] << 24);
+
+            wxUint32 len2;
+            if (len > nbytes)
+            {
+                len2 = len - nbytes;
+                len = nbytes;
+            }
+            else
+                len2 = 0;
+
+            // Don't attempt to read if the msg was zero bytes long.
+            m_lcount = len ? DoRead(buffer, len) : 0;
+
+            if ( len2 )
+            {
+                char discard_buffer[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);
+            }
+
+            if ( !len2 && DoRead(&msg, sizeof(msg)) == sizeof(msg) )
+            {
+                sig = (wxUint32)msg.sig[0];
+                sig |= (wxUint32)(msg.sig[1] << 8);
+                sig |= (wxUint32)(msg.sig[2] << 16);
+                sig |= (wxUint32)(msg.sig[3] << 24);
+
+                if ( sig == 0xdeadfeed )
+                    ok = true;
+            }
+        }
+    }

 
 

-  // Active polling (without using events)
-  result = GSocket_Select(m_socket, flags);
+    if ( !ok )
+        SetError(wxSOCKET_IOERR);

 
 

-  while ((result == 0) && (state == -1))
-  {
-    wxYield();
-    result = GSocket_Select(m_socket, flags);
-  }
+    m_reading = false;
+    SetFlags(old_flags);

 
 

-  timer.Stop();
+    return *this;
+}
+
+wxSocketBase& wxSocketBase::Peek(void* buffer, wxUint32 nbytes)
+{
+    // Mask read events
+    m_reading = true;

 
 

-  return (result != 0);
+    m_lcount = DoRead(buffer, nbytes);
+    Pushback(buffer, m_lcount);
+
+    // Allow read events again
+    m_reading = false;
+
+    return *this;

 }
 
 }
 

-bool wxSocketBase::Wait(long seconds, long milliseconds)
+wxSocketBase& wxSocketBase::Write(const void *buffer, wxUint32 nbytes)

 {
 {

-  return _Wait(seconds, milliseconds, GSOCK_INPUT_FLAG |
-                                      GSOCK_OUTPUT_FLAG |
-                                      GSOCK_CONNECTION_FLAG |
-                                      GSOCK_LOST_FLAG);
+    // Mask write events
+    m_writing = true;
+
+    m_lcount = DoWrite(buffer, nbytes);
+
+    // Allow write events again
+    m_writing = false;
+
+    return *this;

 }
 
 }
 

-bool wxSocketBase::WaitForRead(long seconds, long milliseconds)
+// 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)

 {
 {

-  return _Wait(seconds, milliseconds, GSOCK_INPUT_FLAG | GSOCK_LOST_FLAG);
+    const char *buffer = static_cast<const char *>(buffer_);
+
+    // Return if there is nothing to read or the socket is (already?) closed.
+    if ( !m_impl || !nbytes )
+        return 0;
+
+    wxCHECK_MSG( buffer, 0, "NULL buffer" );
+
+    wxUint32 total = 0;
+    if ( m_flags & wxSOCKET_NOWAIT )
+    {
+        const int ret = m_impl->Write(buffer, nbytes);
+        if ( ret == -1 )
+        {
+            if ( m_impl->GetLastError() != wxSOCKET_WOULDBLOCK )
+                SetError(wxSOCKET_IOERR);
+        }
+        else
+        {
+            total += ret;
+        }
+    }
+    else // blocking socket
+    {
+        for ( ;; )
+        {
+            if ( !WaitForWrite() )
+                break;
+
+            const int ret = m_impl->Write(buffer, nbytes);
+            if ( ret == 0 )
+            {
+                m_closed = true;
+                break;
+            }
+
+            if ( ret == -1 )
+            {
+                SetError(wxSOCKET_IOERR);
+                break;
+            }
+
+            total += ret;
+            if ( !(m_flags & wxSOCKET_WAITALL) )
+                break;
+
+            nbytes -= ret;
+            if ( !nbytes )
+                break;
+
+            buffer += ret;
+        }
+
+        if ( ((m_flags & wxSOCKET_WAITALL) && nbytes) || !total )
+            SetError(wxSOCKET_IOERR);
+    }
+
+    return total;

 }
 
 }
 

-bool wxSocketBase::WaitForWrite(long seconds, long milliseconds)
+wxSocketBase& wxSocketBase::WriteMsg(const void *buffer, wxUint32 nbytes)

 {
 {

-  return _Wait(seconds, milliseconds, GSOCK_OUTPUT_FLAG | GSOCK_LOST_FLAG);
+    struct
+    {
+        unsigned char sig[4];
+        unsigned char len[4];
+    } msg;
+
+    // Mask write events
+    m_writing = true;
+
+    const int old_flags = m_flags;
+    SetFlags((m_flags & wxSOCKET_BLOCK) | wxSOCKET_WAITALL);
+
+    msg.sig[0] = (unsigned char) 0xad;
+    msg.sig[1] = (unsigned char) 0xde;
+    msg.sig[2] = (unsigned char) 0xed;
+    msg.sig[3] = (unsigned char) 0xfe;
+
+    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);
+
+    bool ok = false;
+    if ( DoWrite(&msg, sizeof(msg)) == sizeof(msg) )
+    {
+        m_lcount = DoWrite(buffer, nbytes);
+        if ( m_lcount == nbytes )
+        {
+            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 ( DoWrite(&msg, sizeof(msg)) == sizeof(msg))
+                ok = true;
+        }
+    }
+
+    if ( !ok )
+        SetError(wxSOCKET_IOERR);
+
+    m_writing = false;
+    SetFlags(old_flags);
+
+    return *this;

 }
 
 }
 

-bool wxSocketBase::WaitForLost(long seconds, long milliseconds)
+wxSocketBase& wxSocketBase::Unread(const void *buffer, wxUint32 nbytes)

 {
 {

-  return _Wait(seconds, milliseconds, GSOCK_LOST_FLAG);
+    if (nbytes != 0)
+        Pushback(buffer, nbytes);
+
+    SetError(wxSOCKET_NOERROR);
+    m_lcount = nbytes;
+
+    return *this;

 }
 
 }
 

-void wxSocketBase::SetTimeout(long seconds)
+wxSocketBase& wxSocketBase::Discard()

 {
 {

-  m_timeout = seconds;
+    char *buffer = new char[MAX_DISCARD_SIZE];
+    wxUint32 ret;
+    wxUint32 total = 0;
+
+    // Mask read events
+    m_reading = true;
+
+    const int old_flags = m_flags;
+    SetFlags(wxSOCKET_NOWAIT);
+
+    do
+    {
+        ret = DoRead(buffer, MAX_DISCARD_SIZE);
+        total += ret;
+    }
+    while (ret == MAX_DISCARD_SIZE);
+
+    delete[] buffer;
+    m_lcount = total;
+    SetError(wxSOCKET_NOERROR);
+
+    // Allow read events again
+    m_reading = false;
+
+    SetFlags(old_flags);

 
 

-  if (m_socket)
-    GSocket_SetTimeout(m_socket, m_timeout);
+    return *this;

 }
 
 }
 

-// --------------------------------------------------------------
-// wxSocketBase flags
-// --------------------------------------------------------------
+// --------------------------------------------------------------------------
+// Wait functions
+// --------------------------------------------------------------------------

 
 

-void wxSocketBase::SetFlags(wxSockFlags _flags)
+/*
+    This function will check for the events specified in the flags parameter,
+    and it will return a mask indicating which operations can be performed.
+ */
+wxSocketEventFlags wxSocketImpl::Select(wxSocketEventFlags flags,
+                                        const timeval *timeout)

 {
 {

-  m_flags = _flags;
+    if ( m_fd == INVALID_SOCKET )
+        return (wxSOCKET_LOST_FLAG & flags);
+
+    struct timeval tv;
+    if ( timeout )
+        tv = *timeout;
+    else
+        tv.tv_sec = tv.tv_usec = 0;
+
+    // prepare the FD sets, passing NULL for the one(s) we don't use
+    fd_set
+        readfds, *preadfds = NULL,
+        writefds, *pwritefds = NULL,
+        exceptfds;                      // always want to know about errors
+
+    if ( flags & wxSOCKET_INPUT_FLAG )
+    {
+        preadfds = &readfds;
+        wxFD_ZERO(preadfds);
+        wxFD_SET(m_fd, preadfds);
+    }
+
+    // when using non-blocking connect() the socket becomes connected
+    // (successfully or not) when it becomes writable
+    if ( flags & (wxSOCKET_OUTPUT_FLAG | wxSOCKET_CONNECTION_FLAG) )
+    {
+        pwritefds = &writefds;
+        wxFD_ZERO(pwritefds);
+        wxFD_SET(m_fd, pwritefds);
+    }
+
+    wxFD_ZERO(&exceptfds);
+    wxFD_SET(m_fd, &exceptfds);
+
+    const int rc = select(m_fd + 1, preadfds, pwritefds, &exceptfds, &tv);
+
+    // check for errors first
+    if ( rc == -1 || wxFD_ISSET(m_fd, &exceptfds) )
+    {
+        m_establishing = false;
+
+        return wxSOCKET_LOST_FLAG & flags;
+    }
+
+    if ( rc == 0 )
+        return 0;
+
+    wxASSERT_MSG( rc == 1, "unexpected select() return value" );
+
+    wxSocketEventFlags detected = 0;
+    if ( preadfds && wxFD_ISSET(m_fd, preadfds) )
+        detected |= wxSOCKET_INPUT_FLAG;
+
+    if ( pwritefds && wxFD_ISSET(m_fd, pwritefds) )
+    {
+        // check for the case of non-blocking connect()
+        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 )
+                detected = wxSOCKET_LOST_FLAG;
+            else
+                detected |= wxSOCKET_CONNECTION_FLAG;
+        }
+        else // not called to get non-blocking connect() status
+        {
+            detected |= wxSOCKET_OUTPUT_FLAG;
+        }
+    }
+
+    return detected & flags;

 }
 
 }
 

-wxSocketBase::wxSockFlags wxSocketBase::GetFlags() const
+bool
+wxSocketBase::DoWait(long seconds, long milliseconds, wxSocketEventFlags flags)

 {
 {

-  return m_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 unless this was explicitly disabled by
+    // setting wxSOCKET_BLOCK flag
+    wxEventLoopBase *eventLoop;
+    if ( !(m_flags & wxSOCKET_BLOCK) && wxIsMainThread() )
+    {
+        eventLoop = wxEventLoop::GetActive();
+    }
+    else // in worker thread
+    {
+        // We never dispatch messages from threads other than the main one.
+        eventLoop = NULL;
+    }

 
 

-// --------------------------------------------------------------
-// wxSocketBase callback management
-// --------------------------------------------------------------
+    // Wait until we receive the event we're waiting for or the timeout expires
+    // (but note that we always execute the loop at least once, even if timeout
+    // is 0 as this is used for polling)
+    bool gotEvent = false;
+    for ( bool firstTime = true; !m_interrupt ; firstTime = false )
+    {
+        long timeLeft = wxMilliClockToLong(timeEnd - wxGetLocalTimeMillis());
+        if ( timeLeft < 0 )
+        {
+            if ( !firstTime )
+                break;   // timed out
+
+            timeLeft = 0;
+        }
+
+        // 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.
+        wxSocketEventFlags events;
+        if ( eventLoop )
+        {
+            // reset them before starting to wait
+            m_eventsgot = 0;
+
+            eventLoop->DispatchTimeout(timeLeft);
+
+            events = m_eventsgot;
+        }
+        else // no event loop or waiting in another thread
+        {
+            // as explained below, we should always check for wxSOCKET_LOST_FLAG
+            timeval tv;
+            SetTimeValFromMS(tv, timeLeft);
+            events = m_impl->Select(flags | wxSOCKET_LOST_FLAG, &tv);
+        }
+
+        // always check for wxSOCKET_LOST_FLAG, even if flags doesn't include
+        // it, as continuing to wait for anything else after getting it is
+        // pointless
+        if ( events & wxSOCKET_LOST_FLAG )
+        {
+            m_connected = false;
+            m_establishing = false;
+            if ( flags & wxSOCKET_LOST_FLAG )
+                gotEvent = true;
+            break;
+        }
+
+        // otherwise mask out the bits we're not interested in
+        events &= flags;
+
+        // Incoming connection (server) or connection established (client)?
+        if ( events & wxSOCKET_CONNECTION_FLAG )
+        {
+            m_connected = true;
+            m_establishing = false;
+            gotEvent = true;
+            break;
+        }
+
+        // Data available or output buffer ready?
+        if ( (events & wxSOCKET_INPUT_FLAG) || (events & wxSOCKET_OUTPUT_FLAG) )
+        {
+            gotEvent = true;
+            break;
+        }
+    }
+
+    return gotEvent;
+}

 
 

-wxSocketBase::wxSockCbk wxSocketBase::Callback(wxSockCbk cbk_)
+bool wxSocketBase::Wait(long seconds, long milliseconds)

 {
 {

-  wxSockCbk old_cbk = cbk_;
+    return DoWait(seconds, milliseconds,
+            wxSOCKET_INPUT_FLAG |
+            wxSOCKET_OUTPUT_FLAG |
+            wxSOCKET_CONNECTION_FLAG |
+            wxSOCKET_LOST_FLAG
+        );
+}

 
 

-  m_cbk = cbk_;
-  return old_cbk;
+bool wxSocketBase::WaitForRead(long seconds, long milliseconds)
+{
+    // 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);

 }
 
 }
 

-char *wxSocketBase::CallbackData(char *data)
+
+bool wxSocketBase::WaitForWrite(long seconds, long milliseconds)

 {
 {

-  char *old_data = m_cdata;
+    return DoWait(seconds, milliseconds, wxSOCKET_OUTPUT_FLAG | wxSOCKET_LOST_FLAG);
+}

 
 

-  m_cdata = data;
-  return old_data;
+bool wxSocketBase::WaitForLost(long seconds, long milliseconds)
+{
+    return DoWait(seconds, milliseconds, wxSOCKET_LOST_FLAG);

 }
 
 }
 

-// --------------------------------------------------------------
-// wxSocketBase automatic notifier
-// --------------------------------------------------------------
+// --------------------------------------------------------------------------
+// Miscellaneous
+// --------------------------------------------------------------------------
+
+//
+// Get local or peer address
+//

 
 

-static void wx_socket_callback(GSocket *socket, GSocketEvent event, char *cdata)
+bool wxSocketBase::GetPeer(wxSockAddress& addr) const

 {
 {

-  wxSocketBase *sckobj = (wxSocketBase *)cdata;
+    wxCHECK_MSG( m_impl, false, "invalid socket" );
+
+    const wxSockAddressImpl& peer = m_impl->GetPeer();
+    if ( !peer.IsOk() )
+        return false;

 
 

-  sckobj->OnRequest((wxSocketNotify)event);
+    addr.SetAddress(peer);
+
+    return true;

 }
 
 }
 

-wxSocketEventFlags wxSocketBase::EventToNotify(wxSocketNotify evt)
+bool wxSocketBase::GetLocal(wxSockAddress& addr) const

 {
 {

-  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;
+    wxCHECK_MSG( m_impl, false, "invalid socket" );
+
+    const wxSockAddressImpl& local = m_impl->GetLocal();
+    if ( !local.IsOk() )
+        return false;
+
+    addr.SetAddress(local);
+
+    return true;

 }
 
 }
 

-void wxSocketBase::SetNotify(wxSocketEventFlags flags)
+//
+// Save and restore socket state
+//
+
+void wxSocketBase::SaveState()

 {
 {

-  m_neededreq = flags;
+    wxSocketState *state;
+
+    state = new wxSocketState();
+
+    state->m_flags      = m_flags;
+    state->m_notify     = m_notify;
+    state->m_eventmask  = m_eventmask;
+    state->m_clientData = m_clientData;
+
+    m_states.Append(state);

 }
 
 }
 

-void wxSocketBase::Notify(bool notify)
+void wxSocketBase::RestoreState()

 {
 {

-  m_notify_state = notify;
-}
-
-void wxSocketBase::OnRequest(wxSocketNotify req_evt)
-{
-  wxSocketEvent event(m_id);
-  wxSocketEventFlags flag = EventToNotify(req_evt);
-
-  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)
-      {
-        // GRG: DoDefer() no longer needs to know which
-        // event occured, because this was only used to
-        // catch LOST events and set m_defer_buffer to
-        // NULL, and this is done in OnRequest() now.
-        DoDefer();
-        // Do not notify to user
+    wxList::compatibility_iterator node;
+    wxSocketState *state;
+
+    node = m_states.GetLast();
+    if (!node)

         return;
         return;

-      }
-      break;
-  }

 
 

-  if (((m_neededreq & flag) == flag) && m_notify_state)
-  {
-    event.m_socket = this;
-    event.m_skevt  = req_evt;
-    ProcessEvent(event);
-    OldOnNotify(req_evt);
+    state = (wxSocketState *)node->GetData();
+
+    m_flags      = state->m_flags;
+    m_notify     = state->m_notify;
+    m_eventmask  = state->m_eventmask;
+    m_clientData = state->m_clientData;

 
 

-    if (m_cbk)
-      m_cbk(*this, req_evt, m_cdata);
-  }
+    m_states.Erase(node);
+    delete state;

 }
 
 }
 

-void wxSocketBase::OldOnNotify(wxSocketNotify evt)
+//
+// Timeout and flags
+//
+
+void wxSocketBase::SetTimeout(long seconds)

 {
 {

-}
+    m_timeout = seconds;

 
 

-// --------------------------------------------------------------
-// wxSocketBase set event handler
-// --------------------------------------------------------------
+    if (m_impl)
+        m_impl->SetTimeout(m_timeout * 1000);
+}

 
 

-void wxSocketBase::SetEventHandler(wxEvtHandler& h_evt, int id)
+void wxSocketBase::SetFlags(wxSocketFlags flags)

 {
 {

-  SetNextHandler(&h_evt);
-  m_id = id;
+    // 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;

 }
 
 }
 

-// --------------------------------------------------------------
-// wxSocketBase pushback library
-// --------------------------------------------------------------

 
 

-void wxSocketBase::CreatePushbackAfter(const char *buffer, wxUint32 size)
+// --------------------------------------------------------------------------
+// Event handling
+// --------------------------------------------------------------------------
+
+void wxSocketBase::OnRequest(wxSocketNotify notification)

 {
 {

-  char *curr_pos;
+    wxSocketEventFlags flag = 0;
+    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:
+            wxFAIL_MSG( "unknown wxSocket notification" );
+    }

 
 

-  if (m_unread != NULL)
-    m_unread = (char *) realloc(m_unread, m_unrd_size+size);
-  else
-    m_unread = (char *) malloc(size);
+    // if we lost the connection the socket is now closed
+    if ( notification == wxSOCKET_LOST )
+        m_closed = true;

 
 

-  curr_pos = m_unread + m_unrd_size;
+    // remember the events which were generated for this socket, we're going to
+    // use this in DoWait()
+    m_eventsgot |= flag;

 
 

-  memcpy(curr_pos, buffer, size);
-  m_unrd_size += size;
+    // send the wx event if enabled and we're interested in it
+    if ( m_notify && (m_eventmask & flag) && m_handler )
+    {
+        // 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.
+        if ( notification == wxSOCKET_INPUT )
+        {
+            if ( m_reading || !m_impl->Select(wxSOCKET_INPUT_FLAG) )
+                return;
+        }
+        else if ( notification == wxSOCKET_OUTPUT )
+        {
+            if ( m_writing || !m_impl->Select(wxSOCKET_OUTPUT_FLAG) )
+                return;
+        }
+
+        wxSocketEvent event(m_id);
+        event.m_event      = notification;
+        event.m_clientData = m_clientData;
+        event.SetEventObject(this);
+
+        m_handler->AddPendingEvent(event);
+    }

 }
 
 }
 

-void wxSocketBase::CreatePushbackBefore(const char *buffer, wxUint32 size)
+void wxSocketBase::Notify(bool notify)
+{
+    m_notify = notify;
+}
+
+void wxSocketBase::SetNotify(wxSocketEventFlags flags)

 {
 {

-  if (m_unread == NULL)
-    m_unread = (char *)malloc(size);
-  else {
-    char *tmp;
+    m_eventmask = flags;
+}

 
 

-    tmp = (char *)malloc(m_unrd_size + size);
-    memcpy(tmp+size, m_unread, m_unrd_size);
-    free(m_unread);
+void wxSocketBase::SetEventHandler(wxEvtHandler& handler, int id)
+{
+    m_handler = &handler;
+    m_id      = id;
+}

 
 

-    m_unread = tmp;
-  }
+// --------------------------------------------------------------------------
+// Pushback buffer
+// --------------------------------------------------------------------------

 
 

-  m_unrd_size += size;
+void wxSocketBase::Pushback(const void *buffer, wxUint32 size)
+{
+    if (!size) return;

 
 

-  memcpy(m_unread, buffer, size);
+    if (m_unread == NULL)
+        m_unread = malloc(size);
+    else
+    {
+        void *tmp;
+
+        tmp = malloc(m_unrd_size + size);
+        memcpy((char *)tmp + size, m_unread, m_unrd_size);
+        free(m_unread);
+
+        m_unread = tmp;
+    }
+
+    m_unrd_size += 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,
+                               wxSocketFlags flags)
+              : wxSocketBase(flags, wxSOCKET_SERVER)

 {
 {

-  // Create the socket
-  m_socket = GSocket_new();
+    wxLogTrace( wxTRACE_Socket, _T("Opening wxSocketServer") );
+
+    m_impl = wxSocketImpl::Create(*this);
+
+    if (!m_impl)
+    {
+        wxLogTrace( wxTRACE_Socket, _T("*** Failed to create m_impl") );
+        return;
+    }
+
+    // Setup the socket as server
+    m_impl->SetLocal(addr.GetAddress());

 
 

-  if (!m_socket)
-    return;
+    if (GetFlags() & wxSOCKET_REUSEADDR) {
+        m_impl->SetReusable();
+    }
+    if (GetFlags() & wxSOCKET_BROADCAST) {
+        m_impl->SetBroadcast();
+    }
+    if (GetFlags() & wxSOCKET_NOBIND) {
+        m_impl->DontDoBind();
+    }

 
 

-  // 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->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 || (m_impl->m_fd == INVALID_SOCKET) || !m_impl->IsServer() )
+    {
+        wxFAIL_MSG( "can only be called for a valid server socket" );

 
 

-  if (!m_socket)
-    return FALSE;
+        SetError(wxSOCKET_INVSOCK);

 
 

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

 
 

-  if (!wait)
-    GSocket_SetNonBlocking(m_socket, TRUE);
+    if ( wait )
+    {
+        // wait until we get a connection
+        if ( !m_impl->SelectWithTimeout(wxSOCKET_INPUT_FLAG) )
+        {
+            SetError(wxSOCKET_TIMEDOUT);

 
 

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

 
 

-  if (!wait)
-    GSocket_SetNonBlocking(m_socket, FALSE);
+    sock.m_impl = m_impl->Accept(sock);

 
 

-  // GRG: this was not being handled!
-  if (child_socket == NULL)
-    return FALSE;
+    if ( !sock.m_impl )
+    {
+        SetError(m_impl->GetLastError());

 
 

-  sock.m_type = SOCK_INTERNAL;
-  sock.m_socket = child_socket;
-  sock.m_connected = TRUE;
+        return false;
+    }

 
 

-  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);
+    sock.m_type = wxSOCKET_BASE;
+    sock.m_connected = true;

 
 

-  return TRUE;
+    return true;

 }
 
 wxSocketBase *wxSocketServer::Accept(bool wait)
 {
 }
 
 wxSocketBase *wxSocketServer::Accept(bool wait)
 {

-  wxSocketBase* sock = new wxSocketBase();
+    wxSocketBase* sock = new wxSocketBase();

 
 

-  sock->SetFlags((wxSockFlags)m_flags);
+    sock->SetFlags(m_flags);

 
 

-  if (!AcceptWith(*sock, wait))
-    return NULL;
+    if (!AcceptWith(*sock, wait))
+    {
+        sock->Destroy();
+        sock = NULL;
+    }

 
 

-  return sock;
+    return sock;

 }
 
 bool wxSocketServer::WaitForAccept(long seconds, long milliseconds)
 {
 }
 
 bool wxSocketServer::WaitForAccept(long seconds, long milliseconds)
 {

-  return _Wait(seconds, milliseconds, GSOCK_CONNECTION_FLAG | GSOCK_LOST_FLAG);
+    return DoWait(seconds, milliseconds, wxSOCKET_CONNECTION_FLAG);

 }
 
 }
 

-// --------------------------------------------------------------
+bool wxSocketBase::GetOption(int level, int optname, void *optval, int *optlen)
+{
+    wxASSERT_MSG( m_impl, _T("Socket not initialised") );
+
+    SOCKOPTLEN_T lenreal = *optlen;
+    if ( getsockopt(m_impl->m_fd, level, optname,
+                    static_cast<char *>(optval), &lenreal) != 0 )
+        return false;
+
+    *optlen = lenreal;
+
+    return true;
+}
+
+bool
+wxSocketBase::SetOption(int level, int optname, const void *optval, int optlen)
+{
+    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)
+{
+    m_localAddress = local;
+
+    return true;
+}
+
+// ==========================================================================

 // 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& remote,
+                               const wxSockAddress* local,
+                               bool wait)

 {
 {

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

 
 

-  if (IsConnected())
-    Close();
+    m_connected = false;
+    m_establishing = false;

 
 

-  // This should never happen.
-  if (m_socket)
-    GSocket_destroy(m_socket);
+    // Create and set up the new one
+    m_impl = wxSocketImpl::Create(*this);
+    if ( !m_impl )
+        return false;

 
 

-  // Initialize all socket stuff ...
-  m_socket = GSocket_new();
-  m_connected = FALSE;
-  m_establishing = FALSE;
+    // 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();

 
 

-  if (!m_socket)
-    return FALSE;
+    // Bind to the local IP address and port, when provided or if one had been
+    // set before
+    if ( !local && m_localAddress.GetAddress().IsOk() )
+        local = &m_localAddress;

 
 

-  GSocket_SetTimeout(m_socket, m_timeout);
+    if ( local )
+        m_impl->SetLocal(local->GetAddress());

 
 

-  // GRG: If wait == FALSE, then the call should be nonblocking.
-  // When we are finished, we put the socket to blocking mode
-  // again.
+    m_impl->SetInitialSocketBuffers(m_initialRecvBufferSize, m_initialSendBufferSize);

 
 

-  if (!wait)
-    GSocket_SetNonBlocking(m_socket, TRUE);
+    m_impl->SetPeer(remote.GetAddress());

 
 

-  GSocket_SetPeer(m_socket, addr_man.GetAddress());
-  err = GSocket_Connect(m_socket, GSOCK_STREAMED);
-  GSocket_SetCallback(m_socket, GSOCK_INPUT_FLAG | GSOCK_OUTPUT_FLAG |
-                                GSOCK_LOST_FLAG | GSOCK_CONNECTION_FLAG,
-                                wx_socket_callback, (char *)this);
+    // Finally do create the socket and connect to the peer
+    const wxSocketError err = m_impl->CreateClient(wait);

 
 

-  if (!wait)
-    GSocket_SetNonBlocking(m_socket, FALSE);
+    if ( err != wxSOCKET_NOERROR )
+    {
+        if ( err == wxSOCKET_WOULDBLOCK )
+        {
+            wxASSERT_MSG( !wait, "shouldn't get this for blocking connect" );

 
 

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

 
 

-    return FALSE;
-  }
+        return false;
+    }

 
 

-  m_connected = TRUE;
-  return TRUE;
+    m_connected = true;
+    return true;

 }
 
 }
 

-bool wxSocketClient::WaitOnConnect(long seconds, long milliseconds)
+bool wxSocketClient::Connect(const wxSockAddress& remote, bool wait)

 {
 {

-  bool ret;
+    return DoConnect(remote, NULL, wait);
+}

 
 

-  if (m_connected)      // Already connected
-    return TRUE;
+bool wxSocketClient::Connect(const wxSockAddress& remote,
+                             const wxSockAddress& local,
+                             bool wait)
+{
+    return DoConnect(remote, &local, wait);
+}

 
 

-  if (!m_establishing || !m_socket)  // No connection in progress
-    return FALSE;
+bool wxSocketClient::WaitOnConnect(long seconds, long milliseconds)
+{
+    if ( m_connected )
+    {
+        // this happens if the initial attempt to connect succeeded without
+        // blocking
+        return true;
+    }

 
 

-  ret = _Wait(seconds, milliseconds, GSOCK_CONNECTION_FLAG | GSOCK_LOST_FLAG);
+    wxCHECK_MSG( m_establishing && m_impl, false,
+                 "No connection establishment attempt in progress" );

 
 

-  // GRG: m_connected and m_establishing will be updated in
-  // OnRequest(), but we do it here anyway because sometimes
-  // the event might be a bit delayed, and if that happens,
-  // when WaitOnConnect() returns, m_connected will still be
-  // FALSE. We have to do it as well in OnRequest because
-  // maybe WaitOnConnect() is not being used...
+    // 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);
+}

 
 

-  if (ret)
-  {
-    m_connected = GSocket_Select(m_socket, GSOCK_CONNECTION_FLAG);
-    m_establishing = FALSE;
-  }
+// ==========================================================================
+// wxDatagramSocket
+// ==========================================================================

 
 

-  return m_connected;
-}
+wxDatagramSocket::wxDatagramSocket( const wxSockAddress& addr,
+                                    wxSocketFlags flags )
+                : wxSocketBase( flags, wxSOCKET_DATAGRAM )
+{
+    // Create the socket
+    m_impl = wxSocketImpl::Create(*this);

 
 

+    if (!m_impl)
+        return;

 
 

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

 
 

-wxSocketEvent::wxSocketEvent(int id)
-  : wxEvent(id)
-{
-  wxEventType type = (wxEventType)wxEVT_SOCKET;
+    if ( m_impl->CreateUDP() != wxSOCKET_NOERROR )
+    {
+        delete m_impl;
+        m_impl = NULL;
+        return;
+    }

 
 

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