Removed references to xpm[d].lib

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

diff --git a/src/common/socket.cpp b/src/common/socket.cpp
index a5cf4047a7f972234f23327ca60e99cdab4f305c..7ec0743ec109a5a7ad75c44cd1dca9ba881248a2 100644 (file)
--- a/src/common/socket.cpp
+++ b/src/common/socket.cpp
@@ -3,13 +3,16 @@
 // 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) 2000-1999, Guillermo Rodriguez Garcia

 // RCS_ID:     $Id$
 // License:    see wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 
 // RCS_ID:     $Id$
 // License:    see wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 

+// ==========================================================================
+// Declarations
+// ==========================================================================
+

 #ifdef __GNUG__
 #pragma implementation "socket.h"
 #endif
 #ifdef __GNUG__
 #pragma implementation "socket.h"
 #endif


@@ -23,9 +26,7 @@
 
 #if wxUSE_SOCKETS
 
 
 #if wxUSE_SOCKETS
 

-/////////////////////////////////////////////////////////////////////////////
-// wxWindows headers
-/////////////////////////////////////////////////////////////////////////////
+#include "wx/app.h"

 #include "wx/defs.h"
 #include "wx/object.h"
 #include "wx/string.h"
 #include "wx/defs.h"
 #include "wx/object.h"
 #include "wx/string.h"


@@ -33,88 +34,190 @@
 #include "wx/utils.h"
 #include "wx/module.h"
 #include "wx/log.h"
 #include "wx/utils.h"
 #include "wx/module.h"
 #include "wx/log.h"

+#include "wx/intl.h"
+#include "wx/event.h"

 
 

-#include <stdlib.h>
-#include <string.h>
-#include <ctype.h>
+#if wxUSE_GUI
+  #include "wx/gdicmn.h"      // for wxPendingDelete
+#endif // wxUSE_GUI

 
 

-/////////////////////////////////////////////////////////////////////////////
-// wxSocket headers
-/////////////////////////////////////////////////////////////////////////////

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

-// --------------------------------------------------------------
-// ClassInfos
-// --------------------------------------------------------------
-#if !USE_SHARED_LIBRARY
+// --------------------------------------------------------------------------
+// macros and constants
+// --------------------------------------------------------------------------
+
+// discard buffer
+#define MAX_DISCARD_SIZE (10 * 1024)
+
+// what to do within waits: in wxBase we don't do anything as we don't have
+// the event loop anyhow (for now). In GUI apps we have 2 cases: from the main
+// thread itself we have to call wxYield() to let the events (including the
+// GUI events and the low-level (not wxWindows) events from GSocket) be
+// processed. From another thread it is enough to just call wxThread::Yield()
+// which will give away the rest of our time slice: the explanation is that
+// the events will be processed by the main thread anyhow, without calling
+// wxYield(), but we don't want to eat the CPU time uselessly while sitting
+// in the loop waiting for the data
+#if wxUSE_GUI
+    #if wxUSE_THREADS
+        #define PROCESS_EVENTS()        \
+        {                               \
+            if ( wxThread::IsMain() )   \
+                wxYield();              \
+            else                        \
+                wxThread::Yield();      \
+        }
+    #else // !wxUSE_THREADS
+        #define PROCESS_EVENTS() wxYield()
+    #endif // wxUSE_THREADS/!wxUSE_THREADS
+#else // !wxUSE_GUI
+    #define PROCESS_EVENTS()
+#endif // wxUSE_GUI/!wxUSE_GUI
+
+// --------------------------------------------------------------------------
+// wxWin macros
+// --------------------------------------------------------------------------
+

 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;
+#if WXWIN_COMPATIBILITY
+  wxSocketBase::wxSockCbk  m_cbk;
+  char                    *m_cdata;
+#endif // WXWIN_COMPATIBILITY

 
 public:
   wxSocketState() : wxObject() {}
 };
 
 
 public:
   wxSocketState() : wxObject() {}
 };
 

-// --------------------------------------------------------------
-// wxSocketBase ctor and dtor
-// --------------------------------------------------------------
-
-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()
+// ==========================================================================
+// wxSocketBase
+// ==========================================================================
+
+// --------------------------------------------------------------------------
+// Ctor and dtor
+// --------------------------------------------------------------------------
+
+void wxSocketBase::Init()
+{
+  m_socket       = NULL;
+  m_type         = wxSOCKET_UNINIT;
+
+  // state
+  m_flags        = 0;
+  m_connected    =
+  m_establishing =
+  m_reading      =
+  m_writing      =
+  m_error        = 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           = -1;
+  m_handler      = NULL;
+  m_clientData   = NULL;
+  m_notify       = FALSE;
+  m_eventmask    = 0;
+#if WXWIN_COMPATIBILITY
+  m_cbk          = NULL;
+  m_cdata        = NULL;
+#endif // WXWIN_COMPATIBILITY
+}
+
+wxSocketBase::wxSocketBase()

 {
 {

+  Init();

 }
 
 }
 

-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()
+wxSocketBase::wxSocketBase(wxSocketFlags flags, wxSocketType type)

 {
 {

+  Init();
+
+  m_flags = flags;
+  m_type  = type;

 }
 
 wxSocketBase::~wxSocketBase()
 {
 }
 
 wxSocketBase::~wxSocketBase()
 {

-  if (m_unread)
-    free(m_unread);
+  // Just in case the app called Destroy() *and* then deleted
+  // the socket immediately: don't leave dangling pointers.
+#if wxUSE_GUI
+  wxPendingDelete.DeleteObject(this);
+#endif

 
   // Shutdown and close the socket
 
   // Shutdown and close the socket

-  Close();
+  if (!m_beingDeleted)
+    Close();

 
   // Destroy the GSocket object
   if (m_socket)
     GSocket_destroy(m_socket);
 
   // Destroy the GSocket object
   if (m_socket)
     GSocket_destroy(m_socket);

+
+  // Free the pushback buffer
+  if (m_unread)
+    free(m_unread);

 }
 
 }
 

+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;
+
+  // Shutdown and close the socket
+  Close();
+
+  // Supress events from now on
+  Notify(FALSE);
+
+#if wxUSE_GUI
+  if ( !wxPendingDelete.Member(this) )
+    wxPendingDelete.Append(this);
+#else
+  delete this;
+#endif
+
+  return TRUE;
+}
+
+// --------------------------------------------------------------------------
+// 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?
+

 bool wxSocketBase::Close()
 {
 bool wxSocketBase::Close()
 {

+  // Interrupt pending waits
+  InterruptWait();
+

   if (m_socket)
   {
     // Disable callbacks
   if (m_socket)
   {
     // Disable callbacks


@@ -123,202 +226,132 @@ bool wxSocketBase::Close()
 
     // Shutdown the connection
     GSocket_Shutdown(m_socket);
 
     // Shutdown the connection
     GSocket_Shutdown(m_socket);

-    m_connected = FALSE;
-    m_establishing = FALSE;

   }
 
   }
 

+  m_connected = FALSE;
+  m_establishing = FALSE;

   return TRUE;
 }
 
   return TRUE;
 }
 

-// --------------------------------------------------------------
-// wxSocketBase basic IO operations
-// --------------------------------------------------------------
-
-// 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.
-
-// 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.
-
-class _wxSocketInternalTimer: public wxTimer
+wxSocketBase& wxSocketBase::Read(void* buffer, wxUint32 nbytes)

 {
 {

-public:
-  int *m_state;
-  unsigned long m_new_val;
+  // Mask read events
+  m_reading = TRUE;

 
 

-  void Notify()
-  {
-    *m_state = m_new_val;  // Change the value
-  }
-};
+  m_lcount = _Read(buffer, nbytes);

 
 

-int wxSocketBase::DeferRead(char *buffer, wxUint32 nbytes)
-{
-  // Timer for timeout
-  _wxSocketInternalTimer timer;
-
-  wxASSERT(m_defering == NO_DEFER);
-
-  // Set the defering mode to READ.
-  m_defering = DEFER_READ;
-
-  // Set the current buffer.
-  m_defer_buffer = buffer;
-  m_defer_nbytes = nbytes;
-  m_defer_timer  = &timer;
-
-  timer.m_state = (int *)&m_defer_buffer;
-  timer.m_new_val = 0;
-
-  timer.Start(m_timeout * 1000, FALSE);
-
-  // If the socket is readable, call DoDefer for the first time
-  if (GSocket_Select(m_socket, GSOCK_INPUT_FLAG))
-    DoDefer();
-
-  // Wait for buffer completion. 
-  while (m_defer_buffer != NULL)
-    wxYield();
-
-  timer.Stop();
+  // 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);

 
 

-  // Disable defering mode.
-  m_defering = NO_DEFER;
-  m_defer_timer = NULL;
+  // Allow read events from now on
+  m_reading = FALSE;

 
 

-  // Return the number of bytes read from the socket.
-  return nbytes-m_defer_nbytes;
+  return *this;

 }
 
 }
 

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

 {
 {

+  int total;

   int ret = 1;
 
   int ret = 1;
 

-  m_error = FALSE;
+  // Try the pushback buffer first
+  total = GetPushback(buffer, nbytes, FALSE);
+  nbytes -= total;
+  buffer  = (char *)buffer + total;

 
 

-  // we try this even if the connection has already been closed.
-  m_lcount = GetPushback(buffer, nbytes, FALSE);
-  nbytes -= m_lcount;
-  buffer += m_lcount;
-
-  if (!m_connected || !m_socket)
-  {
-    // if no data retrieved AND not connected, it is an error.
-    if (!m_lcount)
-      m_error = TRUE;
-
-    return *this;
-  }
-
-  // If we have got the whole needed buffer, return immediately
-  if (!nbytes)
-    return *this;
+  // Return now in one of the following cases:
+  // - the socket is invalid,
+  // - we got all the data,
+  // - we got *some* data and we are not using wxSOCKET_WAITALL.
+  if ( !m_socket ||
+       !nbytes ||
+       ((total != 0) && !(m_flags & wxSOCKET_WAITALL)) )
+    return total;

 
   // Possible combinations (they are checked in this order)
 
   // Possible combinations (they are checked in this order)

-  // NOWAIT
-  // SPEED | WAITALL
-  // SPEED          
-  // WAITALL
-  // NONE
+  // wxSOCKET_NOWAIT
+  // wxSOCKET_WAITALL (with or without wxSOCKET_BLOCK)
+  // wxSOCKET_BLOCK
+  // wxSOCKET_NONE

   //
   //

-  if (m_flags & NOWAIT)                 // NOWAIT
+  if (m_flags & wxSOCKET_NOWAIT)

   {
   {

-    GSocket_SetNonBlocking(m_socket, TRUE);
-    ret = GSocket_Read(m_socket, buffer, nbytes);
-    GSocket_SetNonBlocking(m_socket, FALSE);
+    GSocket_SetNonBlocking(m_socket, 1);
+    ret = GSocket_Read(m_socket, (char *)buffer, nbytes);
+    GSocket_SetNonBlocking(m_socket, 0);

 
     if (ret > 0)
 
     if (ret > 0)

-      m_lcount += ret;
+      total += ret;

   }
   }

-  else if (m_flags & SPEED & WAITALL)   // SPEED, WAITALL
+  else

   {
   {

-    while (ret > 0 && nbytes > 0)
+    bool more = TRUE;
+
+    while (more)

     {
     {

-      ret = GSocket_Read(m_socket, buffer, nbytes);
-      m_lcount += ret;
-      buffer += ret;
-      nbytes -= ret;
-    }
-    // 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 ( !(m_flags & wxSOCKET_BLOCK) && !WaitForRead() )
+        break;

 
 

-    if (ret > 0)
-      m_lcount += ret;
-  }
-  else                                  // NONE or WAITALL
-  {
-    ret = DeferRead(buffer, nbytes);
+      ret = GSocket_Read(m_socket, (char *)buffer, nbytes);

 
 

-    if (ret > 0)
-      m_lcount += ret;
-  }
+      if (ret > 0)
+      {
+        total  += ret;
+        nbytes -= ret;
+        buffer  = (char *)buffer + 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;
+      // If we got here and wxSOCKET_WAITALL is not set, we can leave
+      // now. Otherwise, wait until we recv all the data or until there
+      // is an error.
+      //
+      more = (ret > 0 && nbytes > 0 && (m_flags & wxSOCKET_WAITALL));
+    }
+  }

 
 

-  return *this;
+  return total;

 }
 
 }
 

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

 {
 {

-#define MAX_BUFSIZE (10 * 1024)
-
+  wxUint32 len, len2, sig, total;
+  bool error;

   int old_flags;
   int old_flags;

-  unsigned long len, len2, sig;

   struct
   {
   struct
   {

-    char sig[4];
-    char len[4];
+    unsigned char sig[4];
+    unsigned char len[4];

   } msg;
 
   } msg;
 

-  // sig should be an explicit 32-bit unsigned integer; I've seen
-  // compilers in which wxUint32 was actually a 16-bit unsigned integer
+  // Mask read events
+  m_reading = TRUE;

 
 

+  total = 0;
+  error = TRUE;

   old_flags = m_flags;
   old_flags = m_flags;

-  SetFlags(old_flags | WAITALL);
+  SetFlags((m_flags & wxSOCKET_BLOCK) | wxSOCKET_WAITALL);

 
 

-  Read((char *)&msg, sizeof(msg));
-  if (m_lcount != sizeof(msg))
-  {
-    SetFlags(old_flags);
-    m_error = TRUE;
-    return *this;
-  }
+  if (_Read(&msg, sizeof(msg)) != sizeof(msg))
+    goto exit;

 
 

-  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;
+  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)
   {
 
   if (sig != 0xfeeddead)
   {

-    wxLogDebug(_T("Warning: invalid signature returned to ReadMsg\n"));
-    SetFlags(old_flags);
-    m_error = TRUE;
-    return *this;
+    wxLogWarning(_("wxSocket: invalid signature in ReadMsg."));
+    goto exit;

   }
 
   }
 

-  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;
+  len = (wxUint32)msg.len[0];
+  len |= (wxUint32)(msg.len[1] << 8);
+  len |= (wxUint32)(msg.len[2] << 16);
+  len |= (wxUint32)(msg.len[3] << 24);

 
   if (len > nbytes)
   {
 
   if (len > nbytes)
   {


@@ -328,318 +361,368 @@ wxSocketBase& wxSocketBase::ReadMsg(char* buffer, wxUint32 nbytes)
   else
     len2 = 0;
 
   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)
+  // Don't attemp to read if the msg was zero bytes long.
+  if (len)

   {
   {

-    SetFlags(old_flags);
-    m_error = TRUE;
-    return *this;
+    total = _Read(buffer, len);
+
+    if (total != len)
+      goto exit;

   }
   if (len2)
   {
   }
   if (len2)
   {

-    char *discard_buffer = new char[MAX_BUFSIZE];
+    char *discard_buffer = new char[MAX_DISCARD_SIZE];

     long discard_len;
 
     long discard_len;
 

+    // NOTE: discarded bytes don't add to m_lcount.

     do
     {
     do
     {

-      discard_len = ((len2 > MAX_BUFSIZE)? MAX_BUFSIZE : len2);
-      discard_len = Read(discard_buffer, discard_len).LastCount();
-      len2 -= discard_len;
+      discard_len = ((len2 > MAX_DISCARD_SIZE)? MAX_DISCARD_SIZE : len2);
+      discard_len = _Read(discard_buffer, (wxUint32)discard_len);
+      len2 -= (wxUint32)discard_len;

     }
     while ((discard_len > 0) && len2);
 
     delete [] discard_buffer;
 
     if (len2 != 0)
     }
     while ((discard_len > 0) && len2);
 
     delete [] discard_buffer;
 
     if (len2 != 0)

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

   }
   }

+  if (_Read(&msg, sizeof(msg)) != sizeof(msg))
+    goto exit;

 
 

-  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;
+  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)
   {
 
   if (sig != 0xdeadfeed)
   {

-    m_error = TRUE;
-    wxLogDebug(_T("Warning: invalid signature returned to ReadMsg\n"));
+    wxLogWarning(_("wxSocket: invalid signature in ReadMsg."));
+    goto exit;

   }
 
   }
 

-  SetFlags(old_flags);
-  return *this;
+  // everything was OK
+  error = FALSE;

 
 

-#undef MAX_BUFSIZE
-}
-
-wxSocketBase& wxSocketBase::Peek(char* buffer, wxUint32 nbytes)
-{
-  Read(buffer, nbytes);
-  CreatePushbackAfter(buffer, nbytes);
+exit:
+  m_error = error;
+  m_lcount = total;
+  m_reading = FALSE;
+  SetFlags(old_flags);

 
   return *this;
 }
 
 
   return *this;
 }
 

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

 {
 {

-  // Timer for timeout
-  _wxSocketInternalTimer timer;
-
-  wxASSERT(m_defering == NO_DEFER);
+  // Mask read events
+  m_reading = TRUE;

 
 

-  m_defering = DEFER_WRITE;
+  m_lcount = _Read(buffer, nbytes);
+  Pushback(buffer, m_lcount);

 
 

-  // Set the current buffer
-  m_defer_buffer = (char *)buffer;
-  m_defer_nbytes = nbytes;
-  m_defer_timer  = &timer;
+  // 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);

 
 

-  // Start timer
-  timer.m_state   = (int *)&m_defer_buffer;
-  timer.m_new_val = 0;
+  // Allow read events again
+  m_reading = FALSE;

 
 

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

 
 

-  // If the socket is writable, call DoDefer for the first time
-  if (GSocket_Select(m_socket, GSOCK_OUTPUT_FLAG))
-    DoDefer();
+wxSocketBase& wxSocketBase::Write(const void *buffer, wxUint32 nbytes)
+{
+  // Mask write events
+  m_writing = TRUE;

 
 

-  // Wait for buffer completion. 
-  while (m_defer_buffer != NULL)
-    wxYield();
+  m_lcount = _Write(buffer, nbytes);

 
 

-  // Stop timer
-  m_defer_timer = NULL;
-  timer.Stop();
+  // 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);

 
 

-  m_defering = NO_DEFER;
+  // Allow write events again
+  m_writing = FALSE;

 
 

-  return nbytes-m_defer_nbytes;
+  return *this;

 }
 
 }
 

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

 {
 {

+  wxUint32 total = 0;

   int ret = 1;
 
   int ret = 1;
 

-  m_lcount = 0;
-  m_error = FALSE;
-
-  if (!m_connected || !m_socket)
-  {
-    m_error = TRUE;
-    return *this;
-  }
+  // If the socket is invalid or parameters are ill, return immediately
+  if (!m_socket || !buffer || !nbytes)
+    return 0;

 
   // Possible combinations (they are checked in this order)
 
   // Possible combinations (they are checked in this order)

-  // NOWAIT
-  // SPEED | WAITALL
-  // SPEED          
-  // WAITALL
-  // NONE
+  // wxSOCKET_NOWAIT
+  // wxSOCKET_WAITALL (with or without wxSOCKET_BLOCK)
+  // wxSOCKET_BLOCK
+  // wxSOCKET_NONE

   //
   //

-  if (m_flags & NOWAIT)                 // NOWAIT
+  if (m_flags & wxSOCKET_NOWAIT)

   {
   {

-    GSocket_SetNonBlocking(m_socket, TRUE);
-    ret = GSocket_Write(m_socket, buffer, nbytes);
-    GSocket_SetNonBlocking(m_socket, FALSE);
+    GSocket_SetNonBlocking(m_socket, 1);
+    ret = GSocket_Write(m_socket, (const char *)buffer, nbytes);
+    GSocket_SetNonBlocking(m_socket, 0);

 
     if (ret > 0)
 
     if (ret > 0)

-      m_lcount += ret;
+      total = ret;

   }
   }

-  else if (m_flags & SPEED & WAITALL)   // SPEED, WAITALL
+  else

   {
   {

-    while (ret > 0 && nbytes > 0)
+    bool more = TRUE;
+
+    while (more)

     {
     {

-      ret = GSocket_Write(m_socket, buffer, nbytes);
-      m_lcount += ret;
-      buffer += ret;
-      nbytes -= ret;
-    }
-    // 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 ( !(m_flags & wxSOCKET_BLOCK) && !WaitForWrite() )
+        break;

 
 

-    if (ret > 0)
-      m_lcount += ret;
-  }
-  else                                  // NONE or WAITALL
-  {
-    ret = DeferWrite(buffer, nbytes);
+      ret = GSocket_Write(m_socket, (const char *)buffer, nbytes);

 
 

-    if (ret > 0)
-      m_lcount += ret;
-  }
+      if (ret > 0)
+      {
+        total  += ret;
+        nbytes -= ret;
+        buffer  = (const char *)buffer + 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;
+      // If we got here and wxSOCKET_WAITALL is not set, we can leave
+      // now. Otherwise, wait until we send all the data or until there
+      // is an error.
+      //
+      more = (ret > 0 && nbytes > 0 && (m_flags & wxSOCKET_WAITALL));
+    }
+  }

 
 

-  return *this;
+  return total;

 }
 
 }
 

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

 {
 {

+  wxUint32 total;
+  bool error;

   int old_flags;
   int old_flags;

-  struct {
-    char sig[4];
-    char len[4];
+  struct
+  {
+    unsigned char sig[4];
+    unsigned char len[4];

   } msg;
 
   } msg;
 

-  // warning about 'cast truncates constant value'
-#ifdef __VISUALC__
-    #pragma warning(disable: 4310)
-#endif // __VISUALC__
+  // Mask write events
+  m_writing = TRUE;

 
 

-  msg.sig[0] = (char) 0xad;
-  msg.sig[1] = (char) 0xde;
-  msg.sig[2] = (char) 0xed;
-  msg.sig[3] = (char) 0xfe;
+  error = TRUE;
+  total = 0;
+  old_flags = m_flags;
+  SetFlags((m_flags & wxSOCKET_BLOCK) | wxSOCKET_WAITALL);

 
 

-  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;
+  msg.sig[0] = (unsigned char) 0xad;
+  msg.sig[1] = (unsigned char) 0xde;
+  msg.sig[2] = (unsigned char) 0xed;
+  msg.sig[3] = (unsigned char) 0xfe;

 
 

-  old_flags = m_flags;
-  SetFlags(old_flags | WAITALL);
+  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 (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;
-  }
+  if (_Write(&msg, sizeof(msg)) < sizeof(msg))
+    goto exit;
+
+  total = _Write(buffer, nbytes);

 
 

-  msg.sig[0] = (char) 0xed;
-  msg.sig[1] = (char) 0xfe;
-  msg.sig[2] = (char) 0xad;
-  msg.sig[3] = (char) 0xde;
+  if (total < nbytes)
+    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;
 
   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;
+  if ((_Write(&msg, sizeof(msg))) < sizeof(msg))
+    goto exit;

 
 

-  SetFlags(old_flags);
-  return *this;
+  // everything was OK
+  error = FALSE;
+
+exit:
+  m_error = error;
+  m_lcount = total;
+  m_writing = FALSE;

 
 

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

 }
 
 }
 

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

 {
 {

+  if (nbytes != 0)
+    Pushback(buffer, nbytes);
+

   m_error = FALSE;
   m_error = FALSE;

-  m_lcount = 0;
+  m_lcount = nbytes;

 
 

-  if (nbytes != 0)
+  return *this;
+}
+
+wxSocketBase& wxSocketBase::Discard()
+{
+  int old_flags;
+  char *buffer = new char[MAX_DISCARD_SIZE];
+  wxUint32 ret;
+  wxUint32 total = 0;
+
+  // Mask read events
+  m_reading = TRUE;
+
+  old_flags = m_flags;
+  SetFlags(wxSOCKET_NOWAIT);
+
+  do

   {
   {

-    CreatePushbackAfter(buffer, nbytes);
-    m_lcount = nbytes;
+    ret = _Read(buffer, MAX_DISCARD_SIZE);
+    total += ret;

   }
   }

+  while (ret == MAX_DISCARD_SIZE);
+
+  delete[] buffer;
+  m_lcount = total;
+  m_error  = FALSE;
+
+  // Allow read events again
+  m_reading = FALSE;
+

   return *this;
 }
 
   return *this;
 }
 

-bool wxSocketBase::IsData() const
+// --------------------------------------------------------------------------
+// Wait functions
+// --------------------------------------------------------------------------
+
+// All Wait functions poll the socket using GSocket_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 calls PROCESS_EVENTS(), so
+// this won't block the GUI.
+
+bool wxSocketBase::_Wait(long seconds,
+                         long milliseconds,
+                         wxSocketEventFlags flags)

 {
 {

+  GSocketEventFlags result;
+  long timeout;
+
+  // Set this to TRUE to interrupt ongoing waits
+  m_interrupt = FALSE;
+
+  // Check for valid socket

   if (!m_socket)
     return FALSE;
 
   if (!m_socket)
     return FALSE;
 

-  return (GSocket_Select(m_socket, GSOCK_INPUT_FLAG));
-}
-
-// 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.
+  // Check for valid timeout value.
+  if (seconds != -1)
+    timeout = seconds * 1000 + milliseconds;
+  else
+    timeout = m_timeout * 1000;

 
 

-void wxSocketBase::DoDefer()
-{
-  int ret;
+  // Wait in an active polling loop.
+  //
+  // NOTE: We duplicate some of the code in OnRequest, but this doesn't
+  //   hurt. It has to be here because the (GSocket) event might arrive
+  //   a bit delayed, and it has to be in OnRequest as well because we
+  //   don't know whether the Wait functions are being used.
+  //
+  // Do this at least once (important if timeout == 0, when
+  // we are just polling). Also, if just polling, do not yield.

 
 

-  if (!m_defer_buffer)
-    return;
+  wxStopWatch chrono;
+  bool done = FALSE;

 
 

-  switch (m_defering)
+  while (!done)

   {
   {

-    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;
-  }
+    result = GSocket_Select(m_socket, flags | GSOCK_LOST_FLAG);
+
+    // Incoming connection (server) or connection established (client)
+    if (result & GSOCK_CONNECTION_FLAG)
+    {
+      m_connected = TRUE;
+      m_establishing = FALSE;
+      return TRUE;
+    }

 
 

-  if (ret >= 0)
-    m_defer_nbytes -= ret;
+    // Data available or output buffer ready
+    if ((result & GSOCK_INPUT_FLAG) || (result & GSOCK_OUTPUT_FLAG))
+    {
+      return TRUE;
+    }

 
 

-  // 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);
+    // Connection lost
+    if (result & GSOCK_LOST_FLAG)
+    {
+      m_connected = FALSE;
+      m_establishing = FALSE;
+      return (flags & GSOCK_LOST_FLAG) != 0;
+    }
+
+    // Wait more?
+    if ((!timeout) || (chrono.Time() > timeout) || (m_interrupt))
+      done = TRUE;
+    else
+      PROCESS_EVENTS();

   }
   }

+
+  return FALSE;

 }
 
 }
 

-void wxSocketBase::Discard()
+bool wxSocketBase::Wait(long seconds, long milliseconds)

 {
 {

-#define MAX_BUFSIZE (10*1024)
-
-  char *my_data = new char[MAX_BUFSIZE];
-  wxUint32 recv_size = MAX_BUFSIZE;
-  wxUint32 total = 0;
+  return _Wait(seconds, milliseconds, GSOCK_INPUT_FLAG |
+                                      GSOCK_OUTPUT_FLAG |
+                                      GSOCK_CONNECTION_FLAG |
+                                      GSOCK_LOST_FLAG);
+}

 
 

-  SaveState();
-  SetFlags(NOWAIT);     // GRG: SPEED was not needed here!
+bool wxSocketBase::WaitForRead(long seconds, long milliseconds)
+{
+  // Check pushback buffer before entering _Wait
+  if (m_unread)
+    return TRUE;

 
 

-  while (recv_size == MAX_BUFSIZE)
-  {
-    recv_size = Read(my_data, MAX_BUFSIZE).LastCount();
-    total += recv_size;
-  }
+  // Note that GSOCK_INPUT_LOST has to be explicitly passed to
+  // _Wait becuase of the semantics of WaitForRead: a return
+  // value of TRUE means that a GSocket_Read call will return
+  // immediately, not that there is actually data to read.

 
 

-  RestoreState();
-  delete [] my_data;
+  return _Wait(seconds, milliseconds, GSOCK_INPUT_FLAG |
+                                      GSOCK_LOST_FLAG);
+}

 
 

-  m_lcount = total;
-  m_error = FALSE;
+bool wxSocketBase::WaitForWrite(long seconds, long milliseconds)
+{
+  return _Wait(seconds, milliseconds, GSOCK_OUTPUT_FLAG);
+}

 
 

-#undef MAX_BUFSIZE
+bool wxSocketBase::WaitForLost(long seconds, long milliseconds)
+{
+  return _Wait(seconds, milliseconds, GSOCK_LOST_FLAG);

 }
 
 }
 

-// --------------------------------------------------------------
-// wxSocketBase get local or peer addresses
-// --------------------------------------------------------------
+// --------------------------------------------------------------------------
+// Miscellaneous
+// --------------------------------------------------------------------------
+
+//
+// Get local or peer address
+//

 
 bool wxSocketBase::GetPeer(wxSockAddress& addr_man) const
 {
 
 bool wxSocketBase::GetPeer(wxSockAddress& addr_man) const
 {


@@ -669,9 +752,9 @@ bool wxSocketBase::GetLocal(wxSockAddress& addr_man) const
   return TRUE;
 }
 
   return TRUE;
 }
 

-// --------------------------------------------------------------
-// wxSocketBase save and restore socket state
-// --------------------------------------------------------------
+//
+// Save and restore socket state
+//

 
 void wxSocketBase::SaveState()
 {
 
 void wxSocketBase::SaveState()
 {


@@ -679,11 +762,14 @@ void wxSocketBase::SaveState()
 
   state = new wxSocketState();
 
 
   state = new wxSocketState();
 

-  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;
+  state->m_flags      = m_flags;
+  state->m_notify     = m_notify;
+  state->m_eventmask  = m_eventmask;
+  state->m_clientData = m_clientData;
+#if WXWIN_COMPATIBILITY
+  state->m_cbk        = m_cbk;
+  state->m_cdata      = m_cdata;
+#endif // WXWIN_COMPATIBILITY

 
   m_states.Append(state);
 }
 
   m_states.Append(state);
 }


@@ -699,149 +785,42 @@ void wxSocketBase::RestoreState()
 
   state = (wxSocketState *)node->Data();
 
 
   state = (wxSocketState *)node->Data();
 

-  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);
+  m_flags      = state->m_flags;
+  m_notify     = state->m_notify;
+  m_eventmask  = state->m_eventmask;
+  m_clientData = state->m_clientData;
+#if WXWIN_COMPATIBILITY
+  m_cbk        = state->m_cbk;
+  m_cdata      = state->m_cdata;
+#endif // WXWIN_COMPATIBILITY

 
   delete node;
   delete state;
 }
 
 
   delete node;
   delete state;
 }
 

-
-// --------------------------------------------------------------
-// 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.
-
-bool wxSocketBase::_Wait(long seconds, long milliseconds, wxSocketEventFlags flags)
-{
-  GSocketEventFlags result;
-  _wxSocketInternalTimer timer;
-  long timeout;
-  int state = -1;
-
-  // Check for valid socket
-  if (!m_socket)
-    return FALSE;
-
-  // 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 valid timeout value
-  if (seconds != -1)
-    timeout = seconds * 1000 + milliseconds;
-  else
-    timeout = m_timeout * 1000;
-
-  // Activate timer
-  timer.m_state = &state;
-  timer.m_new_val = 0;
-  timer.Start(timeout, TRUE);
-
-  // 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.
-  //
-  while (state == -1)
-  {
-    result = GSocket_Select(m_socket, flags | GSOCK_LOST_FLAG);
-
-    // Connection lost
-    if (result & GSOCK_LOST_FLAG)
-    {
-      timer.Stop();
-      m_defer_buffer = NULL;
-      Close();
-      return TRUE;
-    }
-
-    // Incoming connection (server) or connection established (client)
-    if (result & GSOCK_CONNECTION_FLAG)
-    {
-      timer.Stop();
-      m_connected = TRUE;
-      m_establishing = FALSE;
-      return TRUE;
-    }
-
-    // If we are in the middle of a deferred R/W, ignore these.
-    if ((result & GSOCK_INPUT_FLAG) || (result & GSOCK_OUTPUT_FLAG))
-    {
-      if (m_defer_buffer == NULL)
-      {
-        timer.Stop();
-        return TRUE;
-      }
-    }
-
-    wxYield();
-  }
-
-  timer.Stop();
-  return FALSE;
-}
-
-bool wxSocketBase::Wait(long seconds, long milliseconds)
-{
-  return _Wait(seconds, milliseconds, GSOCK_INPUT_FLAG |
-                                      GSOCK_OUTPUT_FLAG |
-                                      GSOCK_CONNECTION_FLAG |
-                                      GSOCK_LOST_FLAG);
-}
-
-bool wxSocketBase::WaitForRead(long seconds, long milliseconds)
-{
-  return _Wait(seconds, milliseconds, GSOCK_INPUT_FLAG);
-}
-
-bool wxSocketBase::WaitForWrite(long seconds, long milliseconds)
-{
-  return _Wait(seconds, milliseconds, GSOCK_OUTPUT_FLAG);
-}
-
-bool wxSocketBase::WaitForLost(long seconds, long milliseconds)
-{
-  return _Wait(seconds, milliseconds, GSOCK_LOST_FLAG);
-}
+//
+// Timeout and flags
+//

 
 void wxSocketBase::SetTimeout(long seconds)
 {
   m_timeout = seconds;
 
   if (m_socket)
 
 void wxSocketBase::SetTimeout(long seconds)
 {
   m_timeout = seconds;
 
   if (m_socket)

-    GSocket_SetTimeout(m_socket, m_timeout);
+    GSocket_SetTimeout(m_socket, m_timeout * 1000);

 }
 
 }
 

-// --------------------------------------------------------------
-// wxSocketBase flags
-// --------------------------------------------------------------
-
-void wxSocketBase::SetFlags(wxSockFlags _flags)
-{
-  m_flags = _flags;
-}
-                    
-wxSocketBase::wxSockFlags wxSocketBase::GetFlags() const
+void wxSocketBase::SetFlags(wxSocketFlags flags)

 {
 {

-  return m_flags;
+  m_flags = flags;

 }
 
 }
 

-// --------------------------------------------------------------
-// wxSocketBase callback management
-// --------------------------------------------------------------
+
+// --------------------------------------------------------------------------
+// Callbacks (now obsolete - use events instead)
+// --------------------------------------------------------------------------
+
+#if WXWIN_COMPATIBILITY

 
 wxSocketBase::wxSockCbk wxSocketBase::Callback(wxSockCbk cbk_)
 {
 
 wxSocketBase::wxSockCbk wxSocketBase::Callback(wxSockCbk cbk_)
 {


@@ -859,129 +838,141 @@ char *wxSocketBase::CallbackData(char *data)
   return old_data;
 }
 
   return old_data;
 }
 

-// --------------------------------------------------------------
-// wxSocketBase automatic notifier
-// --------------------------------------------------------------
-
-static void LINKAGEMODE wx_socket_callback(GSocket *socket, GSocketEvent event, char *cdata)
-{
-  wxSocketBase *sckobj = (wxSocketBase *)cdata;
+#endif // WXWIN_COMPATIBILITY

 
 

-  sckobj->OnRequest((wxSocketNotify)event);
-}
+// --------------------------------------------------------------------------
+// Event handling
+// --------------------------------------------------------------------------

 
 

-wxSocketEventFlags wxSocketBase::EventToNotify(wxSocketNotify evt)
+// A note on how events are processed, which is probably the most
+// difficult thing to get working right while keeping the same API
+// and functionality for all platforms.
+//
+// When GSocket detects an event, it calls wx_socket_callback, which in
+// turn just calls wxSocketBase::OnRequest in the corresponding wxSocket
+// object. OnRequest does some housekeeping, and if the event is to be
+// propagated to the user, it creates a new wxSocketEvent object and
+// posts it. The event is not processed immediately, but delayed with
+// AddPendingEvent instead. This is necessary in order to decouple the
+// event processing from wx_socket_callback; otherwise, subsequent IO
+// calls made from the user event handler would fail, as gtk callbacks
+// are not reentrant.
+//
+// Note that, unlike events, user callbacks (now deprecated) are _not_
+// decoupled from wx_socket_callback and thus they suffer from a variety
+// of problems. Avoid them where possible and use events instead.
+
+static void LINKAGEMODE wx_socket_callback(GSocket * WXUNUSED(socket),
+                                           GSocketEvent notification,
+                                           char *cdata)

 {
 {

-  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;
-}
+  wxSocketBase *sckobj = (wxSocketBase *)cdata;

 
 

-void wxSocketBase::SetNotify(wxSocketEventFlags flags)
-{
-  m_neededreq = flags;
+  sckobj->OnRequest((wxSocketNotify) notification);

 }
 
 }
 

-void wxSocketBase::Notify(bool notify)
+void wxSocketBase::OnRequest(wxSocketNotify notification)

 {
 {

-  m_notify_state = notify;
-}
+  // NOTE: We duplicate some of the code in _Wait, but this doesn't
+  //   hurt. It has to be here because the (GSocket) event might arrive
+  //   a bit delayed, and it has to be in _Wait as well because we don't
+  //   know whether the Wait functions are being used.

 
 

-void wxSocketBase::OnRequest(wxSocketNotify req_evt)
-{
-  wxSocketEvent event(m_id);
-  wxSocketEventFlags flag = EventToNotify(req_evt);
-
-  // 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)
+  switch(notification)

   {
     case wxSOCKET_CONNECTION:
       m_establishing = FALSE;
       m_connected = TRUE;
       break;
   {
     case wxSOCKET_CONNECTION:
       m_establishing = FALSE;
       m_connected = TRUE;
       break;

-    case wxSOCKET_LOST:
-      m_defer_buffer = NULL;
-      Close();
-      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:
     case wxSOCKET_INPUT:

+      if (m_reading || !GSocket_Select(m_socket, GSOCK_INPUT_FLAG))
+        return;
+      break;
+

     case wxSOCKET_OUTPUT:
     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
+      if (m_writing || !GSocket_Select(m_socket, GSOCK_OUTPUT_FLAG))

         return;
         return;

-      }

       break;
       break;

+
+    case wxSOCKET_LOST:
+      m_connected = FALSE;
+      m_establishing = FALSE;
+      break;
+
+    default:
+      break;
+  }
+
+  // Schedule the event
+
+  wxSocketEventFlags flag = 0;
+  switch (notification)
+  {
+    case GSOCK_INPUT:      flag = GSOCK_INPUT_FLAG; break;
+    case GSOCK_OUTPUT:     flag = GSOCK_OUTPUT_FLAG; break;
+    case GSOCK_CONNECTION: flag = GSOCK_CONNECTION_FLAG; break;
+    case GSOCK_LOST:       flag = GSOCK_LOST_FLAG; break;
+    default:
+      wxLogWarning(_("wxSocket: unknown event!."));
+      return;

   }
 
   }
 

-  if (((m_neededreq & flag) == flag) && m_notify_state)
+  if (((m_eventmask & flag) == flag) && m_notify)

   {
   {

-    event.m_socket = this;
-    event.m_skevt  = req_evt;
-    ProcessEvent(event);
-    OldOnNotify(req_evt);
+    if (m_handler)
+    {
+      wxSocketEvent event(m_id);
+      event.m_event      = notification;
+      event.m_clientData = m_clientData;
+      event.SetEventObject(this);
+
+      m_handler->AddPendingEvent(event);
+    }

 
 

+#if WXWIN_COMPATIBILITY

     if (m_cbk)
     if (m_cbk)

-      m_cbk(*this, req_evt, m_cdata);
+      m_cbk(*this, notification, m_cdata);
+#endif // WXWIN_COMPATIBILITY

   }
 }
 
   }
 }
 

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

 {
 {

+  m_notify = notify;

 }
 
 }
 

-// --------------------------------------------------------------
-// wxSocketBase set event handler
-// --------------------------------------------------------------
-
-void wxSocketBase::SetEventHandler(wxEvtHandler& h_evt, int id)
+void wxSocketBase::SetNotify(wxSocketEventFlags flags)

 {
 {

-  SetNextHandler(&h_evt);
-  m_id = id;
+  m_eventmask = flags;

 }
 
 }
 

-// --------------------------------------------------------------
-// wxSocketBase pushback library
-// --------------------------------------------------------------
-
-void wxSocketBase::CreatePushbackAfter(const char *buffer, wxUint32 size)
+void wxSocketBase::SetEventHandler(wxEvtHandler& handler, int id)

 {
 {

-  char *curr_pos;
-
-  if (m_unread != NULL)
-    m_unread = (char *) realloc(m_unread, m_unrd_size+size);
-  else
-    m_unread = (char *) malloc(size);
-
-  curr_pos = m_unread + m_unrd_size;
-
-  memcpy(curr_pos, buffer, size);
-  m_unrd_size += size;
+  m_handler = &handler;
+  m_id      = id;

 }
 
 }
 

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

 {
 {

+  if (!size) return;
+

   if (m_unread == NULL)
   if (m_unread == NULL)

-    m_unread = (char *)malloc(size);
-  else {
-    char *tmp;
+    m_unread = malloc(size);
+  else
+  {
+    void *tmp;

 
 

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

     free(m_unread);
 
     m_unread = tmp;
     free(m_unread);
 
     m_unread = tmp;


@@ -992,18 +983,21 @@ void wxSocketBase::CreatePushbackBefore(const char *buffer, wxUint32 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;
 
   if (size > (m_unrd_size-m_unrd_cur))
     size = m_unrd_size-m_unrd_cur;
 {
   if (!m_unrd_size)
     return 0;
 
   if (size > (m_unrd_size-m_unrd_cur))
     size = m_unrd_size-m_unrd_cur;

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

 
 

-  if (!peek) {
+  memcpy(buffer, (char *)m_unread + m_unrd_cur, size);
+
+  if (!peek)
+  {

     m_unrd_cur += size;
     m_unrd_cur += size;

-    if (m_unrd_size == m_unrd_cur) {
+    if (m_unrd_size == m_unrd_cur)
+    {

       free(m_unread);
       m_unread = NULL;
       m_unrd_size = 0;
       free(m_unread);
       m_unread = NULL;
       m_unrd_size = 0;


@@ -1014,17 +1008,18 @@ wxUint32 wxSocketBase::GetPushback(char *buffer, wxUint32 size, bool peek)
   return size;
 }
 
   return size;
 }
 

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

 // wxSocketServer
 // wxSocketServer

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

 
 

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

 
 wxSocketServer::wxSocketServer(wxSockAddress& addr_man,
 
 wxSocketServer::wxSocketServer(wxSockAddress& addr_man,

-             wxSockFlags flags) :
-  wxSocketBase(flags, SOCK_SERVER)
+                               wxSocketFlags flags)
+              : wxSocketBase(flags, wxSOCKET_SERVER)

 {
   // Create the socket
   m_socket = GSocket_new();
 {
   // Create the socket
   m_socket = GSocket_new();


@@ -1041,16 +1036,16 @@ wxSocketServer::wxSocketServer(wxSockAddress& addr_man,
     return;
   }
 
     return;
   }
 

-  GSocket_SetTimeout(m_socket, m_timeout);
+  GSocket_SetTimeout(m_socket, m_timeout * 1000);

   GSocket_SetCallback(m_socket, GSOCK_INPUT_FLAG | GSOCK_OUTPUT_FLAG |
                                 GSOCK_LOST_FLAG | GSOCK_CONNECTION_FLAG,
                                 wx_socket_callback, (char *)this);
 
 }
 
   GSocket_SetCallback(m_socket, GSOCK_INPUT_FLAG | GSOCK_OUTPUT_FLAG |
                                 GSOCK_LOST_FLAG | GSOCK_CONNECTION_FLAG,
                                 wx_socket_callback, (char *)this);
 
 }
 

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

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


@@ -1059,27 +1054,26 @@ bool wxSocketServer::AcceptWith(wxSocketBase& sock, bool wait)
   if (!m_socket)
     return FALSE;
 
   if (!m_socket)
     return FALSE;
 

-  // GRG: If wait == FALSE, then the call should be nonblocking.
+  // If wait == FALSE, then the call should be nonblocking.

   // When we are finished, we put the socket to blocking mode
   // again.
 
   if (!wait)
   // When we are finished, we put the socket to blocking mode
   // again.
 
   if (!wait)

-    GSocket_SetNonBlocking(m_socket, TRUE);
+    GSocket_SetNonBlocking(m_socket, 1);

 
   child_socket = GSocket_WaitConnection(m_socket);
 
   if (!wait)
 
   child_socket = GSocket_WaitConnection(m_socket);
 
   if (!wait)

-    GSocket_SetNonBlocking(m_socket, FALSE);
+    GSocket_SetNonBlocking(m_socket, 0);

 
 

-  // GRG: this was not being handled!
-  if (child_socket == NULL)
+  if (!child_socket)

     return FALSE;
 
     return FALSE;
 

-  sock.m_type = SOCK_INTERNAL;
+  sock.m_type = wxSOCKET_BASE;

   sock.m_socket = child_socket;
   sock.m_connected = TRUE;
 
   sock.m_socket = child_socket;
   sock.m_connected = TRUE;
 

-  GSocket_SetTimeout(sock.m_socket, sock.m_timeout);
+  GSocket_SetTimeout(sock.m_socket, sock.m_timeout * 1000);

   GSocket_SetCallback(sock.m_socket, GSOCK_INPUT_FLAG | GSOCK_OUTPUT_FLAG |
                                      GSOCK_LOST_FLAG | GSOCK_CONNECTION_FLAG,
                                      wx_socket_callback, (char *)&sock);
   GSocket_SetCallback(sock.m_socket, GSOCK_INPUT_FLAG | GSOCK_OUTPUT_FLAG |
                                      GSOCK_LOST_FLAG | GSOCK_CONNECTION_FLAG,
                                      wx_socket_callback, (char *)&sock);


@@ -1091,10 +1085,13 @@ 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))
 
   if (!AcceptWith(*sock, wait))

-    return NULL;
+  {
+    sock->Destroy();
+    sock = NULL;
+  }

 
   return sock;
 }
 
   return sock;
 }


@@ -1104,16 +1101,16 @@ bool wxSocketServer::WaitForAccept(long seconds, long milliseconds)
   return _Wait(seconds, milliseconds, GSOCK_CONNECTION_FLAG);
 }
 
   return _Wait(seconds, milliseconds, GSOCK_CONNECTION_FLAG);
 }
 

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

 // 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)

 {
 }
 
 {
 }
 


@@ -1121,21 +1118,21 @@ wxSocketClient::~wxSocketClient()
 {
 }
 
 {
 }
 

-// --------------------------------------------------------------
-// wxSocketClient Connect functions
-// --------------------------------------------------------------
+// --------------------------------------------------------------------------
+// Connect
+// --------------------------------------------------------------------------
+

 bool wxSocketClient::Connect(wxSockAddress& addr_man, bool wait)
 {
   GSocketError err;
 
 bool wxSocketClient::Connect(wxSockAddress& addr_man, bool wait)
 {
   GSocketError err;
 

-  if (IsConnected())
-    Close();
-
-  // This should never happen.

   if (m_socket)
   if (m_socket)

+  {
+    // Shutdown and destroy the socket
+    Close();

     GSocket_destroy(m_socket);
     GSocket_destroy(m_socket);

+  }

 
 

-  // Initialize all socket stuff ...

   m_socket = GSocket_new();
   m_connected = FALSE;
   m_establishing = FALSE;
   m_socket = GSocket_new();
   m_connected = FALSE;
   m_establishing = FALSE;


@@ -1143,23 +1140,23 @@ bool wxSocketClient::Connect(wxSockAddress& addr_man, bool wait)
   if (!m_socket)
     return FALSE;
 
   if (!m_socket)
     return FALSE;
 

-  GSocket_SetTimeout(m_socket, m_timeout);
+  GSocket_SetTimeout(m_socket, m_timeout * 1000);
+  GSocket_SetCallback(m_socket, GSOCK_INPUT_FLAG | GSOCK_OUTPUT_FLAG |
+                                GSOCK_LOST_FLAG | GSOCK_CONNECTION_FLAG,
+                                wx_socket_callback, (char *)this);

 
 

-  // GRG: If wait == FALSE, then the call should be nonblocking.
+  // If wait == FALSE, then the call should be nonblocking.

   // When we are finished, we put the socket to blocking mode
   // again.
 
   if (!wait)
   // When we are finished, we put the socket to blocking mode
   // again.
 
   if (!wait)

-    GSocket_SetNonBlocking(m_socket, TRUE);
+    GSocket_SetNonBlocking(m_socket, 1);

 
   GSocket_SetPeer(m_socket, addr_man.GetAddress());
   err = GSocket_Connect(m_socket, GSOCK_STREAMED);
 
   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);

 
   if (!wait)
 
   if (!wait)

-    GSocket_SetNonBlocking(m_socket, FALSE);
+    GSocket_SetNonBlocking(m_socket, 0);

 
   if (err != GSOCK_NOERROR)
   {
 
   if (err != GSOCK_NOERROR)
   {


@@ -1181,43 +1178,93 @@ bool wxSocketClient::WaitOnConnect(long seconds, long milliseconds)
   if (!m_establishing || !m_socket)     // No connection in progress
     return FALSE;
 
   if (!m_establishing || !m_socket)     // No connection in progress
     return FALSE;
 

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

 }
 
 }
 

-// --------------------------------------------------------------
-// wxSocketEvent
-// --------------------------------------------------------------
+// ==========================================================================
+// wxDatagramSocket
+// ==========================================================================
+
+/* NOTE: experimental stuff - might change */
+
+wxDatagramSocket::wxDatagramSocket( wxSockAddress& addr,
+                                    wxSocketFlags flags )
+                : wxSocketBase( flags, wxSOCKET_DATAGRAM )
+{
+  // Create the socket
+  m_socket = GSocket_new();
+
+  if(!m_socket)
+    return;
+
+  // Setup the socket as non connection oriented
+  GSocket_SetLocal(m_socket, addr.GetAddress());
+  if( GSocket_SetNonOriented(m_socket) != GSOCK_NOERROR )
+  {
+    GSocket_destroy(m_socket);
+    m_socket = NULL;
+    return;
+  }

 
 

-wxSocketEvent::wxSocketEvent(int id)
-  : wxEvent(id)
+  // Initialize all stuff
+  m_connected = FALSE;
+  m_establishing = FALSE;
+  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 );
+
+}
+
+wxDatagramSocket& wxDatagramSocket::RecvFrom( wxSockAddress& addr,
+                                              void* buf,
+                                              wxUint32 nBytes )

 {
 {

-  wxEventType type = (wxEventType)wxEVT_SOCKET;
+    Read(buf, nBytes);
+    GetPeer(addr);
+    return (*this);
+}

 
 

-  SetEventType(type);
+wxDatagramSocket& wxDatagramSocket::SendTo( wxSockAddress& addr,
+                                            const void* buf,
+                                            wxUint32 nBytes )
+{
+    GSocket_SetPeer(m_socket, addr.GetAddress());
+    Write(buf, nBytes);
+    return (*this);

 }
 
 }
 

-void wxSocketEvent::CopyObject(wxObject& obj_d) const
+// ==========================================================================
+// wxSocketEvent
+// ==========================================================================
+
+wxSocketEvent::wxSocketEvent(int id) : wxEvent(id)

 {
 {

-  wxSocketEvent *event = (wxSocketEvent *)&obj_d;
+  SetEventType( (wxEventType)wxEVT_SOCKET );
+}

 
 

-  wxEvent::CopyObject(obj_d);
+void wxSocketEvent::CopyObject(wxObject& object_dest) const
+{
+  wxSocketEvent *event = (wxSocketEvent *)&object_dest;

 
 

-  event->m_skevt = m_skevt;
-  event->m_socket = m_socket;
+  wxEvent::CopyObject(object_dest);
+
+  event->m_event      = m_event;
+  event->m_clientData = m_clientData;

 }
 
 }
 

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

 // wxSocketModule
 // wxSocketModule

-// --------------------------------------------------------------------------
-class WXDLLEXPORT wxSocketModule: public wxModule {
+// ==========================================================================
+
+class WXDLLEXPORT wxSocketModule : public wxModule
+{

   DECLARE_DYNAMIC_CLASS(wxSocketModule)
   DECLARE_DYNAMIC_CLASS(wxSocketModule)

- public:
-  bool OnInit() {
-    return GSocket_Init();
-  }
-  void OnExit() {
-    GSocket_Cleanup();
-  }
+
+public:
+  bool OnInit() { return GSocket_Init() != 0; }
+  void OnExit() { GSocket_Cleanup(); }

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