Work around wxNotebook or Motif or wxMotif bug.

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

diff --git a/src/common/socket.cpp b/src/common/socket.cpp
index fd788e9e96e4a113cad96b0785c3c05bf1b78170..d79c4986c20a72c2309a11a0ab6992c5c248799f 100644 (file)
--- a/src/common/socket.cpp
+++ b/src/common/socket.cpp
@@ -1,13 +1,18 @@
-////////////////////////////////////////////////////////////////////////////////
+/////////////////////////////////////////////////////////////////////////////

 // Name:       socket.cpp
 // Purpose:    Socket handler classes
 // Name:       socket.cpp
 // Purpose:    Socket handler classes

-// Authors:    Guilhem Lavaux
+// Authors:    Guilhem Lavaux, Guillermo Rodriguez Garcia

 // Created:    April 1997
 // Created:    April 1997

-// Updated:    July 1999
-// Copyright:  (C) 1999, 1998, 1997, Guilhem Lavaux
+// 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


@@ -21,468 +26,752 @@
 
 #if wxUSE_SOCKETS
 
 
 #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/app.h"
+#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 "wx/intl.h"
+#include "wx/event.h"

 
 

-/////////////////////////////////////////////////////////////////////////////
-// wxSocket headers
-/////////////////////////////////////////////////////////////////////////////
-#include <wx/sckaddr.h>
-#include <wx/socket.h>
+#if wxUSE_GUI
+  #include "wx/gdicmn.h"      // for wxPendingDelete
+#endif // wxUSE_GUI
+
+#include "wx/sckaddr.h"
+#include "wx/socket.h"
+
+// --------------------------------------------------------------------------
+// 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
+
+#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

 
 

-class wxSocketState : public wxObject {
+// --------------------------------------------------------------------------
+// private classes
+// --------------------------------------------------------------------------
+
+class wxSocketState : public wxObject
+{

 public:
 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() {}

+
+    DECLARE_NO_COPY_CLASS(wxSocketState)

 };
 
 };
 

-// --------------------------------------------------------------
-// --------- wxSocketBase CONSTRUCTOR ---------------------------
-// --------------------------------------------------------------
-wxSocketBase::wxSocketBase(wxSocketBase::wxSockFlags _flags,
-         wxSocketBase::wxSockType _type) :
-  wxEvtHandler(),
-  m_socket(NULL), m_flags(_flags), m_type(_type),
-  m_neededreq(GSOCK_INPUT_FLAG | GSOCK_LOST_FLAG),
-  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_states()
+// ==========================================================================
+// wxSocketBase
+// ==========================================================================
+
+// --------------------------------------------------------------------------
+// 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;

 }
 
 }
 

-wxSocketBase::wxSocketBase() :
-  wxEvtHandler(),
-  m_socket(NULL), m_flags(SPEED | WAITALL), m_type(SOCK_UNINIT),
-  m_neededreq(GSOCK_INPUT_FLAG | GSOCK_LOST_FLAG),
-  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_states()
+bool wxSocketBase::Initialize()

 {
 {

+    if ( !m_countInit++ )
+    {
+        if ( !GSocket_Init() )
+        {
+            m_countInit--;
+
+            return FALSE;
+        }
+    }
+
+    return TRUE;
+}
+
+void wxSocketBase::Shutdown()
+{
+    // we should be initialized
+    wxASSERT_MSG( m_countInit, _T("extra call to Shutdown()") );
+    if ( !--m_countInit )
+    {
+        GSocket_Cleanup();
+    }

 }
 
 }
 

-// --------------------------------------------------------------
-// wxSocketBase destructor
-// --------------------------------------------------------------
+// --------------------------------------------------------------------------
+// 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
+
+  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::wxSocketBase()
+{
+  Init();
+}
+
+wxSocketBase::wxSocketBase(wxSocketFlags flags, wxSocketType type)
+{
+  Init();
+
+  m_flags = flags;
+  m_type  = type;
+}

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

+  // 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
+  if (!m_beingDeleted)
+    Close();
+
+  // Destroy the GSocket object
+  if (m_socket)
+    GSocket_destroy(m_socket);
+
+  // Free the pushback buffer

   if (m_unread)
     free(m_unread);
   if (m_unread)
     free(m_unread);

+}

 
 

-  // At last, close the file descriptor.
+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();
 
   Close();
 

-  if (m_socket)
-    GSocket_destroy(m_socket);
+  // 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)
   {
   if (m_socket)
   {

-    if (m_notify_state == TRUE)
-      Notify(FALSE);
+    // Disable callbacks
+    GSocket_UnsetCallback(m_socket, GSOCK_INPUT_FLAG | GSOCK_OUTPUT_FLAG |
+                                    GSOCK_LOST_FLAG | GSOCK_CONNECTION_FLAG);

 
 

-    // Shutdown the connection.
+    // Shutdown the connection

     GSocket_Shutdown(m_socket);
     GSocket_Shutdown(m_socket);

-    m_connected = FALSE;
-    m_establishing = FALSE;

   }
 
   }
 

+  m_connected = FALSE;
+  m_establishing = FALSE;

   return TRUE;
 }
 
   return TRUE;
 }
 

-// --------------------------------------------------------------
-// wxSocketBase base IO function
-// --------------------------------------------------------------
-class _wxSocketInternalTimer: public wxTimer {
- public:
-  int *m_state;
-  unsigned long m_new_val;
-
-  void Notify()
-     {
-        *m_state = m_new_val;  // Change the value
-     }
-};
-
-int wxSocketBase::DeferRead(char *buffer, wxUint32 nbytes)
+wxSocketBase& wxSocketBase::Read(void* buffer, wxUint32 nbytes)

 {
 {

-  wxSocketEventFlags old_event_flags;
-  bool old_notify_state;
-  // Timer for timeout
-  _wxSocketInternalTimer timer;
-
-  wxASSERT(m_defering == NO_DEFER);
-
-  // Set the defering mode to READ.
-  m_defering = DEFER_READ;
-
-  // Save the old state.
-  old_event_flags = NeededReq();
-  old_notify_state = m_notify_state;
-
-  // Set the new async flag.
-  SetNotify(GSOCK_INPUT_FLAG | GSOCK_LOST_FLAG);
-  Notify(TRUE);
-
-  // Set the current buffer.
-  m_defer_buffer = buffer;
-  m_defer_nbytes = nbytes;
-  m_defer_timer  = &timer;
+  // Mask read events
+  m_reading = TRUE;

 
 

-  timer.m_state = (int *)&m_defer_buffer;
-  timer.m_new_val = 0;
+  m_lcount = _Read(buffer, nbytes);

 
 

-  timer.Start(m_timeout * 1000, FALSE);
-
-  // Wait for buffer completion. 
-  while (m_defer_buffer != NULL)
-    wxYield();
-
-  timer.Stop();
-
-  // Restore the old state.
-  Notify(old_notify_state);
-  SetNotify(old_event_flags);
+  // 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_lcount = GetPushback(buffer, nbytes, FALSE);
-  nbytes -= m_lcount;
-  buffer += m_lcount;
-
-  if (!m_connected)
-    return *this;
+  // Try the pushback buffer first
+  total = GetPushback(buffer, nbytes, FALSE);
+  nbytes -= total;
+  buffer  = (char *)buffer + total;
+
+  // 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)
+  // wxSOCKET_NOWAIT
+  // wxSOCKET_WAITALL (with or without wxSOCKET_BLOCK)
+  // wxSOCKET_BLOCK
+  // wxSOCKET_NONE
+  //
+  if (m_flags & wxSOCKET_NOWAIT)
+  {
+    GSocket_SetNonBlocking(m_socket, 1);
+    ret = GSocket_Read(m_socket, (char *)buffer, nbytes);
+    GSocket_SetNonBlocking(m_socket, 0);

 
 

-  // If we have got the whole needed buffer or if we don't want to
-  // wait then it returns immediately.
-  if (!nbytes || (m_lcount && !(m_flags & WAITALL)) ) {
-    return *this;
+    if (ret > 0)
+      total += ret;

   }
   }

+  else
+  {
+    bool more = TRUE;

 
 

-  if ((m_flags & SPEED) != 0) {
+    while (more)
+    {
+      if ( !(m_flags & wxSOCKET_BLOCK) && !WaitForRead() )
+        break;
+
+      ret = GSocket_Read(m_socket, (char *)buffer, nbytes);

 
 

-    if ((m_flags & WAITALL) != 0) {
-      while (ret > 0 && nbytes > 0) {
-        ret = GSocket_Read(m_socket, buffer, nbytes);
-        m_lcount += ret;
-        buffer += ret;
+      if (ret > 0)
+      {
+        total  += ret;

         nbytes -= ret;
         nbytes -= ret;

+        buffer  = (char *)buffer + ret;

       }
       }

-    // In case the last call was an error ...
-      if (ret < 0)
-        m_lcount ++;
-    } else {
-      ret = GSocket_Read(m_socket, buffer, nbytes);
-      if (ret > 0)
-        m_lcount += ret;
-    }
-
-  } else {
-    ret = DeferRead(buffer, nbytes);

 
 

-    if (ret > 0)
-      m_lcount += ret;
+      // 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)

 {
 {

-  unsigned long len, len2, sig;
-  struct {
-    char sig[4];
-    char len[4];
+  wxUint32 len, len2, sig, total;
+  bool error;
+  int old_flags;
+  struct
+  {
+    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;
+  SetFlags((m_flags & wxSOCKET_BLOCK) | wxSOCKET_WAITALL);

 
 

-  Read((char *)&msg, sizeof(msg));
-  if (m_lcount != sizeof(msg))
-    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)

-    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;
-
-  // len2 is incorrectly computed in the original; this sequence is
-  // the fix
-  if (len > nbytes) {
+  {
+    wxLogWarning(_("wxSocket: invalid signature in ReadMsg."));
+    goto exit;
+  }
+
+  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)
+  {

     len2 = len - nbytes;
     len = nbytes;
   }
   else
     len2 = 0;
 
     len2 = len - nbytes;
     len = nbytes;
   }
   else
     len2 = 0;
 

-  // the "len &&" in the following statement 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)
-    return *this;
-  if (len2 && (Read(NULL, len2).LastCount() != len2))
-    return *this;
-  if (Read((char *)&msg, sizeof(msg)).LastCount() != sizeof(msg))
-    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;
-
-// ERROR
+  // Don't attemp to read if the msg was zero bytes long.
+  if (len)
+  {
+    total = _Read(buffer, len);
+
+    if (total != len)
+      goto exit;
+  }
+  if (len2)
+  {
+    char *discard_buffer = new char[MAX_DISCARD_SIZE];
+    long discard_len;
+
+    // NOTE: discarded bytes don't add to m_lcount.
+    do
+    {
+      discard_len = ((len2 > MAX_DISCARD_SIZE)? MAX_DISCARD_SIZE : len2);
+      discard_len = _Read(discard_buffer, (wxUint32)discard_len);
+      len2 -= (wxUint32)discard_len;
+    }
+    while ((discard_len > 0) && len2);
+
+    delete [] discard_buffer;
+
+    if (len2 != 0)
+      goto exit;
+  }
+  if (_Read(&msg, sizeof(msg)) != sizeof(msg))
+    goto exit;
+
+  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)

-    wxLogDebug(_T("Warning: invalid signature returned to ReadMsg\n"));
+  {
+    wxLogWarning(_("wxSocket: invalid signature in ReadMsg."));
+    goto exit;
+  }
+
+  // everything was OK
+  error = FALSE;
+
+exit:
+  m_error = error;
+  m_lcount = total;
+  m_reading = FALSE;
+  SetFlags(old_flags);

 
   return *this;
 }
 
 
   return *this;
 }
 

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

 {
 {

-  Read(buffer, nbytes);
-  CreatePushbackAfter(buffer, nbytes);
+  // Mask read events
+  m_reading = TRUE;
+
+  m_lcount = _Read(buffer, nbytes);
+  Pushback(buffer, m_lcount);
+
+  // If in wxSOCKET_WAITALL mode, all bytes should have been read.
+  if (m_flags & wxSOCKET_WAITALL)
+    m_error = (m_lcount != nbytes);
+  else
+    m_error = (m_lcount == 0);
+
+  // Allow read events again
+  m_reading = FALSE;

 
   return *this;
 }
 
 
   return *this;
 }
 

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

 {
 {

-  wxSocketEventFlags old_event_flags;
-  bool old_notify_state;
-  // Timer for timeout
-  _wxSocketInternalTimer timer;
+  // Mask write events
+  m_writing = TRUE;

 
 

-  wxASSERT(m_defering == NO_DEFER);
+  m_lcount = _Write(buffer, nbytes);

 
 

-  m_defering = DEFER_WRITE;
+  // 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);
+
+  // Allow write events again
+  m_writing = FALSE;

 
 

-  // Save the old state
-  old_event_flags = NeededReq();
-  old_notify_state = m_notify_state;
+  return *this;
+}

 
 

-  SetNotify(GSOCK_OUTPUT_FLAG | GSOCK_LOST_FLAG);
-  Notify(TRUE);
+wxUint32 wxSocketBase::_Write(const void *buffer, wxUint32 nbytes)
+{
+  wxUint32 total = 0;
+  int ret = 1;

 
 

-  // Set the current buffer
-  m_defer_buffer = (char *)buffer;
-  m_defer_nbytes = nbytes;
+  // If the socket is invalid or parameters are ill, return immediately
+  if (!m_socket || !buffer || !nbytes)
+    return 0;

 
 

-  // Start timer
-  timer.m_state   = (int *)&m_defer_buffer;
-  timer.m_new_val = 0;
+  // Possible combinations (they are checked in this order)
+  // wxSOCKET_NOWAIT
+  // wxSOCKET_WAITALL (with or without wxSOCKET_BLOCK)
+  // wxSOCKET_BLOCK
+  // wxSOCKET_NONE
+  //
+  if (m_flags & wxSOCKET_NOWAIT)
+  {
+    GSocket_SetNonBlocking(m_socket, 1);
+    ret = GSocket_Write(m_socket, (const char *)buffer, nbytes);
+    GSocket_SetNonBlocking(m_socket, 0);

 
 

-  m_defer_timer   = &timer;
-  timer.Start(m_timeout * 1000, FALSE);
+    if (ret > 0)
+      total = ret;
+  }
+  else
+  {
+    bool more = TRUE;

 
 

-  while (m_defer_buffer != NULL)
-    wxYield();
+    while (more)
+    {
+      if ( !(m_flags & wxSOCKET_BLOCK) && !WaitForWrite() )
+        break;

 
 

-  // Stop timer
-  m_defer_timer = NULL;
-  timer.Stop();
+      ret = GSocket_Write(m_socket, (const char *)buffer, nbytes);

 
 

-  // Restore the old state
-  Notify(old_notify_state);
-  SetNotify(old_event_flags);
+      if (ret > 0)
+      {
+        total  += ret;
+        nbytes -= ret;
+        buffer  = (const char *)buffer + ret;
+      }

 
 

-  m_defering = NO_DEFER;
+      // 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 nbytes-m_defer_nbytes;
+  return total;

 }
 
 }
 

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

 {
 {

-  int ret;
+  wxUint32 total;
+  bool error;
+  int old_flags;
+  struct
+  {
+    unsigned char sig[4];
+    unsigned char len[4];
+  } msg;

 
 

-  if ((m_flags & SPEED) != 0)
-    ret = GSocket_Write(m_socket, buffer, nbytes);
-  else
-    ret = DeferWrite(buffer, nbytes);
+  // Mask write events
+  m_writing = TRUE;
+
+  error = TRUE;
+  total = 0;
+  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);
+
+  if (_Write(&msg, sizeof(msg)) < sizeof(msg))
+    goto exit;
+
+  total = _Write(buffer, nbytes);
+
+  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;
+
+  if ((_Write(&msg, sizeof(msg))) < sizeof(msg))
+    goto exit;
+
+  // everything was OK
+  error = FALSE;

 
 

-  if (ret != -1)
-    m_lcount += ret;
+exit:
+  m_error = error;
+  m_lcount = total;
+  m_writing = FALSE;

 
   return *this;
 }
 
 
   return *this;
 }
 

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

 {
 {

-  struct {
-    char sig[4];
-    char len[4];
-  } msg;
+  if (nbytes != 0)
+    Pushback(buffer, nbytes);

 
 

-  // 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;
-
-  if (Write((char *)&msg, sizeof(msg)).LastCount() < sizeof(msg))
-    return *this;
-  if (Write(buffer, nbytes).LastCount() < nbytes)
-    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;
-  Write((char *)&msg, sizeof(msg));
+  m_error = FALSE;
+  m_lcount = nbytes;

 
   return *this;
 
   return *this;

-
-#ifdef __VISUALC__
-    #pragma warning(default: 4310)
-#endif // __VISUALC__

 }
 
 }
 

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

 {
 {

-  m_lcount = 0;
-  if (nbytes != 0) {
-    CreatePushbackAfter(buffer, nbytes);
-    m_lcount = nbytes;
+  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
+  {
+    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_DataAvailable(m_socket));
-}
+  // Check for valid timeout value.
+  if (seconds != -1)
+    timeout = seconds * 1000 + milliseconds;
+  else
+    timeout = m_timeout * 1000;

 
 

-void wxSocketBase::DoDefer(wxSocketNotify req_evt)
-{
-  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 (req_evt == wxSOCKET_LOST) {
-    Close();
-    m_defer_buffer = NULL;
-    return;
-  }
-  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;
-  }
+  wxStopWatch chrono;
+  bool done = FALSE;
+
+  while (!done)
+  {
+    result = GSocket_Select(m_socket, flags | GSOCK_LOST_FLAG);

 
 

-  m_defer_nbytes -= ret;
+    // Incoming connection (server) or connection established (client)
+    if (result & GSOCK_CONNECTION_FLAG)
+    {
+      m_connected = TRUE;
+      m_establishing = FALSE;
+      return TRUE;
+    }
+
+    // Data available or output buffer ready
+    if ((result & GSOCK_INPUT_FLAG) || (result & GSOCK_OUTPUT_FLAG))
+    {
+      return TRUE;
+    }

 
 

-  if (ret < 0)
-    m_defer_nbytes++;
+    // Connection lost
+    if (result & GSOCK_LOST_FLAG)
+    {
+      m_connected = FALSE;
+      m_establishing = FALSE;
+      return (flags & GSOCK_LOST_FLAG) != 0;
+    }

 
 

-  // If we are waiting for all bytes to be acquired, keep the defering modei
-  // enabled.
-  if ((m_flags & WAITALL) == 0 || m_defer_nbytes == 0 || ret < 0) {
-    m_defer_buffer = NULL;
-    Notify(FALSE);
-  } else {
-    m_defer_buffer += ret;
-    m_defer_timer->Start(m_timeout * 1000, FALSE);
+    // Wait more?
+    if ((!timeout) || (chrono.Time() > timeout) || (m_interrupt))
+      done = TRUE;
+    else
+      PROCESS_EVENTS();

   }
   }

+
+  return FALSE;

 }
 
 }
 

-// ---------------------------------------------------------------------
-// --------- wxSocketBase Discard(): deletes all byte in the input queue
-// ---------------------------------------------------------------------
-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;
+  return _Wait(seconds, milliseconds, GSOCK_INPUT_FLAG |
+                                      GSOCK_OUTPUT_FLAG |
+                                      GSOCK_CONNECTION_FLAG |
+                                      GSOCK_LOST_FLAG);
+}

 
 

-  SaveState();
-  SetFlags(NOWAIT | SPEED);
+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();
-  }
+  // 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.
+
+  return _Wait(seconds, milliseconds, GSOCK_INPUT_FLAG |
+                                      GSOCK_LOST_FLAG);
+}

 
 

-  RestoreState();
-  delete [] my_data;
+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 socket info functions
-// --------------------------------------------------------------
+// --------------------------------------------------------------------------
+// Miscellaneous
+// --------------------------------------------------------------------------
+
+//
+// Get local or peer address
+//

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


@@ -492,6 +781,12 @@ bool wxSocketBase::GetPeer(wxSockAddress& addr_man) const
     return FALSE;
 
   peer = GSocket_GetPeer(m_socket);
     return FALSE;
 
   peer = GSocket_GetPeer(m_socket);

+
+    // copying a null address would just trigger an assert anyway
+
+  if (!peer)
+    return FALSE;
+

   addr_man.SetAddress(peer);
   GAddress_destroy(peer);
 
   addr_man.SetAddress(peer);
   GAddress_destroy(peer);
 


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

-// --------------------------------------------------------------
-// wxSocketBase wait functions
-// --------------------------------------------------------------
+//
+// Save and restore socket state
+//

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


@@ -522,11 +817,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);
 }


@@ -536,262 +834,201 @@ void wxSocketBase::RestoreState()
   wxNode *node;
   wxSocketState *state;
 
   wxNode *node;
   wxSocketState *state;
 

-  node = m_states.Last();
+  node = m_states.GetLast();

   if (!node)
     return;
 
   if (!node)
     return;
 

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

 
 

-  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 callback functions --------------------
-// --------------------------------------------------------------
+//
+// Timeout and flags
+//

 
 

-wxSocketBase::wxSockCbk wxSocketBase::Callback(wxSockCbk cbk_)
+void wxSocketBase::SetTimeout(long seconds)

 {
 {

-  wxSockCbk old_cbk = cbk_;
+  m_timeout = seconds;

 
 

-  m_cbk = cbk_;
-  return old_cbk;
+  if (m_socket)
+    GSocket_SetTimeout(m_socket, m_timeout * 1000);

 }
 
 }
 

-char *wxSocketBase::CallbackData(char *data)
+void wxSocketBase::SetFlags(wxSocketFlags flags)

 {
 {

-  char *old_data = m_cdata;
-
-  m_cdata = data;
-  return old_data;
+  m_flags = flags;

 }
 
 }
 

-// --------------------------------------------------------------
-// --------- wxSocketBase wait functions ------------------------
-// --------------------------------------------------------------
-
-static void wx_socket_wait(GSocket *socket, GSocketEvent event, char *cdata)
-{
-  int *state = (int *)cdata;

 
 

-  *state = event;
-}
-
-bool wxSocketBase::_Wait(long seconds, long milliseconds, int type)
-{
-  bool old_notify_state = m_notify_state;
-  int state = -1;
-  _wxSocketInternalTimer timer;
-
-  if ((!m_connected && !m_establishing) || !m_socket)
-    return FALSE;
-
-  // Set the variable to change
-  timer.m_state = &state;
-  timer.m_new_val = GSOCK_MAX_EVENT;
-
-  // Disable the previous handler
-  Notify(FALSE);
-
-  // Set the timeout
-  timer.Start(seconds * 1000 + milliseconds, TRUE);
-  GSocket_SetCallback(m_socket, type, wx_socket_wait, (char *)&state);
-
-  while (state == -1)
-    wxYield();
-
-  GSocket_UnsetCallback(m_socket, type);
-  timer.Stop();
-
-  // Notify will restore automatically the old GSocket flags
-  Notify(old_notify_state);
-
-  // GRG: If a LOST event occured, we set m_establishing to
-  // FALSE here (this is a quick hack to make WaitOnConnect
-  // work; it will be removed when this function is modified
-  // so that it tells the caller which event occured).
-  //
-  if (state == GSOCK_LOST)
-    m_establishing = FALSE;
-
-  return (state != GSOCK_MAX_EVENT);
-}
-
-bool wxSocketBase::Wait(long seconds, long milliseconds)
-{
-  return _Wait(seconds, milliseconds, GSOCK_INPUT_FLAG |
-                                      GSOCK_OUTPUT_FLAG |
-                                      GSOCK_CONNECTION_FLAG |
-                                      GSOCK_LOST_FLAG);
-}
+// --------------------------------------------------------------------------
+// Callbacks (now obsolete - use events instead)
+// --------------------------------------------------------------------------

 
 

-bool wxSocketBase::WaitForRead(long seconds, long milliseconds)
-{
-  return _Wait(seconds, milliseconds, GSOCK_INPUT_FLAG | GSOCK_LOST_FLAG);
-}
+#if WXWIN_COMPATIBILITY

 
 

-bool wxSocketBase::WaitForWrite(long seconds, long milliseconds)
-{
-  return _Wait(seconds, milliseconds, GSOCK_OUTPUT_FLAG | GSOCK_LOST_FLAG);
-}
-
-bool wxSocketBase::WaitForLost(long seconds, long milliseconds)
+wxSocketBase::wxSockCbk wxSocketBase::Callback(wxSockCbk cbk_)

 {
 {

-  return _Wait(seconds, milliseconds, GSOCK_LOST_FLAG);
-}
-
-// --------------------------------------------------------------
-// --------- wxSocketBase callback management -------------------
-// --------------------------------------------------------------
+  wxSockCbk old_cbk = cbk_;

 
 

-wxSocketEventFlags wxSocketBase::EventToNotify(wxSocketNotify evt)
-{
-  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;
+  m_cbk = cbk_;
+  return old_cbk;

 }
 
 }
 

-void wxSocketBase::SetFlags(wxSockFlags _flags)
+char *wxSocketBase::CallbackData(char *data)

 {
 {

-  m_flags = _flags;
-}
+  char *old_data = m_cdata;

 
 

-wxSocketBase::wxSockFlags wxSocketBase::GetFlags() const
-{
-  return m_flags;
+  m_cdata = data;
+  return old_data;

 }
 
 }
 

-void wxSocketBase::SetNotify(wxSocketEventFlags flags)
-{
-  // GRG: A client can also have connection events!
-/*
-  if (m_type != SOCK_SERVER)
-    flags &= ~GSOCK_CONNECTION_FLAG;
-*/
-
-  m_neededreq = flags;
-  if (m_neededreq == 0)
-    Notify(FALSE);
-  else
-    Notify(m_notify_state);
-}
+#endif // WXWIN_COMPATIBILITY

 
 

-// --------------------------------------------------------------
-// Automatic notifier
-// --------------------------------------------------------------
+// --------------------------------------------------------------------------
+// Event handling
+// --------------------------------------------------------------------------

 
 

-static void wx_socket_callback(GSocket *socket, GSocketEvent event, char *cdata)
+// 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.
+
+extern "C"
+void LINKAGEMODE wx_socket_callback(GSocket * WXUNUSED(socket),
+                                    GSocketEvent notification,
+                                    char *cdata)

 {
   wxSocketBase *sckobj = (wxSocketBase *)cdata;
 
 {
   wxSocketBase *sckobj = (wxSocketBase *)cdata;
 

-  sckobj->OnRequest((wxSocketNotify)event);
-}
-
-void wxSocketBase::Notify(bool notify)
-{
-  m_notify_state = notify;
-  if (!m_socket)
-    return;
-
-  GSocket_UnsetCallback(m_socket, GSOCK_INPUT_FLAG | GSOCK_OUTPUT_FLAG |
-                                  GSOCK_LOST_FLAG | GSOCK_CONNECTION_FLAG);
-  if (!notify)
-    return;
-
-  GSocket_SetCallback(m_socket, m_neededreq, wx_socket_callback, (char *)this);
+  sckobj->OnRequest((wxSocketNotify) notification);

 }
 
 }
 

-void wxSocketBase::OnRequest(wxSocketNotify req_evt)
+void wxSocketBase::OnRequest(wxSocketNotify notification)

 {
 {

-  wxSocketEvent event(m_id);
-  wxSocketEventFlags notify = EventToNotify(req_evt);
+  // 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.

 
 

-  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:
-      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_defering != NO_DEFER)
-      {
-        DoDefer(req_evt);
-        // Do not notify to user
+      if (m_writing || !GSocket_Select(m_socket, GSOCK_OUTPUT_FLAG))

         return;
         return;

-      }
+      break;
+
+    case wxSOCKET_LOST:
+      m_connected = FALSE;
+      m_establishing = FALSE;
+      break;
+
+    default:

       break;
   }
 
       break;
   }
 

-  if ((m_neededreq & notify) == notify)
+  // Schedule the event
+
+  wxSocketEventFlags flag = 0;
+  switch (notification)

   {
   {

-    event.m_socket = this;
-    event.m_skevt  = req_evt;
-    ProcessEvent(event);
-    OldOnNotify(req_evt);
+    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_eventmask & flag) == flag) && m_notify)
+  {
+    if (m_handler)
+    {
+      wxSocketEvent event(m_id);
+      event.m_event      = notification;
+      event.m_clientData = m_clientData;
+      event.SetEventObject(this);
+
+      m_handler->AddPendingEvent(event);
+    }
+
+#if WXWIN_COMPATIBILITY
+    if (m_cbk)
+      m_cbk(*this, notification, m_cdata);
+#endif // WXWIN_COMPATIBILITY

   }
 }
 
   }
 }
 

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

 {
 {

+  m_notify = notify;

 }
 
 }
 

-// --------------------------------------------------------------
-// --------- wxSocketBase functions [Callback, CallbackData] ----
-// --------------------------------------------------------------
-
-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;


@@ -802,18 +1039,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;


@@ -824,60 +1064,82 @@ wxUint32 wxSocketBase::GetPushback(char *buffer, wxUint32 size, bool peek)
   return size;
 }
 
   return size;
 }
 

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

 // wxSocketServer
 // wxSocketServer

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

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

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

 {
 {

-  m_socket = GSocket_new();
+    wxLogTrace( wxTRACE_Socket, _T("Opening wxSocketServer") );

 
 

-  if (!m_socket)
-    return;
+    m_socket = GSocket_new();

 
 

-  GSocket_SetLocal(m_socket, addr_man.GetAddress());
-  if (GSocket_SetServer(m_socket) != GSOCK_NOERROR) {
-    GSocket_destroy(m_socket);
-    m_socket = NULL;
-    return;
-  }
+    if (!m_socket)
+    {
+        wxLogTrace( wxTRACE_Socket, _T("*** GSocket_new failed") );
+        return;
+    }
+
+        // Setup the socket as server

 
 

-  Notify(TRUE);
+    GSocket_SetLocal(m_socket, addr_man.GetAddress());
+    if (GSocket_SetServer(m_socket) != GSOCK_NOERROR)
+    {
+        GSocket_destroy(m_socket);
+        m_socket = NULL;
+
+        wxLogTrace( wxTRACE_Socket, _T("*** GSocket_SetServer failed") );
+        return;
+    }
+
+    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);

 }
 
 }
 

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

 
 bool wxSocketServer::AcceptWith(wxSocketBase& sock, bool wait)
 {
   GSocket *child_socket;
 
 
 bool wxSocketServer::AcceptWith(wxSocketBase& sock, bool wait)
 {
   GSocket *child_socket;
 

-  // GRG: If wait == FALSE, then set the socket to
-  // nonblocking. I will set it back to blocking later,
-  // but I am not sure if this is really a good idea.
-  // IMO, all GSockets objects used in wxSocket should
-  // be non-blocking.
-  // --------------------------------
+  if (!m_socket)
+    return FALSE;
+
+  // If wait == FALSE, then the call should be nonblocking.
+  // When we are finished, we put the socket to blocking mode
+  // again.

 
   if (!wait)
 
   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 * 1000);
+  GSocket_SetCallback(sock.m_socket, GSOCK_INPUT_FLAG | GSOCK_OUTPUT_FLAG |
+                                     GSOCK_LOST_FLAG | GSOCK_CONNECTION_FLAG,
+                                     wx_socket_callback, (char *)&sock);
+

   return TRUE;
 }
 
   return TRUE;
 }
 


@@ -885,56 +1147,54 @@ 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;
 }
 

-bool wxSocketServer::WaitOnAccept(long seconds, long milliseconds)
+bool wxSocketServer::WaitForAccept(long seconds, long milliseconds)

 {
 {

-  // TODO: return immediately if there is already a pending connection.
-
-  return _Wait(seconds, milliseconds, GSOCK_CONNECTION_FLAG | GSOCK_LOST_FLAG);
+  return _Wait(seconds, milliseconds, GSOCK_CONNECTION_FLAG);

 }
 
 }
 

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

 // wxSocketClient
 // wxSocketClient

-// --------------------------------------------------------------
+// ==========================================================================
+
+// --------------------------------------------------------------------------
+// Ctor and dtor
+// --------------------------------------------------------------------------

 
 

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

 {
 {

-  m_establishing = FALSE;

 }
 
 }
 

-// --------------------------------------------------------------
-// --------- wxSocketClient DESTRUCTOR --------------------------
-// --------------------------------------------------------------

 wxSocketClient::~wxSocketClient()
 {
 }
 
 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);

+  }

 
 

-  // Initializes all socket stuff ...
-  // --------------------------------

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


@@ -942,30 +1202,31 @@ bool wxSocketClient::Connect(wxSockAddress& addr_man, bool wait)
   if (!m_socket)
     return FALSE;
 
   if (!m_socket)
     return FALSE;
 

-  // Update the flags of m_socket and enable BG events
-  SetFlags(m_flags);
-  Notify(TRUE);
+  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);
+
+  // If wait == FALSE, then the call should be nonblocking.
+  // When we are finished, we put the socket to blocking mode
+  // again.

 
 

-  // GRG: If wait == FALSE, then set the socket to
-  // nonblocking. I will set it back to blocking later,
-  // but I am not sure if this is really a good idea.
-  // IMO, all GSockets objects used in wxSocket should
-  // be non-blocking.
-  // --------------------------------

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

-    GSocket_SetNonBlocking(m_socket, FALSE);
-
-  if (err == GSOCK_WOULDBLOCK)
-    m_establishing = TRUE;
+    GSocket_SetNonBlocking(m_socket, 0);

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

+  {
+    if (err == GSOCK_WOULDBLOCK)
+      m_establishing = TRUE;
+

     return FALSE;
     return FALSE;

+  }

 
   m_connected = TRUE;
   return TRUE;
 
   m_connected = TRUE;
   return TRUE;


@@ -973,81 +1234,95 @@ bool wxSocketClient::Connect(wxSockAddress& addr_man, bool wait)
 
 bool wxSocketClient::WaitOnConnect(long seconds, long milliseconds)
 {
 
 bool wxSocketClient::WaitOnConnect(long seconds, long milliseconds)
 {

-  bool ret;
-
-  // Already connected
-  if (m_connected)
+  if (m_connected)                      // Already connected

     return TRUE;
 
     return TRUE;
 

-  // There is no connection in progress
-  if (!m_establishing)
+  if (!m_establishing || !m_socket)     // No connection in progress

     return FALSE;
 
     return FALSE;
 

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

 
 

-  if (ret)
-  {
-    if (m_establishing)     // it wasn't GSOCK_LOST
-      m_connected = TRUE;
+// ==========================================================================
+// wxDatagramSocket
+// ==========================================================================

 
 

-    m_establishing = FALSE;
-  }
+/* NOTE: experimental stuff - might change */

 
 

-  return m_connected;
-}
-
-void wxSocketClient::OnRequest(wxSocketNotify evt)
+wxDatagramSocket::wxDatagramSocket( wxSockAddress& addr,
+                                    wxSocketFlags flags )
+                : wxSocketBase( flags, wxSOCKET_DATAGRAM )

 {
 {

-  if ((GSocketEvent)evt == GSOCK_CONNECTION)
+  // 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 )

   {
   {

-    if (m_connected)
-    {
-      m_neededreq &= ~GSOCK_CONNECTION_FLAG;
-      return;
-    }
-    m_connected = TRUE;
+    GSocket_destroy(m_socket);
+    m_socket = NULL;

     return;
   }
     return;
   }

-  wxSocketBase::OnRequest(evt);
-}
-
-// --------------------------------------------------------------
-// wxSocketEvent
-// --------------------------------------------------------------

 
 

-wxSocketEvent::wxSocketEvent(int id)
-  : wxEvent(id)
-{
-  wxEventType type = (wxEventType)wxEVT_SOCKET;
+  // 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 );

 
 

-  SetEventType(type);

 }
 
 }
 

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

 {
 {

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

 
 

-  event->m_skevt = m_skevt;
-  event->m_socket = m_socket;
+wxDatagramSocket& wxDatagramSocket::SendTo( wxSockAddress& addr,
+                                            const void* buf,
+                                            wxUint32 nBytes )
+{
+    GSocket_SetPeer(m_socket, 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 WXDLLEXPORT wxSocketModule : public wxModule
+{
+public:
+    virtual bool OnInit()
+    {
+        // wxSocketBase will call GSocket_Init() itself when/if needed
+        return TRUE;
+    }
+
+    virtual void OnExit()
+    {
+        if ( wxSocketBase::IsInitialized() )
+            wxSocketBase::Shutdown();
+    }
+
+private:
+    DECLARE_DYNAMIC_CLASS(wxSocketModule)

 };
 
 IMPLEMENT_DYNAMIC_CLASS(wxSocketModule, wxModule)
 
 #endif
   // wxUSE_SOCKETS
 };
 
 IMPLEMENT_DYNAMIC_CLASS(wxSocketModule, wxModule)
 
 #endif
   // wxUSE_SOCKETS

+
+// vi:sts=4:sw=4:et