1. added range checks in wxGridStringTable

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

diff --git a/src/common/socket.cpp b/src/common/socket.cpp
index 3a34fceba948aaa59ddae4fd946b08e115b7890f..a39f5fff4860c16774924d2e2b0e3f70decbde20 100644 (file)
--- a/src/common/socket.cpp
+++ b/src/common/socket.cpp
@@ -3,14 +3,12 @@
 // Purpose:    Socket handler classes
 // Authors:    Guilhem Lavaux, Guillermo Rodriguez Garcia
 // Created:    April 1997
 // Purpose:    Socket handler classes
 // Authors:    Guilhem Lavaux, Guillermo Rodriguez Garcia
 // Created:    April 1997

-// Updated:    July 1999
-// Copyright:  (C) 1999, 1998, 1997, Guilhem Lavaux
+// Copyright:  (C) 1999-1997, Guilhem Lavaux
+//             (C) 2000-1999, Guillermo Rodriguez Garcia

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

-#include <windows.h>
-

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


@@ -24,9 +22,11 @@
 
 #if wxUSE_SOCKETS
 
 
 #if wxUSE_SOCKETS
 

-/////////////////////////////////////////////////////////////////////////////
-// wxWindows headers
-/////////////////////////////////////////////////////////////////////////////
+// ==========================================================================
+// Headers and constants
+// ==========================================================================
+
+#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"


@@ -34,70 +34,80 @@
 #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 <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"
 

-// --------------------------------------------------------------
+
+// discard buffer
+#define MAX_DISCARD_SIZE (10 * 1024)
+
+// what to do within waits
+#define PROCESS_EVENTS() wxYield()
+
+// use wxPostEvent or not
+#define USE_DELAYED_EVENTS 1
+
+// --------------------------------------------------------------------------

 // ClassInfos
 // 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
 {
 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;
+  bool                     m_notify_state;
+  wxSocketEventFlags       m_neededreq;
+  wxSockFlags              m_flags;
+  wxSocketBase::wxSockCbk  m_cbk;
+  char                    *m_cdata;

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

-// --------------------------------------------------------------
-// wxSocketBase ctor and dtor
-// --------------------------------------------------------------

 
 

-wxSocketBase::wxSocketBase(wxSocketBase::wxSockFlags _flags,
-         wxSocketBase::wxSockType _type) :
+// ==========================================================================
+// wxSocketBase
+// ==========================================================================
+
+// --------------------------------------------------------------------------
+// Ctor and dtor
+// --------------------------------------------------------------------------
+
+wxSocketBase::wxSocketBase(wxSockFlags _flags, wxSockType _type) :

   wxEvtHandler(),
   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_socket(NULL), m_evt_handler(NULL), m_id(-1),
+  m_flags(_flags), m_type(_type),
+  m_neededreq(0), m_notify_state(FALSE),

   m_connected(FALSE), m_establishing(FALSE),
   m_connected(FALSE), m_establishing(FALSE),

-  m_notify_state(FALSE), m_id(-1),
-  m_defering(NO_DEFER),
-  m_states()
+  m_reading(FALSE), m_writing(FALSE),
+  m_error(FALSE), m_lcount(0), m_timeout(600), m_states(),
+  m_unread(NULL), m_unrd_size(0), m_unrd_cur(0),
+  m_cbk(NULL), m_cdata(NULL)

 {
 }
 
 wxSocketBase::wxSocketBase() :
   wxEvtHandler(),
 {
 }
 
 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_socket(NULL), m_evt_handler(NULL), m_id(-1),
+  m_flags(NONE), m_type(SOCK_UNINIT),
+  m_neededreq(0), m_notify_state(FALSE),

   m_connected(FALSE), m_establishing(FALSE),
   m_connected(FALSE), m_establishing(FALSE),

-  m_notify_state(FALSE), m_id(-1),
-  m_defering(NO_DEFER),
-  m_states()
+  m_reading(FALSE), m_writing(FALSE),
+  m_error(FALSE), m_lcount(0), m_timeout(600), m_states(),
+  m_unread(NULL), m_unrd_size(0), m_unrd_cur(0),
+  m_cbk(NULL), m_cdata(NULL)

 {
 }
 
 {
 }
 


@@ -114,8 +124,37 @@ wxSocketBase::~wxSocketBase()
     GSocket_destroy(m_socket);
 }
 
     GSocket_destroy(m_socket);
 }
 

+/*
+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;
+  Close();
+
+  if ( !wxPendingDelete.Member(this) )
+      wxPendingDelete.Append(this);
+
+  return TRUE;
+}
+*/
+
+// --------------------------------------------------------------------------
+// Basic IO operations
+// --------------------------------------------------------------------------
+
+// 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
+  InterruptAllWaits();
+

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


@@ -124,390 +163,533 @@ 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.
-
-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(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;
+  // Mask read events
+  m_reading = TRUE;

 
 

-  timer.Start(m_timeout * 1000, FALSE);
+  m_lcount = _Read(buffer, nbytes);

 
 

-  // 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(char* 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;
-
-  // If we have got the whole needed buffer, return immediately
-  if (!nbytes)
+  // Try the pushback buffer first
+  total = GetPushback(buffer, nbytes, FALSE);
+  nbytes -= total;
+  buffer += total;
+
+  // If the socket is invalid or we got all the data, return now
+  if (!m_socket || !nbytes)
+    return total;
+
+  // Possible combinations (they are checked in this order)
+  // wxSOCKET_NOWAIT
+  // wxSOCKET_WAITALL | wxSOCKET_BLOCK
+  // wxSOCKET_WAITALL
+  // wxSOCKET_BLOCK
+  // wxSOCKET_NONE
+  //
+  if (m_flags & wxSOCKET_NOWAIT)

   {
   {

-    return *this;
-  }
+    GSocket_SetNonBlocking(m_socket, TRUE);
+    ret = GSocket_Read(m_socket, buffer, nbytes);
+    GSocket_SetNonBlocking(m_socket, FALSE);

 
 

-  if (m_flags & SPEED & WAITALL)    // SPEED && WAITALL
+    if (ret > 0)
+      total += ret;
+  }
+  else if (m_flags & wxSOCKET_WAITALL)

   {
     while (ret > 0 && nbytes > 0)
     {
   {
     while (ret > 0 && nbytes > 0)
     {

+      if (!(m_flags & wxSOCKET_BLOCK) && !WaitForRead())
+          break;
+

       ret = GSocket_Read(m_socket, buffer, nbytes);
       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 (ret > 0)
-      m_lcount += ret;
+      if (ret > 0)
+      {
+        total  += ret;
+        buffer += ret;
+        nbytes -= ret;
+      }
+    }

   }
   }

-  else                              // !SPEED
+  else

   {
   {

-    ret = DeferRead(buffer, nbytes);
+    if ((m_flags & wxSOCKET_BLOCK) || WaitForRead())
+    {
+      ret = GSocket_Read(m_socket, buffer, nbytes);

 
 

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

   }
 
   }
 

-  return *this;
+  return total;

 }
 
 wxSocketBase& wxSocketBase::ReadMsg(char* buffer, wxUint32 nbytes)
 {
 }
 
 wxSocketBase& wxSocketBase::ReadMsg(char* 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;

 
 

-  Read((char *)&msg, sizeof(msg));
-  if (m_lcount != sizeof(msg))
-    return *this;
+  total = 0;
+  error = TRUE;
+  old_flags = m_flags;
+  SetFlags((m_flags & wxSOCKET_BLOCK) | wxSOCKET_WAITALL);

 
 

-  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;
+  if (_Read((char *)&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 != 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((char *)&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;
+  }

 
 

-  return *this;
-}
+  // everything was OK
+  error = FALSE;

 
 

-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(char* 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 char *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 char *buffer, wxUint32 nbytes)

 {
 {

+  wxUint32 total = 0;

   int ret = 1;
 
   int ret = 1;
 

-  m_lcount = 0;
+  // If the socket is invalid, return immediately
+  if (!m_socket)
+    return 0;

 
 

-  if (!m_connected)
-    return *this;
+  // Possible combinations (they are checked in this order)
+  // wxSOCKET_NOWAIT
+  // wxSOCKET_WAITALL | wxSOCKET_BLOCK
+  // wxSOCKET_WAITALL
+  // wxSOCKET_BLOCK
+  // wxSOCKET_NONE
+  //
+  if (m_flags & wxSOCKET_NOWAIT)
+  {
+    GSocket_SetNonBlocking(m_socket, TRUE);
+    ret = GSocket_Write(m_socket, buffer, nbytes);
+    GSocket_SetNonBlocking(m_socket, FALSE);

 
 

-  if (m_flags & SPEED & WAITALL)    // SPEED && WAITALL
+    if (ret > 0)
+      total = ret;
+  }
+  else if (m_flags & wxSOCKET_WAITALL)

   {
     while (ret > 0 && nbytes > 0)
     {
   {
     while (ret > 0 && nbytes > 0)
     {

+      if (!(m_flags & wxSOCKET_BLOCK) && !WaitForWrite())
+          break;
+

       ret = GSocket_Write(m_socket, buffer, nbytes);
       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 (ret > 0)
-      m_lcount += ret;
+      if (ret > 0)
+      {
+        total  += ret;
+        buffer += ret;
+        nbytes -= ret;
+      }
+    }

   }
   }

-  else                              // !SPEED
+  else

   {
   {

-    ret = DeferWrite(buffer, nbytes);
+    if ((m_flags & wxSOCKET_BLOCK) || WaitForWrite())
+    {
+      ret = GSocket_Write(m_socket, buffer, nbytes);

 
 

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

   }
 
   }
 

-  return *this;
+  return total;

 }
 
 wxSocketBase& wxSocketBase::WriteMsg(const char *buffer, wxUint32 nbytes)
 {
 }
 
 wxSocketBase& wxSocketBase::WriteMsg(const char *buffer, wxUint32 nbytes)
 {

+  wxUint32 total;
+  bool error;
+  int old_flags;

   struct {
   struct {

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

   } msg;
 
   } msg;
 

-  // warning about 'cast truncates constant value'
-#ifdef __VISUALC__
-    #pragma warning(disable: 4310)
-#endif // __VISUALC__
-
-  msg.sig[0] = (char) 0xad;
-  msg.sig[1] = (char) 0xde;
-  msg.sig[2] = (char) 0xed;
-  msg.sig[3] = (char) 0xfe;
-
-  msg.len[0] = (char) nbytes & 0xff;
-  msg.len[1] = (char) (nbytes >> 8) & 0xff;
-  msg.len[2] = (char) (nbytes >> 16) & 0xff;
-  msg.len[3] = (char) (nbytes >> 24) & 0xff;
-
-  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;
+  // 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((char *)&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;
   msg.len[0] = msg.len[1] = msg.len[2] = msg.len[3] = (char) 0;

-  Write((char *)&msg, sizeof(msg));

 
 

-  return *this;
+  if ((_Write((char *)&msg, sizeof(msg))) < sizeof(msg))
+    goto exit;
+
+  // 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 char *buffer, wxUint32 nbytes)
 {

-  m_lcount = 0;

   if (nbytes != 0)
   if (nbytes != 0)

-  {
-    CreatePushbackAfter(buffer, nbytes);
-    m_lcount = nbytes;
-  }
+    Pushback(buffer, nbytes);
+
+  m_error = FALSE;
+  m_lcount = nbytes;
+

   return *this;
 }
 
   return *this;
 }
 

-bool wxSocketBase::IsData() const
+wxSocketBase& wxSocketBase::Discard()

 {
 {

-  if (!m_socket)
-    return FALSE;
+  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);

 
 

-  return (GSocket_Select(m_socket, GSOCK_INPUT_FLAG));
+  delete[] buffer;
+  m_lcount = total;
+  m_error  = FALSE;
+
+  // Allow read events again
+  m_reading = FALSE;
+
+  return *this;

 }
 
 }
 

-// 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.
+// --------------------------------------------------------------------------
+// Wait functions
+// --------------------------------------------------------------------------

 
 

-void wxSocketBase::DoDefer()
-{
-  int ret;
+// 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.

 
 

-  if (!m_defer_buffer)
-    return;
+#if wxUSE_GUI
+
+class _wxSocketInternalTimer: public wxTimer
+{
+public:
+  int *m_state;
+  unsigned long m_new_val;

 
 

-  switch (m_defering)
+  void Notify()

   {
   {

-    case DEFER_READ:
-      ret = GSocket_Read(m_socket, m_defer_buffer, m_defer_nbytes);
-      break;
-    case DEFER_WRITE:
-      ret = GSocket_Write(m_socket, m_defer_buffer, m_defer_nbytes);
-      break;
-    default:
-      ret = -1;
-      break;
+    *m_state = (int)m_new_val;      // Change the value

   }
   }

+};
+
+#endif // wxUSE_GUI
+
+bool wxSocketBase::_Wait(long seconds, long milliseconds,
+                         wxSocketEventFlags flags)
+{
+  GSocketEventFlags result;
+#if wxUSE_GUI
+  _wxSocketInternalTimer timer;
+  wxTimerRunner runTimer(timer);
+#endif // wxUSE_GUI

 
 

-  if (ret >= 0)
-    m_defer_nbytes -= ret;
+  long timeout;
+  int state = -1;
+
+  // Set this to TRUE to interrupt ongoing waits
+  m_interrupt = FALSE;

 
 

-  // 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)
+  // Check for valid socket
+  if (!m_socket)
+    return FALSE;
+
+  // Check for valid timeout value
+  if (seconds != -1)
+    timeout = seconds * 1000 + milliseconds;
+  else
+    timeout = m_timeout * 1000;
+
+  // Activate timer
+  if (timeout)

   {
   {

-    m_defer_buffer = NULL;
+#if wxUSE_GUI
+    timer.m_state = &state;
+    timer.m_new_val = 0;
+    runTimer.Start((int)timeout, TRUE);
+#endif // wxUSE_GUI

   }
   }

-  else
+
+  // 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 Wait functions are not being
+  //   used.
+  //
+  // Do this at least once (important if timeout == 0, when
+  // we are just polling). Also, if just polling, do not yield.
+
+  while (state == -1)

   {
   {

-    m_defer_buffer += ret;
-    m_defer_timer->Start(m_timeout * 1000, FALSE);
+    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;
+    }
+
+    // Data available or output buffer ready
+    if ((result & GSOCK_INPUT_FLAG) || (result & GSOCK_OUTPUT_FLAG))
+    {
+      return TRUE;
+    }
+
+    // Connection lost
+    if (result & GSOCK_LOST_FLAG)
+    {
+      m_connected = FALSE;
+      m_establishing = FALSE;
+      return (flags & GSOCK_LOST_FLAG);
+    }
+
+    // Wait more?
+    if ((timeout == 0) || (m_interrupt))
+      break;
+    else
+      PROCESS_EVENTS();

   }
   }

+
+  return FALSE;

 }
 
 }
 

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

 {
 {

-#define MAX_BUFSIZE (10*1024)
+  return _Wait(seconds, milliseconds, GSOCK_INPUT_FLAG |
+                                      GSOCK_OUTPUT_FLAG |
+                                      GSOCK_CONNECTION_FLAG |
+                                      GSOCK_LOST_FLAG);
+}

 
 

-  char *my_data = new char[MAX_BUFSIZE];
-  wxUint32 recv_size = MAX_BUFSIZE;
+bool wxSocketBase::WaitForRead(long seconds, long milliseconds)
+{
+  // Check pushback buffer before entering _Wait
+  if (m_unread)
+    return TRUE;

 
 

-  SaveState();
-  SetFlags(NOWAIT | SPEED);
+  // 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.

 
 

-  while (recv_size == MAX_BUFSIZE)
-  {
-    recv_size = Read(my_data, MAX_BUFSIZE).LastCount();
-  }
+  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 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
 {


@@ -537,9 +719,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()
 {


@@ -547,11 +729,11 @@ 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_notify_state = m_notify_state;
+  state->m_neededreq    = m_neededreq;
+  state->m_flags        = m_flags;
+  state->m_cbk          = m_cbk;
+  state->m_cdata        = m_cdata;

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


@@ -567,104 +749,36 @@ 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);
+  SetFlags(state->m_flags);
+  m_cbk       = state->m_cbk;
+  m_cdata     = state->m_cdata;
+  m_neededreq = state->m_neededreq;
+  Notify(state->m_notify_state);

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

+//
+// Timeout and flags
+//

 
 

-// --------------------------------------------------------------
-// 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)
+void wxSocketBase::SetTimeout(long seconds)

 {
 {

-  GSocketEventFlags result;
-  _wxSocketInternalTimer timer;
-  long timeout;
-  int state = -1;
+  m_timeout = seconds;

 
 

-  // Check for valid socket
-  if ((!m_connected && !m_establishing) || !m_socket)
-    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)
-  result = GSocket_Select(m_socket, flags);
-
-  while ((result == 0) && (state == -1))
-  {
-    wxYield();
-    result = GSocket_Select(m_socket, flags);
-  }
-
-  timer.Stop();
-
-  return (result != 0);
-}
-
-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 | GSOCK_LOST_FLAG);
-}
-
-bool wxSocketBase::WaitForWrite(long seconds, long milliseconds)
-{
-  return _Wait(seconds, milliseconds, GSOCK_OUTPUT_FLAG | GSOCK_LOST_FLAG);
-}
-
-bool wxSocketBase::WaitForLost(long seconds, long milliseconds)
-{
-  return _Wait(seconds, milliseconds, GSOCK_LOST_FLAG);
+  if (m_socket)
+    GSocket_SetTimeout(m_socket, m_timeout * 1000);

 }
 
 }
 

-// --------------------------------------------------------------
-// wxSocketBase flags
-// --------------------------------------------------------------
-

 void wxSocketBase::SetFlags(wxSockFlags _flags)
 {
   m_flags = _flags;
 }
 
 void wxSocketBase::SetFlags(wxSockFlags _flags)
 {
   m_flags = _flags;
 }
 

-wxSocketBase::wxSockFlags wxSocketBase::GetFlags() const
-{
-  return m_flags;
-}
-
-// --------------------------------------------------------------
-// wxSocketBase callback management
-// --------------------------------------------------------------
+// --------------------------------------------------------------------------
+// Callbacks (now obsolete - use events instead)
+// --------------------------------------------------------------------------

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


@@ -682,11 +796,17 @@ char *wxSocketBase::CallbackData(char *data)
   return old_data;
 }
 
   return old_data;
 }
 

-// --------------------------------------------------------------
-// wxSocketBase automatic notifier
-// --------------------------------------------------------------
+// --------------------------------------------------------------------------
+// Event system
+// --------------------------------------------------------------------------
+
+// All events (INPUT, OUTPUT, CONNECTION, LOST) are now always
+// internally watched; but users will only be notified of those
+// events they are interested in.

 
 

-static void wx_socket_callback(GSocket *socket, GSocketEvent event, char *cdata)
+static void LINKAGEMODE wx_socket_callback(GSocket * WXUNUSED(socket),
+                                           GSocketEvent event,
+                                           char *cdata)

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


@@ -720,28 +840,38 @@ void wxSocketBase::OnRequest(wxSocketNotify req_evt)
   wxSocketEvent event(m_id);
   wxSocketEventFlags flag = EventToNotify(req_evt);
 
   wxSocketEvent event(m_id);
   wxSocketEventFlags flag = EventToNotify(req_evt);
 

+  // This duplicates some code in _Wait, but this doesn't
+  // hurt. It has to be here because we don't know whether
+  // the Wait functions will be used, and it has to be in
+  // _Wait as well because the event might be a bit delayed.
+

   switch(req_evt)
   {
     case wxSOCKET_CONNECTION:
       m_establishing = FALSE;
       m_connected = TRUE;
       break;
   switch(req_evt)
   {
     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;
+
+    case wxSOCKET_LOST:
+      m_connected = FALSE;
+      m_establishing = FALSE;
+      break;
+
+    default:

       break;
   }
 
       break;
   }
 


@@ -749,52 +879,46 @@ void wxSocketBase::OnRequest(wxSocketNotify req_evt)
   {
     event.m_socket = this;
     event.m_skevt  = req_evt;
   {
     event.m_socket = this;
     event.m_skevt  = req_evt;

-    ProcessEvent(event);
-    OldOnNotify(req_evt);

 
 

+    if (m_evt_handler)
+    {
+#if USE_DELAYED_EVENTS
+      wxPostEvent(m_evt_handler, event);
+#else
+      ProcessEvent(event);
+#endif
+    }
+
+    OldOnNotify(req_evt);

     if (m_cbk)
       m_cbk(*this, req_evt, m_cdata);
   }
 }
 
     if (m_cbk)
       m_cbk(*this, req_evt, m_cdata);
   }
 }
 

-void wxSocketBase::OldOnNotify(wxSocketNotify evt)
+void wxSocketBase::OldOnNotify(wxSocketNotify WXUNUSED(evt))

 {
 }
 
 {
 }
 

-// --------------------------------------------------------------
-// wxSocketBase set event handler
-// --------------------------------------------------------------
-

 void wxSocketBase::SetEventHandler(wxEvtHandler& h_evt, int id)
 {
 void wxSocketBase::SetEventHandler(wxEvtHandler& h_evt, int id)
 {

-  SetNextHandler(&h_evt);
+  m_evt_handler = &h_evt;

   m_id = id;
   m_id = id;

+
+  SetNextHandler(&h_evt);

 }
 
 }
 

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

 
 

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

 {
 {

-  char *curr_pos;
-
-  if (m_unread != NULL)
-    m_unread = (char *) realloc(m_unread, m_unrd_size+size);
-  else
-    m_unread = (char *) malloc(size);
+  if (!size) return;

 
 

-  curr_pos = m_unread + m_unrd_size;
-
-  memcpy(curr_pos, buffer, size);
-  m_unrd_size += size;
-}
-
-void wxSocketBase::CreatePushbackBefore(const char *buffer, wxUint32 size)
-{

   if (m_unread == NULL)
     m_unread = (char *)malloc(size);
   if (m_unread == NULL)
     m_unread = (char *)malloc(size);

-  else {
+  else
+  {

     char *tmp;
 
     tmp = (char *)malloc(m_unrd_size + size);
     char *tmp;
 
     tmp = (char *)malloc(m_unrd_size + size);


@@ -816,11 +940,14 @@ wxUint32 wxSocketBase::GetPushback(char *buffer, wxUint32 size, bool peek)
 
   if (size > (m_unrd_size-m_unrd_cur))
     size = m_unrd_size-m_unrd_cur;
 
   if (size > (m_unrd_size-m_unrd_cur))
     size = m_unrd_size-m_unrd_cur;

+

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

-  if (!peek) {
+  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;


@@ -831,17 +958,17 @@ 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)
+                               wxSockFlags flags)
+              : wxSocketBase(flags, SOCK_SERVER)

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


@@ -858,22 +985,25 @@ 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)
 {
   GSocket *child_socket;
 
 
 bool wxSocketServer::AcceptWith(wxSocketBase& sock, bool wait)
 {
   GSocket *child_socket;
 

-  // GRG: If wait == FALSE, then the call should be nonblocking.
+  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.
 
   // When we are finished, we put the socket to blocking mode
   // again.
 


@@ -885,15 +1015,14 @@ bool wxSocketServer::AcceptWith(wxSocketBase& sock, bool wait)
   if (!wait)
     GSocket_SetNonBlocking(m_socket, FALSE);
 
   if (!wait)
     GSocket_SetNonBlocking(m_socket, FALSE);
 

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

     return FALSE;
 
   sock.m_type = SOCK_INTERNAL;
   sock.m_socket = child_socket;
   sock.m_connected = TRUE;
 
     return FALSE;
 
   sock.m_type = SOCK_INTERNAL;
   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);


@@ -913,43 +1042,44 @@ wxSocketBase *wxSocketServer::Accept(bool wait)
   return sock;
 }
 
   return sock;
 }
 

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

 {
 {

-  return _Wait(seconds, milliseconds, GSOCK_CONNECTION_FLAG | GSOCK_LOST_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(wxSockFlags _flags)
+              : wxSocketBase(_flags, SOCK_CLIENT)

 {
 }
 
 {
 }
 

+// XXX: What is this for ?

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

+  }

 
 

-  // Initialize all socket stuff ...

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


@@ -957,9 +1087,12 @@ 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.
 
   // When we are finished, we put the socket to blocking mode
   // again.
 


@@ -968,9 +1101,6 @@ bool wxSocketClient::Connect(wxSockAddress& addr_man, bool wait)
 
   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)
     GSocket_SetNonBlocking(m_socket, FALSE);
 
   if (!wait)
     GSocket_SetNonBlocking(m_socket, FALSE);


@@ -989,45 +1119,75 @@ bool wxSocketClient::Connect(wxSockAddress& addr_man, bool wait)
 
 bool wxSocketClient::WaitOnConnect(long seconds, long milliseconds)
 {
 
 bool wxSocketClient::WaitOnConnect(long seconds, long milliseconds)
 {

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

     return TRUE;
 
     return TRUE;
 

-  if (!m_establishing)  // No connection in progress
+  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);
+}
+
+// ==========================================================================
+// wxDatagramSocket
+// ==========================================================================

 
 

-  // GRG: m_connected and m_establishing will be updated in
-  // OnRequest(), but we do it here anyway because sometimes
-  // the event might be a bit delayed, and if that happens,
-  // when WaitOnConnect() returns, m_connected will still be
-  // FALSE. We have to do it as well in OnRequest because
-  // maybe WaitOnConnect() is not being used...
+/* NOTE: experimental stuff - might change */

 
 

-  if (ret)
+wxDatagramSocket::wxDatagramSocket( wxSockAddress& addr, wxSockFlags flags )
+                : wxSocketBase( flags, SOCK_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 )

   {
   {

-    m_connected = GSocket_Select(m_socket, GSOCK_CONNECTION_FLAG);
-    m_establishing = FALSE;
+    GSocket_destroy(m_socket);
+    m_socket = NULL;
+    return;

   }
 
   }
 

-  return m_connected;
-}
+  // 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 );

 
 

+}

 
 

-void wxSocketClient::OnRequest(wxSocketNotify req_evt)
+wxDatagramSocket& wxDatagramSocket::RecvFrom( wxSockAddress& addr,
+                                              char* buf,
+                                              wxUint32 nBytes )

 {
 {

-  wxSocketBase::OnRequest(req_evt);
+    Read(buf, nBytes);
+    GetPeer(addr);
+    return (*this);

 }
 
 }
 

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

 
 

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

 // wxSocketEvent
 // wxSocketEvent

-// --------------------------------------------------------------
+// ==========================================================================
+
+// XXX: Should be moved to event.cpp ?

 
 wxSocketEvent::wxSocketEvent(int id)
 
 wxSocketEvent::wxSocketEvent(int id)

-  : wxEvent(id)
+             : wxEvent(id)

 {
   wxEventType type = (wxEventType)wxEVT_SOCKET;
 
 {
   wxEventType type = (wxEventType)wxEVT_SOCKET;
 


@@ -1044,18 +1204,17 @@ void wxSocketEvent::CopyObject(wxObject& obj_d) const
   event->m_socket = m_socket;
 }
 
   event->m_socket = m_socket;
 }
 

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

 // 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(); }
+  void OnExit() { GSocket_Cleanup(); }

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