better control of what need refresh.

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

diff --git a/src/common/socket.cpp b/src/common/socket.cpp
index 2372865175a5af539076b86c05773be378eb93e7..ecb0781c7c4866fbb8a28a650aaa110159581be5 100644 (file)
--- a/src/common/socket.cpp
+++ b/src/common/socket.cpp
@@ -1,11 +1,10 @@
 ////////////////////////////////////////////////////////////////////////////////
 // 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

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

-// Updated:    April 1999
-// Copyright:  (C) 1999 1998, 1997, Guilhem Lavaux
+// Updated:    July 1999
+// Copyright:  (C) 1999, 1998, 1997, Guilhem Lavaux

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


@@ -13,10 +12,6 @@
 #pragma implementation "socket.h"
 #endif
 
 #pragma implementation "socket.h"
 #endif
 

-#ifdef __MWERKS__
-typedef int socklen_t ;
-#endif
-

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


@@ -34,127 +29,18 @@ typedef int socklen_t ;
 #include <wx/string.h>
 #include <wx/timer.h>
 #include <wx/utils.h>
 #include <wx/string.h>
 #include <wx/timer.h>
 #include <wx/utils.h>

-
-// Not enough OS behaviour defined for wxStubs
-#ifndef __WXSTUBS__
+#include <wx/log.h>

 
 #include <stdlib.h>
 #include <string.h>
 #include <ctype.h>
 
 
 #include <stdlib.h>
 #include <string.h>
 #include <ctype.h>
 

-/////////////////////////////////////////////////////////////////////////////
-// System specific headers
-/////////////////////////////////////////////////////////////////////////////
-#ifdef __WXMAC__
-// in order to avoid problems with our c library and double definitions
-#define close closesocket
-#define ioctl ioctlsocket
-
-#include <wx/mac/macsock.h>
-
-#endif
-
-#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 __VISUALC__
-#include <io.h>
-#endif
-

 /////////////////////////////////////////////////////////////////////////////
 // wxSocket headers
 /////////////////////////////////////////////////////////////////////////////
 #include <wx/module.h>
 /////////////////////////////////////////////////////////////////////////////
 // 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>

-#include <wx/sckint.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 __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( __VISUALC__ )
-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
-
-// -------------------
-// Some patch ---- END
-// -------------------
-
-#ifdef GetClassInfo
-#undef GetClassInfo
-#endif
-
-// --------------------------------------------------------------
-// Module
-// --------------------------------------------------------------
-class wxSocketModule: public wxModule 
-{
-  DECLARE_DYNAMIC_CLASS(wxSocketModule)
-public:
-  wxSocketModule() {}
-  bool OnInit();
-  void OnExit();
-};

 
 // --------------------------------------------------------------
 // ClassInfos
 
 // --------------------------------------------------------------
 // ClassInfos


@@ -163,76 +49,76 @@ public:
 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_DYNAMIC_CLASS(wxSocketEvent, wxEvent)
 IMPLEMENT_DYNAMIC_CLASS(wxSocketEvent, wxEvent)

-IMPLEMENT_DYNAMIC_CLASS(wxSocketModule, wxModule)

 #endif
 
 #endif
 

+class wxSocketState : public wxObject {
+public:
+  bool notify_state;
+  GSocketEventFlags evt_notify_state;
+  wxSocketBase::wxSockFlags socket_flags;
+  wxSocketBase::wxSockCbk c_callback;
+  char *c_callback_data;
+
+public:
+  wxSocketState() : wxObject() {}
+};
+

 // --------------------------------------------------------------
 // --------- wxSocketBase CONSTRUCTOR ---------------------------
 // --------------------------------------------------------------
 wxSocketBase::wxSocketBase(wxSocketBase::wxSockFlags _flags,
          wxSocketBase::wxSockType _type) :
   wxEvtHandler(),
 // --------------------------------------------------------------
 // --------- wxSocketBase CONSTRUCTOR ---------------------------
 // --------------------------------------------------------------
 wxSocketBase::wxSocketBase(wxSocketBase::wxSockFlags _flags,
          wxSocketBase::wxSockType _type) :
   wxEvtHandler(),

-  m_flags(_flags), m_type(_type), m_connected(FALSE), m_connecting(FALSE),
-  m_fd(INVALID_SOCKET), m_id(-1),
-  m_handler(0),
-  m_neededreq((wxRequestNotify)(REQ_READ | REQ_LOST)),
-  m_timeout(3600),
-  m_unread(NULL), m_unrd_size(0),
+  m_socket(NULL), m_flags(_flags), m_type(_type),
+  m_neededreq(GSOCK_INPUT_FLAG | GSOCK_LOST_FLAG),
+  m_lcount(0), m_timeout(600),
+  m_unread(NULL), m_unrd_size(0), m_unrd_cur(0),

   m_cbk(NULL), m_cdata(NULL),
   m_cbk(NULL), m_cdata(NULL),

-  m_notify_state(FALSE)
+  m_connected(FALSE), m_notify_state(FALSE), m_id(-1),
+  m_defering(NO_DEFER),
+  m_states()

 {
 {

-  m_internal = new wxSocketInternal(this);

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

-  m_flags(WAITALL), m_type(SOCK_UNINIT), m_connected(FALSE),
-  m_connecting(FALSE), m_fd(INVALID_SOCKET),
-  m_id(-1), m_handler(0),
-  m_neededreq((wxRequestNotify)(REQ_READ | REQ_LOST)),
-  m_timeout(3600),
-  m_unread(NULL), m_unrd_size(0),
+  m_socket(NULL), m_flags(SPEED | WAITALL), m_type(SOCK_UNINIT),
+  m_neededreq(GSOCK_INPUT_FLAG | GSOCK_LOST_FLAG),
+  m_lcount(0), m_timeout(600),
+  m_unread(NULL), m_unrd_size(0), m_unrd_cur(0),

   m_cbk(NULL), m_cdata(NULL),
   m_cbk(NULL), m_cdata(NULL),

-  m_notify_state(FALSE)
+  m_connected(FALSE), m_notify_state(FALSE), m_id(-1),
+  m_defering(NO_DEFER),
+  m_states()

 {
 {

-  m_internal = new wxSocketInternal(this);

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

-// wxSocketBase
+// wxSocketBase destructor

 // --------------------------------------------------------------
 
 wxSocketBase::~wxSocketBase()
 {
 // --------------------------------------------------------------
 
 wxSocketBase::~wxSocketBase()
 {

-  // First, close the file descriptor.
-  Close();
-

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

-  // Unregister from the handler database.
-  if (m_handler) 
-    m_handler->UnRegister(this);

 
 

-  // Destroy all saved states.
-  m_states.DeleteContents(TRUE);
+  // At last, close the file descriptor.
+  Close();

 
 

-  // Destroy the socket manager.
-  delete m_internal;
+  if (m_socket)
+    GSocket_destroy(m_socket);

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

-  if (m_fd != INVALID_SOCKET) 
+  if (m_socket)

   {
     if (m_notify_state == TRUE)
       Notify(FALSE);
 
     // Shutdown the connection.
   {
     if (m_notify_state == TRUE)
       Notify(FALSE);
 
     // Shutdown the connection.

-    shutdown(m_fd, 2);
-    close(m_fd);
-    m_fd = INVALID_SOCKET;
+    GSocket_Shutdown(m_socket);

     m_connected = FALSE;
   }
 
     m_connected = FALSE;
   }
 


@@ -242,73 +128,330 @@ bool wxSocketBase::Close()
 // --------------------------------------------------------------
 // wxSocketBase base IO function
 // --------------------------------------------------------------
 // --------------------------------------------------------------
 // wxSocketBase base IO function
 // --------------------------------------------------------------

+class _wxSocketInternalTimer: public wxTimer {
+ public:
+  int *m_state;
+  unsigned long m_new_val;
+
+  void Notify()
+     {
+        *m_state = m_new_val;  // Change the value
+     }
+};
+
+int wxSocketBase::DeferRead(char *buffer, size_t nbytes)
+{
+  GSocketEventFlags old_event_flags;
+  bool old_notify_state;
+  // Timer for timeout
+  _wxSocketInternalTimer timer;
+
+  wxASSERT(m_defering == NO_DEFER);
+
+  // Set the defering mode to READ.
+  m_defering = DEFER_READ;
+
+  // Save the old state.
+  old_event_flags = NeededReq();
+  old_notify_state = m_notify_state;
+
+  // Set the new async flag.
+  SetNotify(GSOCK_INPUT_FLAG | GSOCK_LOST_FLAG);
+  Notify(TRUE);
+
+  // Set the current buffer.
+  m_defer_buffer = buffer;
+  m_defer_nbytes = nbytes;
+  m_defer_timer  = &timer;
+
+  timer.m_state = (int *)&m_defer_buffer;
+  timer.m_new_val = 0;
+
+  timer.Start(m_timeout * 1000, FALSE);
+
+  // Wait for buffer completion. 
+  while (m_defer_buffer != NULL)
+    wxYield();
+
+  timer.Stop();
+
+  // Restore the old state.
+  Notify(old_notify_state);
+  SetNotify(old_event_flags);
+
+  // Disable defering mode.
+  m_defering = NO_DEFER;
+  m_defer_timer = NULL;
+
+  // Return the number of bytes read from the socket.
+  return nbytes-m_defer_nbytes;
+}

 
 wxSocketBase& wxSocketBase::Read(char* buffer, size_t nbytes)
 {
 
 wxSocketBase& wxSocketBase::Read(char* buffer, size_t nbytes)
 {

+  int ret = 1;
+

   m_lcount = GetPushback(buffer, nbytes, FALSE);
   nbytes -= m_lcount;
   buffer += m_lcount;
 
   m_lcount = GetPushback(buffer, nbytes, FALSE);
   nbytes -= m_lcount;
   buffer += m_lcount;
 

+  if (!m_connected)
+    return *this;
+

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

-  WantBuffer(buffer, nbytes, EVT_READ);
+  if ((m_flags & SPEED) != 0) {
+
+    if ((m_flags & WAITALL) != 0) {
+      while (ret > 0 && nbytes > 0) {
+        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 {
+      ret = GSocket_Read(m_socket, buffer, nbytes);
+      if (ret > 0)
+        m_lcount += ret;
+    }
+
+  } else {
+    ret = DeferRead(buffer, nbytes);
+
+    if (ret > 0)
+      m_lcount += ret;
+  }

 
   return *this;
 }
 
 
   return *this;
 }
 

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

 {
 {

-  m_lcount = GetPushback(buffer, nbytes, TRUE);
-  if (nbytes-m_lcount == 0) 
-  {
+  unsigned long len, len2, sig;
+  struct {
+    char sig[4];
+    char len[4];
+  } msg;
+
+  // sig should be an explicit 32-bit unsigned integer; I've seen
+  // compilers in which size_t was actually a 16-bit unsigned integer
+
+  Read((char *)&msg, sizeof(msg));
+  if (m_lcount != 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;
+
+  if (sig != 0xfeeddead)

     return *this;
     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 is incorrectly computed in the original; this sequence is
+  // the fix
+  if (len > nbytes) {
+    len2 = len - nbytes;
+    len = nbytes;

   }
   }

-  buffer += m_lcount;
-  nbytes -= m_lcount;
+  else
+    len2 = 0;
+
+  // the "len &&" in the following statement is necessary so that
+  // we don't attempt to read (and possibly hang the system)
+  // if the message was zero bytes long
+  if (len && Read(buffer, len).LastCount() != len)
+    return *this;
+  if (len2 && (Read(NULL, len2).LastCount() != len2))
+    return *this;
+  if (Read((char *)&msg, sizeof(msg)).LastCount() != sizeof(msg))
+    return *this;
+
+  sig = msg.sig[0] & 0xff;
+  sig |= (size_t)(msg.sig[1] & 0xff) << 8;
+  sig |= (size_t)(msg.sig[2] & 0xff) << 16;
+  sig |= (size_t)(msg.sig[3] & 0xff) << 24;
+
+// ERROR
+  if (sig != 0xdeadfeed)
+    wxLogDebug(_T("Warning: invalid signature returned to ReadMsg\n"));

 
 

-  WantBuffer(buffer, nbytes, EVT_PEEK);
+  return *this;
+}
+
+wxSocketBase& wxSocketBase::Peek(char* buffer, size_t nbytes)
+{
+  Read(buffer, nbytes);
+  CreatePushbackAfter(buffer, nbytes);

 
   return *this;
 }
 
 
   return *this;
 }
 

+int wxSocketBase::DeferWrite(const char *buffer, size_t nbytes)
+{
+  GSocketEventFlags old_event_flags;
+  bool old_notify_state;
+  // Timer for timeout
+  _wxSocketInternalTimer timer;
+
+  wxASSERT(m_defering == NO_DEFER);
+
+  m_defering = DEFER_WRITE;
+
+  // Save the old state
+  old_event_flags = NeededReq();
+  old_notify_state = m_notify_state;
+
+  SetNotify(GSOCK_OUTPUT_FLAG | GSOCK_LOST_FLAG);
+  Notify(TRUE);
+
+  // Set the current buffer
+  m_defer_buffer = (char *)buffer;
+  m_defer_nbytes = nbytes;
+
+  // Start timer
+  timer.m_state   = (int *)&m_defer_buffer;
+  timer.m_new_val = 0;
+
+  m_defer_timer   = &timer;
+  timer.Start(m_timeout * 1000, FALSE);
+
+  while (m_defer_buffer != NULL)
+    wxYield();
+
+  // Stop timer
+  m_defer_timer = NULL;
+  timer.Stop();
+
+  // Restore the old state
+  Notify(old_notify_state);
+  SetNotify(old_event_flags);
+
+  m_defering = NO_DEFER;
+
+  return nbytes-m_defer_nbytes;
+}
+

 wxSocketBase& wxSocketBase::Write(const char *buffer, size_t nbytes)
 {
 wxSocketBase& wxSocketBase::Write(const char *buffer, size_t nbytes)
 {

-  m_lcount = 0;
-  WantBuffer((char *)buffer, nbytes, EVT_WRITE);
+  int ret;
+
+  if ((m_flags & SPEED) != 0)
+    ret = GSocket_Write(m_socket, buffer, nbytes);
+  else
+    ret = DeferWrite(buffer, nbytes);
+
+  if (ret != -1)
+    m_lcount += ret;
+
+  return *this;
+}
+
+wxSocketBase& wxSocketBase::WriteMsg(const char *buffer, size_t nbytes)
+{
+  struct {
+    char sig[4];
+    char len[4];
+  } msg;
+
+  // warning about 'cast truncates constant value'
+#ifdef __VISUALC__
+    #pragma warning(disable: 4310)
+#endif // __VISUALC__
+
+  msg.sig[0] = (char) 0xad;
+  msg.sig[1] = (char) 0xde;
+  msg.sig[2] = (char) 0xed;
+  msg.sig[3] = (char) 0xfe;
+
+    msg.len[0] = (char) nbytes & 0xff;
+  msg.len[1] = (char) (nbytes >> 8) & 0xff;
+  msg.len[2] = (char) (nbytes >> 16) & 0xff;
+  msg.len[3] = (char) (nbytes >> 24) & 0xff;
+
+  if (Write((char *)&msg, sizeof(msg)).LastCount() < sizeof(msg))
+    return *this;
+  if (Write(buffer, nbytes).LastCount() < nbytes)
+    return *this;
+
+  msg.sig[0] = (char) 0xed;
+  msg.sig[1] = (char) 0xfe;
+  msg.sig[2] = (char) 0xad;
+  msg.sig[3] = (char) 0xde;
+  msg.len[0] = msg.len[1] = msg.len[2] = msg.len[3] = (char) 0;
+  Write((char *)&msg, sizeof(msg));
+

   return *this;
   return *this;

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

 }
 
 wxSocketBase& wxSocketBase::Unread(const char *buffer, size_t nbytes)
 {
 }
 
 wxSocketBase& wxSocketBase::Unread(const char *buffer, size_t nbytes)
 {

-  CreatePushbackAfter(buffer, nbytes);
+  m_lcount = 0;
+  if (nbytes != 0) {
+    CreatePushbackAfter(buffer, nbytes);
+    m_lcount = nbytes;
+  }

   return *this;
 }
 
 bool wxSocketBase::IsData() const
 {
   return *this;
 }
 
 bool wxSocketBase::IsData() const
 {

-  struct timeval tv;
-  fd_set sock_set;
-
-  if (m_fd < 0)
+  if (!m_socket)

     return FALSE;
     return FALSE;

-  if (m_unrd_size > 0)
-    return TRUE;

 
 

-  m_internal->AcquireFD();
+  return (GSocket_DataAvailable(m_socket));
+}
+
+void wxSocketBase::DoDefer(GSocketEvent req_evt)
+{
+  int ret;
+
+  if (req_evt == GSOCK_LOST) {
+    Close();
+    m_defer_buffer = NULL;
+    return;
+  }
+  switch (m_defering) {
+  case DEFER_READ:
+    ret = GSocket_Read(m_socket, m_defer_buffer, m_defer_nbytes);
+    break;
+  case DEFER_WRITE:
+    ret = GSocket_Write(m_socket, m_defer_buffer, m_defer_nbytes);
+    break;
+  default:
+    ret = -1;
+    break;
+  }

 
 

-  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);
+  m_defer_nbytes -= ret;

 
 

-  m_internal->ReleaseFD();
+  if (ret < 0)
+    m_defer_nbytes++;

 
 

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

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


@@ -321,9 +464,9 @@ void wxSocketBase::Discard()
   size_t recv_size = MAX_BUFSIZE;
 
   SaveState();
   size_t recv_size = MAX_BUFSIZE;
 
   SaveState();

-  SetFlags((wxSockFlags)(NOWAIT | SPEED));
+  SetFlags(NOWAIT | SPEED);

 
 

-  while (recv_size == MAX_BUFSIZE) 
+  while (recv_size == MAX_BUFSIZE)

   {
     recv_size = Read(my_data, MAX_BUFSIZE).LastCount();
   }
   {
     recv_size = Read(my_data, MAX_BUFSIZE).LastCount();
   }


@@ -334,64 +477,35 @@ void wxSocketBase::Discard()
 #undef MAX_BUFSIZE
 }
 
 #undef MAX_BUFSIZE
 }
 

-// If what? Who seems to need unsigned int?
-// BTW uint isn't even defined on wxMSW for VC++ for some reason. Even if it
-// were, getpeername/getsockname don't take unsigned int*, they take int*.
-//
-// Under glibc 2.0.7, socketbits.h declares socklen_t to be unsigned int
-// and it uses *socklen_t as the 3rd parameter. Robert.
-
-// JACS - How can we detect this?
-// Meanwhile, if your compiler complains about socklen_t,
-// switch lines below.
-
-#if wxHAVE_GLIBC2
-#   define wxSOCKET_INT socklen_t
-#else
-#   define wxSOCKET_INT int
-#endif
-

 // --------------------------------------------------------------
 // wxSocketBase socket info functions
 // --------------------------------------------------------------
 
 bool wxSocketBase::GetPeer(wxSockAddress& addr_man) const
 {
 // --------------------------------------------------------------
 // wxSocketBase socket info functions
 // --------------------------------------------------------------
 
 bool wxSocketBase::GetPeer(wxSockAddress& addr_man) const
 {

-  struct sockaddr my_addr;
-  wxSOCKET_INT len_addr = sizeof(my_addr);
+  GAddress *peer;

 
 

-  if (m_fd < 0)
+  if (!m_socket)

     return FALSE;
 
     return FALSE;
 

-  m_internal->AcquireFD();
-
-  if (getpeername(m_fd, (struct sockaddr *)&my_addr, &len_addr) < 0) {
-    m_internal->ReleaseFD();
-    return FALSE;
-  }
+  peer = GSocket_GetPeer(m_socket);
+  addr_man.SetAddress(peer);
+  GAddress_destroy(peer);

 
 

-  m_internal->ReleaseFD();
-  addr_man.Disassemble(&my_addr, len_addr);

   return TRUE;
 }
 
 bool wxSocketBase::GetLocal(wxSockAddress& addr_man) const
 {
   return TRUE;
 }
 
 bool wxSocketBase::GetLocal(wxSockAddress& addr_man) const
 {

-  struct sockaddr my_addr;
-  wxSOCKET_INT len_addr = sizeof(my_addr);
+  GAddress *local;

 
 

-  if (m_fd < 0)
+  if (!m_socket)

     return FALSE;
 
     return FALSE;
 

-  m_internal->AcquireFD();
+  local = GSocket_GetLocal(m_socket);
+  addr_man.SetAddress(local);
+  GAddress_destroy(local);

 
 

-  if (getsockname(m_fd, (struct sockaddr *)&my_addr, &len_addr) < 0) {
-    m_internal->ReleaseFD();
-    return FALSE;
-  }
-  m_internal->ReleaseFD();
-
-  addr_man.Disassemble(&my_addr, len_addr);

   return TRUE;
 }
 
   return TRUE;
 }
 


@@ -401,7 +515,9 @@ bool wxSocketBase::GetLocal(wxSockAddress& addr_man) const
 
 void wxSocketBase::SaveState()
 {
 
 void wxSocketBase::SaveState()
 {

-  SocketState *state = new SocketState;
+  wxSocketState *state;
+
+  state = new wxSocketState();

 
   state->notify_state     = m_notify_state;
   state->evt_notify_state = m_neededreq;
 
   state->notify_state     = m_notify_state;
   state->evt_notify_state = m_neededreq;


@@ -409,19 +525,19 @@ void wxSocketBase::SaveState()
   state->c_callback       = m_cbk;
   state->c_callback_data  = m_cdata;
 
   state->c_callback       = m_cbk;
   state->c_callback_data  = m_cdata;
 

-  m_states.Append((wxObject *)state);
+  m_states.Append(state);

 }
 
 void wxSocketBase::RestoreState()
 {
   wxNode *node;
 }
 
 void wxSocketBase::RestoreState()
 {
   wxNode *node;

-  SocketState *state;
+  wxSocketState *state;

 
   node = m_states.Last();
   if (!node)
     return;
 
 
   node = m_states.Last();
   if (!node)
     return;
 

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

 
   SetFlags(state->socket_flags);
   m_neededreq = state->evt_notify_state;
 
   SetFlags(state->socket_flags);
   m_neededreq = state->evt_notify_state;


@@ -457,68 +573,84 @@ char *wxSocketBase::CallbackData(char *data)
 // --------- wxSocketBase wait functions ------------------------
 // --------------------------------------------------------------
 
 // --------- wxSocketBase wait functions ------------------------
 // --------------------------------------------------------------
 

+static void wx_socket_wait(GSocket *socket, GSocketEvent event, char *cdata)
+{
+  int *state = (int *)cdata;
+
+  *state = event;
+}
+

 bool wxSocketBase::_Wait(long seconds, long milliseconds, int type)
 {
 bool wxSocketBase::_Wait(long seconds, long milliseconds, int type)
 {

-  SockRequest *req;
+  bool old_notify_state = m_notify_state;
+  int state = -1;
+  _wxSocketInternalTimer timer;

 
 

-  if ((!m_connected && !m_connecting) || m_fd < 0)
+  if (!m_connected || !m_socket)

     return FALSE;
 
     return FALSE;
 

-  req = new SockRequest;
+  // Set the variable to change
+  timer.m_state = &state;
+  timer.m_new_val = GSOCK_MAX_EVENT;
+
+  // Disable the previous handler
+  Notify(FALSE);
+
+  // Set the timeout
+  timer.Start(seconds * 1000 + milliseconds, TRUE);
+  GSocket_SetCallback(m_socket, type, wx_socket_wait, (char *)&state);

 
 

-  req->type = REQ_WAIT | type;
-  req->timeout = seconds * 1000 + milliseconds;
-  req->done = FALSE;
-  req->buffer = NULL;
-  req->size = 0;
-  req->error = 0;
-  req->wait = TRUE;
-  m_internal->QueueRequest(req, TRUE);
+  while (state == -1)
+    wxYield();

 
 

-  return (req->io_nbytes != 0);
+  GSocket_UnsetCallback(m_socket, type);
+  timer.Stop();
+
+  // Notify will restore automatically the old GSocket flags
+  Notify(old_notify_state);
+
+  return (state != GSOCK_MAX_EVENT);

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

-  return _Wait(seconds, milliseconds, 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 milliseconds)
 {
 }
 
 bool wxSocketBase::WaitForRead(long seconds, long milliseconds)
 {

-  return _Wait(seconds, milliseconds, REQ_READ | REQ_LOST);
+  return _Wait(seconds, milliseconds, GSOCK_INPUT_FLAG | GSOCK_LOST_FLAG);

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

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

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

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

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

-wxSocketBase::wxRequestNotify wxSocketBase::EventToNotify(wxRequestEvent evt)
+GSocketEventFlags wxSocketBase::EventToNotify(GSocketEvent evt)

 {
 {

-  switch (evt) 
+  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;
+  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;
+  default:
+    return 0;

   }
   return 0;
 }
   }
   return 0;
 }


@@ -526,10 +658,6 @@ wxSocketBase::wxRequestNotify wxSocketBase::EventToNotify(wxRequestEvent evt)
 void wxSocketBase::SetFlags(wxSockFlags _flags)
 {
   m_flags = _flags;
 void wxSocketBase::SetFlags(wxSockFlags _flags)
 {
   m_flags = _flags;

-  if (_flags & SPEED) {
-    // SPEED and WAITALL are antagonists.
-    m_flags = (wxSockFlags)(m_flags & ~WAITALL);
-  }

 }
 
 wxSocketBase::wxSockFlags wxSocketBase::GetFlags() const
 }
 
 wxSocketBase::wxSockFlags wxSocketBase::GetFlags() const


@@ -537,67 +665,66 @@ wxSocketBase::wxSockFlags wxSocketBase::GetFlags() const
   return m_flags;
 }
 
   return m_flags;
 }
 

-void wxSocketBase::SetNotify(wxRequestNotify flags)
+void wxSocketBase::SetNotify(GSocketEventFlags flags)

 {
   /* Check if server */
   if (m_type != SOCK_SERVER)
 {
   /* Check if server */
   if (m_type != SOCK_SERVER)

-    flags &= ~REQ_ACCEPT;
+    flags &= ~GSOCK_CONNECTION_FLAG;

 
   m_neededreq = flags;
   if (m_neededreq == 0)
 
   m_neededreq = flags;
   if (m_neededreq == 0)

-    m_internal->StopWaiter();
+    Notify(FALSE);

   else
     Notify(m_notify_state);
 }
 
   else
     Notify(m_notify_state);
 }
 

+// --------------------------------------------------------------
+// Automatic notifier
+// --------------------------------------------------------------
+
+static void wx_socket_fallback(GSocket *socket, GSocketEvent event, char *cdata)
+{
+  wxSocketBase *sckobj = (wxSocketBase *)cdata;
+
+  sckobj->OnRequest(event);
+}
+

 void wxSocketBase::Notify(bool notify)
 {
   m_notify_state = notify;
 void wxSocketBase::Notify(bool notify)
 {
   m_notify_state = notify;

-  if (m_fd == INVALID_SOCKET)
+  if (!m_socket)

     return;
 
     return;
 

-  if (notify)
-    m_internal->ResumeWaiter();
-  else
-    m_internal->StopWaiter();
+  GSocket_UnsetCallback(m_socket, GSOCK_INPUT_FLAG | GSOCK_OUTPUT_FLAG |
+                                  GSOCK_LOST_FLAG | GSOCK_CONNECTION_FLAG);
+  if (!notify)
+    return;
+
+  GSocket_SetCallback(m_socket, m_neededreq, wx_socket_fallback, (char *)this);

 }
 
 }
 

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

 {
   wxSocketEvent event(m_id);
 {
   wxSocketEvent event(m_id);

-  wxRequestNotify notify = EventToNotify(req_evt);
+  GSocketEventFlags notify = EventToNotify(req_evt);
+
+  if (m_defering != NO_DEFER) {
+    DoDefer(req_evt);
+    return;
+  }

 
   if ((m_neededreq & notify) == notify) {
     event.m_socket = this;
     event.m_skevt = req_evt;
     ProcessEvent(event);
 
   if ((m_neededreq & notify) == notify) {
     event.m_socket = this;
     event.m_skevt = req_evt;
     ProcessEvent(event);

-    // TODOTODO
-    // OldOnNotify(req_evt);
-
-    // We disable the event reporting.
-    m_neededreq &= ~notify;
+    OldOnNotify(req_evt);

   }
   }

-}
-
-wxSocketEvent::wxSocketEvent(int id)
-  : wxEvent(id)
-{
-  wxEventType type = (wxEventType)wxEVT_SOCKET;
-
-  SetEventType(type);
-}

 
 

-void wxSocketEvent::CopyObject(wxObject& obj_d) const
-{
-  wxSocketEvent *event = (wxSocketEvent *)&obj_d;
-
-  wxEvent::CopyObject(obj_d);
-
-  event->m_skevt = m_skevt;
-  event->m_socket = m_socket;
+  if (req_evt == GSOCK_LOST)
+    Close();

 }
 
 }
 

-void wxSocketBase::OldOnNotify(wxRequestEvent evt)
+void wxSocketBase::OldOnNotify(GSocketEvent evt)

 {
 }
 
 {
 }
 


@@ -623,6 +750,7 @@ void wxSocketBase::CreatePushbackAfter(const char *buffer, size_t size)
     m_unread = (char *) realloc(m_unread, m_unrd_size+size);
   else
     m_unread = (char *) malloc(size);
     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);
   curr_pos = m_unread + m_unrd_size;
 
   memcpy(curr_pos, buffer, size);


@@ -631,18 +759,21 @@ void wxSocketBase::CreatePushbackAfter(const char *buffer, size_t size)
 
 void wxSocketBase::CreatePushbackBefore(const char *buffer, size_t size)
 {
 
 void wxSocketBase::CreatePushbackBefore(const char *buffer, size_t size)
 {

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

 
 

-  memcpy(new_buf, buffer, size);
-  if (m_unrd_size != 0) {
-    memcpy(curr_pos, m_unread, m_unrd_size);
+    tmp = (char *)malloc(m_unrd_size + size);
+    memcpy(tmp+size, m_unread, m_unrd_size);

     free(m_unread);
     free(m_unread);

+
+    m_unread = tmp;

   }
   }

-  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)
 }
 
 size_t wxSocketBase::GetPushback(char *buffer, size_t size, bool peek)


@@ -650,64 +781,23 @@ size_t wxSocketBase::GetPushback(char *buffer, size_t 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;
+  memcpy(buffer, (m_unread+m_unrd_cur), size);

 
   if (!peek) {
 
   if (!peek) {

-    m_unrd_size -= size;
-    if (m_unrd_size == 0) {
+    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 buffer core requester -----------------
-// --------------------------------------------------------------
-
-void wxSocketBase::WantBuffer(char *buffer, size_t nbytes,
-            wxRequestEvent evt)
-{
-  bool buf_timed_out;
-
-  if (m_fd == INVALID_SOCKET || !m_handler || !m_connected)
-    return;
-
-  SockRequest *buf = new SockRequest;
-
-  SaveState();
-  m_internal->StopWaiter(); 
-  buf->buffer = buffer;
-  buf->size = nbytes;
-  buf->done = FALSE;
-  buf->type = EventToNotify(evt);
-  buf->io_nbytes = 0;
-  buf->error = 0;
-  buf->wait = TRUE;
-  buf->timeout = 1000;
-  buf_timed_out = FALSE;
-
-  if (m_flags & SPEED) 
-    m_internal->QueueRequest(buf, FALSE);
-  else
-    if (m_flags & NOWAIT) 
-      m_internal->QueueRequest(buf, TRUE);
-    else 
-      m_internal->QueueRequest(buf, TRUE);
-  m_lcount += buf->io_nbytes;
-  if (buf_timed_out)
-    m_error = ETIMEDOUT;
-  else
-    m_error = buf->error;
-
-  delete buf;
-  RestoreState();
-}
-

 // --------------------------------------------------------------
 // wxSocketServer
 // --------------------------------------------------------------
 // --------------------------------------------------------------
 // wxSocketServer
 // --------------------------------------------------------------


@@ -716,23 +806,15 @@ wxSocketServer::wxSocketServer(wxSockAddress& addr_man,
              wxSockFlags flags) :
   wxSocketBase(flags, SOCK_SERVER)
 {
              wxSockFlags flags) :
   wxSocketBase(flags, SOCK_SERVER)
 {

-  m_fd = socket(addr_man.GetFamily(), SOCK_STREAM, 0);
-
-  if (m_fd == INVALID_SOCKET)
-    return;
-
-  int flag = 1;
-  setsockopt(m_fd, SOL_SOCKET, SO_REUSEADDR, (char*)&flag, sizeof(int));
+  m_socket = GSocket_new();

 
 

-  struct sockaddr *myaddr;
-  size_t len;
-
-  addr_man.Build(myaddr, len);
-  if (bind(m_fd, myaddr, addr_man.SockAddrLen()) < 0)
+  if (!m_socket)

     return;
 
     return;
 

-  if (listen(m_fd, 5) < 0) {
-    m_fd = INVALID_SOCKET;
+  GSocket_SetLocal(m_socket, addr_man.GetAddress());
+  if (GSocket_SetServer(m_socket) != GSOCK_NOERROR) {
+    GSocket_destroy(m_socket);
+    m_socket = NULL;

     return;
   }
 
     return;
   }
 


@@ -745,30 +827,14 @@ wxSocketServer::wxSocketServer(wxSockAddress& addr_man,
 
 bool wxSocketServer::AcceptWith(wxSocketBase& sock)
 {
 
 bool wxSocketServer::AcceptWith(wxSocketBase& sock)
 {

-  int fd2;
-
-  m_internal->AcquireFD();
-  if ((fd2 = accept(m_fd, 0, 0)) < 0) {
-    m_internal->ReleaseFD();
-    return FALSE;
-  }
-  m_internal->ReleaseFD();
-
-  struct linger linger;
-  linger.l_onoff = 0;
-  linger.l_linger = 1;
-
-  setsockopt(fd2, SOL_SOCKET, SO_LINGER, (char*)&linger, sizeof(linger));
+  GSocket *child_socket;

 
 

-  int flag = 0;
-  setsockopt(fd2, SOL_SOCKET, SO_KEEPALIVE, (char*)&flag, sizeof(int));
+  child_socket = GSocket_WaitConnection(m_socket);

 
   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;
 

-  sock.m_internal->ResumeWaiter();
-

   return TRUE;
 }
 
   return TRUE;
 }
 


@@ -781,9 +847,6 @@ wxSocketBase *wxSocketServer::Accept()
   if (!AcceptWith(*sock))
     return NULL;
 
   if (!AcceptWith(*sock))
     return NULL;
 

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

   return sock;
 }
 
   return sock;
 }
 


@@ -810,43 +873,26 @@ wxSocketClient::~wxSocketClient()
 // --------------------------------------------------------------
 bool wxSocketClient::Connect(wxSockAddress& addr_man, bool WXUNUSED(wait) )
 {
 // --------------------------------------------------------------
 bool wxSocketClient::Connect(wxSockAddress& addr_man, bool WXUNUSED(wait) )
 {

-  struct linger linger;
-

   if (IsConnected())
     Close();
 
   if (IsConnected())
     Close();
 

+  // This should never happen.
+  if (m_socket)
+    GSocket_destroy(m_socket);
+

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

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

 
 

-  if (m_fd < 0)
+  if (!m_socket)

     return FALSE;
 
   m_connected = FALSE;
 
     return FALSE;
 
   m_connected = FALSE;
 

-  linger.l_onoff = 1;
-  linger.l_linger = 5;
-  setsockopt(m_fd, SOL_SOCKET, SO_LINGER, (char*)&linger, sizeof(linger));
-
-  // Stay in touch with the state of things...
-
-  unsigned long flag = 1;
-  setsockopt(m_fd, SOL_SOCKET, SO_KEEPALIVE, (char*)&flag, sizeof(int));
-
-  // Disable the nagle algorithm, which delays sends till the
-  // buffer is full (or a certain time period has passed?)...
-
-#if defined(__WINDOWS__) || (defined(IPPROTO_TCP) && defined(TCP_NODELAY))
-  flag = 1;
-  setsockopt(m_fd, IPPROTO_TCP, TCP_NODELAY, (char*)&flag, sizeof(int));
-#endif
-
-  struct sockaddr *remote;
-  size_t len;
-
-  addr_man.Build(remote, len);
-
-  if (connect(m_fd, remote, len) != 0)
+  // Update the flags of m_socket.
+  SetFlags(m_flags);
+  GSocket_SetPeer(m_socket, addr_man.GetAddress());
+  if (GSocket_Connect(m_socket, GSOCK_STREAMED) != GSOCK_NOERROR)

     return FALSE;
 
   // Enables bg events.
     return FALSE;
 
   // Enables bg events.


@@ -859,7 +905,7 @@ bool wxSocketClient::Connect(wxSockAddress& addr_man, bool WXUNUSED(wait) )
 
 bool wxSocketClient::WaitOnConnect(long seconds, long microseconds)
 {
 
 bool wxSocketClient::WaitOnConnect(long seconds, long microseconds)
 {

-  int ret = _Wait(seconds, microseconds, REQ_CONNECT | REQ_LOST);
+  int ret = _Wait(seconds, microseconds, GSOCK_CONNECTION_FLAG | GSOCK_LOST_FLAG);

 
   if (ret)
     m_connected = TRUE;
 
   if (ret)
     m_connected = TRUE;


@@ -867,13 +913,13 @@ bool wxSocketClient::WaitOnConnect(long seconds, long microseconds)
   return m_connected;
 }
 
   return m_connected;
 }
 

-void wxSocketClient::OnRequest(wxRequestEvent evt)
+void wxSocketClient::OnRequest(GSocketEvent evt)

 {
 {

-  if (evt == EVT_CONNECT) 
+  if (evt == GSOCK_CONNECTION)

   {
   {

-    if (m_connected) 
+    if (m_connected)

     {
     {

-      m_neededreq &= ~REQ_CONNECT;
+      m_neededreq &= ~GSOCK_CONNECTION_FLAG;

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


@@ -882,198 +928,43 @@ void wxSocketClient::OnRequest(wxRequestEvent evt)
   wxSocketBase::OnRequest(evt);
 }
 
   wxSocketBase::OnRequest(evt);
 }
 

-/////////////////////////////////////////////////////////////////
-// wxSocketHandler ///////////////////////////////////////////////
-/////////////////////////////////////////////////////////////////
-
-wxSocketHandler *wxSocketHandler::master = NULL;
-#if defined(__WINDOWS__)
-static int win_initialized = 0;
-#endif
-
-// --------------------------------------------------------------
-// --------- wxSocketHandler CONSTRUCTOR ------------------------
-// --------------------------------------------------------------
-wxSocketHandler::wxSocketHandler()
-{
-#if defined(__WINDOWS__)
-  if (!win_initialized) 
-  {
-    WSADATA wsaData;
-
-    WSAStartup((1 << 8) | 1, &wsaData);
-    win_initialized = 1;
-  }
-#endif
-
-  socks = new wxList;
-
-#ifndef __WINDOWS__
-  signal(SIGPIPE, SIG_IGN);
-#endif
-}
-
-// --------------------------------------------------------------
-// --------- wxSocketHandler DESTRUCTOR -------------------------
-// --------------------------------------------------------------
-wxSocketHandler::~wxSocketHandler()
-{
-  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;
-
-#ifdef __WINDOWS__
-  WSACleanup();
-  win_initialized = 0;
-#endif
-}
-

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

-// --------- wxSocketHandler registering functions --------------
+// wxSocketEvent

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

-void wxSocketHandler::Register(wxSocketBase* sock)
+wxSocketEvent::wxSocketEvent(int id)
+  : wxEvent(id)

 {
 {

-  wxNode *node;
-
-  for (node = socks->First(); node != NULL; node = node->Next()) 
-  {
-    wxSocketBase* s = (wxSocketBase*)node->Data();
-
-    if (s == sock)
-      return;
-  }
+  wxEventType type = (wxEventType)wxEVT_SOCKET;

 
 

-  if (sock) 
-  {
-    socks->Append(sock);
-    sock->SetHandler(this);
-  }
+  SetEventType(type);

 }
 
 }
 

-void wxSocketHandler::UnRegister(wxSocketBase* sock)
+void wxSocketEvent::CopyObject(wxObject& obj_d) const

 {
 {

-  wxNode *node;
-
-  for (node = socks->First(); node; node = node->Next()) 
-  {
-    wxSocketBase* s = (wxSocketBase*)node->Data();
+  wxSocketEvent *event = (wxSocketEvent *)&obj_d;

 
 

-    if (s == sock) 
-    {
-      delete node;
-      sock->SetHandler(NULL);
-      return;
-    }
-  }
-}
+  wxEvent::CopyObject(obj_d);

 
 

-unsigned long wxSocketHandler::Count() const
-{
-  return socks->Number();
+  event->m_skevt = m_skevt;
+  event->m_socket = m_socket;

 }
 
 }
 

-// --------------------------------------------------------------
-// --------- wxSocketHandler "big" wait functions ---------------
-// --------------------------------------------------------------
-
-int wxSocketHandler::Wait(long seconds, long microseconds)
-{
-  // TODO Needs the completely asynchronous notifier.
-
-  /*
-  int i;
-  int on_wait;
-  wxNode *node;
-  for (node = socks->First(), i=0; node; node = node->Next(), i++) 
-  {
-    wxSocketBase *sock = (wxSocketBase *)node->Data();
-
-    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();
+// --------------------------------------------------------------------------
+// wxSocketModule
+// --------------------------------------------------------------------------
+class WXDLLEXPORT wxSocketModule: public wxModule {
+  DECLARE_DYNAMIC_CLASS(wxSocketModule)
+ public:
+  bool OnInit() {
+    return GSocket_Init();

   }
   }

-
-  if (on_wait == -2)
-    return 0;
-
-  return on_wait;
-  */
-  return 0;
-}
-
-void wxSocketHandler::YieldSock()
-{
-  wxNode *node;
-
-  // Nothing to do anymore here except waiting for the queue emptying.
-  for (node = socks->First(); node; node=node->Next()) {
-    wxSocketBase *sock = (wxSocketBase *)node->Data();
-
-    sock->m_internal->WaitForEnd(NULL);
+  void OnExit() {
+    GSocket_Cleanup();

   }
   }

-}
-
-// --------------------------------------------------------------
-// --------- wxSocketHandler: create and register the socket ----
-// --------------------------------------------------------------
-wxSocketServer *wxSocketHandler::CreateServer(wxSockAddress& addr,
-                wxSocketBase::wxSockFlags flags)
-{
-  wxSocketServer *serv = new wxSocketServer(addr, flags);
-
-  Register(serv);
-  return serv;
-}
-
-wxSocketClient *wxSocketHandler::CreateClient(wxSocketBase::wxSockFlags flags)
-{
-  wxSocketClient *client = new wxSocketClient(flags);
-
-  Register(client);
-  return client;
-}
-
-bool wxSocketModule::OnInit() 
-{
-  wxSocketHandler::master = new wxSocketHandler();
-  return TRUE;
-}
-
-void wxSocketModule::OnExit() 
-{
-  delete wxSocketHandler::master;
-  wxSocketHandler::master = NULL;
-}
+};

 
 

-#endif
-  // __WXSTUBS__
+IMPLEMENT_DYNAMIC_CLASS(wxSocketModule, wxModule)

 
 #endif
   // wxUSE_SOCKETS
 
 #endif
   // wxUSE_SOCKETS