Someone must have committed some ASCII string literals while I wasn't looking.

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

diff --git a/src/common/sckipc.cpp b/src/common/sckipc.cpp
index e27ead03d8c876b218680c062ec58b2f35bc5e56..5528d2eca3e5b10b37bb701d2547fcde38f44c8d 100644 (file)
--- a/src/common/sckipc.cpp
+++ b/src/common/sckipc.cpp
@@ -20,6 +20,8 @@
 #pragma hdrstop
 #endif
 
 #pragma hdrstop
 #endif
 

+#if wxUSE_SOCKETS
+

 #ifndef WX_PRECOMP
 #endif
 
 #ifndef WX_PRECOMP
 #endif
 


@@ -92,7 +94,8 @@ wxConnectionBase *wxTCPClient::MakeConnection (const wxString& host,
   wxSocketHandler *hsock = &wxSocketHandler::Master();
   wxSocketClient *client = hsock->CreateClient();
   wxSocketStream *stream = new wxSocketStream(*client);
   wxSocketHandler *hsock = &wxSocketHandler::Master();
   wxSocketClient *client = hsock->CreateClient();
   wxSocketStream *stream = new wxSocketStream(*client);

-  wxDataStream data_s(*stream);
+  wxDataInputStream data_is(*stream);
+  wxDataOutputStream data_os(*stream);

   
   client->SetNotify(wxSocketBase::REQ_READ | wxSocketBase::REQ_LOST);
   addr.Service(server_name);
   
   client->SetNotify(wxSocketBase::REQ_READ | wxSocketBase::REQ_LOST);
   addr.Service(server_name);


@@ -107,10 +110,10 @@ wxConnectionBase *wxTCPClient::MakeConnection (const wxString& host,
   // Send topic name, and enquire whether this has succeeded
   unsigned char msg;
   
   // Send topic name, and enquire whether this has succeeded
   unsigned char msg;
   

-  data_s.Write8(IPC_CONNECT);
-  data_s.WriteString(topic);
+  data_os.Write8(IPC_CONNECT);
+  data_os.WriteString(topic);

   
   

-  msg = data_s.Read8();
+  msg = data_is.Read8();

   
   // OK! Confirmation.
   if (msg == IPC_CONNECT) {
   
   // OK! Confirmation.
   if (msg == IPC_CONNECT) {


@@ -183,18 +186,23 @@ wxConnectionBase *wxTCPServer::OnAcceptConnection( const wxString& WXUNUSED(topi
 
 wxTCPConnection::wxTCPConnection (void)
   : wxConnectionBase(),
 
 wxTCPConnection::wxTCPConnection (void)
   : wxConnectionBase(),

-    m_sock(NULL), m_sockstrm(NULL), m_codec(NULL)
+    m_sock(NULL), m_sockstrm(NULL), m_codeci(NULL), m_codeco(NULL)
+{
+}
+
+wxTCPConnection::wxTCPConnection(char *buffer, int size)

 {
 }
 
 wxTCPConnection::~wxTCPConnection (void)
 {
   wxDELETE(m_sock);
 {
 }
 
 wxTCPConnection::~wxTCPConnection (void)
 {
   wxDELETE(m_sock);

-  wxDELETE(m_codec);
+  wxDELETE(m_codeci);
+  wxDELETE(m_codeco);

   wxDELETE(m_sockstrm);
 }
 
   wxDELETE(m_sockstrm);
 }
 

-void wxTCPConnection::Compress(bool on)
+void wxTCPConnection::Compress(bool WXUNUSED(on))

 {
   // Use wxLZWStream
 }
 {
   // Use wxLZWStream
 }


@@ -203,52 +211,52 @@ void wxTCPConnection::Compress(bool on)
 bool wxTCPConnection::Disconnect (void)
 {
   // Send the the disconnect message to the peer.
 bool wxTCPConnection::Disconnect (void)
 {
   // Send the the disconnect message to the peer.

-  m_codec->Write8(IPC_DISCONNECT);
+  m_codeco->Write8(IPC_DISCONNECT);

   m_sock->Close();
 
   return TRUE;
 }
 
   m_sock->Close();
 
   return TRUE;
 }
 

-bool wxTCPConnection::Execute (char *data, int size, wxDataFormat format)
+bool wxTCPConnection::Execute (wxChar *data, int size, wxIPCFormat format)

 {
   if (!m_sock->IsConnected())
     return FALSE;
 
   // Prepare EXECUTE message
 {
   if (!m_sock->IsConnected())
     return FALSE;
 
   // Prepare EXECUTE message

-  m_codec->Write8(IPC_EXECUTE);
-  m_codec->Write8(format);
+  m_codeco->Write8(IPC_EXECUTE);
+  m_codeco->Write8(format);

   if (size < 0)
   if (size < 0)

-    m_codec->WriteString(data);
+    m_codeco->WriteString(data);

   else {
   else {

-    m_codec->Write32(size);
-    m_codec->Write(data, size);
+    m_codeco->Write32(size);
+    m_codeco->Write(data, size);

   }
 
   return TRUE;
 }
 
   }
 
   return TRUE;
 }
 

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

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

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

 
   // If Unpack doesn't initialize it.
   int ret;
 
 
   // If Unpack doesn't initialize it.
   int ret;
 

-  ret = m_codec->Read8();
+  ret = m_codeci->Read8();

   if (ret == IPC_FAIL)
     return NULL;
   else {
     size_t s;
     char *data = NULL;
 
   if (ret == IPC_FAIL)
     return NULL;
   else {
     size_t s;
     char *data = NULL;
 

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

     data = new char[s];
     data = new char[s];

-    m_codec->Read(data, s);
+    m_codeci->Read(data, s);

 
     if (size)
       *size = s;
 
     if (size)
       *size = s;


@@ -256,19 +264,19 @@ char *wxTCPConnection::Request (const wxString& item, int *size, wxDataFormat fo
   }
 }
 
   }
 }
 

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

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

-  m_codec->Write8(IPC_POKE);
-  m_codec->WriteString(item);
-  m_codec->Write8(format);
+  m_codeco->Write8(IPC_POKE);
+  m_codeco->WriteString(item);
+  m_codeco->Write8(format);

   if (size < 0)
   if (size < 0)

-    m_codec->WriteString(data);
+    m_codeco->WriteString(data);

   else {
   else {

-    m_codec->Write32(size);
-    m_codec->Write(data, size);
+    m_codeco->Write32(size);
+    m_codeco->Write(data, size);

   }
 
   return TRUE;
   }
 
   return TRUE;


@@ -281,10 +289,10 @@ bool wxTCPConnection::StartAdvise (const wxString& item)
   if (!m_sock->IsConnected())
     return FALSE;
 
   if (!m_sock->IsConnected())
     return FALSE;
 

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

 
 

-  ret = m_codec->Read8();
+  ret = m_codeci->Read8();

 
   if (ret != IPC_FAIL)
     return TRUE;
 
   if (ret != IPC_FAIL)
     return TRUE;


@@ -299,10 +307,10 @@ bool wxTCPConnection::StopAdvise (const wxString& item)
   if (!m_sock->IsConnected())
     return FALSE;
 
   if (!m_sock->IsConnected())
     return FALSE;
 

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

 
 

-  msg = m_codec->Read8();
+  msg = m_codeci->Read8();

 
   if (msg != IPC_FAIL)
     return TRUE;
 
   if (msg != IPC_FAIL)
     return TRUE;


@@ -312,19 +320,19 @@ bool wxTCPConnection::StopAdvise (const wxString& item)
 
 // Calls that SERVER can make
 bool wxTCPConnection::Advise (const wxString& item,
 
 // Calls that SERVER can make
 bool wxTCPConnection::Advise (const wxString& item,

-                              char *data, int size, wxDataFormat format)
+                              wxChar *data, int size, wxIPCFormat format)

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

-  m_codec->Write8(IPC_ADVISE);
-  m_codec->WriteString(item);
-  m_codec->Write8(format);
+  m_codeco->Write8(IPC_ADVISE);
+  m_codeco->WriteString(item);
+  m_codeco->Write8(format);

   if (size < 0)
   if (size < 0)

-    m_codec->WriteString(data);
+    m_codeco->WriteString(data);

   else {
   else {

-    m_codec->Write32(size);
-    m_codec->Write(data, size);
+    m_codeco->Write32(size);
+    m_codeco->Write(data, size);

   }
 
   return TRUE;
   }
 
   return TRUE;


@@ -335,7 +343,8 @@ void Client_OnRequest(wxSocketBase& sock, wxSocketBase::wxRequestEvent evt,
 {
   int msg = 0;
   wxTCPConnection *connection = (wxTCPConnection *)cdata;
 {
   int msg = 0;
   wxTCPConnection *connection = (wxTCPConnection *)cdata;

-  wxDataStream *codec;
+  wxDataInputStream *codeci;
+  wxDataOutputStream *codeco; 

   wxString topic_name = connection->m_topic;
   wxString item;
 
   wxString topic_name = connection->m_topic;
   wxString item;
 


@@ -347,19 +356,20 @@ void Client_OnRequest(wxSocketBase& sock, wxSocketBase::wxRequestEvent evt,
   }
 
   // Receive message number.
   }
 
   // Receive message number.

-  codec = connection->m_codec;
-  msg = codec->Read8();
+  codeci = connection->m_codeci;
+  codeco = connection->m_codeco;
+  msg = codeci->Read8();

 
   switch (msg) {
   case IPC_EXECUTE: {
     char *data;
     size_t size; 
 
   switch (msg) {
   case IPC_EXECUTE: {
     char *data;
     size_t size; 

-    wxDataFormat format;
+    wxIPCFormat format;

     
     

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

     data = new char[size];
     data = new char[size];

-    codec->Read(data, size);
+    codeci->Read(data, size);

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


@@ -369,13 +379,13 @@ void Client_OnRequest(wxSocketBase& sock, wxSocketBase::wxRequestEvent evt,
   case IPC_ADVISE: {
     char *data;
     size_t size;
   case IPC_ADVISE: {
     char *data;
     size_t size;

-    wxDataFormat format;
+    wxIPCFormat format;

 
 

-    item = codec->ReadString();
-    format = (wxDataFormat)codec->Read8();
-    size = codec->Read32();
+    item = codeci->ReadString();
+    format = (wxIPCFormat)codeci->Read8();
+    size = codeci->Read32();

     data = new char[size];
     data = new char[size];

-    codec->Read(data, size);
+    codeci->Read(data, size);

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


@@ -383,37 +393,37 @@ void Client_OnRequest(wxSocketBase& sock, wxSocketBase::wxRequestEvent evt,
     break;
   }
   case IPC_ADVISE_START: {
     break;
   }
   case IPC_ADVISE_START: {

-    item = codec->ReadString();
+    item = codeci->ReadString();

 
     bool ok = connection->OnStartAdvise (topic_name, item);
     if (ok)
 
     bool ok = connection->OnStartAdvise (topic_name, item);
     if (ok)

-      codec->Write8(IPC_ADVISE_START);
+      codeco->Write8(IPC_ADVISE_START);

     else
     else

-      codec->Write8(IPC_FAIL);
+      codeco->Write8(IPC_FAIL);

 
     break;
   }
   case IPC_ADVISE_STOP: {
 
     break;
   }
   case IPC_ADVISE_STOP: {

-    item = codec->ReadString();
+    item = codeci->ReadString();

 
     bool ok = connection->OnStopAdvise (topic_name, item);
     if (ok)
 
     bool ok = connection->OnStopAdvise (topic_name, item);
     if (ok)

-      codec->Write8(IPC_ADVISE_STOP);
+      codeco->Write8(IPC_ADVISE_STOP);

     else
     else

-      codec->Write8(IPC_FAIL);
+      codeco->Write8(IPC_FAIL);

 
     break;
   }
   case IPC_POKE: {
 
     break;
   }
   case IPC_POKE: {

-    wxDataFormat format;
+    wxIPCFormat format;

     size_t size;
     size_t size;

-    char *data;
+    wxChar *data;

 
 

-    item = codec->ReadString();
-    format = (wxDataFormat)codec->Read8();
-    size = codec->Read32();
-    data = new char[size];
-    codec->Read(data, size);
+    item = codeci->ReadString();
+    format = (wxIPCFormat)codeci->Read8();
+    size = codeci->Read32();
+    data = new wxChar[size];
+    codeci->Read(data, size);

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


@@ -422,23 +432,23 @@ void Client_OnRequest(wxSocketBase& sock, wxSocketBase::wxRequestEvent evt,
     break;
   }
   case IPC_REQUEST: {
     break;
   }
   case IPC_REQUEST: {

-    wxDataFormat format;
+    wxIPCFormat format;

 
 

-    item = codec->ReadString();
-    format = (wxDataFormat)codec->Read8();
+    item = codeci->ReadString();
+    format = (wxIPCFormat)codeci->Read8();

 
     int user_size = -1;
     char *user_data = connection->OnRequest (topic_name, item, &user_size, format);
 
     if (user_data) {
 
     int user_size = -1;
     char *user_data = connection->OnRequest (topic_name, item, &user_size, format);
 
     if (user_data) {

-      codec->Write8(IPC_REQUEST_REPLY);
+      codeco->Write8(IPC_REQUEST_REPLY);

       if (user_size != -1) {
       if (user_size != -1) {

-        codec->Write32(user_size);
-        codec->Write(user_data, user_size);
+        codeco->Write32(user_size);
+        codeco->Write(user_data, user_size);

       } else
       } else

-        codec->WriteString(user_data);
+        codeco->WriteString(user_data);

     } else
     } else

-      codec->Write8(IPC_FAIL);
+      codeco->Write8(IPC_FAIL);

 
     break;
   }
 
     break;
   }


@@ -448,7 +458,7 @@ void Client_OnRequest(wxSocketBase& sock, wxSocketBase::wxRequestEvent evt,
     break;
   }
   default:
     break;
   }
   default:

-    codec->Write8(IPC_FAIL);
+    codeco->Write8(IPC_FAIL);

     break;
   }
 }
     break;
   }
 }


@@ -458,7 +468,8 @@ void Server_OnRequest(wxSocketServer& server,
 {
   wxTCPServer *ipcserv = (wxTCPServer *)cdata;
   wxSocketStream *stream;
 {
   wxTCPServer *ipcserv = (wxTCPServer *)cdata;
   wxSocketStream *stream;

-  wxDataStream *codec;
+  wxDataInputStream *codeci;
+  wxDataOutputStream *codeco;

 
   if (evt != wxSocketBase::EVT_ACCEPT)
     return;
 
   if (evt != wxSocketBase::EVT_ACCEPT)
     return;


@@ -469,17 +480,18 @@ void Server_OnRequest(wxSocketServer& server,
   sock->SetNotify(wxSocketBase::REQ_READ | wxSocketBase::REQ_LOST);
 
   stream = new wxSocketStream(*sock);
   sock->SetNotify(wxSocketBase::REQ_READ | wxSocketBase::REQ_LOST);
 
   stream = new wxSocketStream(*sock);

-  codec = new wxDataStream(*stream);
+  codeci = new wxDataInputStream(*stream);
+  codeco = new wxDataOutputStream(*stream);

 
   if (!sock->Ok())
     return;
 
   int msg;
 
   if (!sock->Ok())
     return;
 
   int msg;

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

 
   if (msg == IPC_CONNECT) {
     wxString topic_name;
 
   if (msg == IPC_CONNECT) {
     wxString topic_name;

-    topic_name = codec->ReadString();
+    topic_name = codeci->ReadString();

 
     /* Register new socket with the notifier */
     wxTCPConnection *new_connection =
 
     /* Register new socket with the notifier */
     wxTCPConnection *new_connection =


@@ -487,21 +499,25 @@ void Server_OnRequest(wxSocketServer& server,
     if (new_connection) {
       if (!new_connection->IsKindOf(CLASSINFO(wxTCPConnection))) {
         delete new_connection;
     if (new_connection) {
       if (!new_connection->IsKindOf(CLASSINFO(wxTCPConnection))) {
         delete new_connection;

-        codec->Write8(IPC_FAIL);
+        codeco->Write8(IPC_FAIL);

         return;
       }
       // Acknowledge success
         return;
       }
       // Acknowledge success

-      codec->Write8(IPC_CONNECT);
+      codeco->Write8(IPC_CONNECT);

       
       new_connection->m_topic = topic_name;
       new_connection->m_sockstrm = stream;
       
       new_connection->m_topic = topic_name;
       new_connection->m_sockstrm = stream;

-      new_connection->m_codec = codec;
+      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
       sock->Callback(Client_OnRequest);
       sock->CallbackData((char *)new_connection);
       sock->Notify(TRUE);
     } else {
       // Send failure message

-      codec->Write8(IPC_FAIL);
+      codeco->Write8(IPC_FAIL);

     }
   }
 }
     }
   }
 }

+
+#endif
+  // wxUSE_SOCKETS