/////////////////////////////////////////////////////////////////////////////
// Name: sckipc.cpp
// Purpose: Interprocess communication implementation (wxSocket version)
-// Author: Julian Smart, Guilhem Lavaux
+// Author: Julian Smart
// Modified by: Guilhem Lavaux (big rewrite) May 1997, 1998
+// Guillermo Rodriguez (updated for wxSocket v2) Jan 2000
// Created: 1993
// RCS-ID: $Id$
-// Copyright: (c) Julian Smart 1993, Guilhem Lavaux 1997, 1998
+// Copyright: (c) Julian Smart 1993
+// (c) Guilhem Lavaux 1997, 1998
+// (c) 2000 Guillermo Rodriguez <guille@iies.es>
// Licence: wxWindows license
/////////////////////////////////////////////////////////////////////////////
#endif
#ifndef WX_PRECOMP
+#include "wx/defs.h"
#endif
+#if wxUSE_SOCKETS
+
#include <stdlib.h>
#include <stdio.h>
#include "wx/socket.h"
#include "wx/sckipc.h"
+#include "wx/log.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
+IMPLEMENT_CLASS(wxTCPConnection, wxConnectionBase)
// It seems to be already defined somewhere in the Xt includes.
#ifndef __XT__
#endif
void Server_OnRequest(wxSocketServer& server,
- wxSocketBase::wxRequestEvent evt,
- char *cdata);
+ wxSocketNotify evt,
+ char *cdata);
void Client_OnRequest(wxSocketBase& sock,
- wxSocketBase::wxRequestEvent evt,
- char *cdata);
+ wxSocketNotify evt,
+ char *cdata);
+
+
+// All sockets will be created with the following flags
+
+#define SCKIPC_FLAGS wxSOCKET_NONE
// ---------------------------------------------------------------------------
// wxTCPClient
// ---------------------------------------------------------------------------
-wxTCPClient::wxTCPClient (void)
+wxTCPClient::wxTCPClient ()
: wxClientBase()
{
}
-wxTCPClient::~wxTCPClient (void)
+wxTCPClient::~wxTCPClient ()
{
}
const wxString& server_name,
const wxString& topic)
{
- wxIPV4address addr;
- wxSocketHandler *hsock = &wxSocketHandler::Master();
- wxSocketClient *client = hsock->CreateClient();
+ wxSocketClient *client = new wxSocketClient(SCKIPC_FLAGS);
wxSocketStream *stream = new wxSocketStream(*client);
- wxDataInputStream data_is(*stream);
- wxDataOutputStream data_os(*stream);
-
- client->SetNotify(wxSocketBase::REQ_READ | wxSocketBase::REQ_LOST);
+ wxDataInputStream *data_is = new wxDataInputStream(*stream);
+ wxDataOutputStream *data_os = new wxDataOutputStream(*stream);
+
+ wxIPV4address addr;
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;
+ if (client->Connect(addr))
+ {
+ unsigned char msg;
- 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.
- if (msg == IPC_CONNECT) {
- wxTCPConnection *connection = (wxTCPConnection *)OnMakeConnection ();
- if (connection) {
- if (!connection->IsKindOf(CLASSINFO(wxTCPConnection))) {
- delete connection;
- return NULL;
+ msg = data_is->Read8();
+
+ // OK! Confirmation.
+ if (msg == IPC_CONNECT)
+ {
+ wxTCPConnection *connection = (wxTCPConnection *)OnMakeConnection ();
+
+ if (connection)
+ {
+ if (!connection->IsKindOf(CLASSINFO(wxTCPConnection)))
+ {
+ delete connection;
+ // and fall through to delete everything else
+ }
+ else
+ {
+ 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->SetNotify(wxSOCKET_INPUT_FLAG | wxSOCKET_LOST_FLAG);
+ client->Notify(TRUE);
+ return connection;
+ }
}
- connection->m_topic = topic;
- client->Callback(Client_OnRequest);
- client->CallbackData((char *)connection);
- client->Notify(TRUE);
- return connection;
- } else {
- delete client;
- return NULL;
}
- } else {
- delete client;
- return NULL;
}
+
+ // something went wrong
+ delete data_is;
+ delete data_os;
+ delete stream;
+ delete client;
return NULL;
}
// wxTCPServer
// ---------------------------------------------------------------------------
-wxTCPServer::wxTCPServer (void)
+wxTCPServer::wxTCPServer ()
: wxServerBase()
{
}
bool wxTCPServer::Create(const wxString& server_name)
{
- wxIPV4address addr;
- wxSocketHandler *hsock = &wxSocketHandler::Master();
wxSocketServer *server;
+ // wxIPV4address defaults to INADDR_ANY:0
+ wxIPV4address addr;
addr.Service(server_name);
// Create a socket listening on specified port
- server = hsock->CreateServer(addr);
+ server = new wxSocketServer(addr, SCKIPC_FLAGS);
server->Callback((wxSocketBase::wxSockCbk)Server_OnRequest);
- server->SetNotify(wxSocketBase::REQ_ACCEPT);
-
server->CallbackData((char *)this);
+ server->SetNotify(wxSOCKET_CONNECTION_FLAG);
+ server->Notify(TRUE);
return TRUE;
}
-wxTCPServer::~wxTCPServer(void)
+wxTCPServer::~wxTCPServer()
{
}
// wxTCPConnection
// ---------------------------------------------------------------------------
-wxTCPConnection::wxTCPConnection (void)
+wxTCPConnection::wxTCPConnection ()
: wxConnectionBase(),
m_sock(NULL), m_sockstrm(NULL), m_codeci(NULL), m_codeco(NULL)
{
}
-wxTCPConnection::~wxTCPConnection (void)
+wxTCPConnection::wxTCPConnection(char * WXUNUSED(buffer), int WXUNUSED(size))
+{
+}
+
+wxTCPConnection::~wxTCPConnection ()
{
wxDELETE(m_sock);
wxDELETE(m_codeci);
}
// 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);
return TRUE;
}
-bool wxTCPConnection::Execute (char *data, int size, wxIPCFormat format)
+bool wxTCPConnection::Execute(const wxChar *data, int 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 {
- m_codeco->Write32(size);
- m_codeco->Write(data, size);
- }
+ size = strlen(data) + 1; // includes final NUL
+
+ m_codeco->Write32(size);
+ m_sockstrm->Write(data, size);
return TRUE;
}
ret = m_codeci->Read8();
if (ret == IPC_FAIL)
return NULL;
- else {
+ else
+ {
size_t s;
char *data = NULL;
s = m_codeci->Read32();
data = new char[s];
- m_codeci->Read(data, s);
+ m_sockstrm->Read(data, s);
if (size)
*size = s;
}
}
-bool wxTCPConnection::Poke (const wxString& item, char *data, int size, wxIPCFormat format)
+bool wxTCPConnection::Poke (const wxString& item, wxChar *data, int 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 {
- m_codeco->Write32(size);
- m_codeco->Write(data, size);
- }
+ size = strlen(data) + 1; // includes final NUL
+
+ m_codeco->Write32(size);
+ m_sockstrm->Write(data, size);
return TRUE;
}
// Calls that SERVER can make
bool wxTCPConnection::Advise (const wxString& item,
- char *data, int size, wxIPCFormat format)
+ wxChar *data, int 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 {
- m_codeco->Write32(size);
- m_codeco->Write(data, size);
- }
+ size = strlen(data) + 1; // includes final NUL
+
+ m_codeco->Write32(size);
+ m_sockstrm->Write(data, size);
return TRUE;
}
-void Client_OnRequest(wxSocketBase& sock, wxSocketBase::wxRequestEvent evt,
+void Client_OnRequest(wxSocketBase& sock, wxSocketNotify evt,
char *cdata)
{
int msg = 0;
wxTCPConnection *connection = (wxTCPConnection *)cdata;
wxDataInputStream *codeci;
wxDataOutputStream *codeco;
+ wxSocketStream *sockstrm;
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) {
+ if (evt == wxSOCKET_LOST)
+ {
sock.Close();
connection->OnDisconnect();
return;
// Receive message number.
codeci = connection->m_codeci;
codeco = connection->m_codeco;
+ sockstrm = connection->m_sockstrm;
msg = codeci->Read8();
- switch (msg) {
- case IPC_EXECUTE: {
+ switch (msg)
+ {
+ case IPC_EXECUTE:
+ {
char *data;
size_t size;
wxIPCFormat format;
format = (wxIPCFormat)codeci->Read8();
size = codeci->Read32();
data = new char[size];
- codeci->Read(data, size);
+ sockstrm->Read(data, size);
connection->OnExecute (topic_name, data, size, format);
delete [] data;
break;
}
- case IPC_ADVISE: {
+ case IPC_ADVISE:
+ {
char *data;
size_t size;
wxIPCFormat format;
format = (wxIPCFormat)codeci->Read8();
size = codeci->Read32();
data = new char[size];
- codeci->Read(data, size);
+ sockstrm->Read(data, size);
connection->OnAdvise (topic_name, item, data, size, format);
delete [] data;
break;
}
- case IPC_ADVISE_START: {
+ case IPC_ADVISE_START:
+ {
item = codeci->ReadString();
bool ok = connection->OnStartAdvise (topic_name, item);
break;
}
- case IPC_ADVISE_STOP: {
+ case IPC_ADVISE_STOP:
+ {
item = codeci->ReadString();
bool ok = connection->OnStopAdvise (topic_name, item);
break;
}
- case IPC_POKE: {
+ case IPC_POKE:
+ {
wxIPCFormat format;
size_t size;
- char *data;
+ wxChar *data;
item = codeci->ReadString();
format = (wxIPCFormat)codeci->Read8();
size = codeci->Read32();
- data = new char[size];
- codeci->Read(data, size);
+ data = new wxChar[size];
+ sockstrm->Read(data, size);
connection->OnPoke (topic_name, item, data, size, format);
break;
}
- case IPC_REQUEST: {
+ case IPC_REQUEST:
+ {
wxIPCFormat format;
item = codeci->ReadString();
int user_size = -1;
char *user_data = connection->OnRequest (topic_name, item, &user_size, format);
- if (user_data) {
+ 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
+
+ if (user_size == -1)
+ user_size = strlen(user_data) + 1; // includes final NUL
+
+ codeco->Write32(user_size);
+ sockstrm->Write(user_data, user_size);
+ }
+ else
codeco->Write8(IPC_FAIL);
break;
}
- case IPC_DISCONNECT: {
+ case IPC_DISCONNECT:
+ {
sock.Close();
connection->OnDisconnect();
break;
}
void Server_OnRequest(wxSocketServer& server,
- wxSocketBase::wxRequestEvent evt, char *cdata)
+ wxSocketNotify evt, char *cdata)
{
wxTCPServer *ipcserv = (wxTCPServer *)cdata;
wxSocketStream *stream;
wxDataInputStream *codeci;
wxDataOutputStream *codeco;
- if (evt != wxSocketBase::EVT_ACCEPT)
+ if (evt != wxSOCKET_CONNECTION)
return;
/* Accept the connection, getting a new socket */
wxSocketBase *sock = server.Accept();
- sock->Notify(FALSE);
- sock->SetNotify(wxSocketBase::REQ_READ | wxSocketBase::REQ_LOST);
+ if (!sock->Ok())
+ return;
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) {
+ 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))) {
+ if (new_connection)
+ {
+ if (!new_connection->IsKindOf(CLASSINFO(wxTCPConnection)))
+ {
delete new_connection;
codeco->Write8(IPC_FAIL);
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 {
+ }
+ else
+ {
// Send failure message
codeco->Write8(IPC_FAIL);
}
}
}
+
+#endif
+ // wxUSE_SOCKETS
projects / wxWidgets.git / blobdiff