1. added wxGetNumberFromUser (to textdlgg.cpp and dialogs sample)

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

diff --git a/src/common/socket.cpp b/src/common/socket.cpp
index d6919eb2f02b5c17cbcc1a096fdd74c5c852ba4a..4e12e8971bfd4affb1ab62808130a48d4a4d89fc 100644 (file)
--- a/src/common/socket.cpp
+++ b/src/common/socket.cpp
@@ -1,18 +1,15 @@
 ////////////////////////////////////////////////////////////////////////////////
 // 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:    March 1998
-// Copyright:  (C) 1998, 1997, Guilhem Lavaux
+// Updated:    July 1999
+// Copyright:  (C) 1999, 1998, 1997, Guilhem Lavaux

 // RCS_ID:     $Id$
 // License:    see wxWindows license
 ////////////////////////////////////////////////////////////////////////////////
 #ifdef __GNUG__
 #pragma implementation "socket.h"
 // RCS_ID:     $Id$
 // License:    see wxWindows license
 ////////////////////////////////////////////////////////////////////////////////
 #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,6 +19,8 @@
 #pragma hdrstop
 #endif
 
 #pragma hdrstop
 #endif
 

+#if wxUSE_SOCKETS
+

 /////////////////////////////////////////////////////////////////////////////
 // wxWindows headers
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////
 // wxWindows headers
 /////////////////////////////////////////////////////////////////////////////


@@ -30,128 +29,18 @@
 #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
-/////////////////////////////////////////////////////////////////////////////
-#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>
-
-/////////////////////////////
-// Needs internal variables
-/////////////////////////////
-#ifdef __WXXT__
-#define Uses_XtIntrinsic
-#endif
-
-#endif
-
-#if defined(__WXGTK__)
-#include <gtk/gtk.h>
-#endif
-

 /////////////////////////////////////////////////////////////////////////////
 // wxSocket headers
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////
 // wxSocket headers
 /////////////////////////////////////////////////////////////////////////////

-#define WXSOCK_INTERNAL
-#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
-
-#if defined(__WINDOWS__)
-#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
-/////////////////////////////////////////////////////////////////////////////
+#include <wx/module.h>
+#include <wx/sckaddr.h>
+#include <wx/socket.h>

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


@@ -160,133 +49,76 @@ int PASCAL FAR __WSAFDIsSet(SOCKET fd, fd_set FAR *set)
 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)
 #endif
 
 IMPLEMENT_DYNAMIC_CLASS(wxSocketEvent, wxEvent)
 #endif
 

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

 public:
 public:

-  int *my_id;
-  int n_val;
-  wxSocketBase *sock;
+  bool notify_state; 
+  GSocketEventFlags evt_notify_state;
+  wxSocketBase::wxSockFlags socket_flags;
+  wxSocketBase::wxSockCbk c_callback;
+  char *c_callback_data;

 
 

-  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 CONSTRUCTOR ---------------------------
 // --------------------------------------------------------------
 wxSocketBase::wxSocketBase(wxSocketBase::wxSockFlags _flags,
 // --------------------------------------------------------------
 // --------- wxSocketBase CONSTRUCTOR ---------------------------
 // --------------------------------------------------------------
 wxSocketBase::wxSocketBase(wxSocketBase::wxSockFlags _flags,

-                          wxSocketBase::wxSockType _type) :
+         wxSocketBase::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_flags(_flags), m_type(_type),
+  m_neededreq(GSOCK_INPUT_FLAG | GSOCK_LOST_FLAG),
+  m_lcount(0), m_timeout(3600),
+  m_unread(NULL), m_unrd_size(0), m_unrd_cur(0),
+  m_cbk(NULL), m_cdata(NULL),
+  m_connected(FALSE), m_notify_state(FALSE), m_id(-1),
+  m_defering(NO_DEFER),
+  m_states()

 {
 {

-  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_flags((wxSockFlags)SPEED | WAITALL), m_type(SOCK_UNINIT),
+  m_neededreq(GSOCK_INPUT_FLAG | GSOCK_LOST_FLAG),
+  m_lcount(0), m_timeout(3600),
+  m_unread(NULL), m_unrd_size(0), m_unrd_cur(0),
+  m_cbk(NULL), m_cdata(NULL),
+  m_connected(FALSE), m_notify_state(FALSE), m_id(-1),
+  m_defering(NO_DEFER),
+  m_states()

 {
 {

-  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 destructor

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

+

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

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

-  if (m_fd != INVALID_SOCKET) {
-    for (int i=0;i<3;i++) {
-      wxNode *n, *node = req_list[i].First();
-
-      while (node) {
-        SockRequest *req = (SockRequest *)node->Data();
-        req->done = TRUE;
+  if (m_socket) 
+  {
+    if (m_notify_state == TRUE)
+      Notify(FALSE);

 
 

-        n = node->Next();
-        delete node;
-        node = n;
-      }
-    }
-
-    DestroyCallbacks();
-    shutdown(m_fd, 2);
-    close(m_fd);
-    m_fd = INVALID_SOCKET;
+    // Shutdown the connection.
+    GSocket_Shutdown(m_socket);

     m_connected = FALSE;
   }
 
     m_connected = FALSE;
   }
 


@@ -294,47 +126,92 @@ bool wxSocketBase::Close()
 }
 
 // --------------------------------------------------------------
 }
 
 // --------------------------------------------------------------

-// --------- wxSocketBase base IO functions ---------------------
+// wxSocketBase base IO function

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

-wxSocketBase& wxSocketBase::Read(char* buffer, size_t nbytes)
+
+int wxSocketBase::DeferRead(char *buffer, size_t nbytes)

 {
 {

-  m_lcount = GetPushback(buffer, nbytes, FALSE);
+  GSocketEventFlags old_event_flags;
+  bool old_notify_state;

 
 

-  // 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;
+  wxASSERT(m_defering == NO_DEFER);

 
 

-  WantBuffer(buffer, nbytes, EVT_READ);
+  m_defering = DEFER_READ;

 
 

-  return *this;
+  old_event_flags = NeededReq();
+  old_notify_state = m_notify_state;
+  
+  SetNotify(GSOCK_INPUT_FLAG | GSOCK_LOST_FLAG);
+  Notify(TRUE);
+
+  m_defer_buffer = buffer;
+  m_defer_nbytes = nbytes;
+  while (m_defer_buffer != NULL)
+    wxYield();
+
+  Notify(old_notify_state);
+  SetNotify(old_event_flags);
+
+  m_defering = NO_DEFER;
+
+  return nbytes-m_defer_nbytes;

 }
 
 }
 

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

 {
 {

-  size_t nbytes_old = nbytes;
+  int ret = 1;
+
+  m_lcount = GetPushback(buffer, nbytes, FALSE);
+  nbytes -= m_lcount;
+  buffer += m_lcount;

 
 

-  nbytes -= GetPushback(buffer, nbytes, TRUE);
-  if (!nbytes) {
-    m_lcount = nbytes_old;
+  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;
   }
 
     return *this;
   }
 

-  WantBuffer(buffer, nbytes, EVT_PEEK);
+  if ((m_flags & SPEED) != 0) {

 
 

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

 
 

-wxSocketBase& wxSocketBase::Write(const char *buffer, size_t nbytes)
-{
-  WantBuffer((char *)buffer, nbytes, EVT_WRITE);

   return *this;
 }
 
 wxSocketBase& wxSocketBase::ReadMsg(char* buffer, size_t nbytes)
 {
   return *this;
 }
 
 wxSocketBase& wxSocketBase::ReadMsg(char* buffer, size_t nbytes)
 {

-  SockMsg msg;
-  size_t len, len2, sig;
+  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))
 
   Read((char *)&msg, sizeof(msg));
   if (m_lcount != sizeof(msg))


@@ -351,13 +228,20 @@ wxSocketBase& wxSocketBase::ReadMsg(char* buffer, size_t nbytes)
   len |= (size_t)(msg.len[1] & 0xff) << 8;
   len |= (size_t)(msg.len[2] & 0xff) << 16;
   len |= (size_t)(msg.len[3] & 0xff) << 24;
   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;
-  if (len > nbytes)
+
+  // len2 is incorrectly computed in the original; this sequence is
+  // the fix
+  if (len > nbytes) {
+    len2 = len - nbytes;

     len = nbytes;
     len = nbytes;

+  }

   else
     len2 = 0;
 
   else
     len2 = 0;
 

-  if (Read(buffer, len).LastCount() != len)
+  // 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;
     return *this;
   if (len2 && (Read(NULL, len2).LastCount() != len2))
     return *this;


@@ -368,23 +252,83 @@ wxSocketBase& wxSocketBase::ReadMsg(char* buffer, size_t nbytes)
   sig |= (size_t)(msg.sig[1] & 0xff) << 8;
   sig |= (size_t)(msg.sig[2] & 0xff) << 16;
   sig |= (size_t)(msg.sig[3] & 0xff) << 24;
   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)
 // ERROR
   if (sig != 0xdeadfeed)

-    return *this;
+    wxLogDebug(_T("Warning: invalid signature returned to ReadMsg\n"));
+
+  return *this;
+}
+
+wxSocketBase& wxSocketBase::Peek(char* buffer, size_t nbytes)
+{
+  Read(buffer, nbytes);
+  CreatePushbackAfter(buffer, nbytes);
+
+  return *this;
+}
+
+int wxSocketBase::DeferWrite(const char *buffer, size_t nbytes)
+{
+  GSocketEventFlags old_event_flags;
+  bool old_notify_state;
+
+  wxASSERT(m_defering == NO_DEFER);
+
+  m_defering = DEFER_WRITE;
+
+  old_event_flags = NeededReq();
+  old_notify_state = m_notify_state;
+
+  SetNotify(GSOCK_OUTPUT_FLAG | GSOCK_LOST_FLAG);
+  Notify(TRUE);
+
+  m_defer_buffer = (char *)buffer;
+  m_defer_nbytes = nbytes;
+  while (m_defer_buffer != NULL)
+    wxYield();
+
+  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)
+{
+  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)
 {
 
   return *this;
 }
 
 wxSocketBase& wxSocketBase::WriteMsg(const char *buffer, size_t nbytes)
 {

-  SockMsg msg;
+  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.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[0] = (char) nbytes & 0xff;

   msg.len[1] = (char) (nbytes >> 8) & 0xff;
   msg.len[2] = (char) (nbytes >> 16) & 0xff;
   msg.len[3] = (char) (nbytes >> 24) & 0xff;
   msg.len[1] = (char) (nbytes >> 8) & 0xff;
   msg.len[2] = (char) (nbytes >> 16) & 0xff;
   msg.len[3] = (char) (nbytes >> 24) & 0xff;


@@ -402,30 +346,61 @@ wxSocketBase& wxSocketBase::WriteMsg(const char *buffer, size_t nbytes)
   Write((char *)&msg, sizeof(msg));
 
   return *this;
   Write((char *)&msg, sizeof(msg));
 
   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;
-
-  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 (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;
+  }
+
+  m_defer_nbytes -= ret;
+
+  if (ret < 0)
+    m_defer_nbytes++;
+
+  if ((m_flags & WAITALL) == 0 || m_defer_nbytes == 0 || ret < 0) {
+    m_defer_buffer = NULL;
+    Notify(FALSE);
+  } else
+    m_defer_buffer += ret;

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


@@ -440,7 +415,8 @@ void wxSocketBase::Discard()
   SaveState();
   SetFlags((wxSockFlags)(NOWAIT | SPEED));
 
   SaveState();
   SetFlags((wxSockFlags)(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();
   }
 


@@ -451,51 +427,52 @@ void wxSocketBase::Discard()
 }
 
 // --------------------------------------------------------------
 }
 
 // --------------------------------------------------------------

-// --------- wxSocketBase socket info functions -----------------
+// wxSocketBase socket info functions

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

+

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

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

 
 

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

     return FALSE;
 
     return FALSE;
 

-  if (getpeername(m_fd, (struct sockaddr *)&my_addr, (int *)&len_addr) < 0)
-    return FALSE;
+  peer = GSocket_GetPeer(m_socket);
+  addr_man.SetAddress(peer);
+  GAddress_destroy(peer);

 
 

-  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;
-  size_t len_addr = sizeof(my_addr);
+  GAddress *local;

 
 

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

     return FALSE;
 
     return FALSE;
 

-  if (getsockname(m_fd, (struct sockaddr *)&my_addr, (int *)&len_addr) < 0)
-    return FALSE;
+  local = GSocket_GetLocal(m_socket);
+  addr_man.SetAddress(local);
+  GAddress_destroy(local);

 
 

-  addr_man.Disassemble(&my_addr, len_addr);

   return TRUE;
 }
 
 // --------------------------------------------------------------
   return TRUE;
 }
 
 // --------------------------------------------------------------

-// --------- wxSocketBase wait functions ------------------------
+// wxSocketBase wait functions

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

+

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

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

 
 

-  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;
+  state->notify_state     = m_notify_state;
+  state->evt_notify_state = m_neededreq;
+  state->socket_flags     = m_flags;
+  state->c_callback       = m_cbk;
+  state->c_callback_data  = m_cdata;

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


@@ -503,198 +480,131 @@ void wxSocketBase::SaveState()
 void wxSocketBase::RestoreState()
 {
   wxNode *node;
 void wxSocketBase::RestoreState()
 {
   wxNode *node;

+  wxSocketState *state;

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

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

 
 

-  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();
+  SetFlags(state->socket_flags);
+  m_neededreq = state->evt_notify_state;
+  m_cbk       = state->c_callback;
+  m_cdata     = state->c_callback_data;
+  Notify(state->notify_state);

 
   delete node;
   delete state;
 }
 
 // --------------------------------------------------------------
 
   delete node;
   delete state;
 }
 
 // --------------------------------------------------------------

-// --------- wxSocketBase wait functions ------------------------
+// --------- wxSocketBase callback functions --------------------

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

-//
-bool wxSocketBase::_Wait(long seconds, long microseconds, int type)
-{
-  if ((!m_connected && !m_connecting) || m_fd < 0)
-    return FALSE;
-
-  wxSockWakeUp wakeup(this, &m_waitflags, 0);
-
-  SaveState();
-  SetNotify((wxRequestNotify)type);
-  SetupCallbacks();
-
-  if (seconds != -1)
-    wakeup.Start((int)(seconds*1000 + (microseconds / 1000)), TRUE);

 
 

-  m_waitflags = 0x80 | type;
-  while (m_waitflags & 0x80)
-    PROCESS_EVENTS();
-
-  RestoreState();
-
-  if (m_waitflags & 0x40) {
-    m_waitflags = 0;
-    return TRUE;
-  }
-  m_waitflags = 0;
-
-  return FALSE;
-}
-
-bool wxSocketBase::Wait(long seconds, long microseconds)
+wxSocketBase::wxSockCbk wxSocketBase::Callback(wxSockCbk cbk_)

 {
 {

-  return _Wait(seconds, microseconds, REQ_ACCEPT | REQ_CONNECT |
-                                      REQ_READ | REQ_WRITE | REQ_LOST);
-}
+  wxSockCbk old_cbk = cbk_;

 
 

-bool wxSocketBase::WaitForRead(long seconds, long microseconds)
-{
-  return _Wait(seconds, microseconds, REQ_READ | REQ_LOST);
+  m_cbk = cbk_;
+  return old_cbk;

 }
 
 }
 

-bool wxSocketBase::WaitForWrite(long seconds, long microseconds)
+char *wxSocketBase::CallbackData(char *data)

 {
 {

-  return _Wait(seconds, microseconds, REQ_WRITE);
-}
+  char *old_data = m_cdata;

 
 

-bool wxSocketBase::WaitForLost(long seconds, long microseconds)
-{
-  return _Wait(seconds, microseconds, REQ_LOST);
+  m_cdata = data;
+  return old_data;

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

-// --------- wxSocketBase callback management -------------------
+// --------- wxSocketBase wait functions ------------------------

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

-#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;
-
-  i = recv(fd, &c, 1, MSG_PEEK);
-
-  if (i == -1 && (sock->NeededReq() & wxSocketBase::REQ_ACCEPT)) {
-    sock->OnRequest(wxSocketBase::EVT_ACCEPT);
-    return;
-  }
-
-  if (i != 0) {
-    if (!(sock->NeededReq() & wxSocketBase::REQ_READ))
-      return;
+class _wxSocketInternalTimer: public wxTimer {
+ public:
+  int *m_state;

 
 

-    sock->OnRequest(wxSocketBase::EVT_READ);
-  } else {
-    if (!(sock->NeededReq() & wxSocketBase::REQ_LOST)) {
-      sock->Close();
-      return;
-    }
+  void Notify()
+     {
+        *m_state = GSOCK_MAX_EVENT;  // Just to say it's a timeout.
+     }
+};

 
 

-    sock->OnRequest(wxSocketBase::EVT_LOST);
-  }
-}
-#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
+static void wx_socket_wait(GSocket *socket, GSocketEvent event, char *cdata)

 {
 {

-  wxSocketBase *sock = (wxSocketBase *)client;
+  int *state = (int *)cdata;

 
 

-  if (!sock->IsConnected())
-    sock->OnRequest(wxSocketBase::EVT_CONNECT);
-  else
-    sock->OnRequest(wxSocketBase::EVT_WRITE);
+  *state = event;

 }
 }

-#endif

 
 

-#ifdef wx_xview
-Notify_value wx_sock_read_xview (Notify_client client, int fd)
+bool wxSocketBase::_Wait(long seconds, long milliseconds, int type)

 {
 {

-  wxSocketBase *sock = (wxSocketBase *)client;
-  char c;
-  int i;
+  bool old_notify_state = m_notify_state;
+  int state = 0;
+  _wxSocketInternalTimer timer;

 
 

-  i = recv(fd, &c, 1, MSG_PEEK);
+  if (!m_connected || !m_socket)
+    return FALSE;

 
 

-  if (i == -1 && (sock->NeededReq() & wxSocketBase::REQ_ACCEPT)) {
-    sock->OnRequest(wxSocketBase::EVT_ACCEPT);
-    return;
-  }
+  timer.m_state = &state;

 
 

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

 
 

-    sock->OnRequest(wxSocketBase::EVT_READ);
-  } else {
-    if (!(sock->NeededReq() & wxSocketBase::REQ_LOST))
-      return;
+  timer.Start(seconds * 1000 + milliseconds, TRUE);
+  GSocket_SetFallback(m_socket, type, wx_socket_wait, (char *)&state);

 
 

-    sock->OnRequest(wxSocketBase::EVT_LOST);
-  }
+  while (state == 0)
+    wxYield();
+
+  GSocket_UnsetFallback(m_socket, type);
+  timer.Stop();
+
+  Notify(old_notify_state);

 
 

-  return (Notify_value) FALSE;
+  return (state != GSOCK_MAX_EVENT);

 }
 
 }
 

-Notify_value wx_sock_write_xview (Notify_client client, int fd)
+bool wxSocketBase::Wait(long seconds, long milliseconds)

 {
 {

-  wxSocketBase *sock = (wxSocketBase *)client;
+  return _Wait(seconds, milliseconds, GSOCK_INPUT_FLAG | GSOCK_OUTPUT_FLAG |
+                                      GSOCK_CONNECTION_FLAG | GSOCK_LOST_FLAG);
+}

 
 

-  if (!sock->IsConnected())
-    sock->OnRequest(wxSocketBase::EVT_CONNECT);
-  else
-    sock->OnRequest(wxSocketBase::EVT_WRITE);
+bool wxSocketBase::WaitForRead(long seconds, long milliseconds)
+{
+  return _Wait(seconds, milliseconds, GSOCK_INPUT_FLAG | GSOCK_LOST_FLAG);
+}

 
 

-  return (Notify_value) TRUE;
+bool wxSocketBase::WaitForWrite(long seconds, long milliseconds)
+{
+  return _Wait(seconds, milliseconds, GSOCK_OUTPUT_FLAG | GSOCK_LOST_FLAG);

 }
 }

-#endif

 
 

-wxSocketBase::wxRequestNotify wxSocketBase::EventToNotify(wxRequestEvent evt)
+bool wxSocketBase::WaitForLost(long seconds, long milliseconds)

 {
 {

-  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 _Wait(seconds, milliseconds, GSOCK_LOST_FLAG);
+}
+
+// --------------------------------------------------------------
+// --------- wxSocketBase callback management -------------------
+// --------------------------------------------------------------
+
+GSocketEventFlags wxSocketBase::EventToNotify(GSocketEvent 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_FLAG:
+    return GSOCK_LOST_FLAG;
+  default:
+    return 0;

   }
   return 0;
 }
   }
   return 0;
 }


@@ -702,194 +612,79 @@ 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) {
-    unsigned long flag = 0;
-    ioctl(m_fd, FIONBIO, &flag);
-
-    // SPEED and WAITALL are antagonists.
-    m_flags = (wxSockFlags)(m_flags & ~WAITALL);
-
-    Notify(FALSE);
-  } else {
-    unsigned long flag = 1;
-    ioctl(m_fd, FIONBIO, &flag);
-  }

 }
 
 }
 

-void wxSocketBase::SetNotify(wxRequestNotify flags)
+wxSocketBase::wxSockFlags wxSocketBase::GetFlags() const

 {
 {

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

 }
 
 }
 

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

 {
 {

-  if (m_fd == INVALID_SOCKET || !m_handler || (m_flags & SPEED))
-    return;
+  /* Check if server */
+  if (m_type != SOCK_SERVER)
+    flags &= ~GSOCK_CONNECTION_FLAG;

 
 

-#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
-  }
-#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;
+  m_neededreq = flags;
+  if (m_neededreq == 0)
+    Notify(FALSE);
+  else
+    Notify(m_notify_state);

 }
 
 }
 

-void wxSocketBase::DestroyCallbacks()
+// --------------------------------------------------------------
+// Automatic notifier
+// --------------------------------------------------------------
+
+static void wx_socket_fallback(GSocket *socket, GSocketEvent event, char *cdata)

 {
 {

-  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
+  wxSocketBase *sckobj = (wxSocketBase *)cdata;
+
+  sckobj->OnRequest(event);

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

-  if (m_notifyme == notify)
+  m_notify_state = notify;
+  if (!m_socket)

     return;
     return;

-  if (notify)
-    SetupCallbacks();
-  else
-    DestroyCallbacks();
-  m_notifyme = notify;
-}

 
 

-void wxSocketBase::OnRequest(wxRequestEvent req_evt)
-{
-  wxRequestNotify req_notif = EventToNotify(req_evt);
+  GSocket_UnsetFallback(m_socket, GSOCK_INPUT_FLAG | GSOCK_OUTPUT_FLAG |
+                                  GSOCK_LOST_FLAG | GSOCK_CONNECTION_FLAG);
+  if (!notify)
+    return;

 
 

-  // Mask the current event
-  SetNotify(m_neededreq & ~req_notif);
+  GSocket_SetFallback(m_socket, m_neededreq, wx_socket_fallback, (char *)this);
+}

 
 

-  if (req_evt <= EVT_WRITE && DoRequests(req_evt))
-    return;
+void wxSocketBase::OnRequest(GSocketEvent req_evt)
+{
+  wxSocketEvent event(m_id);
+  GSocketEventFlags notify = 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
-    }
+  if (m_defering != NO_DEFER) {
+    DoDefer(req_evt);

     return;
   }
 
     return;
   }
 

-  if (req_evt == EVT_LOST) {
-    m_connected = FALSE;
-    Close();
-  }
-  if (m_notifyme)
+  if ((m_neededreq & notify) == notify) {
+    event.m_socket = this;
+    event.m_skevt = req_evt;
+    ProcessEvent(event);

     OldOnNotify(req_evt);
     OldOnNotify(req_evt);

+  }

 
 

-  // Unmask
-  SetNotify(m_neededreq | req_notif);
-}
-
-wxSocketEvent::wxSocketEvent(int id)
-  : wxEvent(id)
-{
-  wxEventType type = (wxEventType)wxEVT_SOCKET;
-
-  SetEventType(type);
+  if (req_evt == GSOCK_LOST)
+    Close();

 }
 
 }
 

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

 {
 {

-  wxSocketEvent event(m_id);
-
-  event.SetEventObject(this);
-  event.m_skevt = evt;
-  ProcessEvent(event);
-
-  if (m_cbk)
-    m_cbk(*this, evt, m_cdata);

 }
 
 // --------------------------------------------------------------
 // --------- wxSocketBase functions [Callback, CallbackData] ----
 // --------------------------------------------------------------
 }
 
 // --------------------------------------------------------------
 // --------- wxSocketBase functions [Callback, CallbackData] ----
 // --------------------------------------------------------------

-wxSocketBase::wxSockCbk wxSocketBase::Callback(wxSocketBase::wxSockCbk _cbk)
-{
-  wxSockCbk old_cbk = m_cbk;
-
-  m_cbk = _cbk;
-  return old_cbk;
-}
-
-char *wxSocketBase::CallbackData(char *cdata_)
-{
-  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)
 {


@@ -900,11 +695,16 @@ void wxSocketBase::SetEventHandler(wxEvtHandler& h_evt, int id)
 // --------------------------------------------------------------
 // --------- wxSocketBase pushback library ----------------------
 // --------------------------------------------------------------
 // --------------------------------------------------------------
 // --------- wxSocketBase pushback library ----------------------
 // --------------------------------------------------------------

+

 void wxSocketBase::CreatePushbackAfter(const char *buffer, size_t size)
 {
   char *curr_pos;
 
 void wxSocketBase::CreatePushbackAfter(const char *buffer, size_t size)
 {
   char *curr_pos;
 

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

   curr_pos = m_unread + m_unrd_size;
 
   memcpy(curr_pos, buffer, size);
   curr_pos = m_unread + m_unrd_size;
 
   memcpy(curr_pos, buffer, size);


@@ -913,17 +713,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);
-  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 = new_buf;
+    m_unread = tmp;
+  }
+  

   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)


@@ -931,15 +735,17 @@ 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) {
+    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;

     }
   }
 
     }
   }
 


@@ -947,206 +753,40 @@ size_t wxSocketBase::GetPushback(char *buffer, size_t size, bool peek)
 }
 
 // --------------------------------------------------------------
 }
 
 // --------------------------------------------------------------

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

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

-bool wxSocketBase::DoRequests(wxRequestEvent req_flag)
-{
-  wxNode *node = req_list[req_flag].First();
-  size_t len;
-  int ret;
-
-  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)
-{
-  bool buf_timed_out;
-
-  if (m_fd == INVALID_SOCKET || !m_handler || !m_connected)
-    return;
-
-  if (m_flags & SPEED) {
-    WantSpeedBuffer(buffer, nbytes, evt);
-    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;
-
-  delete buf;
-  RestoreState();
-}
-
-// --------------------------------------------------------------
-// wxSocketServer ///////////////////////////////////////////////
-// --------------------------------------------------------------
-
-// --------------------------------------------------------------
-// --------- wxSocketServer CONSTRUCTOR -------------------------
-// --------------------------------------------------------------

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

-                              wxSockFlags flags) :
+             wxSockFlags flags) :

   wxSocketBase(flags, SOCK_SERVER)
 {
   wxSocketBase(flags, SOCK_SERVER)
 {

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

 
 

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

     return;
 
     return;
 

-  int flag = 1;
-  setsockopt(m_fd, SOL_SOCKET, SO_REUSEADDR, (char*)&flag, sizeof(int));
-
-  struct sockaddr *myaddr;
-  size_t len;
-
-  addr_man.Build(myaddr, len);
-  if (bind(m_fd, myaddr, addr_man.SockAddrLen()) < 0)
-    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;
   }

+
+  Notify(TRUE);

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

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

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

+

 bool wxSocketServer::AcceptWith(wxSocketBase& sock)
 {
 bool wxSocketServer::AcceptWith(wxSocketBase& sock)
 {

-  int fd2;
-
-  if ((fd2 = accept(m_fd, 0, 0)) < 0)
-    return FALSE;
-
-  struct linger linger;
-  linger.l_onoff = 0;
-  linger.l_linger = 1;
+  GSocket *child_socket;

 
 

-  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);
-  }
+  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;
 
   return TRUE;
   sock.m_connected = TRUE;
 
   return TRUE;


@@ -1161,30 +801,17 @@ wxSocketBase *wxSocketServer::Accept()
   if (!AcceptWith(*sock))
     return NULL;
 
   if (!AcceptWith(*sock))
     return NULL;
 

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

   return sock;
 }
 
 // --------------------------------------------------------------
   return sock;
 }
 
 // --------------------------------------------------------------

-// --------- wxSocketServer callbacks ---------------------------
-// --------------------------------------------------------------
-void wxSocketServer::OnRequest(wxRequestEvent evt)
-{
-  if (evt == EVT_ACCEPT) {
-    OldOnNotify(EVT_ACCEPT);
-  }
-}
-
-// --------------------------------------------------------------
-// wxSocketClient ///////////////////////////////////////////////
+// wxSocketClient

 // --------------------------------------------------------------
 
 // --------- wxSocketClient CONSTRUCTOR -------------------------
 // --------------------------------------------------------------
 wxSocketClient::wxSocketClient(wxSockFlags _flags) :
 // --------------------------------------------------------------
 
 // --------- wxSocketClient CONSTRUCTOR -------------------------
 // --------------------------------------------------------------
 wxSocketClient::wxSocketClient(wxSockFlags _flags) :

-       wxSocketBase(_flags, SOCK_CLIENT)
+  wxSocketBase(_flags, SOCK_CLIENT)

 {
 }
 
 {
 }
 


@@ -1200,48 +827,31 @@ 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();
 

-  m_fd = socket(addr_man.GetFamily(), SOCK_STREAM, 0);
+  // This should never happen.
+  if (m_socket)
+    GSocket_destroy(m_socket);
+
+  // Initializes all socket stuff ...
+  // --------------------------------
+  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;
     return FALSE;

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

   }
 
   }
 

+  // Enables bg events.
+  // ------------------

   Notify(TRUE);
 
   m_connected = TRUE;
   Notify(TRUE);
 
   m_connected = TRUE;


@@ -1250,7 +860,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;


@@ -1258,290 +868,42 @@ 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 (m_connected) {
-      SetNotify(m_neededreq & ~REQ_CONNECT);
+  if (evt == GSOCK_CONNECTION) 
+  {
+    if (m_connected) 
+    {
+      m_neededreq &= ~GSOCK_CONNECTION_FLAG;

       return;
     }
       return;
     }

-    m_waitflags = 0x40;

     m_connected = TRUE;
     m_connected = TRUE;

-    OldOnNotify(EVT_CONNECT);
-    DestroyCallbacks();

     return;
   }
   wxSocketBase::OnRequest(evt);
 }
 
     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)
-{
-  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 (!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);
-
-  return (LRESULT)0;
-}
-
-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;
-
-#ifndef __WINDOWS__
-  signal(SIGPIPE, SIG_IGN);
-#endif
-}
-

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

-// --------- wxSocketHandler DESTRUCTOR -------------------------
+// wxSocketEvent

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

-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__
-  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 (sock) {
-    socks->Append(sock);
-    sock->SetHandler(this);
-    sock->SetupCallbacks();
-  }
-}
-
-void wxSocketHandler::UnRegister(wxSocketBase* sock)
-{
-  wxNode *node;
-
-  for (node = socks->First(); node; node = node->Next()) {
-    wxSocketBase* s = (wxSocketBase*)node->Data();
-
-    if (s == sock) {
-      delete node;
-      sock->DestroyCallbacks();
-      sock->SetHandler(NULL);
-      return;
-    }
-  }
-}
-
-unsigned long wxSocketHandler::Count() const
-{
-  return socks->Number();
-}
-
-// --------------------------------------------------------------
-// --------- wxSocketHandler "big" wait functions ---------------
-// --------------------------------------------------------------
-void handler_cbk(wxSocketBase& sock,
-                wxSocketBase::wxRequestEvent WXUNUSED(flags),
-                char *cdata)
-{
-  int *a_wait = (int *)cdata;
-
-  (*a_wait)++;
-  sock.Notify(FALSE);
-}
-
-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();
-
-    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();
-  }
-
-  if (on_wait == -2)
-    return 0;
-
-  return on_wait;
-}
-
-void wxSocketHandler::YieldSock()
-{
-  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);
-
-    sock->RestoreState();
-  }
-}
-
-// --------------------------------------------------------------
-// --------- 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)
+wxSocketEvent::wxSocketEvent(int id)
+  : wxEvent(id)

 {
 {

-  wxSocketClient *client = new wxSocketClient(flags);
+  wxEventType type = (wxEventType)wxEVT_SOCKET;

 
 

-  Register(client);
-  return client;
+  SetEventType(type);

 }
 
 }
 

-#ifdef __WINDOWS__
-// --------------------------------------------------------------
-// --------- wxSocketHandler: Windows specific methods ----------
-// --------------------------------------------------------------
-UINT wxSocketHandler::NewMessage(wxSocketBase *sock)
+void wxSocketEvent::CopyObject(wxObject& obj_d) const

 {
 {

-  internal->firstAvailableMsg++;
-  smsg_list->Append(internal->firstAvailableMsg, sock);
-  return internal->firstAvailableMsg;
-}
+  wxSocketEvent *event = (wxSocketEvent *)&obj_d;

 
 

-void wxSocketHandler::DestroyMessage(UINT msg)
-{
-  wxNode *node = smsg_list->Find(msg);
-  delete node;
-}
+  wxEvent::CopyObject(obj_d);

 
 

-HWND wxSocketHandler::GetHWND() const
-{
-  return internal->sockWin;
+  event->m_skevt = m_skevt;
+  event->m_socket = m_socket;

 }
 
 #endif
 }
 
 #endif

-
-#endif
-  // __WXSTUBS__
+  // wxUSE_SOCKETS