*** empty log message ***

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

diff --git a/src/common/sckipc.cpp b/src/common/sckipc.cpp
index c532acbbee6f4fe768fee8a4c295e4e5b589ab98..28284b2695361e7746f6f82fd9fc68492ba00f34 100644 (file)
--- a/src/common/sckipc.cpp
+++ b/src/common/sckipc.cpp
@@ -4,6 +4,7 @@
 // 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

 // Created:     1993
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart 1993
 // Created:     1993
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart 1993


@@ -12,6 +13,14 @@
 // Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 

+// ==========================================================================
+// declarations
+// ==========================================================================
+
+// --------------------------------------------------------------------------
+// headers
+// --------------------------------------------------------------------------
+

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


@@ -27,27 +36,30 @@
 #include "wx/defs.h"
 #endif
 
 #include "wx/defs.h"
 #endif
 

-#if wxUSE_SOCKETS 
+#if wxUSE_SOCKETS && wxUSE_IPC

 
 #include <stdlib.h>
 #include <stdio.h>
 
 #include "wx/socket.h"
 #include "wx/sckipc.h"
 
 #include <stdlib.h>
 #include <stdio.h>
 
 #include "wx/socket.h"
 #include "wx/sckipc.h"

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

 #include "wx/log.h"
 
 #ifdef __BORLANDC__
 #pragma hdrstop
 #endif
 
 #include "wx/log.h"
 
 #ifdef __BORLANDC__
 #pragma hdrstop
 #endif
 

-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 +74,46 @@ 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
 
 // All sockets will be created with the following flags

+#define SCKIPC_FLAGS (wxSOCKET_WAITALL)
+
+// --------------------------------------------------------------------------
+// wxTCPEventHandler stuff (private class)
+// --------------------------------------------------------------------------

 
 

-#define SCKIPC_FLAGS wxSOCKET_NONE
+class wxTCPEventHandler : public wxEvtHandler
+{
+public:
+  wxTCPEventHandler() : wxEvtHandler() {};
+
+  void Client_OnRequest(wxSocketEvent& event);
+  void Server_OnRequest(wxSocketEvent& event);
+
+  DECLARE_EVENT_TABLE()
+};
+
+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::wxTCPClient ()
-  : wxClientBase()
+wxTCPClient::wxTCPClient () : wxClientBase()

 {
 }
 
 {
 }
 


@@ -124,33 +158,34 @@ 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->Notify(TRUE);
           return connection;
         }
           client->SetNotify(wxSOCKET_INPUT_FLAG | wxSOCKET_LOST_FLAG);
           client->Notify(TRUE);
           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;
 }
 
   return NULL;
 }
 


@@ -159,12 +194,11 @@ wxConnectionBase *wxTCPClient::OnMakeConnection()
   return new wxTCPConnection;
 }
 
   return new wxTCPConnection;
 }
 

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

 // wxTCPServer
 // wxTCPServer

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

 
 

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

 {
 }
 
 {
 }
 


@@ -178,8 +212,8 @@ bool wxTCPServer::Create(const wxString& server_name)
 
   // Create a socket listening on specified port
   server = new wxSocketServer(addr, SCKIPC_FLAGS);
 
   // Create a socket listening on specified port
   server = new wxSocketServer(addr, SCKIPC_FLAGS);

-  server->Callback((wxSocketBase::wxSockCbk)Server_OnRequest);
-  server->CallbackData((char *)this);
+  server->SetEventHandler(*gs_handler, _SERVER_ONREQUEST_ID);
+  server->SetClientData(this);

   server->SetNotify(wxSOCKET_CONNECTION_FLAG);
   server->Notify(TRUE);
 
   server->SetNotify(wxSOCKET_CONNECTION_FLAG);
   server->Notify(TRUE);
 


@@ -195,14 +229,16 @@ 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(char * WXUNUSED(buffer), int WXUNUSED(size))


@@ -211,10 +247,11 @@ wxTCPConnection::wxTCPConnection(char * WXUNUSED(buffer), int WXUNUSED(size))
 
 wxTCPConnection::~wxTCPConnection ()
 {
 
 wxTCPConnection::~wxTCPConnection ()
 {

-  wxDELETE(m_sock);

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

+
+  if (m_sock) m_sock->Destroy();

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


@@ -227,6 +264,7 @@ bool wxTCPConnection::Disconnect ()
 {
   // 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();
 
   return TRUE;
   m_sock->Close();
 
   return TRUE;


@@ -354,11 +392,22 @@ bool wxTCPConnection::Advise (const wxString& item,
   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)

 {
 {

+  wxSocketBase *sock = event.GetSocket();
+  wxSocketNotify evt = event.GetSocketEvent();
+  wxTCPConnection *connection = (wxTCPConnection *)(event.GetClientData());
+

   int msg = 0;
   int msg = 0;

-  wxTCPConnection *connection = (wxTCPConnection *)cdata;

   wxDataInputStream *codeci;
   wxDataOutputStream *codeco; 
   wxSocketStream *sockstrm;
   wxDataInputStream *codeci;
   wxDataOutputStream *codeco; 
   wxSocketStream *sockstrm;


@@ -368,7 +417,8 @@ void Client_OnRequest(wxSocketBase& sock, wxSocketNotify evt,
   // The socket handler signals us that we lost the connection: destroy all.
   if (evt == wxSOCKET_LOST)
   {
   // The socket handler signals us that we lost the connection: destroy all.
   if (evt == wxSOCKET_LOST)
   {

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

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


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

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

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


@@ -493,25 +544,25 @@ 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 *) event.GetClientData();

 
 

-  if (evt != wxSOCKET_CONNECTION)
+  if (event.GetSocketEvent() != wxSOCKET_CONNECTION)

     return;
 
     return;
 

-  /* Accept the connection, getting a new socket */
-  wxSocketBase *sock = server.Accept();
+  // 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 +572,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 WXDLLEXPORT 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