X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/aa8fb7a0164e989e09d2b78867633399a740f1d3..6627a4b0497f89221ea9f7848990f8830cf81b7e:/src/common/socket.cpp

diff --git a/src/common/socket.cpp b/src/common/socket.cpp
index 399c4f5cd4..3a34fceba9 100644
--- a/src/common/socket.cpp
+++ b/src/common/socket.cpp
@@ -1,13 +1,16 @@
-////////////////////////////////////////////////////////////////////////////////
+/////////////////////////////////////////////////////////////////////////////
 // Name:       socket.cpp
 // Purpose:    Socket handler classes
-// Authors:    Guilhem Lavaux
+// Authors:    Guilhem Lavaux, Guillermo Rodriguez Garcia
 // Created:    April 1997
 // Updated:    July 1999
 // Copyright:  (C) 1999, 1998, 1997, Guilhem Lavaux
 // RCS_ID:     $Id$
 // License:    see wxWindows license
-////////////////////////////////////////////////////////////////////////////////
+/////////////////////////////////////////////////////////////////////////////
+
+#include <windows.h>
+
 #ifdef __GNUG__
 #pragma implementation "socket.h"
 #endif
@@ -24,12 +27,13 @@
 /////////////////////////////////////////////////////////////////////////////
 // wxWindows headers
 /////////////////////////////////////////////////////////////////////////////
-#include <wx/defs.h>
-#include <wx/object.h>
-#include <wx/string.h>
-#include <wx/timer.h>
-#include <wx/utils.h>
-#include <wx/log.h>
+#include "wx/defs.h"
+#include "wx/object.h"
+#include "wx/string.h"
+#include "wx/timer.h"
+#include "wx/utils.h"
+#include "wx/module.h"
+#include "wx/log.h"
 
 #include <stdlib.h>
 #include <string.h>
@@ -38,9 +42,8 @@
 /////////////////////////////////////////////////////////////////////////////
 // wxSocket headers
 /////////////////////////////////////////////////////////////////////////////
-#include <wx/module.h>
-#include <wx/sckaddr.h>
-#include <wx/socket.h>
+#include "wx/sckaddr.h"
+#include "wx/socket.h"
 
 // --------------------------------------------------------------
 // ClassInfos
@@ -52,7 +55,8 @@ IMPLEMENT_CLASS(wxSocketClient, wxSocketBase)
 IMPLEMENT_DYNAMIC_CLASS(wxSocketEvent, wxEvent)
 #endif
 
-class wxSocketState : public wxObject {
+class wxSocketState : public wxObject
+{
 public:
   bool notify_state;
   GSocketEventFlags evt_notify_state;
@@ -65,17 +69,19 @@ public:
 };
 
 // --------------------------------------------------------------
-// --------- wxSocketBase CONSTRUCTOR ---------------------------
+// wxSocketBase ctor and dtor
 // --------------------------------------------------------------
+
 wxSocketBase::wxSocketBase(wxSocketBase::wxSockFlags _flags,
          wxSocketBase::wxSockType _type) :
   wxEvtHandler(),
   m_socket(NULL), m_flags(_flags), m_type(_type),
-  m_neededreq(GSOCK_INPUT_FLAG | GSOCK_LOST_FLAG),
+  m_neededreq(0),
   m_lcount(0), m_timeout(600),
   m_unread(NULL), m_unrd_size(0), m_unrd_cur(0),
   m_cbk(NULL), m_cdata(NULL),
-  m_connected(FALSE), m_notify_state(FALSE), m_id(-1),
+  m_connected(FALSE), m_establishing(FALSE),
+  m_notify_state(FALSE), m_id(-1),
   m_defering(NO_DEFER),
   m_states()
 {
@@ -83,29 +89,27 @@ wxSocketBase::wxSocketBase(wxSocketBase::wxSockFlags _flags,
 
 wxSocketBase::wxSocketBase() :
   wxEvtHandler(),
-  m_socket(NULL), m_flags(SPEED | WAITALL), m_type(SOCK_UNINIT),
-  m_neededreq(GSOCK_INPUT_FLAG | GSOCK_LOST_FLAG),
+  m_socket(NULL), m_flags(WAITALL | SPEED), m_type(SOCK_UNINIT),
+  m_neededreq(0),
   m_lcount(0), m_timeout(600),
   m_unread(NULL), m_unrd_size(0), m_unrd_cur(0),
   m_cbk(NULL), m_cdata(NULL),
-  m_connected(FALSE), m_notify_state(FALSE), m_id(-1),
+  m_connected(FALSE), m_establishing(FALSE),
+  m_notify_state(FALSE), m_id(-1),
   m_defering(NO_DEFER),
   m_states()
 {
 }
 
-// --------------------------------------------------------------
-// wxSocketBase destructor
-// --------------------------------------------------------------
-
 wxSocketBase::~wxSocketBase()
 {
   if (m_unread)
     free(m_unread);
 
-  // At last, close the file descriptor.
+  // Shutdown and close the socket
   Close();
 
+  // Destroy the GSocket object
   if (m_socket)
     GSocket_destroy(m_socket);
 }
@@ -114,35 +118,45 @@ bool wxSocketBase::Close()
 {
   if (m_socket)
   {
-    if (m_notify_state == TRUE)
-      Notify(FALSE);
+    // Disable callbacks
+    GSocket_UnsetCallback(m_socket, GSOCK_INPUT_FLAG | GSOCK_OUTPUT_FLAG |
+                                    GSOCK_LOST_FLAG | GSOCK_CONNECTION_FLAG);
 
-    // Shutdown the connection.
+    // Shutdown the connection
     GSocket_Shutdown(m_socket);
     m_connected = FALSE;
+    m_establishing = FALSE;
   }
 
   return TRUE;
 }
 
 // --------------------------------------------------------------
-// wxSocketBase base IO function
+// wxSocketBase basic IO operations
 // --------------------------------------------------------------
-class _wxSocketInternalTimer: public wxTimer {
- public:
+
+// GRG: I have made some changes to wxSocket internal event
+// system; now, all events (INPUT, OUTPUT, CONNECTION, LOST)
+// are always internally monitored; but users will only be
+// notified of these events they are interested in. So we
+// no longer have to change the event mask with SetNotify()
+// in internal functions like DeferRead, DeferWrite, and
+// the like. This solves a lot of problems.
+
+class _wxSocketInternalTimer: public wxTimer
+{
+public:
   int *m_state;
   unsigned long m_new_val;
 
   void Notify()
-     {
-        *m_state = m_new_val;  // Change the value
-     }
+  {
+    *m_state = m_new_val;  // Change the value
+  }
 };
 
-int wxSocketBase::DeferRead(char *buffer, size_t nbytes)
+int wxSocketBase::DeferRead(char *buffer, wxUint32 nbytes)
 {
-  GSocketEventFlags old_event_flags;
-  bool old_notify_state;
   // Timer for timeout
   _wxSocketInternalTimer timer;
 
@@ -151,14 +165,6 @@ int wxSocketBase::DeferRead(char *buffer, size_t nbytes)
   // 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;
@@ -169,16 +175,16 @@ int wxSocketBase::DeferRead(char *buffer, size_t nbytes)
 
   timer.Start(m_timeout * 1000, FALSE);
 
+  // If the socket is readable, call DoDefer for the first time
+  if (GSocket_Select(m_socket, GSOCK_INPUT_FLAG))
+    DoDefer();
+
   // Wait for buffer completion. 
   while (m_defer_buffer != NULL)
     wxYield();
 
   timer.Stop();
 
-  // Restore the old state.
-  Notify(old_notify_state);
-  SetNotify(old_event_flags);
-
   // Disable defering mode.
   m_defering = NO_DEFER;
   m_defer_timer = NULL;
@@ -187,7 +193,7 @@ int wxSocketBase::DeferRead(char *buffer, size_t nbytes)
   return nbytes-m_defer_nbytes;
 }
 
-wxSocketBase& wxSocketBase::Read(char* buffer, size_t nbytes)
+wxSocketBase& wxSocketBase::Read(char* buffer, wxUint32 nbytes)
 {
   int ret = 1;
 
@@ -198,31 +204,34 @@ wxSocketBase& wxSocketBase::Read(char* buffer, size_t nbytes)
   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)) ) {
+  // If we have got the whole needed buffer, return immediately
+  if (!nbytes)
+  {
     return *this;
   }
 
-  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 {
+  if (m_flags & SPEED & WAITALL)    // SPEED && WAITALL
+  {
+    while (ret > 0 && nbytes > 0)
+    {
       ret = GSocket_Read(m_socket, buffer, nbytes);
-      if (ret > 0)
-        m_lcount += ret;
+      m_lcount += ret;
+      buffer += ret;
+      nbytes -= ret;
     }
+    // In case the last call was an error ...
+    if (ret < 0)
+      m_lcount ++;
+  }
+  else if (m_flags & SPEED)         // SPEED && !WAITALL
+  {
+    ret = GSocket_Read(m_socket, buffer, nbytes);
 
-  } else {
+    if (ret > 0)
+      m_lcount += ret;
+  }
+  else                              // !SPEED
+  {
     ret = DeferRead(buffer, nbytes);
 
     if (ret > 0)
@@ -232,7 +241,7 @@ wxSocketBase& wxSocketBase::Read(char* buffer, size_t nbytes)
   return *this;
 }
 
-wxSocketBase& wxSocketBase::ReadMsg(char* buffer, size_t nbytes)
+wxSocketBase& wxSocketBase::ReadMsg(char* buffer, wxUint32 nbytes)
 {
   unsigned long len, len2, sig;
   struct {
@@ -241,23 +250,23 @@ wxSocketBase& wxSocketBase::ReadMsg(char* buffer, size_t nbytes)
   } 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
+  // compilers in which wxUint32 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;
+  sig |= (wxUint32)(msg.sig[1] & 0xff) << 8;
+  sig |= (wxUint32)(msg.sig[2] & 0xff) << 16;
+  sig |= (wxUint32)(msg.sig[3] & 0xff) << 24;
 
   if (sig != 0xfeeddead)
     return *this;
   len = msg.len[0] & 0xff;
-  len |= (size_t)(msg.len[1] & 0xff) << 8;
-  len |= (size_t)(msg.len[2] & 0xff) << 16;
-  len |= (size_t)(msg.len[3] & 0xff) << 24;
+  len |= (wxUint32)(msg.len[1] & 0xff) << 8;
+  len |= (wxUint32)(msg.len[2] & 0xff) << 16;
+  len |= (wxUint32)(msg.len[3] & 0xff) << 24;
 
   // len2 is incorrectly computed in the original; this sequence is
   // the fix
@@ -279,9 +288,9 @@ wxSocketBase& wxSocketBase::ReadMsg(char* buffer, size_t nbytes)
     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;
+  sig |= (wxUint32)(msg.sig[1] & 0xff) << 8;
+  sig |= (wxUint32)(msg.sig[2] & 0xff) << 16;
+  sig |= (wxUint32)(msg.sig[3] & 0xff) << 24;
 
 // ERROR
   if (sig != 0xdeadfeed)
@@ -290,7 +299,7 @@ wxSocketBase& wxSocketBase::ReadMsg(char* buffer, size_t nbytes)
   return *this;
 }
 
-wxSocketBase& wxSocketBase::Peek(char* buffer, size_t nbytes)
+wxSocketBase& wxSocketBase::Peek(char* buffer, wxUint32 nbytes)
 {
   Read(buffer, nbytes);
   CreatePushbackAfter(buffer, nbytes);
@@ -298,10 +307,8 @@ wxSocketBase& wxSocketBase::Peek(char* buffer, size_t nbytes)
   return *this;
 }
 
-int wxSocketBase::DeferWrite(const char *buffer, size_t nbytes)
+int wxSocketBase::DeferWrite(const char *buffer, wxUint32 nbytes)
 {
-  GSocketEventFlags old_event_flags;
-  bool old_notify_state;
   // Timer for timeout
   _wxSocketInternalTimer timer;
 
@@ -309,24 +316,22 @@ int wxSocketBase::DeferWrite(const char *buffer, size_t nbytes)
 
   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;
+  m_defer_timer  = &timer;
 
   // Start timer
   timer.m_state   = (int *)&m_defer_buffer;
   timer.m_new_val = 0;
 
-  m_defer_timer   = &timer;
   timer.Start(m_timeout * 1000, FALSE);
 
+  // If the socket is writable, call DoDefer for the first time
+  if (GSocket_Select(m_socket, GSOCK_OUTPUT_FLAG))
+    DoDefer();
+
+  // Wait for buffer completion. 
   while (m_defer_buffer != NULL)
     wxYield();
 
@@ -334,31 +339,52 @@ int wxSocketBase::DeferWrite(const char *buffer, size_t nbytes)
   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, wxUint32 nbytes)
 {
-  int ret;
+  int ret = 1;
+
+  m_lcount = 0;
+
+  if (!m_connected)
+    return *this;
 
-  if ((m_flags & SPEED) != 0)
+  if (m_flags & SPEED & WAITALL)    // SPEED && WAITALL
+  {
+    while (ret > 0 && nbytes > 0)
+    {
+      ret = GSocket_Write(m_socket, buffer, nbytes);
+      m_lcount += ret;
+      buffer += ret;
+      nbytes -= ret;
+    }
+    // In case the last call was an error ...
+    if (ret < 0)
+      m_lcount ++;
+  }
+  else if (m_flags & SPEED)         // SPEED && !WAITALL
+  {
     ret = GSocket_Write(m_socket, buffer, nbytes);
-  else
+
+    if (ret > 0)
+      m_lcount += ret;
+  }
+  else                              // !SPEED
+  {
     ret = DeferWrite(buffer, nbytes);
 
-  if (ret != -1)
-    m_lcount += ret;
+    if (ret > 0)
+      m_lcount += ret;
+  }
 
   return *this;
 }
 
-wxSocketBase& wxSocketBase::WriteMsg(const char *buffer, size_t nbytes)
+wxSocketBase& wxSocketBase::WriteMsg(const char *buffer, wxUint32 nbytes)
 {
   struct {
     char sig[4];
@@ -375,7 +401,7 @@ wxSocketBase& wxSocketBase::WriteMsg(const char *buffer, size_t nbytes)
   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;
@@ -399,10 +425,11 @@ wxSocketBase& wxSocketBase::WriteMsg(const char *buffer, size_t nbytes)
 #endif // __VISUALC__
 }
 
-wxSocketBase& wxSocketBase::Unread(const char *buffer, size_t nbytes)
+wxSocketBase& wxSocketBase::Unread(const char *buffer, wxUint32 nbytes)
 {
   m_lcount = 0;
-  if (nbytes != 0) {
+  if (nbytes != 0)
+  {
     CreatePushbackAfter(buffer, nbytes);
     m_lcount = nbytes;
   }
@@ -414,54 +441,55 @@ bool wxSocketBase::IsData() const
   if (!m_socket)
     return FALSE;
 
-  return (GSocket_DataAvailable(m_socket));
+  return (GSocket_Select(m_socket, GSOCK_INPUT_FLAG));
 }
 
-void wxSocketBase::DoDefer(GSocketEvent req_evt)
+// GRG: DoDefer() no longer needs to know which event occured,
+// because this was only used to catch LOST events and set
+// m_defer_buffer = NULL; this is done in OnRequest() now.
+
+void wxSocketBase::DoDefer()
 {
   int ret;
 
-  if (req_evt == GSOCK_LOST) {
-    Close();
-    m_defer_buffer = NULL;
+  if (!m_defer_buffer)
     return;
-  }
-  switch (m_defering) {
-  case DEFER_READ:
-    ret = GSocket_Read(m_socket, m_defer_buffer, m_defer_nbytes);
-    break;
-  case DEFER_WRITE:
-    ret = GSocket_Write(m_socket, m_defer_buffer, m_defer_nbytes);
-    break;
-  default:
-    ret = -1;
-    break;
-  }
 
-  m_defer_nbytes -= ret;
+  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;
+  }
 
-  if (ret < 0)
-    m_defer_nbytes++;
+  if (ret >= 0)
+    m_defer_nbytes -= ret;
 
-  // 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) {
+  // If we are waiting for all bytes to be acquired, keep the defering
+  // mode enabled.
+  if ((m_flags & WAITALL) == 0 || m_defer_nbytes == 0 || ret < 0)
+  {
     m_defer_buffer = NULL;
-    Notify(FALSE);
-  } else {
+  }
+  else
+  {
     m_defer_buffer += ret;
     m_defer_timer->Start(m_timeout * 1000, FALSE);
   }
 }
 
-// ---------------------------------------------------------------------
-// --------- wxSocketBase Discard(): deletes all byte in the input queue
-// ---------------------------------------------------------------------
 void wxSocketBase::Discard()
 {
 #define MAX_BUFSIZE (10*1024)
+
   char *my_data = new char[MAX_BUFSIZE];
-  size_t recv_size = MAX_BUFSIZE;
+  wxUint32 recv_size = MAX_BUFSIZE;
 
   SaveState();
   SetFlags(NOWAIT | SPEED);
@@ -478,7 +506,7 @@ void wxSocketBase::Discard()
 }
 
 // --------------------------------------------------------------
-// wxSocketBase socket info functions
+// wxSocketBase get local or peer addresses
 // --------------------------------------------------------------
 
 bool wxSocketBase::GetPeer(wxSockAddress& addr_man) const
@@ -510,7 +538,7 @@ bool wxSocketBase::GetLocal(wxSockAddress& addr_man) const
 }
 
 // --------------------------------------------------------------
-// wxSocketBase wait functions
+// wxSocketBase save and restore socket state
 // --------------------------------------------------------------
 
 void wxSocketBase::SaveState()
@@ -549,73 +577,60 @@ void wxSocketBase::RestoreState()
   delete state;
 }
 
-// --------------------------------------------------------------
-// --------- wxSocketBase callback functions --------------------
-// --------------------------------------------------------------
-
-wxSocketBase::wxSockCbk wxSocketBase::Callback(wxSockCbk cbk_)
-{
-  wxSockCbk old_cbk = cbk_;
-
-  m_cbk = cbk_;
-  return old_cbk;
-}
-
-char *wxSocketBase::CallbackData(char *data)
-{
-  char *old_data = m_cdata;
-
-  m_cdata = data;
-  return old_data;
-}
 
 // --------------------------------------------------------------
-// --------- wxSocketBase wait functions ------------------------
+// wxSocketBase Wait functions
 // --------------------------------------------------------------
 
-static void wx_socket_wait(GSocket *socket, GSocketEvent event, char *cdata)
-{
-  int *state = (int *)cdata;
-
-  *state = event;
-}
+// GRG: I have completely rewritten this family of functions
+// so that they don't depend on event notifications; instead,
+// they poll the socket, using GSocket_Select(), to check for
+// the specified combination of event flags, until an event
+// occurs or until the timeout ellapses. The polling loop
+// calls wxYield(), so this won't block the GUI.
 
-bool wxSocketBase::_Wait(long seconds, long milliseconds, int type)
+bool wxSocketBase::_Wait(long seconds, long milliseconds, wxSocketEventFlags flags)
 {
-  bool old_notify_state = m_notify_state;
-  int state = -1;
+  GSocketEventFlags result;
   _wxSocketInternalTimer timer;
+  long timeout;
+  int state = -1;
 
-  if (!m_connected || !m_socket)
+  // Check for valid socket
+  if ((!m_connected && !m_establishing) || !m_socket)
     return FALSE;
 
-  // Set the variable to change
-  timer.m_state = &state;
-  timer.m_new_val = GSOCK_MAX_EVENT;
+  // Check for valid timeout value
+  if (seconds != -1)
+    timeout = seconds * 1000 + milliseconds;
+  else
+    timeout = m_timeout * 1000;
 
-  // Disable the previous handler
-  Notify(FALSE);
+  // Activate timer
+  timer.m_state = &state;
+  timer.m_new_val = 0;
+  timer.Start(timeout, TRUE);
 
-  // Set the timeout
-  timer.Start(seconds * 1000 + milliseconds, TRUE);
-  GSocket_SetCallback(m_socket, type, wx_socket_wait, (char *)&state);
+  // Active polling (without using events)
+  result = GSocket_Select(m_socket, flags);
 
-  while (state == -1)
+  while ((result == 0) && (state == -1))
+  {
     wxYield();
+    result = GSocket_Select(m_socket, flags);
+  }
 
-  GSocket_UnsetCallback(m_socket, type);
   timer.Stop();
 
-  // Notify will restore automatically the old GSocket flags
-  Notify(old_notify_state);
-
-  return (state != GSOCK_MAX_EVENT);
+  return (result != 0);
 }
 
 bool wxSocketBase::Wait(long seconds, long milliseconds)
 {
-  return _Wait(seconds, milliseconds, GSOCK_INPUT_FLAG | GSOCK_OUTPUT_FLAG |
-                                      GSOCK_CONNECTION_FLAG | GSOCK_LOST_FLAG);
+  return _Wait(seconds, milliseconds, GSOCK_INPUT_FLAG |
+                                      GSOCK_OUTPUT_FLAG |
+                                      GSOCK_CONNECTION_FLAG |
+                                      GSOCK_LOST_FLAG);
 }
 
 bool wxSocketBase::WaitForRead(long seconds, long milliseconds)
@@ -634,27 +649,9 @@ bool wxSocketBase::WaitForLost(long seconds, long milliseconds)
 }
 
 // --------------------------------------------------------------
-// --------- wxSocketBase callback management -------------------
+// wxSocketBase flags
 // --------------------------------------------------------------
 
-wxSocketEventFlags wxSocketBase::EventToNotify(wxSocketNotify evt)
-{
-  switch (evt)
-  {
-  case GSOCK_INPUT:
-    return GSOCK_INPUT_FLAG;
-  case GSOCK_OUTPUT:
-    return GSOCK_OUTPUT_FLAG;
-  case GSOCK_CONNECTION:
-    return GSOCK_CONNECTION_FLAG;
-  case GSOCK_LOST:
-    return GSOCK_LOST_FLAG;
-  default:
-    return 0;
-  }
-  return 0;
-}
-
 void wxSocketBase::SetFlags(wxSockFlags _flags)
 {
   m_flags = _flags;
@@ -665,63 +662,99 @@ wxSocketBase::wxSockFlags wxSocketBase::GetFlags() const
   return m_flags;
 }
 
-void wxSocketBase::SetNotify(wxSocketEventFlags flags)
+// --------------------------------------------------------------
+// wxSocketBase callback management
+// --------------------------------------------------------------
+
+wxSocketBase::wxSockCbk wxSocketBase::Callback(wxSockCbk cbk_)
 {
-  /* Check if server */
-  if (m_type != SOCK_SERVER)
-    flags &= ~GSOCK_CONNECTION_FLAG;
+  wxSockCbk old_cbk = cbk_;
 
-  m_neededreq = flags;
-  if (m_neededreq == 0)
-    Notify(FALSE);
-  else
-    Notify(m_notify_state);
+  m_cbk = cbk_;
+  return old_cbk;
+}
+
+char *wxSocketBase::CallbackData(char *data)
+{
+  char *old_data = m_cdata;
+
+  m_cdata = data;
+  return old_data;
 }
 
 // --------------------------------------------------------------
-// Automatic notifier
+// wxSocketBase automatic notifier
 // --------------------------------------------------------------
 
-static void wx_socket_fallback(GSocket *socket, GSocketEvent event, char *cdata)
+static void wx_socket_callback(GSocket *socket, GSocketEvent event, char *cdata)
 {
   wxSocketBase *sckobj = (wxSocketBase *)cdata;
 
   sckobj->OnRequest((wxSocketNotify)event);
 }
 
-void wxSocketBase::Notify(bool notify)
+wxSocketEventFlags wxSocketBase::EventToNotify(wxSocketNotify evt)
 {
-  m_notify_state = notify;
-  if (!m_socket)
-    return;
+  switch (evt)
+  {
+    case GSOCK_INPUT:      return GSOCK_INPUT_FLAG;
+    case GSOCK_OUTPUT:     return GSOCK_OUTPUT_FLAG;
+    case GSOCK_CONNECTION: return GSOCK_CONNECTION_FLAG;
+    case GSOCK_LOST:       return GSOCK_LOST_FLAG;
+  }
+  return 0;
+}
 
-  GSocket_UnsetCallback(m_socket, GSOCK_INPUT_FLAG | GSOCK_OUTPUT_FLAG |
-                                  GSOCK_LOST_FLAG | GSOCK_CONNECTION_FLAG);
-  if (!notify)
-    return;
+void wxSocketBase::SetNotify(wxSocketEventFlags flags)
+{
+  m_neededreq = flags;
+}
 
-  GSocket_SetCallback(m_socket, m_neededreq, wx_socket_fallback, (char *)this);
+void wxSocketBase::Notify(bool notify)
+{
+  m_notify_state = notify;
 }
 
 void wxSocketBase::OnRequest(wxSocketNotify req_evt)
 {
   wxSocketEvent event(m_id);
-  GSocketEventFlags notify = EventToNotify(req_evt);
+  wxSocketEventFlags flag = EventToNotify(req_evt);
 
-  if (m_defering != NO_DEFER) {
-    DoDefer((GSocketEvent)req_evt);
-    return;
+  switch(req_evt)
+  {
+    case wxSOCKET_CONNECTION:
+      m_establishing = FALSE;
+      m_connected = TRUE;
+      break;
+    case wxSOCKET_LOST:
+      m_defer_buffer = NULL;
+      Close();
+      break;
+    case wxSOCKET_INPUT:
+    case wxSOCKET_OUTPUT:
+      if (m_defer_buffer)
+      {
+        // GRG: DoDefer() no longer needs to know which
+        // event occured, because this was only used to
+        // catch LOST events and set m_defer_buffer to
+        // NULL, and this is done in OnRequest() now.
+        DoDefer();
+        // Do not notify to user
+        return;
+      }
+      break;
   }
 
-  if ((m_neededreq & notify) == notify) {
+  if (((m_neededreq & flag) == flag) && m_notify_state)
+  {
     event.m_socket = this;
-    event.m_skevt = (GSocketEvent) req_evt;
+    event.m_skevt  = req_evt;
     ProcessEvent(event);
     OldOnNotify(req_evt);
-  }
 
-  if ((GSocketEvent)req_evt == GSOCK_LOST)
-    Close();
+    if (m_cbk)
+      m_cbk(*this, req_evt, m_cdata);
+  }
 }
 
 void wxSocketBase::OldOnNotify(wxSocketNotify evt)
@@ -729,7 +762,7 @@ void wxSocketBase::OldOnNotify(wxSocketNotify evt)
 }
 
 // --------------------------------------------------------------
-// --------- wxSocketBase functions [Callback, CallbackData] ----
+// wxSocketBase set event handler
 // --------------------------------------------------------------
 
 void wxSocketBase::SetEventHandler(wxEvtHandler& h_evt, int id)
@@ -739,10 +772,10 @@ void wxSocketBase::SetEventHandler(wxEvtHandler& h_evt, int id)
 }
 
 // --------------------------------------------------------------
-// --------- wxSocketBase pushback library ----------------------
+// wxSocketBase pushback library
 // --------------------------------------------------------------
 
-void wxSocketBase::CreatePushbackAfter(const char *buffer, size_t size)
+void wxSocketBase::CreatePushbackAfter(const char *buffer, wxUint32 size)
 {
   char *curr_pos;
 
@@ -757,7 +790,7 @@ void wxSocketBase::CreatePushbackAfter(const char *buffer, size_t size)
   m_unrd_size += size;
 }
 
-void wxSocketBase::CreatePushbackBefore(const char *buffer, size_t size)
+void wxSocketBase::CreatePushbackBefore(const char *buffer, wxUint32 size)
 {
   if (m_unread == NULL)
     m_unread = (char *)malloc(size);
@@ -776,7 +809,7 @@ void wxSocketBase::CreatePushbackBefore(const char *buffer, size_t size)
   memcpy(m_unread, buffer, size);
 }
 
-size_t wxSocketBase::GetPushback(char *buffer, size_t size, bool peek)
+wxUint32 wxSocketBase::GetPushback(char *buffer, wxUint32 size, bool peek)
 {
   if (!m_unrd_size)
     return 0;
@@ -802,77 +835,113 @@ size_t wxSocketBase::GetPushback(char *buffer, size_t size, bool peek)
 // wxSocketServer
 // --------------------------------------------------------------
 
+// --------------------------------------------------------------
+// wxSocketServer ctor and dtor
+// --------------------------------------------------------------
+
 wxSocketServer::wxSocketServer(wxSockAddress& addr_man,
              wxSockFlags flags) :
   wxSocketBase(flags, SOCK_SERVER)
 {
+  // Create the socket
   m_socket = GSocket_new();
 
   if (!m_socket)
     return;
 
+  // Setup the socket as server
   GSocket_SetLocal(m_socket, addr_man.GetAddress());
-  if (GSocket_SetServer(m_socket) != GSOCK_NOERROR) {
+  if (GSocket_SetServer(m_socket) != GSOCK_NOERROR)
+  {
     GSocket_destroy(m_socket);
     m_socket = NULL;
     return;
   }
 
-  Notify(TRUE);
+  GSocket_SetTimeout(m_socket, m_timeout);
+  GSocket_SetCallback(m_socket, GSOCK_INPUT_FLAG | GSOCK_OUTPUT_FLAG |
+                                GSOCK_LOST_FLAG | GSOCK_CONNECTION_FLAG,
+                                wx_socket_callback, (char *)this);
+
 }
 
 // --------------------------------------------------------------
 // wxSocketServer Accept
 // --------------------------------------------------------------
 
-bool wxSocketServer::AcceptWith(wxSocketBase& sock)
+bool wxSocketServer::AcceptWith(wxSocketBase& sock, bool wait)
 {
   GSocket *child_socket;
 
+  // GRG: If wait == FALSE, then the call should be nonblocking.
+  // When we are finished, we put the socket to blocking mode
+  // again.
+
+  if (!wait)
+    GSocket_SetNonBlocking(m_socket, TRUE);
+
   child_socket = GSocket_WaitConnection(m_socket);
 
+  if (!wait)
+    GSocket_SetNonBlocking(m_socket, FALSE);
+
+  // GRG: this was not being handled!
+  if (child_socket == NULL)
+    return FALSE;
+
   sock.m_type = SOCK_INTERNAL;
   sock.m_socket = child_socket;
   sock.m_connected = TRUE;
 
+  GSocket_SetTimeout(sock.m_socket, sock.m_timeout);
+  GSocket_SetCallback(sock.m_socket, GSOCK_INPUT_FLAG | GSOCK_OUTPUT_FLAG |
+                                     GSOCK_LOST_FLAG | GSOCK_CONNECTION_FLAG,
+                                     wx_socket_callback, (char *)&sock);
+
   return TRUE;
 }
 
-wxSocketBase *wxSocketServer::Accept()
+wxSocketBase *wxSocketServer::Accept(bool wait)
 {
   wxSocketBase* sock = new wxSocketBase();
 
   sock->SetFlags((wxSockFlags)m_flags);
 
-  if (!AcceptWith(*sock))
+  if (!AcceptWith(*sock, wait))
     return NULL;
 
   return sock;
 }
 
+bool wxSocketServer::WaitOnAccept(long seconds, long milliseconds)
+{
+  return _Wait(seconds, milliseconds, GSOCK_CONNECTION_FLAG | GSOCK_LOST_FLAG);
+}
+
 // --------------------------------------------------------------
 // wxSocketClient
 // --------------------------------------------------------------
 
-// --------- wxSocketClient CONSTRUCTOR -------------------------
 // --------------------------------------------------------------
+// wxSocketClient ctor and dtor
+// --------------------------------------------------------------
+
 wxSocketClient::wxSocketClient(wxSockFlags _flags) :
   wxSocketBase(_flags, SOCK_CLIENT)
 {
 }
 
-// --------------------------------------------------------------
-// --------- wxSocketClient DESTRUCTOR --------------------------
-// --------------------------------------------------------------
 wxSocketClient::~wxSocketClient()
 {
 }
 
 // --------------------------------------------------------------
-// --------- wxSocketClient Connect functions -------------------
+// wxSocketClient Connect functions
 // --------------------------------------------------------------
-bool wxSocketClient::Connect(wxSockAddress& addr_man, bool WXUNUSED(wait) )
+bool wxSocketClient::Connect(wxSockAddress& addr_man, bool wait)
 {
+  GSocketError err;
+
   if (IsConnected())
     Close();
 
@@ -880,54 +949,79 @@ bool wxSocketClient::Connect(wxSockAddress& addr_man, bool WXUNUSED(wait) )
   if (m_socket)
     GSocket_destroy(m_socket);
 
-  // Initializes all socket stuff ...
-  // --------------------------------
+  // Initialize all socket stuff ...
   m_socket = GSocket_new();
+  m_connected = FALSE;
+  m_establishing = FALSE;
 
   if (!m_socket)
     return FALSE;
 
-  m_connected = FALSE;
+  GSocket_SetTimeout(m_socket, m_timeout);
+
+  // GRG: If wait == FALSE, then the call should be nonblocking.
+  // When we are finished, we put the socket to blocking mode
+  // again.
+
+  if (!wait)
+    GSocket_SetNonBlocking(m_socket, TRUE);
 
-  // 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;
+  err = GSocket_Connect(m_socket, GSOCK_STREAMED);
+  GSocket_SetCallback(m_socket, GSOCK_INPUT_FLAG | GSOCK_OUTPUT_FLAG |
+                                GSOCK_LOST_FLAG | GSOCK_CONNECTION_FLAG,
+                                wx_socket_callback, (char *)this);
 
-  // Enables bg events.
-  // ------------------
-  Notify(TRUE);
+  if (!wait)
+    GSocket_SetNonBlocking(m_socket, FALSE);
+
+  if (err != GSOCK_NOERROR)
+  {
+    if (err == GSOCK_WOULDBLOCK)
+      m_establishing = TRUE;
+
+    return FALSE;
+  }
 
   m_connected = TRUE;
   return TRUE;
 }
 
-bool wxSocketClient::WaitOnConnect(long seconds, long microseconds)
+bool wxSocketClient::WaitOnConnect(long seconds, long milliseconds)
 {
-  int ret = _Wait(seconds, microseconds, GSOCK_CONNECTION_FLAG | GSOCK_LOST_FLAG);
+  bool ret;
+
+  if (m_connected)      // Already connected
+    return TRUE;
+
+  if (!m_establishing)  // No connection in progress
+    return FALSE;
+
+  ret = _Wait(seconds, milliseconds, GSOCK_CONNECTION_FLAG | GSOCK_LOST_FLAG);
+
+  // GRG: m_connected and m_establishing will be updated in
+  // OnRequest(), but we do it here anyway because sometimes
+  // the event might be a bit delayed, and if that happens,
+  // when WaitOnConnect() returns, m_connected will still be
+  // FALSE. We have to do it as well in OnRequest because
+  // maybe WaitOnConnect() is not being used...
 
   if (ret)
-    m_connected = TRUE;
+  {
+    m_connected = GSocket_Select(m_socket, GSOCK_CONNECTION_FLAG);
+    m_establishing = FALSE;
+  }
 
   return m_connected;
 }
 
-void wxSocketClient::OnRequest(wxSocketNotify evt)
+
+void wxSocketClient::OnRequest(wxSocketNotify req_evt)
 {
-  if ((GSocketEvent)evt == GSOCK_CONNECTION)
-  {
-    if (m_connected)
-    {
-      m_neededreq &= ~GSOCK_CONNECTION_FLAG;
-      return;
-    }
-    m_connected = TRUE;
-    return;
-  }
-  wxSocketBase::OnRequest(evt);
+  wxSocketBase::OnRequest(req_evt);
 }
 
+
 // --------------------------------------------------------------
 // wxSocketEvent
 // --------------------------------------------------------------