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 9f9851482a20f470b78e37edc4d3f4b9d1335164..a39f5fff4860c16774924d2e2b0e3f70decbde20 100644 (file)
--- a/src/common/socket.cpp
+++ b/src/common/socket.cpp
@@ -1,18 +1,16 @@
-////////////////////////////////////////////////////////////////////////////////
+/////////////////////////////////////////////////////////////////////////////

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

-// Authors:    Guilhem Lavaux (completely rewritten from a basic API of Andrew
-//             Davidson(1995) in wxWeb)
+// Authors:    Guilhem Lavaux, Guillermo Rodriguez Garcia

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

-// Updated:    March 1998
-// Copyright:  (C) 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

-////////////////////////////////////////////////////////////////////////////////
+/////////////////////////////////////////////////////////////////////////////
+

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

-// #pragma interface
-// #pragma implementation "socket.cpp"

 #endif
 
 // For compilers that support precompilation, includes "wx.h".
 #endif
 
 // For compilers that support precompilation, includes "wx.h".


@@ -22,1554 +20,1204 @@
 #pragma hdrstop
 #endif
 
 #pragma hdrstop
 #endif
 

-/////////////////////////////////////////////////////////////////////////////
-// wxWindows headers
-/////////////////////////////////////////////////////////////////////////////
-#include <wx/defs.h>
-#include <wx/object.h>
-#include <wx/string.h>
-#include <wx/timer.h>
-#include <wx/utils.h>
-
-// Not enough OS behaviour defined for wxStubs
-#ifndef __WXSTUBS__
-
-#include <stdlib.h>
-#include <string.h>
-#include <ctype.h>
-
-/////////////////////////////////////////////////////////////////////////////
-// System specific headers
-/////////////////////////////////////////////////////////////////////////////
-#if defined(__WINDOWS__)
-#include <winsock.h>
-#endif // __WINDOWS__
-
-#if defined(__UNIX__)
-
-#ifdef VMS
-#include <socket.h>
-#else
-#include <sys/socket.h>
-#endif
-#include <sys/ioctl.h>
-
-#include <sys/time.h>
-#include <unistd.h>
-
-#ifdef sun
-#include <sys/filio.h>
-#endif
-
-#endif // __UNIX__
-
-#include <signal.h>
-#include <errno.h>
-
-#ifdef _MSC_VER
-#include <io.h>
-#endif
-
-#if defined(__WXMOTIF__) || defined(__WXXT__)
-#include <X11/Intrinsic.h>
+#if wxUSE_SOCKETS

 
 

-/////////////////////////////
-// Needs internal variables
-/////////////////////////////
-#ifdef __WXXT__
-#define Uses_XtIntrinsic
-#endif
+// ==========================================================================
+// Headers and constants
+// ==========================================================================

 
 

-#endif
+#include "wx/app.h"
+#include "wx/defs.h"
+#include "wx/object.h"
+#include "wx/string.h"
+#include "wx/timer.h"
+#include "wx/utils.h"
+#include "wx/module.h"
+#include "wx/log.h"
+#include "wx/intl.h"

 
 

-#if defined(__WXGTK__)
-#include <gtk/gtk.h>
-#endif
+#if wxUSE_GUI
+    #include "wx/gdicmn.h"      // for wxPendingDelete
+#endif // wxUSE_GUI

 
 

-/////////////////////////////////////////////////////////////////////////////
-// wxSocket headers
-/////////////////////////////////////////////////////////////////////////////
-#include "wx/module.h"
-#define WXSOCK_INTERNAL

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

-/////////////////////////////////////////////////////////////////////////////
-// Some patch ///// BEGIN
-/////////////////////////////////////////////////////////////////////////////
-#ifdef __WINDOWS__
-#define close closesocket
-#define ioctl ioctlsocket
-#ifdef errno
-#undef errno
-#endif
-#define errno WSAGetLastError()
-#ifdef EWOULDBLOCK
-#undef EWOULDBLOCK
-#endif
-#define EWOULDBLOCK WSAEWOULDBLOCK
-#define ETIMEDOUT WSAETIMEDOUT
-#undef EINTR
-#define EINTR WSAEINTR
-#endif
-
-#ifndef __WINDOWS__
-#define INVALID_SOCKET -1
-#endif
-
-#ifdef __WXMOTIF__
-#define wxAPP_CONTEXT ((XtAppContext)wxTheApp->GetAppContext())
-#endif
-
-#ifdef __WINDOWS__
-// This is an MS TCP/IP routine and is not needed here. Some WinSock
-// implementations (such as PC-NFS) will require you to include this
-// or a similar routine (see appendix in WinSock doc or help file).
-
-#if defined( NEED_WSAFDIsSet ) || defined( _MSC_VER )
-int PASCAL FAR __WSAFDIsSet(SOCKET fd, fd_set FAR *set)
-{
-       int i = set->fd_count;
-
-       while (i--)
-       {
-               if (set->fd_array[i] == fd)
-                       return 1;
-       }

 
 

-       return 0;
-}
-#endif
-#endif
+// discard buffer
+#define MAX_DISCARD_SIZE (10 * 1024)

 
 

-#if defined(__WINDOWS__)
+// what to do within waits

 #define PROCESS_EVENTS() wxYield()
 #define PROCESS_EVENTS() wxYield()

-#elif defined(__WXXT__) || defined(__WXMOTIF__)
-#define PROCESS_EVENTS() XtAppProcessEvent(wxAPP_CONTEXT, XtIMAll)
-#elif defined(__WXGTK__)
-#define PROCESS_EVENTS() gtk_main_iteration()
-#endif
-
-/////////////////////////////////////////////////////////////////////////////
-// Some patch ///// END
-/////////////////////////////////////////////////////////////////////////////

 
 

-// --------------------------------------------------------------
-// Module
-// --------------------------------------------------------------
-class wxSocketModule: public wxModule {
-  DECLARE_DYNAMIC_CLASS(wxSocketModule)
-public:
-  wxSocketModule() {}
-  bool OnInit();
-  void OnExit();
-};
+// 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(wxSocketHandler, wxObject)
+IMPLEMENT_CLASS(wxDatagramSocket, wxSocketBase)

 IMPLEMENT_DYNAMIC_CLASS(wxSocketEvent, wxEvent)
 IMPLEMENT_DYNAMIC_CLASS(wxSocketEvent, wxEvent)

-IMPLEMENT_DYNAMIC_CLASS(wxSocketModule, wxModule)
-#endif

 
 

-class wxSockWakeUp : public wxTimer {
+class wxSocketState : public wxObject
+{

 public:
 public:

-  int *my_id;
-  int n_val;
-  wxSocketBase *sock;
+  bool                     m_notify_state;
+  wxSocketEventFlags       m_neededreq;
+  wxSockFlags              m_flags;
+  wxSocketBase::wxSockCbk  m_cbk;
+  char                    *m_cdata;

 
 

-  wxSockWakeUp(wxSocketBase *_sock, int *id, int new_val) {
-    my_id = id; n_val = new_val;
-    sock = _sock;
-  }
-  virtual void Notify() {
-    *my_id = n_val;
-    if (sock) sock->Notify(FALSE);
-  }
-};
-
-/// Socket request
-class SockRequest : public wxObject {

 public:
 public:

-  char *buffer;
-  size_t size, nbytes;
-  bool done;
-  int error;
-  wxSockWakeUp *auto_wakeup;
-  wxSocketBase::wxRequestNotify type;
+  wxSocketState() : wxObject() {}

 };
 
 
 };
 
 

-/////////////////////////////////////////////////////////////////////////////
-// Some internal define
-/////////////////////////////////////////////////////////////////////////////
+// ==========================================================================
+// wxSocketBase
+// ==========================================================================

 
 

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

   wxEvtHandler(),
   wxEvtHandler(),

-  m_flags(_flags), m_type(_type), m_connected(FALSE), m_connecting(FALSE),
-  m_fd(INVALID_SOCKET), m_waitflags(0), m_cbk(0), m_cdata(0), m_id(-1),
-  m_handler(0),
-  m_neededreq((wxRequestNotify)(REQ_READ | REQ_LOST)),
-  m_cbkon(FALSE),
-  m_unread(NULL), m_unrd_size(0),
-  m_processing(FALSE),
-  m_timeout(3600), m_wantbuf(0)
+  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_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)

 {
 {

-  m_internal = new wxSockInternal;
-#if defined(__WXXT__) || defined(__WXMOTIF__) || defined(__WXGTK__)
-  m_internal->sock_inputid = 0;
-  m_internal->sock_outputid = 0;
-  m_internal->sock_exceptid = 0;
-#endif
-#ifdef __WINDOWS__
-  m_internal->my_msg = 0;
-#endif

 }
 
 wxSocketBase::wxSocketBase() :
   wxEvtHandler(),
 }
 
 wxSocketBase::wxSocketBase() :
   wxEvtHandler(),

-  m_flags(WAITALL), m_type(SOCK_UNINIT), m_connected(FALSE),
-  m_connecting(FALSE), m_fd(INVALID_SOCKET), m_waitflags(0),
-  m_cbk(0), m_cdata(0),
-  m_id(-1), m_handler(0),
-  m_neededreq((wxRequestNotify)(REQ_READ | REQ_LOST)),
-  m_cbkon(FALSE),
-  m_unread(NULL), m_unrd_size(0),
-  m_processing(FALSE),
-  m_timeout(3600), m_wantbuf(0)
+  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_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)

 {
 {

-  m_internal = new wxSockInternal;
-#if defined(__WXXT__) || defined(__WXMOTIF__) || defined(__WXGTK__)
-  m_internal->sock_inputid = 0;
-  m_internal->sock_outputid = 0;
-  m_internal->sock_exceptid = 0;
-#endif
-#ifdef __WINDOWS__
-  m_internal->my_msg = 0;
-#endif

 }
 
 }
 

-// --------------------------------------------------------------
-// --------- wxSocketBase CONSTRUCTOR ---------------------------
-// --------------------------------------------------------------

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

-  DestroyCallbacks();
-  Close();
-

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

-  if (m_handler) {
-#ifdef __WINDOWS__
-    if (m_internal->my_msg)
-      m_handler->DestroyMessage(m_internal->my_msg);
-#endif
-    m_handler->UnRegister(this);
-  }
-  m_states.DeleteContents(TRUE);

 
 

-  delete m_internal;
+  // Shutdown and close the socket
+  Close();
+
+  // Destroy the GSocket object
+  if (m_socket)
+    GSocket_destroy(m_socket);

 }
 
 }
 

-bool wxSocketBase::Close()
+/*
+bool wxSocketBase::Destroy()

 {
 {

-  if (m_fd != INVALID_SOCKET) {
-    for (int i=0;i<3;i++) {
-      wxNode *n, *node = req_list[i].First();
+  // Delayed destruction: the socket will be deleted during the next
+  // idle loop iteration. This ensures that all pending events have
+  // been processed.

 
 

-      while (node) {
-        SockRequest *req = (SockRequest *)node->Data();
-        req->done = TRUE;
+  m_beingDeleted = TRUE;
+  Close();

 
 

-        n = node->Next();
-        delete node;
-        node = n;
-      }
-    }
+  if ( !wxPendingDelete.Member(this) )
+      wxPendingDelete.Append(this);
+
+  return TRUE;
+}
+*/

 
 

-    DestroyCallbacks();
-    shutdown(m_fd, 2);
-    close(m_fd);
-    m_fd = INVALID_SOCKET;
-    m_connected = FALSE;
+// --------------------------------------------------------------------------
+// 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()
+{
+  // Interrupt pending waits
+  InterruptAllWaits();
+
+  if (m_socket)
+  {
+    // Disable callbacks
+    GSocket_UnsetCallback(m_socket, GSOCK_INPUT_FLAG | GSOCK_OUTPUT_FLAG |
+                                    GSOCK_LOST_FLAG | GSOCK_CONNECTION_FLAG);
+
+    // Shutdown the connection
+    GSocket_Shutdown(m_socket);

   }
 
   }
 

+  m_connected = FALSE;
+  m_establishing = FALSE;

   return TRUE;
 }
 
   return TRUE;
 }
 

-// --------------------------------------------------------------
-// --------- wxSocketBase base IO functions ---------------------
-// --------------------------------------------------------------
-wxSocketBase& wxSocketBase::Read(char* buffer, size_t nbytes)
+wxSocketBase& wxSocketBase::Read(char* buffer, wxUint32 nbytes)

 {
 {

-  m_lcount = GetPushback(buffer, nbytes, FALSE);
+  // Mask read events
+  m_reading = TRUE;
+
+  m_lcount = _Read(buffer, nbytes);

 
 

-  // If we have got the whole needed buffer or if we don't want to
-  // wait then it returns immediately.
-  if (!nbytes || (m_lcount && !(m_flags & WAITALL)) )
-    return *this;
+  // If 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);

 
 

-  WantBuffer(buffer, nbytes, EVT_READ);
+  // Allow read events from now on
+  m_reading = FALSE;

 
   return *this;
 }
 
 
   return *this;
 }
 

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

 {
 {

-  size_t nbytes_old = nbytes;
+  int total;
+  int ret = 1;
+
+  // Try the pushback buffer first
+  total = GetPushback(buffer, nbytes, FALSE);
+  nbytes -= total;
+  buffer += total;

 
 

-  nbytes -= GetPushback(buffer, nbytes, TRUE);
-  if (!nbytes) {
-    m_lcount = nbytes_old;
-    return *this;
+  // 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)
+  {
+    GSocket_SetNonBlocking(m_socket, TRUE);
+    ret = GSocket_Read(m_socket, buffer, nbytes);
+    GSocket_SetNonBlocking(m_socket, FALSE);
+
+    if (ret > 0)
+      total += ret;

   }
   }

+  else if (m_flags & wxSOCKET_WAITALL)
+  {
+    while (ret > 0 && nbytes > 0)
+    {
+      if (!(m_flags & wxSOCKET_BLOCK) && !WaitForRead())
+          break;
+
+      ret = GSocket_Read(m_socket, buffer, nbytes);
+
+      if (ret > 0)
+      {
+        total  += ret;
+        buffer += ret;
+        nbytes -= ret;
+      }
+    }
+  }
+  else
+  {
+    if ((m_flags & wxSOCKET_BLOCK) || WaitForRead())
+    {
+      ret = GSocket_Read(m_socket, buffer, nbytes);

 
 

-  WantBuffer(buffer, nbytes, EVT_PEEK);
+      if (ret > 0)
+        total += ret;
+    }
+  }

 
 

-  return *this;
+  return total;

 }
 
 }
 

-wxSocketBase& wxSocketBase::Write(const char *buffer, size_t nbytes)
+wxSocketBase& wxSocketBase::ReadMsg(char* buffer, wxUint32 nbytes)

 {
 {

-  WantBuffer((char *)buffer, nbytes, EVT_WRITE);
-  return *this;
-}
+  wxUint32 len, len2, sig, total;
+  bool error;
+  int old_flags;
+  struct
+  {
+    unsigned char sig[4];
+    unsigned char len[4];
+  } msg;

 
 

-wxSocketBase& wxSocketBase::ReadMsg(char* buffer, size_t nbytes)
-{
-  SockMsg msg;
-  size_t len, len2, sig;
+  // 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 |= (size_t)(msg.sig[1] & 0xff) << 8;
-  sig |= (size_t)(msg.sig[2] & 0xff) << 16;
-  sig |= (size_t)(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 |= (size_t)(msg.len[1] & 0xff) << 8;
-  len |= (size_t)(msg.len[2] & 0xff) << 16;
-  len |= (size_t)(msg.len[3] & 0xff) << 24;
-  len2 = len;
+  {
+    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)
   if (len > nbytes)

+  {
+    len2 = len - nbytes;

     len = nbytes;
     len = nbytes;

+  }

   else
     len2 = 0;
 
   else
     len2 = 0;
 

-  if (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 |= (size_t)(msg.sig[1] & 0xff) << 8;
-  sig |= (size_t)(msg.sig[2] & 0xff) << 16;
-  sig |= (size_t)(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)

-    return *this;
+  {
+    wxLogWarning( _("wxSocket: invalid signature in ReadMsg."));
+    goto exit;
+  }

 
 

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

 
 

-wxSocketBase& wxSocketBase::WriteMsg(const char *buffer, size_t nbytes)
-{
-  SockMsg msg;
-
-  msg.sig[0] = (char) 0xad;
-  msg.sig[1] = (char) 0xde;
-  msg.sig[2] = (char) 0xed;
-  msg.sig[3] = (char) 0xfe;
-
-  msg.len[0] = (char) nbytes & 0xff;
-  msg.len[1] = (char) (nbytes >> 8) & 0xff;
-  msg.len[2] = (char) (nbytes >> 16) & 0xff;
-  msg.len[3] = (char) (nbytes >> 24) & 0xff;
-
-  if (Write((char *)&msg, sizeof(msg)).LastCount() < sizeof(msg))
-    return *this;
-  if (Write(buffer, nbytes).LastCount() < nbytes)
-    return *this;
-
-  msg.sig[0] = (char) 0xed;
-  msg.sig[1] = (char) 0xfe;
-  msg.sig[2] = (char) 0xad;
-  msg.sig[3] = (char) 0xde;
-  msg.len[0] = msg.len[1] = msg.len[2] = msg.len[3] = (char) 0;
-  Write((char *)&msg, sizeof(msg));
+exit:
+  m_error = error;
+  m_lcount = total;
+  m_reading = FALSE;
+  SetFlags(old_flags);

 
   return *this;
 }
 
 
   return *this;
 }
 

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

 {
 {

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

   return *this;
 }
 
   return *this;
 }
 

-bool wxSocketBase::IsData() const
+wxSocketBase& wxSocketBase::Write(const char *buffer, wxUint32 nbytes)

 {
 {

-  struct timeval tv;
-  fd_set sock_set;
+  // Mask write events
+  m_writing = TRUE;

 
 

-  if (m_fd < 0)
-    return FALSE;
-  if (m_unrd_size > 0)
-    return TRUE;
+  m_lcount = _Write(buffer, nbytes);
+
+  // If in wxSOCKET_WAITALL mode, all bytes should have been written.
+  if (m_flags & wxSOCKET_WAITALL)
+    m_error = (m_lcount != nbytes);
+  else
+    m_error = (m_lcount == 0);
+
+  // Allow write events again
+  m_writing = FALSE;

 
 

-  tv.tv_sec = 0;
-  tv.tv_usec = 0;
-  FD_ZERO(&sock_set);
-  FD_SET(m_fd, &sock_set);
-  select(FD_SETSIZE, &sock_set, NULL, NULL, &tv);
-  return (FD_ISSET(m_fd, &sock_set) != 0);
+  return *this;

 }
 
 }
 

-// ---------------------------------------------------------------------
-// --------- wxSocketBase Discard(): deletes all byte in the input queue
-// ---------------------------------------------------------------------
-void wxSocketBase::Discard()
+wxUint32 wxSocketBase::_Write(const char *buffer, wxUint32 nbytes)

 {
 {

-#define MAX_BUFSIZE (10*1024)
-  char *my_data = new char[MAX_BUFSIZE];
-  size_t recv_size = MAX_BUFSIZE;
+  wxUint32 total = 0;
+  int ret = 1;
+
+  // If the socket is invalid, return immediately
+  if (!m_socket)
+    return 0;

 
 

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

 
 

-  while (recv_size == MAX_BUFSIZE) {
-    recv_size = Read(my_data, MAX_BUFSIZE).LastCount();
+    if (ret > 0)
+      total = ret;
+  }
+  else if (m_flags & wxSOCKET_WAITALL)
+  {
+    while (ret > 0 && nbytes > 0)
+    {
+      if (!(m_flags & wxSOCKET_BLOCK) && !WaitForWrite())
+          break;
+
+      ret = GSocket_Write(m_socket, buffer, nbytes);
+
+      if (ret > 0)
+      {
+        total  += ret;
+        buffer += ret;
+        nbytes -= ret;
+      }
+    }

   }
   }

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

 
 

-  RestoreState();
-  delete [] my_data;
+      if (ret > 0)
+        total = ret;
+    }
+  }

 
 

-#undef MAX_BUFSIZE
+  return total;

 }
 
 }
 

-// --------------------------------------------------------------
-// --------- wxSocketBase socket info functions -----------------
-// --------------------------------------------------------------
-bool wxSocketBase::GetPeer(wxSockAddress& addr_man) const
+wxSocketBase& wxSocketBase::WriteMsg(const char *buffer, wxUint32 nbytes)

 {
 {

-  struct sockaddr my_addr;
-  size_t len_addr = sizeof(my_addr);
+  wxUint32 total;
+  bool error;
+  int old_flags;
+  struct {
+    unsigned char sig[4];
+    unsigned char len[4];
+  } msg;

 
 

-  if (m_fd < 0)
-    return FALSE;
+  // Mask write events
+  m_writing = TRUE;

 
 

-  if (getpeername(m_fd, (struct sockaddr *)&my_addr, (socklen_t *)&len_addr) < 0)
-    return FALSE;
+  error = TRUE;
+  total = 0;
+  old_flags = m_flags;
+  SetFlags((m_flags & wxSOCKET_BLOCK) | wxSOCKET_WAITALL);

 
 

-  addr_man.Disassemble(&my_addr, len_addr);
-  return TRUE;
-}
+  msg.sig[0] = (unsigned char) 0xad;
+  msg.sig[1] = (unsigned char) 0xde;
+  msg.sig[2] = (unsigned char) 0xed;
+  msg.sig[3] = (unsigned char) 0xfe;

 
 

-bool wxSocketBase::GetLocal(wxSockAddress& addr_man) const
-{
-  struct sockaddr my_addr;
-  size_t len_addr = sizeof(my_addr);
+  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 (m_fd < 0)
-    return FALSE;
+  if (_Write((char *)&msg, sizeof(msg)) < sizeof(msg))
+    goto exit;

 
 

-  if (getsockname(m_fd, (struct sockaddr *)&my_addr, (socklen_t *)&len_addr) < 0)
-    return FALSE;
+  total = _Write(buffer, nbytes);

 
 

-  addr_man.Disassemble(&my_addr, len_addr);
-  return TRUE;
+  if (total < nbytes)
+    goto exit;
+
+  msg.sig[0] = (unsigned char) 0xed;
+  msg.sig[1] = (unsigned char) 0xfe;
+  msg.sig[2] = (unsigned char) 0xad;
+  msg.sig[3] = (unsigned char) 0xde;
+  msg.len[0] = msg.len[1] = msg.len[2] = msg.len[3] = (char) 0;
+
+  if ((_Write((char *)&msg, sizeof(msg))) < sizeof(msg))
+    goto exit;
+
+  // everything was OK
+  error = FALSE;
+
+exit:
+  m_error = error;
+  m_lcount = total;
+  m_writing = FALSE;
+
+  return *this;

 }
 
 }
 

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

 {
 {

-  wxSockState *state = new wxSockState;
+  if (nbytes != 0)
+    Pushback(buffer, nbytes);

 
 

-  state->cbk_on = m_cbkon;
-  state->cbk_set= m_neededreq;
-  state->cbk    = m_cbk;
-  state->cdata  = m_cdata;
-  state->flags  = m_flags;
-  state->notif  = m_notifyme;
+  m_error = FALSE;
+  m_lcount = nbytes;

 
 

-  m_states.Append(state);
+  return *this;

 }
 
 }
 

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

 {
 {

-  wxNode *node;
+  int old_flags;
+  char *buffer = new char[MAX_DISCARD_SIZE];
+  wxUint32 ret;
+  wxUint32 total = 0;

 
 

-  node = m_states.Last();
-  if (!node)
-    return;
+  // Mask read events
+  m_reading = TRUE;

 
 

-  wxSockState *state = (wxSockState *)node->Data();
+  old_flags = m_flags;
+  SetFlags(wxSOCKET_NOWAIT);

 
 

-  SetFlags(state->flags);
-  m_neededreq = state->cbk_set;
-  m_cbk       = state->cbk;
-  m_cdata     = state->cdata;
-  m_notifyme  = state->notif;
-  if (state->cbk_on)
-    SetupCallbacks();
-  else
-    DestroyCallbacks();
+  do
+  {
+    ret = _Read(buffer, MAX_DISCARD_SIZE);
+    total += ret;
+  }
+  while (ret == MAX_DISCARD_SIZE);

 
 

-  delete node;
-  delete state;
+  delete[] buffer;
+  m_lcount = total;
+  m_error  = FALSE;
+
+  // Allow read events again
+  m_reading = FALSE;
+
+  return *this;

 }
 
 }
 

-// --------------------------------------------------------------
-// --------- wxSocketBase wait functions ------------------------
-// --------------------------------------------------------------
-//
-bool wxSocketBase::_Wait(long seconds, long microseconds, int type)
+// --------------------------------------------------------------------------
+// Wait functions
+// --------------------------------------------------------------------------
+
+// All Wait functions poll the socket using GSocket_Select() to
+// check for the specified combination of conditions, until one
+// of these conditions become true, an error occurs, or the
+// timeout elapses. The polling loop calls PROCESS_EVENTS(), so
+// this won't block the GUI.
+
+#if wxUSE_GUI
+
+class _wxSocketInternalTimer: public wxTimer

 {
 {

-  if ((!m_connected && !m_connecting) || m_fd < 0)
-    return FALSE;
+public:
+  int *m_state;
+  unsigned long m_new_val;
+
+  void Notify()
+  {
+    *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

 
 

-  wxSockWakeUp wakeup(this, &m_waitflags, 0);
+  long timeout;
+  int state = -1;

 
 

-  SaveState();
-  SetNotify((wxRequestNotify)type);
-  SetupCallbacks();
+  // Set this to TRUE to interrupt ongoing waits
+  m_interrupt = FALSE;

 
 

+  // Check for valid socket
+  if (!m_socket)
+    return FALSE;
+
+  // Check for valid timeout value

   if (seconds != -1)
   if (seconds != -1)

-    wakeup.Start((int)(seconds*1000 + (microseconds / 1000)), TRUE);
+    timeout = seconds * 1000 + milliseconds;
+  else
+    timeout = m_timeout * 1000;

 
 

-  m_waitflags = 0x80 | type;
-  while (m_waitflags & 0x80)
-    PROCESS_EVENTS();
+  // Activate timer
+  if (timeout)
+  {
+#if wxUSE_GUI
+    timer.m_state = &state;
+    timer.m_new_val = 0;
+    runTimer.Start((int)timeout, TRUE);
+#endif // wxUSE_GUI
+  }

 
 

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

 
 

-  if (m_waitflags & 0x40) {
-    m_waitflags = 0;
-    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();

   }
   }

-  m_waitflags = 0;

 
   return FALSE;
 }
 
 
   return FALSE;
 }
 

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

 {
 {

-  return _Wait(seconds, microseconds, REQ_ACCEPT | REQ_CONNECT |
-                                      REQ_READ | REQ_WRITE | REQ_LOST);
+  return _Wait(seconds, milliseconds, GSOCK_INPUT_FLAG |
+                                      GSOCK_OUTPUT_FLAG |
+                                      GSOCK_CONNECTION_FLAG |
+                                      GSOCK_LOST_FLAG);

 }
 
 }
 

-bool wxSocketBase::WaitForRead(long seconds, long microseconds)
+bool wxSocketBase::WaitForRead(long seconds, long milliseconds)

 {
 {

-  return _Wait(seconds, microseconds, REQ_READ | REQ_LOST);
+  // Check pushback buffer before entering _Wait
+  if (m_unread)
+    return TRUE;
+
+  // Note that GSOCK_INPUT_LOST has to be explicitly passed to
+  // _Wait becuase of the semantics of WaitForRead: a return
+  // value of TRUE means that a GSocket_Read call will return
+  // immediately, not that there is actually data to read.
+
+  return _Wait(seconds, milliseconds, GSOCK_INPUT_FLAG |
+                                      GSOCK_LOST_FLAG);

 }
 
 }
 

-bool wxSocketBase::WaitForWrite(long seconds, long microseconds)
+bool wxSocketBase::WaitForWrite(long seconds, long milliseconds)

 {
 {

-  return _Wait(seconds, microseconds, REQ_WRITE);
+  return _Wait(seconds, milliseconds, GSOCK_OUTPUT_FLAG);

 }
 
 }
 

-bool wxSocketBase::WaitForLost(long seconds, long microseconds)
+bool wxSocketBase::WaitForLost(long seconds, long milliseconds)

 {
 {

-  return _Wait(seconds, microseconds, REQ_LOST);
+  return _Wait(seconds, milliseconds, GSOCK_LOST_FLAG);

 }
 
 }
 

-// --------------------------------------------------------------
-// --------- wxSocketBase callback management -------------------
-// --------------------------------------------------------------
-
-#if defined(__WXMOTIF__) || defined(__WXXT__) || defined(__WXGTK__)
-#if defined(__WXMOTIF__) || defined(__WXXT__)
-static void wx_socket_read(XtPointer client, int *fid,
-                          XtInputId *WXUNUSED(id))
-#define fd *fid
-#else
-static void wx_socket_read(gpointer client, gint fd,
-                           GdkInputCondition WXUNUSED(cond))
-#define fd fd
-#endif
-{
-  wxSocketBase *sock = (wxSocketBase *)client;
-  char c;
-  int i;
+// --------------------------------------------------------------------------
+// Miscellaneous
+// --------------------------------------------------------------------------

 
 

-  i = recv(fd, &c, 1, MSG_PEEK);
+//
+// Get local or peer address
+//

 
 

-  if (i == -1 && (sock->NeededReq() & wxSocketBase::REQ_ACCEPT)) {
-    sock->OnRequest(wxSocketBase::EVT_ACCEPT);
-    return;
-  }
+bool wxSocketBase::GetPeer(wxSockAddress& addr_man) const
+{
+  GAddress *peer;

 
 

-  if (i != 0) {
-    if (!(sock->NeededReq() & wxSocketBase::REQ_READ))
-      return;
+  if (!m_socket)
+    return FALSE;

 
 

-    sock->OnRequest(wxSocketBase::EVT_READ);
-  } else {
-    if (!(sock->NeededReq() & wxSocketBase::REQ_LOST)) {
-      sock->Close();
-      return;
-    }
+  peer = GSocket_GetPeer(m_socket);
+  addr_man.SetAddress(peer);
+  GAddress_destroy(peer);

 
 

-    sock->OnRequest(wxSocketBase::EVT_LOST);
-  }
+  return TRUE;

 }
 }

-#undef fd

 
 

-#if defined(__WXMOTIF__) || defined(__WXXT__)
-static void wx_socket_write(XtPointer client, int *WXUNUSED(fid),
-                           XtInputId *WXUNUSED(id))
-#else
-static void wx_socket_write(gpointer client, gint WXUNUSED(fd),
-                           GdkInputCondition WXUNUSED(cond))
-#endif
+bool wxSocketBase::GetLocal(wxSockAddress& addr_man) const

 {
 {

-  wxSocketBase *sock = (wxSocketBase *)client;
+  GAddress *local;

 
 

-  if (!sock->IsConnected())
-    sock->OnRequest(wxSocketBase::EVT_CONNECT);
-  else
-    sock->OnRequest(wxSocketBase::EVT_WRITE);
-}
-#endif
+  if (!m_socket)
+    return FALSE;

 
 

-#ifdef wx_xview
-Notify_value wx_sock_read_xview (Notify_client client, int fd)
-{
-  wxSocketBase *sock = (wxSocketBase *)client;
-  char c;
-  int i;
+  local = GSocket_GetLocal(m_socket);
+  addr_man.SetAddress(local);
+  GAddress_destroy(local);

 
 

-  i = recv(fd, &c, 1, MSG_PEEK);
+  return TRUE;
+}

 
 

-  if (i == -1 && (sock->NeededReq() & wxSocketBase::REQ_ACCEPT)) {
-    sock->OnRequest(wxSocketBase::EVT_ACCEPT);
-    return;
-  }
+//
+// Save and restore socket state
+//

 
 

-  /* Bytes arrived */
-  if (i != 0) {
-    if (!(sock->NeededReq() & wxSocketBase::REQ_READ))
-      return (Notify_value) FALSE;
+void wxSocketBase::SaveState()
+{
+  wxSocketState *state;

 
 

-    sock->OnRequest(wxSocketBase::EVT_READ);
-  } else {
-    if (!(sock->NeededReq() & wxSocketBase::REQ_LOST))
-      return;
+  state = new wxSocketState();

 
 

-    sock->OnRequest(wxSocketBase::EVT_LOST);
-  }
+  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;

 
 

-  return (Notify_value) FALSE;
+  m_states.Append(state);

 }
 
 }
 

-Notify_value wx_sock_write_xview (Notify_client client, int fd)
+void wxSocketBase::RestoreState()

 {
 {

-  wxSocketBase *sock = (wxSocketBase *)client;
+  wxNode *node;
+  wxSocketState *state;

 
 

-  if (!sock->IsConnected())
-    sock->OnRequest(wxSocketBase::EVT_CONNECT);
-  else
-    sock->OnRequest(wxSocketBase::EVT_WRITE);
+  node = m_states.Last();
+  if (!node)
+    return;
+
+  state = (wxSocketState *)node->Data();

 
 

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

 }
 }

-#endif

 
 

-wxSocketBase::wxRequestNotify wxSocketBase::EventToNotify(wxRequestEvent evt)
+//
+// Timeout and flags
+//
+
+void wxSocketBase::SetTimeout(long seconds)

 {
 {

-  switch (evt) {
-  case EVT_READ:
-    return REQ_READ;
-  case EVT_PEEK:
-    return REQ_PEEK;
-  case EVT_WRITE:
-    return REQ_WRITE;
-  case EVT_LOST:
-    return REQ_LOST;
-  case EVT_ACCEPT:
-    return REQ_ACCEPT;
-  case EVT_CONNECT:
-    return REQ_CONNECT;
-  }
-  return 0;
+  m_timeout = seconds;
+
+  if (m_socket)
+    GSocket_SetTimeout(m_socket, m_timeout * 1000);

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

-  if (_flags & SPEED) {
-    unsigned long flag = 0;
-    ioctl(m_fd, FIONBIO, &flag);
+}

 
 

-    // SPEED and WAITALL are antagonists.
-    m_flags = (wxSockFlags)(m_flags & ~WAITALL);
+// --------------------------------------------------------------------------
+// Callbacks (now obsolete - use events instead)
+// --------------------------------------------------------------------------

 
 

-    Notify(FALSE);
-  } else {
-    unsigned long flag = 1;
-    ioctl(m_fd, FIONBIO, &flag);
-  }
+wxSocketBase::wxSockCbk wxSocketBase::Callback(wxSockCbk cbk_)
+{
+  wxSockCbk old_cbk = cbk_;
+
+  m_cbk = cbk_;
+  return old_cbk;

 }
 
 }
 

-void wxSocketBase::SetNotify(wxRequestNotify flags)
+char *wxSocketBase::CallbackData(char *data)

 {
 {

-  wxRequestNotify old_needed_req = m_neededreq;
-  if (flags & REQ_ACCEPT) {
-    /* Check if server */
-    if (!(GetClassInfo()->IsKindOf(CLASSINFO(wxSocketServer))))
-      flags &= ~REQ_ACCEPT;
-  }
-  m_neededreq = flags;
-  if (m_cbkon && old_needed_req != flags)
-    SetupCallbacks();
+  char *old_data = m_cdata;
+
+  m_cdata = data;
+  return old_data;

 }
 
 }
 

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

 {
 {

-  if (m_fd == INVALID_SOCKET || !m_handler || (m_flags & SPEED))
-    return;
+  wxSocketBase *sckobj = (wxSocketBase *)cdata;

 
 

-#if defined(__WXMOTIF__) || defined(__WXXT__) || defined(__WXGTK__)
-  if (m_cbkon)
-    DestroyCallbacks();
-  if (m_neededreq & (REQ_ACCEPT | REQ_READ | REQ_LOST)) {
-#ifdef __WXGTK__
-    m_internal->sock_inputid = gdk_input_add(m_fd, GDK_INPUT_READ,
-                                           wx_socket_read, (gpointer)this);
-#else
-    m_internal->sock_inputid = XtAppAddInput (wxAPP_CONTEXT, m_fd,
-                                       (XtPointer *) XtInputReadMask,
-                                       (XtInputCallbackProc) wx_socket_read,
-                                       (XtPointer) this);
-#endif
-  }
-  if (m_neededreq & (REQ_CONNECT | REQ_WRITE)) {
-#ifdef __WXGTK__
-    m_internal->sock_inputid = gdk_input_add(m_fd, GDK_INPUT_WRITE,
-                                             wx_socket_write, (gpointer)this);
-#else
-    m_internal->sock_outputid = XtAppAddInput (wxAPP_CONTEXT, m_fd,
-                                       (XtPointer *) XtInputWriteMask,
-                                       (XtInputCallbackProc) wx_socket_write,
-                                       (XtPointer) this);
-#endif
+  sckobj->OnRequest((wxSocketNotify)event);
+}
+
+wxSocketEventFlags wxSocketBase::EventToNotify(wxSocketNotify evt)
+{
+  switch (evt)
+  {
+    case GSOCK_INPUT:      return GSOCK_INPUT_FLAG;
+    case GSOCK_OUTPUT:     return GSOCK_OUTPUT_FLAG;
+    case GSOCK_CONNECTION: return GSOCK_CONNECTION_FLAG;
+    case GSOCK_LOST:       return GSOCK_LOST_FLAG;

   }
   }

-#endif
-#ifdef __WINDOWS__
-  WORD mask = 0;
-
-  if (m_neededreq & REQ_READ)
-    mask |= FD_READ;
-  if (m_neededreq & REQ_WRITE)
-    mask |= FD_WRITE;
-  if (m_neededreq & REQ_LOST)
-    mask |= FD_CLOSE;
-  if (m_neededreq & REQ_ACCEPT)
-    mask |= FD_ACCEPT;
-  if (m_neededreq & REQ_CONNECT)
-    mask |= FD_CONNECT;
-
-  if (!m_internal->my_msg)
-    m_internal->my_msg = m_handler->NewMessage(this);
-  WSAAsyncSelect(m_fd, m_handler->GetHWND(), m_internal->my_msg, mask);
-#endif
-  m_cbkon = TRUE;
-  m_processing = FALSE;
+  return 0;

 }
 
 }
 

-void wxSocketBase::DestroyCallbacks()
+void wxSocketBase::SetNotify(wxSocketEventFlags flags)

 {
 {

-  if (!m_cbkon || !m_handler)
-    return;
-  m_cbkon = FALSE;
-  m_processing = FALSE;
-#if defined(__WXMOTIF__) || defined(__WXXT__)
-  if (m_internal->sock_inputid > 0)
-    XtRemoveInput(m_internal->sock_inputid);
-  m_internal->sock_inputid = 0;
-  if (m_internal->sock_outputid > 0)
-    XtRemoveInput(m_internal->sock_outputid);
-  m_internal->sock_outputid = 0;
-#endif
-#ifdef __WXGTK__
-  if (m_internal->sock_inputid > 0)
-    gdk_input_remove(m_internal->sock_inputid);
-  m_internal->sock_inputid = 0;
-  if (m_internal->sock_outputid > 0)
-    gdk_input_remove(m_internal->sock_outputid);
-  m_internal->sock_outputid = 0;
-#endif
-#ifdef __WINDOWS__
-  WSAAsyncSelect(m_fd, m_handler->GetHWND(), 0, 0);
-#endif
+  m_neededreq = flags;

 }
 
 void wxSocketBase::Notify(bool notify)
 {
 }
 
 void wxSocketBase::Notify(bool notify)
 {

-  if (m_notifyme == notify)
-    return;
-  if (notify)
-    SetupCallbacks();
-  else
-    DestroyCallbacks();
-  m_notifyme = notify;
+  m_notify_state = notify;

 }
 
 }
 

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

 {
 {

-  wxRequestNotify req_notif = EventToNotify(req_evt);
-
-  // Mask the current event
-  SetNotify(m_neededreq & ~req_notif);
-
-  if (req_evt <= EVT_WRITE && DoRequests(req_evt))
-    return;
+  wxSocketEvent event(m_id);
+  wxSocketEventFlags flag = EventToNotify(req_evt);

 
 

-  if (m_waitflags & 0xF0) {
-    // Wake up
-    if ((m_waitflags & 0x0F) == req_evt) {
-      m_waitflags = 0x80;
-#ifndef __WXGTK__
-      DestroyCallbacks();  // I disable it to prevent infinite loop on X11.
-#endif
-    }
-    return;
-  }
+  // 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.

 
 

-  if (req_evt == EVT_LOST) {
-    m_connected = FALSE;
-    Close();
-  }
-  if (m_notifyme)
-    OldOnNotify(req_evt);
+  switch(req_evt)
+  {
+    case wxSOCKET_CONNECTION:
+      m_establishing = FALSE;
+      m_connected = TRUE;
+      break;

 
 

-  // Unmask
-  SetNotify(m_neededreq | req_notif);
-}
+    // 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.

 
 

-wxSocketEvent::wxSocketEvent(int id)
-  : wxEvent(id)
-{
-  wxEventType type = (wxEventType)wxEVT_SOCKET;
+    case wxSOCKET_INPUT:
+      if (m_reading || !GSocket_Select(m_socket, GSOCK_INPUT_FLAG))
+        return;
+      break;

 
 

-  SetEventType(type);
-}
+    case wxSOCKET_OUTPUT:
+      if (m_writing || !GSocket_Select(m_socket, GSOCK_OUTPUT_FLAG))
+        return;
+      break;

 
 

-void wxSocketBase::OldOnNotify(wxRequestEvent evt)
-{
-  wxSocketEvent event(m_id);
+    case wxSOCKET_LOST:
+      m_connected = FALSE;
+      m_establishing = FALSE;
+      break;

 
 

-  event.SetEventObject(this);
-  event.m_skevt = evt;
-  ProcessEvent(event);
+    default:
+      break;
+  }

 
 

-  if (m_cbk)
-    m_cbk(*this, evt, m_cdata);
-}
+  if (((m_neededreq & flag) == flag) && m_notify_state)
+  {
+    event.m_socket = this;
+    event.m_skevt  = req_evt;

 
 

-// --------------------------------------------------------------
-// --------- wxSocketBase functions [Callback, CallbackData] ----
-// --------------------------------------------------------------
-wxSocketBase::wxSockCbk wxSocketBase::Callback(wxSocketBase::wxSockCbk _cbk)
-{
-  wxSockCbk old_cbk = m_cbk;
+    if (m_evt_handler)
+    {
+#if USE_DELAYED_EVENTS
+      wxPostEvent(m_evt_handler, event);
+#else
+      ProcessEvent(event);
+#endif
+    }

 
 

-  m_cbk = _cbk;
-  return old_cbk;
+    OldOnNotify(req_evt);
+    if (m_cbk)
+      m_cbk(*this, req_evt, m_cdata);
+  }

 }
 
 }
 

-char *wxSocketBase::CallbackData(char *cdata_)
+void wxSocketBase::OldOnNotify(wxSocketNotify WXUNUSED(evt))

 {
 {

-  char *old_cdata = m_cdata;
-
-  m_cdata = cdata_;
-  return old_cdata;

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

-}

 
 

-// --------------------------------------------------------------
-// --------- wxSocketBase pushback library ----------------------
-// --------------------------------------------------------------
-void wxSocketBase::CreatePushbackAfter(const char *buffer, size_t size)
-{
-  char *curr_pos;
-
-  m_unread = (char *) realloc(m_unread, m_unrd_size+size);
-  curr_pos = m_unread + m_unrd_size;
-
-  memcpy(curr_pos, buffer, size);
-  m_unrd_size += size;
+  SetNextHandler(&h_evt);

 }
 
 }
 

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

 {
 {

-  char *curr_pos, *new_buf;
+  if (!size) return;
+
+  if (m_unread == NULL)
+    m_unread = (char *)malloc(size);
+  else
+  {
+    char *tmp;

 
 

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

 
 

-  memcpy(new_buf, buffer, size);
-  memcpy(curr_pos, m_unread, m_unrd_size);
+    m_unread = tmp;
+  }

 
 

-  free(m_unread);
-  m_unread = new_buf;

   m_unrd_size += size;
   m_unrd_size += size;

+
+  memcpy(m_unread, buffer, size);

 }
 
 }
 

-size_t wxSocketBase::GetPushback(char *buffer, size_t size, bool peek)
+wxUint32 wxSocketBase::GetPushback(char *buffer, wxUint32 size, bool peek)

 {
   if (!m_unrd_size)
     return 0;
 
 {
   if (!m_unrd_size)
     return 0;
 

-  if (size > m_unrd_size)
-    size = m_unrd_size;
-  memcpy(buffer, m_unread, size);
+  if (size > (m_unrd_size-m_unrd_cur))
+    size = m_unrd_size-m_unrd_cur;

 
 

-  if (!peek) {
-    m_unrd_size -= size;
-    if (!m_unrd_size) {
+  memcpy(buffer, (m_unread+m_unrd_cur), size);
+
+  if (!peek)
+  {
+    m_unrd_cur += size;
+    if (m_unrd_size == m_unrd_cur)
+    {

       free(m_unread);
       m_unread = NULL;
       free(m_unread);
       m_unread = NULL;

+      m_unrd_size = 0;
+      m_unrd_cur  = 0;

     }
   }
 
   return size;
 }
 
     }
   }
 
   return size;
 }
 

-// --------------------------------------------------------------
-// --------- wxSocketBase "multi-thread" core -------------------
-// --------------------------------------------------------------
+// ==========================================================================
+// wxSocketServer
+// ==========================================================================

 
 

-bool wxSocketBase::DoRequests(wxRequestEvent req_flag)
-{
-  wxNode *node = req_list[req_flag].First();
-  size_t len;
-  int ret;
+// --------------------------------------------------------------------------
+// Ctor
+// --------------------------------------------------------------------------

 
 

-  if (!node)
-    return FALSE;
-
-  SockRequest *req = (SockRequest *)node->Data();
-
-  delete node;
-
-  switch (req->type) {
-  case EVT_READ:
-  case EVT_PEEK:
-    ret = recv(m_fd, req->buffer, req->size,
-              (req->type == EVT_PEEK) ? MSG_PEEK : 0);
-    if (ret < 0) {
-      req->error = errno;
-      req->done = TRUE;
-      break;
-    }
-    len = ret;
-    if ((len < req->size) && (m_flags & WAITALL)) {
-      req->size -= len;
-      req->nbytes += len;
-      req->buffer += len;
-      req->auto_wakeup->Start(m_timeout*1000, TRUE);
-      req_list[req_flag].Insert(req);
-      break;
-    }
-    req->done = TRUE;
-    req->nbytes += len;
-#ifndef __WXGTK__
-    DestroyCallbacks();
-#endif
-    break;
-  case EVT_WRITE:
-    ret = send(m_fd, req->buffer, req->size, 0);
-    if (ret < 0) {
-      req->error = errno;
-      req->done = TRUE;
-      break;
-    }
-    len = ret;
-    if ((len < req->size) && (m_flags & WAITALL)) {
-      req->size -= len;
-      req->nbytes += len;
-      req->buffer += len;
-      req->auto_wakeup->Start(m_timeout*1000, TRUE);
-      req_list[req_flag].Insert(req);
-      break;
-    }
-    req->done = TRUE;
-    req->nbytes += len;
-#ifndef __WXGTK__
-    DestroyCallbacks();
-#endif
-    break;
-  default:
-    return FALSE;
-  }
-  return TRUE;
-}
-
-void wxSocketBase::WantSpeedBuffer(char *buffer, size_t nbytes,
-                                   wxRequestEvent evt)
-{
-  int ret = 0;
-
-  switch (evt) {
-  case EVT_PEEK:
-  case EVT_READ:
-    ret = recv(m_fd, buffer, nbytes,
-               (evt == EVT_PEEK) ? MSG_PEEK : 0);
-    break;
-  case EVT_WRITE:
-    ret = send(m_fd, buffer, nbytes, 0);
-    break;
-  }
-  if (ret < 0) {
-    m_lcount = 0;
-    m_error = errno;
-  } else {
-    m_lcount = ret;
-    m_error = 0;
-  }
-}
-
-void wxSocketBase::WantBuffer(char *buffer, size_t nbytes,
-                             wxRequestEvent evt)
+wxSocketServer::wxSocketServer(wxSockAddress& addr_man,
+                               wxSockFlags flags)
+              : wxSocketBase(flags, SOCK_SERVER)

 {
 {

-  bool buf_timed_out;
+  // Create the socket
+  m_socket = GSocket_new();

 
 

-  if (m_fd == INVALID_SOCKET || !m_handler || !m_connected)
+  if (!m_socket)

     return;
 
     return;
 

-  if (m_flags & SPEED) {
-    WantSpeedBuffer(buffer, nbytes, evt);
+  // Setup the socket as server
+  GSocket_SetLocal(m_socket, addr_man.GetAddress());
+  if (GSocket_SetServer(m_socket) != GSOCK_NOERROR)
+  {
+    GSocket_destroy(m_socket);
+    m_socket = NULL;

     return;
   }
 
     return;
   }
 

-  SockRequest *buf = new SockRequest;
-  wxSockWakeUp s_wake(NULL, (int *)&buf_timed_out, (int)TRUE);
-
-  m_wantbuf++;
-  req_list[evt].Append(buf);
-
-  SaveState();
-  SetNotify(REQ_LOST | EventToNotify(evt));
-  SetupCallbacks();
-  buf->buffer = buffer;
-  buf->size = nbytes;
-  buf->done = FALSE;
-  buf->type = evt;
-  buf->nbytes = 0;
-  buf->auto_wakeup = &s_wake;
-  buf->error = 0;
-  buf_timed_out = FALSE;
-
-  s_wake.Start(m_timeout*1000, TRUE);
-  if (m_flags & NOWAIT) {
-    DoRequests(evt);
-  } else {
-    while (!buf->done && !buf_timed_out)
-      PROCESS_EVENTS();
-  }
-  m_wantbuf--;
-  m_lcount = buf->nbytes;
-  if (buf_timed_out)
-    m_error = ETIMEDOUT;
-  else
-    m_error = buf->error;
+  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);

 
 

-  delete buf;
-  RestoreState();

 }
 
 }
 

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

 
 

-// --------------------------------------------------------------
-// --------- wxSocketServer CONSTRUCTOR -------------------------
-// --------------------------------------------------------------
-wxSocketServer::wxSocketServer(wxSockAddress& addr_man,
-                              wxSockFlags flags) :
-  wxSocketBase(flags, SOCK_SERVER)
+bool wxSocketServer::AcceptWith(wxSocketBase& sock, bool wait)

 {
 {

-  m_fd = socket(addr_man.GetFamily(), SOCK_STREAM, 0);
+  GSocket *child_socket;

 
 

-  if (m_fd == INVALID_SOCKET)
-    return;
-
-  int flag = 1;
-  setsockopt(m_fd, SOL_SOCKET, SO_REUSEADDR, (char*)&flag, sizeof(int));
+  if (!m_socket)
+    return FALSE;

 
 

-  struct sockaddr *myaddr;
-  size_t len;
+  // If wait == FALSE, then the call should be nonblocking.
+  // When we are finished, we put the socket to blocking mode
+  // again.

 
 

-  addr_man.Build(myaddr, len);
-  if (bind(m_fd, myaddr, addr_man.SockAddrLen()) < 0)
-    return;
+  if (!wait)
+    GSocket_SetNonBlocking(m_socket, TRUE);

 
 

-  if (listen(m_fd, 5) < 0) {
-    m_fd = INVALID_SOCKET;
-    return;
-  }
-}
+  child_socket = GSocket_WaitConnection(m_socket);

 
 

-// --------------------------------------------------------------
-// --------- wxSocketServer Accept ------------------------------
-// --------------------------------------------------------------
-bool wxSocketServer::AcceptWith(wxSocketBase& sock)
-{
-  int fd2;
+  if (!wait)
+    GSocket_SetNonBlocking(m_socket, FALSE);

 
 

-  if ((fd2 = accept(m_fd, 0, 0)) < 0)
+  if (!child_socket)

     return FALSE;
 
     return FALSE;
 

-  struct linger linger;
-  linger.l_onoff = 0;
-  linger.l_linger = 1;
-
-  setsockopt(fd2, SOL_SOCKET, SO_LINGER, (char*)&linger, sizeof(linger));
-
-  int flag = 0;
-  setsockopt(fd2, SOL_SOCKET, SO_KEEPALIVE, (char*)&flag, sizeof(int));
-
-  if (!(sock.m_flags & SPEED)) {
-    unsigned long flag2 = 1;
-    ioctl(fd2, FIONBIO, &flag2);
-  }
-

   sock.m_type = SOCK_INTERNAL;
   sock.m_type = SOCK_INTERNAL;

-  sock.m_fd = fd2;
+  sock.m_socket = child_socket;

   sock.m_connected = TRUE;
 
   sock.m_connected = TRUE;
 

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

   return TRUE;
 }
 
   return TRUE;
 }
 

-wxSocketBase *wxSocketServer::Accept()
+wxSocketBase *wxSocketServer::Accept(bool wait)

 {
   wxSocketBase* sock = new wxSocketBase();
 
   sock->SetFlags((wxSockFlags)m_flags);
 
 {
   wxSocketBase* sock = new wxSocketBase();
 
   sock->SetFlags((wxSockFlags)m_flags);
 

-  if (!AcceptWith(*sock))
+  if (!AcceptWith(*sock, wait))

     return NULL;
 
     return NULL;
 

-  if (m_handler)
-    m_handler->Register(sock);
-

   return sock;
 }
 
   return sock;
 }
 

-// --------------------------------------------------------------
-// --------- wxSocketServer callbacks ---------------------------
-// --------------------------------------------------------------
-void wxSocketServer::OnRequest(wxRequestEvent evt)
+bool wxSocketServer::WaitForAccept(long seconds, long milliseconds)

 {
 {

-  if (evt == EVT_ACCEPT) {
-    OldOnNotify(EVT_ACCEPT);
-  }
+  return _Wait(seconds, milliseconds, GSOCK_CONNECTION_FLAG);

 }
 
 }
 

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

 
 

-// --------- wxSocketClient CONSTRUCTOR -------------------------
-// --------------------------------------------------------------
-wxSocketClient::wxSocketClient(wxSockFlags _flags) :
-       wxSocketBase(_flags, SOCK_CLIENT)
+// --------------------------------------------------------------------------
+// Ctor and dtor
+// --------------------------------------------------------------------------
+
+wxSocketClient::wxSocketClient(wxSockFlags _flags)
+              : wxSocketBase(_flags, SOCK_CLIENT)

 {
 }
 
 {
 }
 

-// --------------------------------------------------------------
-// --------- wxSocketClient DESTRUCTOR --------------------------
-// --------------------------------------------------------------
+// XXX: What is this for ?

 wxSocketClient::~wxSocketClient()
 {
 }
 
 wxSocketClient::~wxSocketClient()
 {
 }
 

-// --------------------------------------------------------------
-// --------- wxSocketClient Connect functions -------------------
-// --------------------------------------------------------------
-bool wxSocketClient::Connect(wxSockAddress& addr_man, bool WXUNUSED(wait) )
+// --------------------------------------------------------------------------
+// Connect
+// --------------------------------------------------------------------------
+
+bool wxSocketClient::Connect(wxSockAddress& addr_man, bool wait)

 {
 {

-  struct linger linger;
+  GSocketError err;

 
 

-  if (IsConnected())
+  if (m_socket)
+  {
+    // Shutdown and destroy the socket

     Close();
     Close();

+    GSocket_destroy(m_socket);
+  }

 
 

-  m_fd = socket(addr_man.GetFamily(), SOCK_STREAM, 0);
-
-  if (m_fd < 0)
-    return FALSE;
-
+  m_socket = GSocket_new();

   m_connected = FALSE;
   m_connected = FALSE;

+  m_establishing = FALSE;

 
 

-  linger.l_onoff = 1;
-  linger.l_linger = 5;
-  setsockopt(m_fd, SOL_SOCKET, SO_LINGER, (char*)&linger, sizeof(linger));
+  if (!m_socket)
+    return FALSE;

 
 

-  // Stay in touch with the state of things...
+  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);

 
 

-  unsigned long flag = 1;
-  setsockopt(m_fd, SOL_SOCKET, SO_KEEPALIVE, (char*)&flag, sizeof(int));
+  // If wait == FALSE, then the call should be nonblocking.
+  // When we are finished, we put the socket to blocking mode
+  // again.

 
 

-  // Disable the nagle algorithm, which delays sends till the
-  // buffer is full (or a certain time period has passed?)...
+  if (!wait)
+    GSocket_SetNonBlocking(m_socket, TRUE);

 
 

-#if defined(__WINDOWS__) || (defined(IPPROTO_TCP) && defined(TCP_NODELAY))
-  flag = 1;
-  setsockopt(m_fd, IPPROTO_TCP, TCP_NODELAY, (char*)&flag, sizeof(int));
-#endif
+  GSocket_SetPeer(m_socket, addr_man.GetAddress());
+  err = GSocket_Connect(m_socket, GSOCK_STREAMED);

 
 

-  struct sockaddr *remote;
-  size_t len;
+  if (!wait)
+    GSocket_SetNonBlocking(m_socket, FALSE);

 
 

-  addr_man.Build(remote, len);
+  if (err != GSOCK_NOERROR)
+  {
+    if (err == GSOCK_WOULDBLOCK)
+      m_establishing = TRUE;

 
 

-  if (connect(m_fd, remote, len) != 0)

     return FALSE;
     return FALSE;

-
-  if (!(m_flags & SPEED)) {
-    flag = 1;
-    ioctl(m_fd, FIONBIO, &flag);

   }
 
   }
 

-  Notify(TRUE);
-

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

-bool wxSocketClient::WaitOnConnect(long seconds, long microseconds)
-{
-  int ret = _Wait(seconds, microseconds, REQ_CONNECT | REQ_LOST);
-
-  if (ret)
-    m_connected = TRUE;
-
-  return m_connected;
-}
-
-void wxSocketClient::OnRequest(wxRequestEvent evt)
-{
-  if (evt == EVT_CONNECT) {
-    if (m_connected) {
-      SetNotify(m_neededreq & ~REQ_CONNECT);
-      return;
-    }
-    m_waitflags = 0x40;
-    m_connected = TRUE;
-    OldOnNotify(EVT_CONNECT);
-    DestroyCallbacks();
-    return;
-  }
-  wxSocketBase::OnRequest(evt);
-}
-
-/////////////////////////////////////////////////////////////////
-// wxSocketHandler ///////////////////////////////////////////////
-/////////////////////////////////////////////////////////////////
-
-wxSocketHandler *wxSocketHandler::master = NULL;
-#if defined(__WINDOWS__)
-static int win_initialized = 0;
-#endif
-
-// --------------------------------------------------------------
-// --------- wxSocketHandler CONSTRUCTOR ------------------------
-// --------------------------------------------------------------
-#ifdef __WINDOWS__
-
-extern char wxPanelClassName[];
-
-LRESULT APIENTRY _EXPORT wxSocketHandlerWndProc(HWND hWnd, UINT message,
-   WPARAM wParam, LPARAM lParam)
+bool wxSocketClient::WaitOnConnect(long seconds, long milliseconds)

 {
 {

-  if(message==WM_DESTROY)
-  {
-         ::SetWindowLong(hWnd, GWL_WNDPROC, (LONG) DefWindowProc);
-         return DefWindowProc(hWnd, message, wParam, lParam);
-  }
-  wxSocketHandler *h_sock = (wxSocketHandler *)GetWindowLong(hWnd, GWL_USERDATA);
-  wxNode *node = h_sock->smsg_list->Find(message);
-  wxSocketBase *sock;
-  wxSocketBase::wxRequestEvent sk_req;
-  UINT event = WSAGETSELECTEVENT(lParam);
+  if (m_connected)                      // Already connected
+    return TRUE;

 
 

-  if (!node)
-    return DefWindowProc(hWnd, message, wParam, lParam);
-
-  sock = (wxSocketBase *)node->Data();
-
-  switch (event) {
-  case FD_READ:
-    sk_req = wxSocketBase::EVT_READ;
-    break;
-  case FD_WRITE:
-    sk_req = wxSocketBase::EVT_WRITE;
-    break;
-  case FD_CLOSE:
-    sk_req = wxSocketBase::EVT_LOST;
-    break;
-  case FD_ACCEPT:
-    sk_req = wxSocketBase::EVT_ACCEPT;
-    break;
-  case FD_CONNECT:
-    sk_req = wxSocketBase::EVT_CONNECT;
-    break;
-  }
-  sock->OnRequest(sk_req);
+  if (!m_establishing || !m_socket)     // No connection in progress
+    return FALSE;

 
 

-  return (LRESULT)0;
+  return _Wait(seconds, milliseconds, GSOCK_CONNECTION_FLAG);

 }
 
 }
 

-FARPROC wxSocketSubClassProc = NULL;
-
-#endif
-
-wxSocketHandler::wxSocketHandler()
-{
-#if defined(__WINDOWS__)
-  if (!win_initialized) {
-    WSADATA wsaData;
-
-    WSAStartup((1 << 8) | 1, &wsaData);
-    win_initialized = 1;
-  }
-  internal = new wxSockHandlerInternal;
-  internal->sockWin = ::CreateWindow(wxPanelClassName, NULL, 0,
-               0, 0, 0, 0, NULL, (HMENU) NULL,
-               wxhInstance, 0);
-
-  // Subclass the window
-  if (!wxSocketSubClassProc)
-    wxSocketSubClassProc = MakeProcInstance((FARPROC) wxSocketHandlerWndProc, wxhInstance);
-  ::SetWindowLong(internal->sockWin, GWL_WNDPROC, (LONG) wxSocketSubClassProc);
-  ::SetWindowLong(internal->sockWin, GWL_USERDATA, (LONG) this);
-
-  internal->firstAvailableMsg = 5000;
-  smsg_list = new wxList(wxKEY_INTEGER);
-#endif
-
-  socks = new wxList;
+// ==========================================================================
+// wxDatagramSocket
+// ==========================================================================

 
 

-#ifndef __WINDOWS__
-  signal(SIGPIPE, SIG_IGN);
-#endif
-}
+/* NOTE: experimental stuff - might change */

 
 

-// --------------------------------------------------------------
-// --------- wxSocketHandler DESTRUCTOR -------------------------
-// --------------------------------------------------------------
-wxSocketHandler::~wxSocketHandler()
+wxDatagramSocket::wxDatagramSocket( wxSockAddress& addr, wxSockFlags flags )
+                : wxSocketBase( flags, SOCK_DATAGRAM )

 {
 {

-  wxNode *next_node, *node = socks->First();
-
-  while (node) {
-    wxSocketBase* sock = (wxSocketBase*)node->Data();
-
-    delete sock;
-    next_node = node->Next();
-    delete node;
-    node = next_node;
-  }
-
-  delete socks;
+  // Create the socket
+  m_socket = GSocket_new();

 
 

-#ifdef __WINDOWS__
-  delete smsg_list;
-
-  ::DestroyWindow(internal->sockWin);
-  WSACleanup();
-  win_initialized = 0;
-
-  delete internal;
-#endif
-}
-
-// --------------------------------------------------------------
-// --------- wxSocketHandler registering functions --------------
-// --------------------------------------------------------------
-void wxSocketHandler::Register(wxSocketBase* sock)
-{
-  wxNode *node;
-
-  for (node = socks->First(); node != NULL; node = node->Next()) {
-    wxSocketBase* s = (wxSocketBase*)node->Data();
-
-    if (s == sock)
-      return;
-  }
+  if(!m_socket)
+    return;

 
 

-  if (sock) {
-    socks->Append(sock);
-    sock->SetHandler(this);
-    sock->SetupCallbacks();
+  // Setup the socket as non connection oriented
+  GSocket_SetLocal(m_socket, addr.GetAddress());
+  if( GSocket_SetNonOriented(m_socket) != GSOCK_NOERROR )
+  {
+    GSocket_destroy(m_socket);
+    m_socket = NULL;
+    return;

   }
   }

-}
-
-void wxSocketHandler::UnRegister(wxSocketBase* sock)
-{
-  wxNode *node;

 
 

-  for (node = socks->First(); node; node = node->Next()) {
-    wxSocketBase* s = (wxSocketBase*)node->Data();
+  // 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 );

 
 

-    if (s == sock) {
-      delete node;
-      sock->DestroyCallbacks();
-      sock->SetHandler(NULL);
-      return;
-    }
-  }

 }
 
 }
 

-unsigned long wxSocketHandler::Count() const
+wxDatagramSocket& wxDatagramSocket::RecvFrom( wxSockAddress& addr,
+                                              char* buf,
+                                              wxUint32 nBytes )

 {
 {

-  return socks->Number();
+    Read(buf, nBytes);
+    GetPeer(addr);
+    return (*this);

 }
 
 }
 

-// --------------------------------------------------------------
-// --------- wxSocketHandler "big" wait functions ---------------
-// --------------------------------------------------------------
-void handler_cbk(wxSocketBase& sock,
-                wxSocketBase::wxRequestEvent WXUNUSED(flags),
-                char *cdata)
+wxDatagramSocket& wxDatagramSocket::SendTo( wxSockAddress& addr,
+                                            const char* buf,
+                                            wxUint32 nBytes )

 {
 {

-  int *a_wait = (int *)cdata;
-
-  (*a_wait)++;
-  sock.Notify(FALSE);
+    GSocket_SetPeer(m_socket, addr.GetAddress());
+    Write(buf, nBytes);
+    return (*this);

 }
 
 }
 

-int wxSocketHandler::Wait(long seconds, long microseconds)
-{
-  int i;
-  int on_wait;
-  wxSockWakeUp s_wake(NULL, &on_wait, -2);
-  wxNode *node;
-
-  for (node = socks->First(), i=0; node; node = node->Next(), i++) {
-    wxSocketBase *sock = (wxSocketBase *)node->Data();
+// ==========================================================================
+// wxSocketEvent
+// ==========================================================================

 
 

-    sock->SaveState();
-
-    sock->SetupCallbacks();
-
-    sock->Callback(handler_cbk);
-    sock->CallbackData((char *)&on_wait);
-  }
-  on_wait = 0;
-  if (seconds != -1)
-    s_wake.Start((seconds*1000) + (microseconds/1000), TRUE);
-
-  while (!on_wait)
-    PROCESS_EVENTS();
-
-  for (node = socks->First(), i=0; node; node = node->Next(), i++) {
-    wxSocketBase *sock = (wxSocketBase *)node->Data();
-
-    sock->RestoreState();
-  }
+// XXX: Should be moved to event.cpp ?

 
 

-  if (on_wait == -2)
-    return 0;
-
-  return on_wait;
-}
-
-void wxSocketHandler::YieldSock()
+wxSocketEvent::wxSocketEvent(int id)
+             : wxEvent(id)

 {
 {

-  wxNode *node;
-
-  for (node = socks->First(); node; node = node->Next() ) {
-    wxSocketBase *sock = (wxSocketBase *)node->Data();
-
-    sock->SaveState();
-
-    sock->SetFlags(wxSocketBase::SPEED);
-    if (sock->IsData())
-      sock->DoRequests(wxSocketBase::EVT_READ);
-    sock->DoRequests(wxSocketBase::EVT_WRITE);
+  wxEventType type = (wxEventType)wxEVT_SOCKET;

 
 

-    sock->RestoreState();
-  }
+  SetEventType(type);

 }
 
 }
 

-// --------------------------------------------------------------
-// --------- wxSocketHandler: create and register the socket ----
-// --------------------------------------------------------------
-wxSocketServer *wxSocketHandler::CreateServer(wxSockAddress& addr,
-                                             wxSocketBase::wxSockFlags flags)
+void wxSocketEvent::CopyObject(wxObject& obj_d) const

 {
 {

-  wxSocketServer *serv = new wxSocketServer(addr, flags);
+  wxSocketEvent *event = (wxSocketEvent *)&obj_d;

 
 

-  Register(serv);
-  return serv;
-}
-
-wxSocketClient *wxSocketHandler::CreateClient(wxSocketBase::wxSockFlags flags)
-{
-  wxSocketClient *client = new wxSocketClient(flags);
+  wxEvent::CopyObject(obj_d);

 
 

-  Register(client);
-  return client;
+  event->m_skevt = m_skevt;
+  event->m_socket = m_socket;

 }
 
 }
 

-#ifdef __WINDOWS__
-// --------------------------------------------------------------
-// --------- wxSocketHandler: Windows specific methods ----------
-// --------------------------------------------------------------
-UINT wxSocketHandler::NewMessage(wxSocketBase *sock)
-{
-  internal->firstAvailableMsg++;
-  smsg_list->Append(internal->firstAvailableMsg, sock);
-  return internal->firstAvailableMsg;
-}
-
-void wxSocketHandler::DestroyMessage(UINT msg)
-{
-  wxNode *node = smsg_list->Find(msg);
-  delete node;
-}
+// ==========================================================================
+// wxSocketModule
+// ==========================================================================

 
 

-HWND wxSocketHandler::GetHWND() const
+class WXDLLEXPORT wxSocketModule: public wxModule

 {
 {

-  return internal->sockWin;
-}
-
-#endif
+  DECLARE_DYNAMIC_CLASS(wxSocketModule)

 
 

-bool wxSocketModule::OnInit() {
-  wxSocketHandler::master = new wxSocketHandler();
-  return TRUE;
-}
+public:
+  bool OnInit() { return GSocket_Init(); }
+  void OnExit() { GSocket_Cleanup(); }
+};

 
 

-void wxSocketModule::OnExit() {
-  delete wxSocketHandler::master;
-  wxSocketHandler::master = NULL;
-}
+IMPLEMENT_DYNAMIC_CLASS(wxSocketModule, wxModule)

 
 #endif
 
 #endif

-  // __WXSTUBS__
+  // wxUSE_SOCKETS