implementation of wxGetPasswordFromUser

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

diff --git a/src/common/socket.cpp b/src/common/socket.cpp
index 26bfa784b56c08cb9279d77850c2606ebff5741a..0058d50318d2a66b87f9a46f8cb5f41fb662092c 100644 (file)
--- a/src/common/socket.cpp
+++ b/src/common/socket.cpp
@@ -3,8 +3,8 @@
 // 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
 /////////////////////////////////////////////////////////////////////////////


@@ -25,6 +25,8 @@
 /////////////////////////////////////////////////////////////////////////////
 // wxWindows headers
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////
 // wxWindows headers
 /////////////////////////////////////////////////////////////////////////////

+
+#include "wx/app.h"

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


@@ -32,35 +34,42 @@
 #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 <stdlib.h>
-#include <string.h>
-#include <ctype.h>
+#include "wx/intl.h"

 
 /////////////////////////////////////////////////////////////////////////////
 // wxSocket headers
 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 // 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 EXPERIMENTAL_USE_POST 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;
+  GSocketEventFlags        m_neededreq;
+  wxSockFlags              m_flags;
+  wxSocketBase::wxSockCbk  m_cbk;
+  char                    *m_cdata;

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


@@ -70,32 +79,29 @@ public:
 // wxSocketBase ctor and dtor
 // --------------------------------------------------------------
 
 // wxSocketBase ctor and dtor
 // --------------------------------------------------------------
 

-wxSocketBase::wxSocketBase(wxSocketBase::wxSockFlags _flags,
-         wxSocketBase::wxSockType _type) :
+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_error(FALSE),
-  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_error(FALSE),
-  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,6 +120,9 @@ wxSocketBase::~wxSocketBase()
 
 bool wxSocketBase::Close()
 {
 
 bool wxSocketBase::Close()
 {

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

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


@@ -133,20 +142,10 @@ bool wxSocketBase::Close()
 // wxSocketBase basic IO operations
 // --------------------------------------------------------------
 
 // wxSocketBase basic IO operations
 // --------------------------------------------------------------
 

-// GRG: I have made some changes to wxSocket internal event
-// system; now, all events (INPUT, OUTPUT, CONNECTION, LOST)
-// are always internally monitored; but users will only be
-// notified of these events they are interested in. So we
-// no longer have to change the event mask with SetNotify()
-// in internal functions like DeferRead, DeferWrite, and
-// the like. This solves a lot of problems.
-
-// GRG: I added m_error handling to IO operations. Now,
-// wxSocketBase::Error() correctly indicates if the last
-// operation from {Read, Write, ReadMsg, WriteMsg, Peek,
-// Unread, Discard} failed. Note that now, every function
-// that updates m_lcount, also updates m_error. While I
-// was at it, also fixed an UGLY bug in ReadMsg.
+// All IO operations {Read, Write, ReadMsg, WriteMsg, Peek,
+// Unread, Discard} update m_error and m_lcount.
+//
+// TODO: Should Connect, Accept and AcceptWith update m_error?

 
 class _wxSocketInternalTimer: public wxTimer
 {
 
 class _wxSocketInternalTimer: public wxTimer
 {


@@ -156,154 +155,131 @@ public:
 
   void Notify()
   {
 
   void Notify()
   {

-    *m_state = m_new_val;  // Change the value
+    *m_state = (int)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);
+  // Mask read events
+  m_reading = TRUE;

 
 

-  // Set the defering mode to READ.
-  m_defering = DEFER_READ;
+  m_lcount = _Read(buffer, nbytes);

 
 

-  // Set the current buffer.
-  m_defer_buffer = buffer;
-  m_defer_nbytes = nbytes;
-  m_defer_timer  = &timer;
-
-  timer.m_state = (int *)&m_defer_buffer;
-  timer.m_new_val = 0;
-
-  timer.Start(m_timeout * 1000, FALSE);
-
-  // If the socket is readable, call DoDefer for the first time
-  if (GSocket_Select(m_socket, GSOCK_INPUT_FLAG))
-    DoDefer();
-
-  // Wait for buffer completion. 
-  while (m_defer_buffer != NULL)
-    wxYield();
-
-  timer.Stop();
+  // If in wxSOCKET_WAITALL mode, all bytes should have been read.
+  if (m_flags & wxSOCKET_WAITALL)
+    m_error = (m_lcount != nbytes);
+  else
+    m_error = (m_lcount == 0);

 
 

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

 
 

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

 }
 
 }
 

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

 {
 {

+  int total;

   int ret = 1;
 
   int ret = 1;
 

-  m_error = FALSE;
-

   // we try this even if the connection has already been closed.
   // we try this even if the connection has already been closed.

-  m_lcount = GetPushback(buffer, nbytes, FALSE);
-  nbytes -= m_lcount;
-  buffer += m_lcount;
-
-  if (!m_connected || !m_socket)
+  total = GetPushback(buffer, nbytes, FALSE);
+  nbytes -= total;
+  buffer += total;
+
+  // If the socket is not connected, or we have got the whole
+  // needed buffer, return immedately
+  if (!m_socket || !m_connected || !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)

   {
   {

-    // if no data retrieved AND not connected, it is an error.
-    if (!m_lcount)
-      m_error = TRUE;
-
-    return *this;
-  }
+    GSocket_SetNonBlocking(m_socket, TRUE);
+    ret = GSocket_Read(m_socket, buffer, nbytes);
+    GSocket_SetNonBlocking(m_socket, FALSE);

 
 

-  // If we have got the whole needed buffer, return immediately
-  if (!nbytes)
-  {
-    return *this;
+    if (ret > 0)
+      total += ret;

   }
   }

-
-  if (m_flags & SPEED & WAITALL)    // SPEED && WAITALL
+  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;
+    }

   }
 
   }
 

-  // If we have read some data, then it is not an error, even
-  // when in WAITALL mode, the last low-level IO call might
-  // have failed.
-  if (!m_lcount)
-    m_error = TRUE;
-
-  return *this;
+  return total;

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

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

   int old_flags;
   int old_flags;

-  unsigned long len, len2, sig;

   struct
   {
   struct
   {

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

   } msg;
 
   } msg;
 

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

 
 

+  total = 0;
+  error = TRUE;

   old_flags = m_flags;
   old_flags = m_flags;

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

 
 

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

 
 

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

 
   if (sig != 0xfeeddead)
   {
 
   if (sig != 0xfeeddead)
   {

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

   }
 
   }
 

-  len = msg.len[0] & 0xff;
-  len |= (wxUint32)(msg.len[1] & 0xff) << 8;
-  len |= (wxUint32)(msg.len[2] & 0xff) << 16;
-  len |= (wxUint32)(msg.len[3] & 0xff) << 24;
+  len = (wxUint32)msg.len[0];
+  len |= (wxUint32)(msg.len[1] << 8);
+  len |= (wxUint32)(msg.len[2] << 16);
+  len |= (wxUint32)(msg.len[3] << 24);
+
+  //wxLogMessage("Readmsg: %d  %d  %d  %d -> len == %d",
+  //  msg.len[0], msg.len[1], msg.len[2], msg.len[3], len);

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


@@ -313,298 +289,265 @@ wxSocketBase& wxSocketBase::ReadMsg(char* buffer, wxUint32 nbytes)
   else
     len2 = 0;
 
   else
     len2 = 0;
 

-  // The "len &&" in the following statements is necessary so 
-  // that we don't attempt to read (and possibly hang the system)
-  // if the message was zero bytes long
-  if (len && Read(buffer, len).LastCount() != len)
+  // This check is necessary so that we don't attemp to read if
+  // the msg was zero bytes long.
+  if (len)

   {
   {

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

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

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

     long discard_len;
 
     long discard_len;
 

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

     do
     {
     do
     {

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

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

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

   }
   }

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

 
 

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

 
   if (sig != 0xdeadfeed)
   {
 
   if (sig != 0xdeadfeed)
   {

-    m_error = TRUE;
-    wxLogDebug(_T("Warning: invalid signature returned to ReadMsg\n"));
+    //wxLogMessage(wxT("Warning: invalid signature returned to ReadMsg"));
+    goto exit;

   }
 
   }
 

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

 
 

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

 
   return *this;
 }
 
 
   return *this;
 }
 

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

 {
 {

-  // Timer for timeout
-  _wxSocketInternalTimer timer;
+  // Mask read events
+  m_reading = TRUE;

 
 

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

 
 

-  m_defering = DEFER_WRITE;
-
-  // 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;
-  m_error = FALSE;
-

   if (!m_connected || !m_socket)
   if (!m_connected || !m_socket)

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

   {
   {

-    m_error = TRUE;
-    return *this;
-  }
+    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;
+    }

   }
 
   }
 

-  // If we have written some data, then it is not an error,
-  // even when in WAITALL mode, the last low-level IO call
-  // might have failed.
-  if (!m_lcount)
-    m_error = TRUE;
-
-  return *this;
+  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 {
   int old_flags;
   struct {

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

   } msg;
 
   } msg;
 

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

   // warning about 'cast truncates constant value'
 #ifdef __VISUALC__
   // warning about 'cast truncates constant value'
 #ifdef __VISUALC__

-    #pragma warning(disable: 4310)
+#  pragma warning(disable: 4310)

 #endif // __VISUALC__
 
 #endif // __VISUALC__
 

-  msg.sig[0] = (char) 0xad;
-  msg.sig[1] = (char) 0xde;
-  msg.sig[2] = (char) 0xed;
-  msg.sig[3] = (char) 0xfe;
+  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] = (char) nbytes & 0xff;
-  msg.len[1] = (char) (nbytes >> 8) & 0xff;
-  msg.len[2] = (char) (nbytes >> 16) & 0xff;
-  msg.len[3] = (char) (nbytes >> 24) & 0xff;
+  msg.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;

 
 

-  // GRG: We need WAITALL | SPEED
-  old_flags = m_flags;
-  SetFlags(WAITALL | SPEED);
+  //wxLogMessage("Writemsg: %d  %d  %d  %d -> %d",
+  //  nbytes & 0xff,
+  //  (nbytes >> 8) & 0xff,
+  //  (nbytes >> 16) & 0xff,
+  //  (nbytes >> 24) & 0xff,
+  //  nbytes
+  //  );

 
 

-  if (Write((char *)&msg, sizeof(msg)).LastCount() < sizeof(msg))
-  {
-    SetFlags(old_flags);
-    m_error = TRUE;
-    return *this;
-  }
-  if (Write(buffer, nbytes).LastCount() < nbytes)
-  {
-    SetFlags(old_flags);
-    m_error = TRUE;
-    return *this;
-  }
+  if (_Write((char *)&msg, sizeof(msg)) < sizeof(msg))
+    goto exit;
+
+  total = _Write(buffer, nbytes);

 
 

-  msg.sig[0] = (char) 0xed;
-  msg.sig[1] = (char) 0xfe;
-  msg.sig[2] = (char) 0xad;
-  msg.sig[3] = (char) 0xde;
+  if (total < nbytes)
+    goto exit;
+
+  msg.sig[0] = (unsigned char) 0xed;
+  msg.sig[1] = (unsigned char) 0xfe;
+  msg.sig[2] = (unsigned char) 0xad;
+  msg.sig[3] = (unsigned char) 0xde;

   msg.len[0] = msg.len[1] = msg.len[2] = msg.len[3] = (char) 0;
 
   msg.len[0] = msg.len[1] = msg.len[2] = msg.len[3] = (char) 0;
 

-  if (Write((char *)&msg, sizeof(msg)).LastCount() < sizeof(msg))
-    m_error = TRUE;
+  if ((_Write((char *)&msg, sizeof(msg))) < sizeof(msg))
+    goto exit;
+
+  // everything was OK
+  error = FALSE;
+
+exit:
+  m_error = error;
+  m_lcount = total;
+  m_writing = FALSE;

 
 

-  SetFlags(old_flags);

   return *this;
 
 #ifdef __VISUALC__
   return *this;
 
 #ifdef __VISUALC__

-    #pragma warning(default: 4310)
+#  pragma warning(default: 4310)

 #endif // __VISUALC__
 }
 
 wxSocketBase& wxSocketBase::Unread(const char *buffer, wxUint32 nbytes)
 {
 #endif // __VISUALC__
 }
 
 wxSocketBase& wxSocketBase::Unread(const char *buffer, wxUint32 nbytes)
 {

-  m_error = FALSE;
-  m_lcount = 0;
-

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

-  {
-    CreatePushbackAfter(buffer, nbytes);
-    m_lcount = nbytes;
-  }
-  return *this;
-}
-
-bool wxSocketBase::IsData() const
-{
-  if (!m_socket)
-    return FALSE;
-
-  return (GSocket_Select(m_socket, GSOCK_INPUT_FLAG));
-}
-
-// GRG: DoDefer() no longer needs to know which event occured,
-// because this was only used to catch LOST events and set
-// m_defer_buffer = NULL; this is done in OnRequest() now.
-
-void wxSocketBase::DoDefer()
-{
-  int ret;
-
-  if (!m_defer_buffer)
-    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;
-  }
+    Pushback(buffer, nbytes);

 
 

-  if (ret >= 0)
-    m_defer_nbytes -= ret;
+  m_error = FALSE;
+  m_lcount = nbytes;

 
 

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

 }
 
 }
 

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

 {
 {

-#define MAX_BUFSIZE (10*1024)
-
-  char *my_data = new char[MAX_BUFSIZE];
-  wxUint32 recv_size = MAX_BUFSIZE;
+  int old_flags;
+  char *my_data = new char[MAX_DISCARD_SIZE];
+  wxUint32 recv_size = MAX_DISCARD_SIZE;

   wxUint32 total = 0;
 
   wxUint32 total = 0;
 

-  SaveState();
-  SetFlags(NOWAIT);     // GRG: SPEED was not needed here!
+  // Mask read events
+  m_reading = TRUE;

 
 

-  while (recv_size == MAX_BUFSIZE)
+  old_flags = m_flags;
+  SetFlags(wxSOCKET_NOWAIT);
+
+  while (recv_size == MAX_DISCARD_SIZE)

   {
   {

-    recv_size = Read(my_data, MAX_BUFSIZE).LastCount();
+    recv_size = _Read(my_data, MAX_DISCARD_SIZE);

     total += recv_size;
   }
 
     total += recv_size;
   }
 

-  RestoreState();

   delete [] my_data;
   delete [] my_data;

-

   m_lcount = total;
   m_error = FALSE;
 
   m_lcount = total;
   m_error = FALSE;
 

-#undef MAX_BUFSIZE
+  // Allow read events again
+  m_reading = FALSE;
+
+  return *this;

 }
 
 // --------------------------------------------------------------
 }
 
 // --------------------------------------------------------------


@@ -649,11 +592,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);
 }


@@ -669,11 +612,11 @@ 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;


@@ -684,22 +627,31 @@ void wxSocketBase::RestoreState()
 // wxSocketBase Wait functions
 // --------------------------------------------------------------
 
 // 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)
+// These WaitXXX unctions do not depend on the event system any
+// longer; instead, they poll the socket, using GSocket_Select()
+// to check for the specified combination of event flags, until
+// an event occurs or until the timeout ellapses. The polling
+// loop calls PROCESS_EVENTS(), so this won't block the GUI.
+//
+// XXX: Should it honour the wxSOCKET_BLOCK flag ?
+//
+bool wxSocketBase::_Wait(long seconds, long milliseconds,
+                         wxSocketEventFlags flags)

 {
   GSocketEventFlags result;
   _wxSocketInternalTimer timer;
   long timeout;
   int state = -1;
 
 {
   GSocketEventFlags result;
   _wxSocketInternalTimer timer;
   long timeout;
   int state = -1;
 

+  // Set this to TRUE to interrupt ongoing waits
+  m_interrupt = FALSE;
+

   // Check for valid socket
   // Check for valid socket

-  if ((!m_connected && !m_establishing) || !m_socket)
+  if (!m_socket)
+    return FALSE;
+
+  // If it is not a server, it must be connected or establishing connection
+  if ((m_type != SOCK_SERVER) && (!m_connected && !m_establishing))

     return FALSE;
 
   // Check for valid timeout value
     return FALSE;
 
   // Check for valid timeout value


@@ -709,22 +661,60 @@ bool wxSocketBase::_Wait(long seconds, long milliseconds, wxSocketEventFlags fla
     timeout = m_timeout * 1000;
 
   // Activate timer
     timeout = m_timeout * 1000;
 
   // Activate timer

-  timer.m_state = &state;
-  timer.m_new_val = 0;
-  timer.Start(timeout, TRUE);
+  if (timeout)
+  {
+    timer.m_state = &state;
+    timer.m_new_val = 0;
+    timer.Start((int)timeout, TRUE);
+  }

 
   // Active polling (without using events)
 
   // Active polling (without using events)

-  result = GSocket_Select(m_socket, flags);
-
-  while ((result == 0) && (state == -1))
+  //
+  // NOTE: this duplicates some of the code in OnRequest (lost
+  // connection and connection establishment handling) but this
+  // doesn't hurt. It has to be here because the event might
+  // be a bit delayed, and it has to be in OnRequest as well
+  // because maybe the WaitXXX functions are not being used.
+  //
+  // Do this at least once (important if timeout == 0, when
+  // we are just polling). Also, if just polling, do not yield.
+  //
+  while (state == -1)

   {
   {

-    wxYield();
-    result = GSocket_Select(m_socket, flags);
+    result = GSocket_Select(m_socket, flags | GSOCK_LOST_FLAG);
+
+    // Connection lost
+    if (result & GSOCK_LOST_FLAG)
+    {
+      timer.Stop();
+      Close();
+      return TRUE;
+    }
+
+    // Incoming connection (server) or connection established (client)
+    if (result & GSOCK_CONNECTION_FLAG)
+    {
+      timer.Stop();
+      m_connected = TRUE;
+      m_establishing = FALSE;
+      return TRUE;
+    }
+
+    if ((result & GSOCK_INPUT_FLAG) || (result & GSOCK_OUTPUT_FLAG))
+    {
+      timer.Stop();
+      return TRUE;
+    }
+
+    // Wait more?
+    if ((timeout == 0) || (m_interrupt))
+      break;
+    else
+      PROCESS_EVENTS();

   }
 
   timer.Stop();
   }
 
   timer.Stop();

-
-  return (result != 0);
+  return FALSE;

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


@@ -737,12 +727,16 @@ bool wxSocketBase::Wait(long seconds, long milliseconds)
 
 bool wxSocketBase::WaitForRead(long seconds, long milliseconds)
 {
 
 bool wxSocketBase::WaitForRead(long seconds, long milliseconds)
 {

-  return _Wait(seconds, milliseconds, GSOCK_INPUT_FLAG | GSOCK_LOST_FLAG);
+  // Check pushback buffer
+  if (m_unread)
+    return TRUE;
+
+  return _Wait(seconds, milliseconds, GSOCK_INPUT_FLAG);

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

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

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


@@ -755,7 +749,7 @@ void wxSocketBase::SetTimeout(long seconds)
   m_timeout = seconds;
 
   if (m_socket)
   m_timeout = seconds;
 
   if (m_socket)

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

 }
 
 // --------------------------------------------------------------
 }
 
 // --------------------------------------------------------------


@@ -767,11 +761,6 @@ void wxSocketBase::SetFlags(wxSockFlags _flags)
   m_flags = _flags;
 }
 
   m_flags = _flags;
 }
 

-wxSocketBase::wxSockFlags wxSocketBase::GetFlags() const
-{
-  return m_flags;
-}
-

 // --------------------------------------------------------------
 // wxSocketBase callback management
 // --------------------------------------------------------------
 // --------------------------------------------------------------
 // wxSocketBase callback management
 // --------------------------------------------------------------


@@ -796,7 +785,12 @@ char *wxSocketBase::CallbackData(char *data)
 // wxSocketBase automatic notifier
 // --------------------------------------------------------------
 
 // wxSocketBase automatic notifier
 // --------------------------------------------------------------
 

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

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


@@ -830,44 +824,63 @@ void wxSocketBase::OnRequest(wxSocketNotify req_evt)
   wxSocketEvent event(m_id);
   wxSocketEventFlags flag = EventToNotify(req_evt);
 
   wxSocketEvent event(m_id);
   wxSocketEventFlags flag = EventToNotify(req_evt);
 

-  switch(req_evt)
+  // dbg("Entering OnRequest (evt %d)\n", req_evt);
+
+  switch (req_evt)

   {
   {

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

       m_establishing = FALSE;
       m_connected = TRUE;
       break;
     case wxSOCKET_LOST:
       m_establishing = FALSE;
       m_connected = TRUE;
       break;
     case wxSOCKET_LOST:

-      m_defer_buffer = NULL;

       Close();
       break;
       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;
+      else
+        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;
+      else
+        break;

   }
 
   if (((m_neededreq & flag) == flag) && m_notify_state)
   {
   }
 
   if (((m_neededreq & flag) == flag) && m_notify_state)
   {

+    // dbg("Evt %d delivered\n", 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 EXPERIMENTAL_USE_POST
+      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);

+

   }
   }

+
+  // dbg("Exiting OnRequest (evt %d)\n", req_evt);

 }
 
 }
 

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

 {
 }
 
 {
 }
 


@@ -877,34 +890,24 @@ void wxSocketBase::OldOnNotify(wxSocketNotify evt)
 
 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
+// wxSocketBase pushback

 // --------------------------------------------------------------
 
 // --------------------------------------------------------------
 

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

 {
 {

-  char *curr_pos;
+  if (!size) return;

 
 

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


@@ -926,11 +929,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;


@@ -968,7 +974,7 @@ 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);


@@ -1006,7 +1012,7 @@ bool wxSocketServer::AcceptWith(wxSocketBase& sock, bool wait)
   sock.m_socket = child_socket;
   sock.m_connected = TRUE;
 
   sock.m_socket = child_socket;
   sock.m_connected = TRUE;
 

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

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


@@ -1028,7 +1034,7 @@ wxSocketBase *wxSocketServer::Accept(bool wait)
 
 bool wxSocketServer::WaitForAccept(long seconds, long milliseconds)
 {
 
 bool wxSocketServer::WaitForAccept(long seconds, long milliseconds)
 {

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

 }
 
 // --------------------------------------------------------------
 }
 
 // --------------------------------------------------------------


@@ -1051,6 +1057,7 @@ wxSocketClient::~wxSocketClient()
 // --------------------------------------------------------------
 // wxSocketClient Connect functions
 // --------------------------------------------------------------
 // --------------------------------------------------------------
 // wxSocketClient Connect functions
 // --------------------------------------------------------------

+

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


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


@@ -1081,9 +1091,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);


@@ -1102,32 +1109,66 @@ 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 || !m_socket)  // 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
+// --------------------------------------------------------------
+
+/* NOTE: experimental stuff - might change */
+
+wxDatagramSocket::wxDatagramSocket( wxSockAddress& addr, wxSockFlags flags )
+                : wxSocketBase( flags, SOCK_DATAGRAM )
+{
+  // Create the socket
+  m_socket = GSocket_new();

 
 

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

 
 

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

 }
 
 }
 

+wxDatagramSocket& wxDatagramSocket::RecvFrom( wxSockAddress& addr,
+                                              char* buf,
+                                              wxUint32 nBytes )
+{
+    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


@@ -1154,13 +1195,17 @@ void wxSocketEvent::CopyObject(wxObject& obj_d) const
 // --------------------------------------------------------------------------
 // wxSocketModule
 // --------------------------------------------------------------------------
 // --------------------------------------------------------------------------
 // wxSocketModule
 // --------------------------------------------------------------------------

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

   DECLARE_DYNAMIC_CLASS(wxSocketModule)
   DECLARE_DYNAMIC_CLASS(wxSocketModule)

- public:
-  bool OnInit() {
+public:
+  bool OnInit()
+  {

     return GSocket_Init();
   }
     return GSocket_Init();
   }

-  void OnExit() {
+  void OnExit()
+  {

     GSocket_Cleanup();
   }
 };
     GSocket_Cleanup();
   }
 };