applying OSAF patch for "toolbar selection not correct on Mac after calling Realize...

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

diff --git a/src/common/sckipc.cpp b/src/common/sckipc.cpp
index c532acbbee6f4fe768fee8a4c295e4e5b589ab98..5dbcec46cd366800e6210cbd13ec76c69285df69 100644 (file)
--- a/src/common/sckipc.cpp
+++ b/src/common/sckipc.cpp
@@ -4,15 +4,25 @@
 // Author:      Julian Smart
 // Modified by: Guilhem Lavaux (big rewrite) May 1997, 1998
 //              Guillermo Rodriguez (updated for wxSocket v2) Jan 2000
 // Author:      Julian Smart
 // Modified by: Guilhem Lavaux (big rewrite) May 1997, 1998
 //              Guillermo Rodriguez (updated for wxSocket v2) Jan 2000

+//                                  (callbacks deprecated)    Mar 2000
+//              Vadim Zeitlin (added support for Unix sockets) Apr 2002

 // Created:     1993
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart 1993
 //              (c) Guilhem Lavaux 1997, 1998
 //              (c) 2000 Guillermo Rodriguez <guille@iies.es>
 // Created:     1993
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart 1993
 //              (c) Guilhem Lavaux 1997, 1998
 //              (c) 2000 Guillermo Rodriguez <guille@iies.es>

-// Licence:     wxWindows license
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
+// ==========================================================================
+// declarations
+// ==========================================================================
+
+// --------------------------------------------------------------------------
+// headers
+// --------------------------------------------------------------------------
+
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma implementation "sckipc.h"
 #endif
 
 #pragma implementation "sckipc.h"
 #endif
 


@@ -24,30 +34,29 @@
 #endif
 
 #ifndef WX_PRECOMP
 #endif
 
 #ifndef WX_PRECOMP

-#include "wx/defs.h"
+#include "wx/log.h"

 #endif
 
 #endif
 

-#if wxUSE_SOCKETS 
+#if wxUSE_SOCKETS && wxUSE_IPC && wxUSE_STREAMS

 
 #include <stdlib.h>
 #include <stdio.h>
 
 #include <stdlib.h>
 #include <stdio.h>

+#include <errno.h>

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

-#include "wx/log.h"
-
-#ifdef __BORLANDC__
-#pragma hdrstop
-#endif
+#include "wx/module.h"
+#include "wx/event.h"

 
 

-IMPLEMENT_DYNAMIC_CLASS(wxTCPServer, wxServerBase)
-IMPLEMENT_DYNAMIC_CLASS(wxTCPClient, wxClientBase)
-IMPLEMENT_CLASS(wxTCPConnection, wxConnectionBase)
+// --------------------------------------------------------------------------
+// macros and constants
+// --------------------------------------------------------------------------

 
 // It seems to be already defined somewhere in the Xt includes.
 #ifndef __XT__
 // Message codes
 
 // It seems to be already defined somewhere in the Xt includes.
 #ifndef __XT__
 // Message codes

-enum {
+enum
+{

   IPC_EXECUTE = 1,
   IPC_REQUEST,
   IPC_POKE,
   IPC_EXECUTE = 1,
   IPC_REQUEST,
   IPC_POKE,


@@ -62,24 +71,84 @@ enum {
 };
 #endif
 
 };
 #endif
 

-void Server_OnRequest(wxSocketServer& server,
-                      wxSocketNotify evt,
-                      char *cdata);
-void Client_OnRequest(wxSocketBase& sock,
-                      wxSocketNotify evt,
-                      char *cdata);
+// All sockets will be created with the following flags
+#define SCKIPC_FLAGS (wxSOCKET_WAITALL)

 
 

+// headers needed for umask()
+#ifdef __UNIX_LIKE__
+    #include <sys/types.h>
+    #include <sys/stat.h>
+#endif // __UNIX_LIKE__

 
 

-// All sockets will be created with the following flags
+// ----------------------------------------------------------------------------
+// private functions
+// ----------------------------------------------------------------------------
+
+// get the address object for the given server name, the caller must delete it
+static wxSockAddress *
+GetAddressFromName(const wxString& serverName, const wxString& host = wxEmptyString)
+{
+    // we always use INET sockets under non-Unix systems
+#if defined(__UNIX__) && !defined(__WXMAC__) && !defined(__WINE__)
+    // under Unix, if the server name looks like a path, create a AF_UNIX
+    // socket instead of AF_INET one
+    if ( serverName.Find(_T('/')) != wxNOT_FOUND )
+    {
+        wxUNIXaddress *addr = new wxUNIXaddress;
+        addr->Filename(serverName);
+
+        return addr;
+    }
+#endif // Unix/!Unix
+    {
+        wxIPV4address *addr = new wxIPV4address;
+        addr->Service(serverName);
+        if ( !host.empty() )
+        {
+            addr->Hostname(host);
+        }
+
+        return addr;
+    }
+}
+
+// --------------------------------------------------------------------------
+// wxTCPEventHandler stuff (private class)
+// --------------------------------------------------------------------------
+
+class wxTCPEventHandler : public wxEvtHandler
+{
+public:
+  wxTCPEventHandler() : wxEvtHandler() {}
+
+  void Client_OnRequest(wxSocketEvent& event);
+  void Server_OnRequest(wxSocketEvent& event);
+
+  DECLARE_EVENT_TABLE()
+  DECLARE_NO_COPY_CLASS(wxTCPEventHandler)
+};
+
+enum
+{
+  _CLIENT_ONREQUEST_ID = 1000,
+  _SERVER_ONREQUEST_ID
+};
+
+static wxTCPEventHandler *gs_handler = NULL;
+
+// ==========================================================================
+// implementation
+// ==========================================================================

 
 

-#define SCKIPC_FLAGS wxSOCKET_NONE
+IMPLEMENT_DYNAMIC_CLASS(wxTCPServer, wxServerBase)
+IMPLEMENT_DYNAMIC_CLASS(wxTCPClient, wxClientBase)
+IMPLEMENT_CLASS(wxTCPConnection, wxConnectionBase)

 
 

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

 // wxTCPClient
 // wxTCPClient

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

 
 

-wxTCPClient::wxTCPClient ()
-  : wxClientBase()
+wxTCPClient::wxTCPClient () : wxClientBase()

 {
 }
 
 {
 }
 


@@ -95,7 +164,7 @@ bool wxTCPClient::ValidHost(const wxString& host)
 }
 
 wxConnectionBase *wxTCPClient::MakeConnection (const wxString& host,
 }
 
 wxConnectionBase *wxTCPClient::MakeConnection (const wxString& host,

-                                               const wxString& server_name,
+                                               const wxString& serverName,

                                                const wxString& topic)
 {
   wxSocketClient *client = new wxSocketClient(SCKIPC_FLAGS);
                                                const wxString& topic)
 {
   wxSocketClient *client = new wxSocketClient(SCKIPC_FLAGS);


@@ -103,18 +172,21 @@ wxConnectionBase *wxTCPClient::MakeConnection (const wxString& host,
   wxDataInputStream *data_is = new wxDataInputStream(*stream);
   wxDataOutputStream *data_os = new wxDataOutputStream(*stream);
 
   wxDataInputStream *data_is = new wxDataInputStream(*stream);
   wxDataOutputStream *data_os = new wxDataOutputStream(*stream);
 

-  wxIPV4address addr;
-  addr.Service(server_name);
-  addr.Hostname(host);
+  wxSockAddress *addr = GetAddressFromName(serverName, host);
+  if ( !addr )
+      return NULL;

 
 

-  if (client->Connect(addr))
+  bool ok = client->Connect(*addr);
+  delete addr;
+
+  if ( ok )

   {
     unsigned char msg;
   {
     unsigned char msg;

-  
+

     // Send topic name, and enquire whether this has succeeded
     data_os->Write8(IPC_CONNECT);
     data_os->WriteString(topic);
     // Send topic name, and enquire whether this has succeeded
     data_os->Write8(IPC_CONNECT);
     data_os->WriteString(topic);

-  
+

     msg = data_is->Read8();
 
     // OK! Confirmation.
     msg = data_is->Read8();
 
     // OK! Confirmation.


@@ -124,70 +196,138 @@ wxConnectionBase *wxTCPClient::MakeConnection (const wxString& host,
 
       if (connection)
       {
 
       if (connection)
       {

-        if (!connection->IsKindOf(CLASSINFO(wxTCPConnection)))
-        {
-          delete connection;
-          // and fall through to delete everything else
-        }
-        else
+        if (connection->IsKindOf(CLASSINFO(wxTCPConnection)))

         {
           connection->m_topic = topic;
           connection->m_sock  = client;
           connection->m_sockstrm = stream;
           connection->m_codeci = data_is;
           connection->m_codeco = data_os;
         {
           connection->m_topic = topic;
           connection->m_sock  = client;
           connection->m_sockstrm = stream;
           connection->m_codeci = data_is;
           connection->m_codeco = data_os;

-          client->Callback(Client_OnRequest);
-          client->CallbackData((char *)connection);
+          client->SetEventHandler(*gs_handler, _CLIENT_ONREQUEST_ID);
+          client->SetClientData(connection);

           client->SetNotify(wxSOCKET_INPUT_FLAG | wxSOCKET_LOST_FLAG);
           client->SetNotify(wxSOCKET_INPUT_FLAG | wxSOCKET_LOST_FLAG);

-          client->Notify(TRUE);
+          client->Notify(true);

           return connection;
         }
           return connection;
         }

+        else
+        {
+          delete connection;
+          // and fall through to delete everything else
+        }

       }
     }
   }
 
       }
     }
   }
 

-  // something went wrong
+  // Something went wrong, delete everything

   delete data_is;
   delete data_os;
   delete stream;
   delete data_is;
   delete data_os;
   delete stream;

-  delete client;
+  client->Destroy();
+

   return NULL;
 }
 
 wxConnectionBase *wxTCPClient::OnMakeConnection()
 {
   return NULL;
 }
 
 wxConnectionBase *wxTCPClient::OnMakeConnection()
 {

-  return new wxTCPConnection;
+  return new wxTCPConnection();

 }
 
 }
 

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

 // wxTCPServer
 // wxTCPServer

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

 
 

-wxTCPServer::wxTCPServer ()
-  : wxServerBase()
+wxTCPServer::wxTCPServer () : wxServerBase()

 {
 {

+  m_server = NULL;

 }
 
 }
 

-bool wxTCPServer::Create(const wxString& server_name)
+bool wxTCPServer::Create(const wxString& serverName)

 {
 {

-  wxSocketServer *server;
+  // Destroy previous server, if any
+  if (m_server)
+  {
+    m_server->SetClientData(NULL);
+    m_server->Destroy();
+    m_server = NULL;
+  }

 
 

-  // wxIPV4address defaults to INADDR_ANY:0
-  wxIPV4address addr;
-  addr.Service(server_name);
+  wxSockAddress *addr = GetAddressFromName(serverName);
+  if ( !addr )
+      return false;
+
+#ifdef __UNIX_LIKE__
+  mode_t umaskOld;
+  if ( addr->Type() == wxSockAddress::UNIX )
+  {
+      // ensure that the file doesn't exist as otherwise calling socket() would
+      // fail
+      int rc = remove(serverName.fn_str());
+      if ( rc < 0 && errno != ENOENT )
+      {
+          delete addr;

 
 

-  // Create a socket listening on specified port
-  server = new wxSocketServer(addr, SCKIPC_FLAGS);
-  server->Callback((wxSocketBase::wxSockCbk)Server_OnRequest);
-  server->CallbackData((char *)this);
-  server->SetNotify(wxSOCKET_CONNECTION_FLAG);
-  server->Notify(TRUE);
+          return false;
+      }

 
 

-  return TRUE;
+      // also set the umask to prevent the others from reading our file
+      umaskOld = umask(077);
+  }
+  else
+  {
+      // unused anyhow but shut down the compiler warnings
+      umaskOld = 0;
+  }
+#endif // __UNIX_LIKE__
+
+  // Create a socket listening on the specified port
+  m_server = new wxSocketServer(*addr, SCKIPC_FLAGS);
+
+#ifdef __UNIX_LIKE__
+  if ( addr->Type() == wxSockAddress::UNIX )
+  {
+      // restore the umask
+      umask(umaskOld);
+
+      // save the file name to remove it later
+      m_filename = serverName;
+  }
+#endif // __UNIX_LIKE__
+
+  delete addr;
+
+  if (!m_server->Ok())
+  {
+    m_server->Destroy();
+    m_server = NULL;
+
+    return false;
+  }
+
+  m_server->SetEventHandler(*gs_handler, _SERVER_ONREQUEST_ID);
+  m_server->SetClientData(this);
+  m_server->SetNotify(wxSOCKET_CONNECTION_FLAG);
+  m_server->Notify(true);
+
+  return true;

 }
 
 wxTCPServer::~wxTCPServer()
 {
 }
 
 wxTCPServer::~wxTCPServer()
 {

+    if (m_server)
+    {
+        m_server->SetClientData(NULL);
+        m_server->Destroy();
+    }
+
+#ifdef __UNIX_LIKE__
+    if ( !m_filename.empty() )
+    {
+        if ( remove(m_filename.fn_str()) != 0 )
+        {
+            wxLogDebug(_T("Stale AF_UNIX file '%s' left."), m_filename.c_str());
+        }
+    }
+#endif // __UNIX_LIKE__

 }
 
 wxConnectionBase *wxTCPServer::OnAcceptConnection( const wxString& WXUNUSED(topic) )
 }
 
 wxConnectionBase *wxTCPServer::OnAcceptConnection( const wxString& WXUNUSED(topic) )


@@ -195,26 +335,39 @@ wxConnectionBase *wxTCPServer::OnAcceptConnection( const wxString& WXUNUSED(topi
   return new wxTCPConnection();
 }
 
   return new wxTCPConnection();
 }
 

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

 // wxTCPConnection
 // wxTCPConnection

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

 
 

-wxTCPConnection::wxTCPConnection ()
-  : wxConnectionBase(),
-    m_sock(NULL), m_sockstrm(NULL), m_codeci(NULL), m_codeco(NULL)
+wxTCPConnection::wxTCPConnection () : wxConnectionBase()

 {
 {

+  m_sock     = NULL;
+  m_sockstrm = NULL;
+  m_codeci   = NULL;
+  m_codeco   = NULL;

 }
 
 }
 

-wxTCPConnection::wxTCPConnection(char * WXUNUSED(buffer), int WXUNUSED(size))
+wxTCPConnection::wxTCPConnection(wxChar *buffer, int size)
+       : wxConnectionBase(buffer, size)

 {
 {

+  m_sock     = NULL;
+  m_sockstrm = NULL;
+  m_codeci   = NULL;
+  m_codeco   = NULL;

 }
 
 wxTCPConnection::~wxTCPConnection ()
 {
 }
 
 wxTCPConnection::~wxTCPConnection ()
 {

-  wxDELETE(m_sock);
+  Disconnect();

   wxDELETE(m_codeci);
   wxDELETE(m_codeco);
   wxDELETE(m_sockstrm);
   wxDELETE(m_codeci);
   wxDELETE(m_codeco);
   wxDELETE(m_sockstrm);

+
+  if (m_sock)
+  {
+    m_sock->SetClientData(NULL);
+    m_sock->Destroy();
+  }

 }
 
 void wxTCPConnection::Compress(bool WXUNUSED(on))
 }
 
 void wxTCPConnection::Compress(bool WXUNUSED(on))


@@ -225,32 +378,36 @@ void wxTCPConnection::Compress(bool WXUNUSED(on))
 // Calls that CLIENT can make.
 bool wxTCPConnection::Disconnect ()
 {
 // Calls that CLIENT can make.
 bool wxTCPConnection::Disconnect ()
 {

+  if ( !GetConnected() )
+      return true;

   // Send the the disconnect message to the peer.
   m_codeco->Write8(IPC_DISCONNECT);
   // Send the the disconnect message to the peer.
   m_codeco->Write8(IPC_DISCONNECT);

+  m_sock->Notify(false);

   m_sock->Close();
   m_sock->Close();

+  SetConnected(false);

 
 

-  return TRUE;
+  return true;

 }
 
 bool wxTCPConnection::Execute(const wxChar *data, int size, wxIPCFormat format)
 {
   if (!m_sock->IsConnected())
 }
 
 bool wxTCPConnection::Execute(const wxChar *data, int size, wxIPCFormat format)
 {
   if (!m_sock->IsConnected())

-    return FALSE;
+    return false;

 
   // Prepare EXECUTE message
   m_codeco->Write8(IPC_EXECUTE);
   m_codeco->Write8(format);
 
   if (size < 0)
 
   // Prepare EXECUTE message
   m_codeco->Write8(IPC_EXECUTE);
   m_codeco->Write8(format);
 
   if (size < 0)

-    size = strlen(data) + 1;    // includes final NUL
+    size = wxStrlen(data) + 1;    // includes final NUL

 
   m_codeco->Write32(size);
   m_sockstrm->Write(data, size);
 
 
   m_codeco->Write32(size);
   m_sockstrm->Write(data, size);
 

-  return TRUE;
+  return true;

 }
 
 }
 

-char *wxTCPConnection::Request (const wxString& item, int *size, wxIPCFormat format)
+wxChar *wxTCPConnection::Request (const wxString& item, int *size, wxIPCFormat format)

 {
   if (!m_sock->IsConnected())
     return NULL;
 {
   if (!m_sock->IsConnected())
     return NULL;


@@ -268,10 +425,11 @@ char *wxTCPConnection::Request (const wxString& item, int *size, wxIPCFormat for
   else
   {
     size_t s;
   else
   {
     size_t s;

-    char *data = NULL;

 
     s = m_codeci->Read32();
 
     s = m_codeci->Read32();

-    data = new char[s];
+    wxChar *data = GetBufferAtLeast( s );
+    wxASSERT_MSG(data != NULL,
+                 _T("Buffer too small in wxTCPConnection::Request") );

     m_sockstrm->Read(data, s);
 
     if (size)
     m_sockstrm->Read(data, s);
 
     if (size)


@@ -283,19 +441,19 @@ char *wxTCPConnection::Request (const wxString& item, int *size, wxIPCFormat for
 bool wxTCPConnection::Poke (const wxString& item, wxChar *data, int size, wxIPCFormat format)
 {
   if (!m_sock->IsConnected())
 bool wxTCPConnection::Poke (const wxString& item, wxChar *data, int size, wxIPCFormat format)
 {
   if (!m_sock->IsConnected())

-    return FALSE;
+    return false;

 
   m_codeco->Write8(IPC_POKE);
   m_codeco->WriteString(item);
   m_codeco->Write8(format);
 
   if (size < 0)
 
   m_codeco->Write8(IPC_POKE);
   m_codeco->WriteString(item);
   m_codeco->Write8(format);
 
   if (size < 0)

-    size = strlen(data) + 1;    // includes final NUL
+    size = wxStrlen(data) + 1;    // includes final NUL

 
   m_codeco->Write32(size);
   m_sockstrm->Write(data, size);
 
 
   m_codeco->Write32(size);
   m_sockstrm->Write(data, size);
 

-  return TRUE;
+  return true;

 }
 
 bool wxTCPConnection::StartAdvise (const wxString& item)
 }
 
 bool wxTCPConnection::StartAdvise (const wxString& item)


@@ -303,7 +461,7 @@ bool wxTCPConnection::StartAdvise (const wxString& item)
   int ret;
 
   if (!m_sock->IsConnected())
   int ret;
 
   if (!m_sock->IsConnected())

-    return FALSE;
+    return false;

 
   m_codeco->Write8(IPC_ADVISE_START);
   m_codeco->WriteString(item);
 
   m_codeco->Write8(IPC_ADVISE_START);
   m_codeco->WriteString(item);


@@ -311,9 +469,9 @@ bool wxTCPConnection::StartAdvise (const wxString& item)
   ret = m_codeci->Read8();
 
   if (ret != IPC_FAIL)
   ret = m_codeci->Read8();
 
   if (ret != IPC_FAIL)

-    return TRUE;
+    return true;

   else
   else

-    return FALSE;
+    return false;

 }
 
 bool wxTCPConnection::StopAdvise (const wxString& item)
 }
 
 bool wxTCPConnection::StopAdvise (const wxString& item)


@@ -321,7 +479,7 @@ bool wxTCPConnection::StopAdvise (const wxString& item)
   int msg;
 
   if (!m_sock->IsConnected())
   int msg;
 
   if (!m_sock->IsConnected())

-    return FALSE;
+    return false;

 
   m_codeco->Write8(IPC_ADVISE_STOP);
   m_codeco->WriteString(item);
 
   m_codeco->Write8(IPC_ADVISE_STOP);
   m_codeco->WriteString(item);


@@ -329,9 +487,9 @@ bool wxTCPConnection::StopAdvise (const wxString& item)
   msg = m_codeci->Read8();
 
   if (msg != IPC_FAIL)
   msg = m_codeci->Read8();
 
   if (msg != IPC_FAIL)

-    return TRUE;
+    return true;

   else
   else

-    return FALSE;
+    return false;

 }
 
 // Calls that SERVER can make
 }
 
 // Calls that SERVER can make


@@ -339,36 +497,51 @@ bool wxTCPConnection::Advise (const wxString& item,
                               wxChar *data, int size, wxIPCFormat format)
 {
   if (!m_sock->IsConnected())
                               wxChar *data, int size, wxIPCFormat format)
 {
   if (!m_sock->IsConnected())

-    return FALSE;
+    return false;

 
   m_codeco->Write8(IPC_ADVISE);
   m_codeco->WriteString(item);
   m_codeco->Write8(format);
 
   if (size < 0)
 
   m_codeco->Write8(IPC_ADVISE);
   m_codeco->WriteString(item);
   m_codeco->Write8(format);
 
   if (size < 0)

-    size = strlen(data) + 1;    // includes final NUL
+    size = wxStrlen(data) + 1;    // includes final NUL

 
   m_codeco->Write32(size);
   m_sockstrm->Write(data, size);
 
 
   m_codeco->Write32(size);
   m_sockstrm->Write(data, size);
 

-  return TRUE;
+  return true;

 }
 
 }
 

-void Client_OnRequest(wxSocketBase& sock, wxSocketNotify evt,
-                     char *cdata)
+// --------------------------------------------------------------------------
+// wxTCPEventHandler (private class)
+// --------------------------------------------------------------------------
+
+BEGIN_EVENT_TABLE(wxTCPEventHandler, wxEvtHandler)
+  EVT_SOCKET(_CLIENT_ONREQUEST_ID, wxTCPEventHandler::Client_OnRequest)
+  EVT_SOCKET(_SERVER_ONREQUEST_ID, wxTCPEventHandler::Server_OnRequest)
+END_EVENT_TABLE()
+
+void wxTCPEventHandler::Client_OnRequest(wxSocketEvent &event)

 {
 {

-  int msg = 0;
-  wxTCPConnection *connection = (wxTCPConnection *)cdata;
+  wxSocketBase *sock = event.GetSocket();
+  wxSocketNotify evt = event.GetSocketEvent();
+  wxTCPConnection *connection = (wxTCPConnection *)(sock->GetClientData());
+
+  // This socket is being deleted; skip this event
+  if (!connection)
+    return;
+

   wxDataInputStream *codeci;
   wxDataInputStream *codeci;

-  wxDataOutputStream *codeco; 
+  wxDataOutputStream *codeco;

   wxSocketStream *sockstrm;
   wxString topic_name = connection->m_topic;
   wxString item;
 
   wxSocketStream *sockstrm;
   wxString topic_name = connection->m_topic;
   wxString item;
 

-  // The socket handler signals us that we lost the connection: destroy all.
+  // We lost the connection: destroy everything

   if (evt == wxSOCKET_LOST)
   {
   if (evt == wxSOCKET_LOST)
   {

-    sock.Close();
+    sock->Notify(false);
+    sock->Close();

     connection->OnDisconnect();
     return;
   }
     connection->OnDisconnect();
     return;
   }


@@ -377,41 +550,43 @@ void Client_OnRequest(wxSocketBase& sock, wxSocketNotify evt,
   codeci = connection->m_codeci;
   codeco = connection->m_codeco;
   sockstrm = connection->m_sockstrm;
   codeci = connection->m_codeci;
   codeco = connection->m_codeco;
   sockstrm = connection->m_sockstrm;

-  msg = codeci->Read8();
+  int msg = codeci->Read8();

 
   switch (msg)
   {
   case IPC_EXECUTE:
   {
 
   switch (msg)
   {
   case IPC_EXECUTE:
   {

-    char *data;
-    size_t size; 
+    wxChar *data;
+    size_t size;

     wxIPCFormat format;
     wxIPCFormat format;

-    
+

     format = (wxIPCFormat)codeci->Read8();
     size = codeci->Read32();
     format = (wxIPCFormat)codeci->Read8();
     size = codeci->Read32();

-    data = new char[size];
+    data = connection->GetBufferAtLeast( size );
+    wxASSERT_MSG(data != NULL,
+                 _T("Buffer too small in wxTCPEventHandler::Client_OnRequest") );

     sockstrm->Read(data, size);
 
     connection->OnExecute (topic_name, data, size, format);
 
     sockstrm->Read(data, size);
 
     connection->OnExecute (topic_name, data, size, format);
 

-    delete [] data;

     break;
   }
   case IPC_ADVISE:
   {
     break;
   }
   case IPC_ADVISE:
   {

-    char *data;
+    wxChar *data;

     size_t size;
     wxIPCFormat format;
 
     item = codeci->ReadString();
     format = (wxIPCFormat)codeci->Read8();
     size = codeci->Read32();
     size_t size;
     wxIPCFormat format;
 
     item = codeci->ReadString();
     format = (wxIPCFormat)codeci->Read8();
     size = codeci->Read32();

-    data = new char[size];
+    data = connection->GetBufferAtLeast( size );
+    wxASSERT_MSG(data != NULL,
+                 _T("Buffer too small in wxTCPEventHandler::Client_OnRequest") );

     sockstrm->Read(data, size);
     sockstrm->Read(data, size);

-    
+

     connection->OnAdvise (topic_name, item, data, size, format);
 
     connection->OnAdvise (topic_name, item, data, size, format);
 

-    delete [] data;

     break;
   }
   case IPC_ADVISE_START:
     break;
   }
   case IPC_ADVISE_START:


@@ -447,12 +622,12 @@ void Client_OnRequest(wxSocketBase& sock, wxSocketNotify evt,
     item = codeci->ReadString();
     format = (wxIPCFormat)codeci->Read8();
     size = codeci->Read32();
     item = codeci->ReadString();
     format = (wxIPCFormat)codeci->Read8();
     size = codeci->Read32();

-    data = new wxChar[size];
+    data = connection->GetBufferAtLeast( size );
+    wxASSERT_MSG(data != NULL,
+                 _T("Buffer too small in wxTCPEventHandler::Client_OnRequest") );

     sockstrm->Read(data, size);
     sockstrm->Read(data, size);

-    
-    connection->OnPoke (topic_name, item, data, size, format);

 
 

-    delete [] data;
+    connection->OnPoke (topic_name, item, data, size, format);

 
     break;
   }
 
     break;
   }


@@ -464,14 +639,14 @@ void Client_OnRequest(wxSocketBase& sock, wxSocketNotify evt,
     format = (wxIPCFormat)codeci->Read8();
 
     int user_size = -1;
     format = (wxIPCFormat)codeci->Read8();
 
     int user_size = -1;

-    char *user_data = connection->OnRequest (topic_name, item, &user_size, format);
+    wxChar *user_data = connection->OnRequest (topic_name, item, &user_size, format);

 
     if (user_data)
     {
       codeco->Write8(IPC_REQUEST_REPLY);
 
       if (user_size == -1)
 
     if (user_data)
     {
       codeco->Write8(IPC_REQUEST_REPLY);
 
       if (user_size == -1)

-        user_size = strlen(user_data) + 1;      // includes final NUL
+        user_size = wxStrlen(user_data) + 1;      // includes final NUL

 
       codeco->Write32(user_size);
       sockstrm->Write(user_data, user_size);
 
       codeco->Write32(user_size);
       sockstrm->Write(user_data, user_size);


@@ -483,7 +658,9 @@ void Client_OnRequest(wxSocketBase& sock, wxSocketNotify evt,
   }
   case IPC_DISCONNECT:
   {
   }
   case IPC_DISCONNECT:
   {

-    sock.Close();
+    sock->Notify(false);
+    sock->Close();
+    connection->SetConnected(false);

     connection->OnDisconnect();
     break;
   }
     connection->OnDisconnect();
     break;
   }


@@ -493,25 +670,29 @@ void Client_OnRequest(wxSocketBase& sock, wxSocketNotify evt,
   }
 }
 
   }
 }
 

-void Server_OnRequest(wxSocketServer& server,
-                     wxSocketNotify evt, char *cdata)
+void wxTCPEventHandler::Server_OnRequest(wxSocketEvent &event)

 {
 {

-  wxTCPServer *ipcserv = (wxTCPServer *)cdata;
-  wxSocketStream *stream;
-  wxDataInputStream *codeci;
-  wxDataOutputStream *codeco;
+  wxSocketServer *server = (wxSocketServer *) event.GetSocket();
+  wxTCPServer *ipcserv = (wxTCPServer *) server->GetClientData();

 
 

-  if (evt != wxSOCKET_CONNECTION)
+  // This socket is being deleted; skip this event
+  if (!ipcserv)

     return;
 
     return;
 

-  /* Accept the connection, getting a new socket */
-  wxSocketBase *sock = server.Accept();
+  if (event.GetSocketEvent() != wxSOCKET_CONNECTION)
+    return;
+
+  // Accept the connection, getting a new socket
+  wxSocketBase *sock = server->Accept();

   if (!sock->Ok())
   if (!sock->Ok())

+  {
+    sock->Destroy();

     return;
     return;

+  }

 
 

-  stream = new wxSocketStream(*sock);
-  codeci = new wxDataInputStream(*stream);
-  codeco = new wxDataOutputStream(*stream);
+  wxSocketStream *stream     = new wxSocketStream(*sock);
+  wxDataInputStream *codeci  = new wxDataInputStream(*stream);
+  wxDataOutputStream *codeco = new wxDataOutputStream(*stream);

 
   int msg;
   msg = codeci->Read8();
 
   int msg;
   msg = codeci->Read8();


@@ -521,36 +702,58 @@ void Server_OnRequest(wxSocketServer& server,
     wxString topic_name;
     topic_name = codeci->ReadString();
 
     wxString topic_name;
     topic_name = codeci->ReadString();
 

-    /* Register new socket with the notifier */

     wxTCPConnection *new_connection =
          (wxTCPConnection *)ipcserv->OnAcceptConnection (topic_name);
     wxTCPConnection *new_connection =
          (wxTCPConnection *)ipcserv->OnAcceptConnection (topic_name);

+

     if (new_connection)
     {
     if (new_connection)
     {

-      if (!new_connection->IsKindOf(CLASSINFO(wxTCPConnection)))
+      if (new_connection->IsKindOf(CLASSINFO(wxTCPConnection)))

       {
       {

-        delete new_connection;
-        codeco->Write8(IPC_FAIL);
+        // Acknowledge success
+        codeco->Write8(IPC_CONNECT);
+        new_connection->m_topic = topic_name;
+        new_connection->m_sock = sock;
+        new_connection->m_sockstrm = stream;
+        new_connection->m_codeci = codeci;
+        new_connection->m_codeco = codeco;
+        sock->SetEventHandler(*gs_handler, _CLIENT_ONREQUEST_ID);
+        sock->SetClientData(new_connection);
+        sock->SetNotify(wxSOCKET_INPUT_FLAG | wxSOCKET_LOST_FLAG);
+        sock->Notify(true);

         return;
       }
         return;
       }

-      // Acknowledge success
-      codeco->Write8(IPC_CONNECT);
-      new_connection->m_topic = topic_name;
-      new_connection->m_sock = sock;      
-      new_connection->m_sockstrm = stream;
-      new_connection->m_codeci = codeci;
-      new_connection->m_codeco = codeco;
-      sock->Callback(Client_OnRequest);
-      sock->CallbackData((char *)new_connection);
-      sock->SetNotify(wxSOCKET_INPUT_FLAG | wxSOCKET_LOST_FLAG);
-      sock->Notify(TRUE);
-    }
-    else
-    {
-      // Send failure message
-      codeco->Write8(IPC_FAIL);
+      else
+      {
+        delete new_connection;
+        // and fall through to delete everything else
+      }

     }
   }
     }
   }

+
+  // Something went wrong, send failure message and delete everything
+  codeco->Write8(IPC_FAIL);
+
+  delete codeco;
+  delete codeci;
+  delete stream;
+  sock->Destroy();

 }
 
 }
 

+// --------------------------------------------------------------------------
+// wxTCPEventHandlerModule (private class)
+// --------------------------------------------------------------------------
+
+class wxTCPEventHandlerModule: public wxModule
+{
+  DECLARE_DYNAMIC_CLASS(wxTCPEventHandlerModule)
+
+public:
+  bool OnInit() { gs_handler = new wxTCPEventHandler(); return true; }
+  void OnExit() { wxDELETE(gs_handler); }
+};
+
+IMPLEMENT_DYNAMIC_CLASS(wxTCPEventHandlerModule, wxModule)
+
+

 #endif
 #endif

-  // wxUSE_SOCKETS
+    // wxUSE_SOCKETS && wxUSE_IPC