automated ifacecheck fixes

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

diff --git a/src/common/sckipc.cpp b/src/common/sckipc.cpp
index 718211b7dc7f053086f7d6fbc456b656f749b7f4..1d43462ec2427ecda5e5b458ac8232fd5c96b71d 100644 (file)
--- a/src/common/sckipc.cpp
+++ b/src/common/sckipc.cpp
@@ -1,514 +1,756 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        sckipc.cpp
+// Name:        src/common/sckipc.cpp

 // Purpose:     Interprocess communication implementation (wxSocket version)
 // Purpose:     Interprocess communication implementation (wxSocket version)

-// Author:      Julian Smart, Guilhem Lavaux
+// Author:      Julian Smart

 // Modified by: Guilhem Lavaux (big rewrite) May 1997, 1998
 // 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$
 // Created:     1993
 // RCS-ID:      $Id$

-// Copyright:   (c) Julian Smart 1993, Guilhem Lavaux 1997, 1998
-// Licence:     wxWindows license
+// Copyright:   (c) Julian Smart 1993
+//              (c) Guilhem Lavaux 1997, 1998
+//              (c) 2000 Guillermo Rodriguez <guille@iies.es>
+// Licence:     wxWindows licence

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

-#ifdef __GNUG__
-#pragma implementation "sckipc.h"
-#endif
+// ==========================================================================
+// declarations
+// ==========================================================================
+
+// --------------------------------------------------------------------------
+// headers
+// --------------------------------------------------------------------------

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

-#pragma hdrstop
+    #pragma hdrstop

 #endif
 
 #endif
 

+#if wxUSE_SOCKETS && wxUSE_IPC && wxUSE_STREAMS
+
+#include "wx/sckipc.h"
+

 #ifndef WX_PRECOMP
 #ifndef WX_PRECOMP

+    #include "wx/log.h"
+    #include "wx/event.h"
+    #include "wx/module.h"

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

+#include <errno.h>

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

-#include "wx/sckipc.h"

 
 

-#ifdef __BORLANDC__
-#pragma hdrstop
-#endif
-
-#if !USE_SHARED_LIBRARY
-IMPLEMENT_DYNAMIC_CLASS(wxTCPServer, wxServerBase)
-IMPLEMENT_DYNAMIC_CLASS(wxTCPClient, wxClientBase)
-IMPLEMENT_DYNAMIC_CLASS(wxTCPConnection, wxConnectionBase)
-#endif
+// --------------------------------------------------------------------------
+// macros and constants
+// --------------------------------------------------------------------------

 
 

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

 // Message codes
 // Message codes

-enum {
-  IPC_EXECUTE = 1,
-  IPC_REQUEST,
-  IPC_POKE,
-  IPC_ADVISE_START,
-  IPC_ADVISE_REQUEST,
-  IPC_ADVISE,
-  IPC_ADVISE_STOP,
-  IPC_REQUEST_REPLY,
-  IPC_FAIL,
-  IPC_CONNECT,
-  IPC_DISCONNECT
+enum
+{
+    IPC_EXECUTE = 1,
+    IPC_REQUEST,
+    IPC_POKE,
+    IPC_ADVISE_START,
+    IPC_ADVISE_REQUEST,
+    IPC_ADVISE,
+    IPC_ADVISE_STOP,
+    IPC_REQUEST_REPLY,
+    IPC_FAIL,
+    IPC_CONNECT,
+    IPC_DISCONNECT

 };
 };

-#endif

 
 

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

 
 

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

 
 

-wxTCPClient::wxTCPClient (void)
-  : wxClientBase()
+// ----------------------------------------------------------------------------
+// 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(__WINDOWS__) && !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;
+    }

 }
 
 }
 

-wxTCPClient::~wxTCPClient (void)
+// --------------------------------------------------------------------------
+// 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
+// ==========================================================================
+
+IMPLEMENT_DYNAMIC_CLASS(wxTCPServer, wxServerBase)
+IMPLEMENT_DYNAMIC_CLASS(wxTCPClient, wxClientBase)
+IMPLEMENT_CLASS(wxTCPConnection, wxConnectionBase)
+
+// --------------------------------------------------------------------------
+// wxTCPClient
+// --------------------------------------------------------------------------
+
+wxTCPClient::wxTCPClient()
+           : wxClientBase()

 {
 }
 
 bool wxTCPClient::ValidHost(const wxString& host)
 {
 {
 }
 
 bool wxTCPClient::ValidHost(const wxString& host)
 {

-  wxIPV4address addr;
+    wxIPV4address addr;

 
 

-  return addr.Hostname(host);
+    return addr.Hostname(host);

 }
 
 wxConnectionBase *wxTCPClient::MakeConnection (const wxString& host,
 }
 
 wxConnectionBase *wxTCPClient::MakeConnection (const wxString& host,

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

                                                const wxString& topic)
 {
                                                const wxString& topic)
 {

-  wxIPV4address addr;
-  wxSocketHandler *hsock = &wxSocketHandler::Master();
-  wxSocketClient *client = hsock->CreateClient();
-  wxSocketStream *stream = new wxSocketStream(*client);
-  wxDataInputStream data_is(*stream);
-  wxDataOutputStream data_os(*stream);
-  
-  client->SetNotify(wxSocketBase::REQ_READ | wxSocketBase::REQ_LOST);
-  addr.Service(server_name);
-  addr.Hostname(host);
-
-  if (!client->Connect(addr)) {
-    delete client;
-    return NULL;
-  }
-  client->Notify(FALSE);
-
-  // Send topic name, and enquire whether this has succeeded
-  unsigned char msg;
-  
-  data_os.Write8(IPC_CONNECT);
-  data_os.WriteString(topic);
-  
-  msg = data_is.Read8();
-  
-  // OK! Confirmation.
-  if (msg == IPC_CONNECT) {
-    wxTCPConnection *connection = (wxTCPConnection *)OnMakeConnection ();
-    if (connection) {
-      if (!connection->IsKindOf(CLASSINFO(wxTCPConnection))) {
-        delete connection;
+    wxSockAddress *addr = GetAddressFromName(serverName, host);
+    if ( !addr )

         return NULL;
         return NULL;

-      }
-      connection->m_topic = topic;
-      client->Callback(Client_OnRequest);
-      client->CallbackData((char *)connection);
-      client->Notify(TRUE);
-      return connection;
-    } else {
-      delete client;
-      return NULL;
+
+    wxSocketClient *client = new wxSocketClient(SCKIPC_FLAGS);
+    wxSocketStream *stream = new wxSocketStream(*client);
+    wxDataInputStream *data_is = new wxDataInputStream(*stream);
+    wxDataOutputStream *data_os = new wxDataOutputStream(*stream);
+
+    bool ok = client->Connect(*addr);
+    delete addr;
+
+    if ( ok )
+    {
+        unsigned char msg;
+
+        // Send topic name, and enquire whether this has succeeded
+        data_os->Write8(IPC_CONNECT);
+        data_os->WriteString(topic);
+
+        msg = data_is->Read8();
+
+        // OK! Confirmation.
+        if (msg == IPC_CONNECT)
+        {
+            wxTCPConnection *
+                connection = (wxTCPConnection *)OnMakeConnection ();
+
+            if (connection)
+            {
+                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;
+                    client->SetEventHandler(*gs_handler, _CLIENT_ONREQUEST_ID);
+                    client->SetClientData(connection);
+                    client->SetNotify(wxSOCKET_INPUT_FLAG | wxSOCKET_LOST_FLAG);
+                    client->Notify(true);
+                    return connection;
+                }
+                else
+                {
+                    delete connection;
+                    // and fall through to delete everything else
+                }
+            }
+        }

     }
     }

-  } else {
-    delete client;
+
+    // Something went wrong, delete everything
+    delete data_is;
+    delete data_os;
+    delete stream;
+    client->Destroy();
+

     return NULL;
     return NULL;

-  }
-  return NULL;

 }
 
 wxConnectionBase *wxTCPClient::OnMakeConnection()
 {
 }
 
 wxConnectionBase *wxTCPClient::OnMakeConnection()
 {

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

 }
 
 }
 

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

 // wxTCPServer
 // wxTCPServer

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

 
 

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

 {
 {

+    m_server = NULL;

 }
 
 }
 

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

 {
 {

-  wxIPV4address addr;
-  wxSocketHandler *hsock = &wxSocketHandler::Master();
-  wxSocketServer *server;
+    // Destroy previous server, if any
+    if (m_server)
+    {
+        m_server->SetClientData(NULL);
+        m_server->Destroy();
+        m_server = NULL;
+    }

 
 

-  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;
+
+            return false;
+        }
+
+        // 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;

 
 

-  // Create a socket listening on specified port
-  server = hsock->CreateServer(addr);
-  server->Callback((wxSocketBase::wxSockCbk)Server_OnRequest);
-  server->SetNotify(wxSocketBase::REQ_ACCEPT);
+        return false;
+    }

 
 

-  server->CallbackData((char *)this);
+    m_server->SetEventHandler(*gs_handler, _SERVER_ONREQUEST_ID);
+    m_server->SetClientData(this);
+    m_server->SetNotify(wxSOCKET_CONNECTION_FLAG);
+    m_server->Notify(true);

 
 

-  return TRUE;
+    return true;

 }
 
 }
 

-wxTCPServer::~wxTCPServer(void)
+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))

 {
 {

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

 }
 
 }
 

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

 // wxTCPConnection
 // wxTCPConnection

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

 
 

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

 {
 {

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

 }
 
 }
 

-wxTCPConnection::~wxTCPConnection (void)
+wxTCPConnection::~wxTCPConnection()

 {
 {

-  wxDELETE(m_sock);
-  wxDELETE(m_codeci);
-  wxDELETE(m_codeco);
-  wxDELETE(m_sockstrm);
+    Disconnect();
+
+    if ( m_sock )
+    {
+        m_sock->SetClientData(NULL);
+        m_sock->Destroy();
+    }
+
+    /* Delete after destroy */
+    wxDELETE(m_codeci);
+    wxDELETE(m_codeco);
+    wxDELETE(m_sockstrm);

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

-  // Use wxLZWStream
+    // TODO

 }
 
 // Calls that CLIENT can make.
 }
 
 // Calls that CLIENT can make.

-bool wxTCPConnection::Disconnect (void)
+bool wxTCPConnection::Disconnect()

 {
 {

-  // Send the the disconnect message to the peer.
-  m_codeco->Write8(IPC_DISCONNECT);
-  m_sock->Close();
+    if ( !GetConnected() )
+        return true;
+
+    // Send the disconnect message to the peer.
+    m_codeco->Write8(IPC_DISCONNECT);
+
+    if ( m_sock )
+    {
+        m_sock->Notify(false);
+        m_sock->Close();
+    }

 
 

-  return TRUE;
+    SetConnected(false);
+
+    return true;

 }
 
 }
 

-bool wxTCPConnection::Execute (char *data, int size, wxDataFormat format)
+bool wxTCPConnection::DoExecute(const void *data,
+                                size_t size,
+                                wxIPCFormat format)

 {
 {

-  if (!m_sock->IsConnected())
-    return FALSE;
-
-  // Prepare EXECUTE message
-  m_codeco->Write8(IPC_EXECUTE);
-  m_codeco->Write8(format);
-  if (size < 0)
-    m_codeco->WriteString(data);
-  else {
+    if ( !m_sock->IsConnected() )
+        return false;
+
+    // Prepare EXECUTE message
+    m_codeco->Write8(IPC_EXECUTE);
+    m_codeco->Write8(format);
+

     m_codeco->Write32(size);
     m_codeco->Write32(size);

-    m_codeco->Write(data, size);
-  }
+    m_sockstrm->Write(data, size);

 
 

-  return TRUE;
+    return true;

 }
 
 }
 

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

 {
 {

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

 
 

-  m_codeco->Write8(IPC_REQUEST);
-  m_codeco->WriteString(item);
-  m_codeco->Write8(format);
+    m_codeco->Write8(IPC_REQUEST);
+    m_codeco->WriteString(item);
+    m_codeco->Write8(format);

 
 

-  // If Unpack doesn't initialize it.
-  int ret;
+    int ret = m_codeci->Read8();
+    if ( ret == IPC_FAIL )
+        return NULL;

 
 

-  ret = m_codeci->Read8();
-  if (ret == IPC_FAIL)
-    return NULL;
-  else {
-    size_t s;
-    char *data = NULL;
+    size_t s = m_codeci->Read32();

 
 

-    s = m_codeci->Read32();
-    data = new char[s];
-    m_codeci->Read(data, s);
+    void *data = GetBufferAtLeast( s );
+    wxASSERT_MSG(data != NULL,
+            _T("Buffer too small in wxTCPConnection::Request") );
+    m_sockstrm->Read(data, s);

 
     if (size)
 
     if (size)

-      *size = s;
+        *size = s;

     return data;
     return data;

-  }

 }
 
 }
 

-bool wxTCPConnection::Poke (const wxString& item, char *data, int size, wxDataFormat format)
+bool wxTCPConnection::DoPoke(const wxString& item,
+                             const void *data,
+                             size_t size,
+                             wxIPCFormat format)

 {
 {

-  if (!m_sock->IsConnected())
-    return FALSE;
-
-  m_codeco->Write8(IPC_POKE);
-  m_codeco->WriteString(item);
-  m_codeco->Write8(format);
-  if (size < 0)
-    m_codeco->WriteString(data);
-  else {
+    if ( !m_sock->IsConnected() )
+        return false;
+
+    m_codeco->Write8(IPC_POKE);
+    m_codeco->WriteString(item);
+    m_codeco->Write8(format);
+

     m_codeco->Write32(size);
     m_codeco->Write32(size);

-    m_codeco->Write(data, size);
-  }
+    m_sockstrm->Write(data, size);

 
 

-  return TRUE;
+    return true;

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

-  int ret;
-
-  if (!m_sock->IsConnected())
-    return FALSE;
+    if ( !m_sock->IsConnected() )
+        return false;

 
 

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

 
 

-  ret = m_codeci->Read8();
-
-  if (ret != IPC_FAIL)
-    return TRUE;
-  else
-    return FALSE;
+    int ret = m_codeci->Read8();
+    if (ret != IPC_FAIL)
+        return true;
+    else
+        return false;

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

-  int msg;
-
-  if (!m_sock->IsConnected())
-    return FALSE;
+    if ( !m_sock->IsConnected() )
+        return false;

 
 

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

 
 

-  msg = m_codeci->Read8();
+    int ret = m_codeci->Read8();

 
 

-  if (msg != IPC_FAIL)
-    return TRUE;
-  else
-    return FALSE;
+    if (ret != IPC_FAIL)
+        return true;
+    else
+        return false;

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

-bool wxTCPConnection::Advise (const wxString& item,
-                              char *data, int size, wxDataFormat format)
+bool wxTCPConnection::DoAdvise(const wxString& item,
+                               const void *data,
+                               size_t size,
+                               wxIPCFormat format)

 {
 {

-  if (!m_sock->IsConnected())
-    return FALSE;
-
-  m_codeco->Write8(IPC_ADVISE);
-  m_codeco->WriteString(item);
-  m_codeco->Write8(format);
-  if (size < 0)
-    m_codeco->WriteString(data);
-  else {
+    if ( !m_sock->IsConnected() )
+        return false;
+
+    m_codeco->Write8(IPC_ADVISE);
+    m_codeco->WriteString(item);
+    m_codeco->Write8(format);
+

     m_codeco->Write32(size);
     m_codeco->Write32(size);

-    m_codeco->Write(data, size);
-  }
+    m_sockstrm->Write(data, size);

 
 

-  return TRUE;
+    return true;

 }
 
 }
 

-void Client_OnRequest(wxSocketBase& sock, wxSocketBase::wxRequestEvent 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;
-  wxDataInputStream *codeci;
-  wxDataOutputStream *codeco; 
-  wxString topic_name = connection->m_topic;
-  wxString item;
-
-  // The socket handler signals us that we lost the connection: destroy all.
-  if (evt == wxSocketBase::EVT_LOST) {
-    sock.Close();
-    connection->OnDisconnect();
-    return;
-  }
-
-  // Receive message number.
-  codeci = connection->m_codeci;
-  codeco = connection->m_codeco;
-  msg = codeci->Read8();
-
-  switch (msg) {
-  case IPC_EXECUTE: {
-    char *data;
-    size_t size; 
-    wxDataFormat format;
-    
-    format = (wxDataFormat)codeci->Read8();
-    size = codeci->Read32();
-    data = new char[size];
-    codeci->Read(data, size);
-
-    connection->OnExecute (topic_name, data, size, format);
-
-    delete [] data;
-    break;
-  }
-  case IPC_ADVISE: {
-    char *data;
-    size_t size;
-    wxDataFormat format;
-
-    item = codeci->ReadString();
-    format = (wxDataFormat)codeci->Read8();
-    size = codeci->Read32();
-    data = new char[size];
-    codeci->Read(data, size);
-    
-    connection->OnAdvise (topic_name, item, data, size, format);
-
-    delete [] data;
-    break;
-  }
-  case IPC_ADVISE_START: {
-    item = codeci->ReadString();
-
-    bool ok = connection->OnStartAdvise (topic_name, item);
-    if (ok)
-      codeco->Write8(IPC_ADVISE_START);
-    else
-      codeco->Write8(IPC_FAIL);
+    wxSocketBase *sock = event.GetSocket();
+    if (!sock)
+        return ;

 
 

-    break;
-  }
-  case IPC_ADVISE_STOP: {
-    item = codeci->ReadString();
+    wxSocketNotify evt = event.GetSocketEvent();
+    wxTCPConnection *connection = (wxTCPConnection *)(sock->GetClientData());

 
 

-    bool ok = connection->OnStopAdvise (topic_name, item);
-    if (ok)
-      codeco->Write8(IPC_ADVISE_STOP);
-    else
-      codeco->Write8(IPC_FAIL);
-
-    break;
-  }
-  case IPC_POKE: {
-    wxDataFormat format;
-    size_t size;
-    char *data;
-
-    item = codeci->ReadString();
-    format = (wxDataFormat)codeci->Read8();
-    size = codeci->Read32();
-    data = new char[size];
-    codeci->Read(data, size);
-    
-    connection->OnPoke (topic_name, item, data, size, format);
-
-    delete [] data;
-
-    break;
-  }
-  case IPC_REQUEST: {
-    wxDataFormat format;
-
-    item = codeci->ReadString();
-    format = (wxDataFormat)codeci->Read8();
-
-    int user_size = -1;
-    char *user_data = connection->OnRequest (topic_name, item, &user_size, format);
-
-    if (user_data) {
-      codeco->Write8(IPC_REQUEST_REPLY);
-      if (user_size != -1) {
-        codeco->Write32(user_size);
-        codeco->Write(user_data, user_size);
-      } else
-        codeco->WriteString(user_data);
-    } else
-      codeco->Write8(IPC_FAIL);
-
-    break;
-  }
-  case IPC_DISCONNECT: {
-    sock.Close();
-    connection->OnDisconnect();
-    break;
-  }
-  default:
-    codeco->Write8(IPC_FAIL);
-    break;
-  }
+    // This socket is being deleted; skip this event
+    if (!connection)
+        return;
+
+    wxDataInputStream *codeci;
+    wxDataOutputStream *codeco;
+    wxSocketStream *sockstrm;
+    wxString topic_name = connection->m_topic;
+    wxString item;
+
+    // We lost the connection: destroy everything
+    if (evt == wxSOCKET_LOST)
+    {
+        sock->Notify(false);
+        sock->Close();
+        connection->OnDisconnect();
+        return;
+    }
+
+    // Receive message number.
+    codeci = connection->m_codeci;
+    codeco = connection->m_codeco;
+    sockstrm = connection->m_sockstrm;
+    int msg = codeci->Read8();
+
+    switch (msg)
+    {
+        case IPC_EXECUTE:
+            {
+                void *data;
+                size_t size;
+                wxIPCFormat format;
+
+                format = (wxIPCFormat)codeci->Read8();
+                size = codeci->Read32();
+
+                data = connection->GetBufferAtLeast( size );
+                wxASSERT_MSG(data != NULL,
+                    "Buffer too small in wxTCPEventHandler::Client_OnRequest" );
+                sockstrm->Read(data, size);
+
+                connection->OnExecute (topic_name, data, size, format);
+
+                break;
+            }
+        case IPC_ADVISE:
+            {
+                item = codeci->ReadString();
+                wxIPCFormat format = (wxIPCFormat)codeci->Read8();
+                size_t size = codeci->Read32();
+                void *data = connection->GetBufferAtLeast( size );
+                wxASSERT_MSG(data != NULL,
+                    "Buffer too small in wxTCPEventHandler::Client_OnRequest" );
+                sockstrm->Read(data, size);
+
+                connection->OnAdvise (topic_name, item, data, size, format);
+
+                break;
+            }
+        case IPC_ADVISE_START:
+            {
+                item = codeci->ReadString();
+
+                bool ok = connection->OnStartAdvise (topic_name, item);
+                if (ok)
+                    codeco->Write8(IPC_ADVISE_START);
+                else
+                    codeco->Write8(IPC_FAIL);
+
+                break;
+            }
+        case IPC_ADVISE_STOP:
+            {
+                item = codeci->ReadString();
+
+                bool ok = connection->OnStopAdvise (topic_name, item);
+                if (ok)
+                    codeco->Write8(IPC_ADVISE_STOP);
+                else
+                    codeco->Write8(IPC_FAIL);
+
+                break;
+            }
+        case IPC_POKE:
+            {
+                item = codeci->ReadString();
+                wxIPCFormat format = (wxIPCFormat)codeci->Read8();
+                size_t size = codeci->Read32();
+                void *data = connection->GetBufferAtLeast( size );
+                wxASSERT_MSG(data != NULL,
+                    "Buffer too small in wxTCPEventHandler::Client_OnRequest" );
+                sockstrm->Read(data, size);
+
+                connection->OnPoke (topic_name, item, data, size, format);
+
+                break;
+            }
+        case IPC_REQUEST:
+            {
+                wxIPCFormat format;
+
+                item = codeci->ReadString();
+                format = (wxIPCFormat)codeci->Read8();
+
+                size_t user_size = wxNO_LEN;
+                const void *user_data = connection->OnRequest(topic_name,
+                                                              item,
+                                                              &user_size,
+                                                              format);
+
+                if (user_data)
+                {
+                    codeco->Write8(IPC_REQUEST_REPLY);
+
+                    if (user_size == wxNO_LEN)
+                    {
+                        switch (format)
+                        {
+                            case wxIPC_TEXT:
+                            case wxIPC_UTF8TEXT:
+                                user_size = strlen((const char *)user_data) + 1;  // includes final NUL
+                                break;
+                            case wxIPC_UNICODETEXT:
+                                user_size = (wcslen((const wchar_t *)user_data) + 1) * sizeof(wchar_t);  // includes final NUL
+                                break;
+                            default:
+                                user_size = 0;
+                        }
+                    }
+
+                    codeco->Write32(user_size);
+                    sockstrm->Write(user_data, user_size);
+                }
+                else
+                    codeco->Write8(IPC_FAIL);
+
+                break;
+            }
+        case IPC_DISCONNECT:
+            {
+                sock->Notify(false);
+                sock->Close();
+                connection->SetConnected(false);
+                connection->OnDisconnect();
+                break;
+            }
+        default:
+            codeco->Write8(IPC_FAIL);
+            break;
+    }

 }
 
 }
 

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

 {
 {

-  wxTCPServer *ipcserv = (wxTCPServer *)cdata;
-  wxSocketStream *stream;
-  wxDataInputStream *codeci;
-  wxDataOutputStream *codeco;
-
-  if (evt != wxSocketBase::EVT_ACCEPT)
-    return;
-
-  /* Accept the connection, getting a new socket */
-  wxSocketBase *sock = server.Accept();
-  sock->Notify(FALSE);
-  sock->SetNotify(wxSocketBase::REQ_READ | wxSocketBase::REQ_LOST);
-
-  stream = new wxSocketStream(*sock);
-  codeci = new wxDataInputStream(*stream);
-  codeco = new wxDataOutputStream(*stream);
-
-  if (!sock->Ok())
-    return;
-
-  int msg;
-  msg = codeci->Read8();
-
-  if (msg == IPC_CONNECT) {
-    wxString topic_name;
-    topic_name = codeci->ReadString();
-
-    /* Register new socket with the notifier */
-    wxTCPConnection *new_connection =
-         (wxTCPConnection *)ipcserv->OnAcceptConnection (topic_name);
-    if (new_connection) {
-      if (!new_connection->IsKindOf(CLASSINFO(wxTCPConnection))) {
-        delete new_connection;
-        codeco->Write8(IPC_FAIL);
+    wxSocketServer *server = (wxSocketServer *) event.GetSocket();
+    if (!server)
+        return ;
+    wxTCPServer *ipcserv = (wxTCPServer *) server->GetClientData();
+
+    // This socket is being deleted; skip this event
+    if (!ipcserv)
+        return;
+
+    if (event.GetSocketEvent() != wxSOCKET_CONNECTION)
+        return;
+
+    // Accept the connection, getting a new socket
+    wxSocketBase *sock = server->Accept();
+    if (!sock)
+        return ;
+    if (!sock->Ok())
+    {
+        sock->Destroy();

         return;
         return;

-      }
-      // Acknowledge success
-      codeco->Write8(IPC_CONNECT);
-      
-      new_connection->m_topic = topic_name;
-      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->Notify(TRUE);
-    } else {
-      // Send failure message
-      codeco->Write8(IPC_FAIL);

     }
     }

-  }
+
+    wxSocketStream *stream     = new wxSocketStream(*sock);
+    wxDataInputStream *codeci  = new wxDataInputStream(*stream);
+    wxDataOutputStream *codeco = new wxDataOutputStream(*stream);
+
+    int msg;
+    msg = codeci->Read8();
+
+    if (msg == IPC_CONNECT)
+    {
+        wxString topic_name;
+        topic_name = codeci->ReadString();
+
+        wxTCPConnection *new_connection =
+            (wxTCPConnection *)ipcserv->OnAcceptConnection (topic_name);
+
+        if (new_connection)
+        {
+            if (new_connection->IsKindOf(CLASSINFO(wxTCPConnection)))
+            {
+                // 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;
+            }
+            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
+{
+public:
+    virtual bool OnInit() { gs_handler = new wxTCPEventHandler; return true; }
+    virtual void OnExit() { wxDELETE(gs_handler); }
+
+    DECLARE_DYNAMIC_CLASS(wxTCPEventHandlerModule)
+};
+
+IMPLEMENT_DYNAMIC_CLASS(wxTCPEventHandlerModule, wxModule)
+
+#endif // wxUSE_SOCKETS && wxUSE_IPC && wxUSE_STREAMS