X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f565a6c2f4c6961c96dd330a98d0fa78f20ca8c0..f90566f5c386e6e5d80deecad9052ec53a0394ba:/src/common/sckipc.cpp?ds=inline diff --git a/src/common/sckipc.cpp b/src/common/sckipc.cpp index daa27c636c..822f96397e 100644 --- a/src/common/sckipc.cpp +++ b/src/common/sckipc.cpp @@ -5,6 +5,7 @@ // 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 @@ -33,23 +34,19 @@ #endif #ifndef WX_PRECOMP -#include "wx/defs.h" +#include "wx/log.h" #endif #if wxUSE_SOCKETS && wxUSE_IPC && wxUSE_STREAMS #include #include +#include #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 // -------------------------------------------------------------------------- // macros and constants @@ -74,10 +71,47 @@ enum }; #endif - // All sockets will be created with the following flags #define SCKIPC_FLAGS (wxSOCKET_WAITALL) +// headers needed for umask() +#ifdef __UNIX_LIKE__ + #include + #include +#endif // __UNIX_LIKE__ + +// ---------------------------------------------------------------------------- +// 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 = _T("")) +{ + // we always use INET sockets under non-Unix systems +#if defined(__UNIX__) && !defined(__WXMAC__) + // 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) // -------------------------------------------------------------------------- @@ -129,7 +163,7 @@ bool wxTCPClient::ValidHost(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); @@ -137,18 +171,21 @@ wxConnectionBase *wxTCPClient::MakeConnection (const wxString& host, 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; - + // Send topic name, and enquire whether this has succeeded data_os->Write8(IPC_CONNECT); data_os->WriteString(topic); - + msg = data_is->Read8(); // OK! Confirmation. @@ -213,12 +250,49 @@ bool wxTCPServer::Create(const wxString& serverName) m_server = NULL; } - // wxIPV4address defaults to INADDR_ANY:0 - wxIPV4address addr; - addr.Service(serverName); + 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); + 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); + 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()) { @@ -238,11 +312,21 @@ bool wxTCPServer::Create(const wxString& serverName) wxTCPServer::~wxTCPServer() { - if (m_server) - { - m_server->SetClientData(NULL); - m_server->Destroy(); - } + if (m_server) + { + m_server->SetClientData(NULL); + m_server->Destroy(); + } + +#ifdef __UNIX_LIKE__ + if ( !m_filename.empty() ) + { + if ( remove(m_filename) != 0 ) + { + wxLogDebug(_T("Stale AF_UNIX file '%s' left."), m_filename.c_str()); + } + } +#endif // __UNIX_LIKE__ } wxConnectionBase *wxTCPServer::OnAcceptConnection( const wxString& WXUNUSED(topic) ) @@ -438,7 +522,7 @@ void wxTCPEventHandler::Client_OnRequest(wxSocketEvent &event) int msg = 0; wxDataInputStream *codeci; - wxDataOutputStream *codeco; + wxDataOutputStream *codeco; wxSocketStream *sockstrm; wxString topic_name = connection->m_topic; wxString item; @@ -463,15 +547,15 @@ void wxTCPEventHandler::Client_OnRequest(wxSocketEvent &event) case IPC_EXECUTE: { char *data; - size_t size; + size_t size; wxIPCFormat format; - + format = (wxIPCFormat)codeci->Read8(); size = codeci->Read32(); data = new char[size]; sockstrm->Read(data, size); - connection->OnExecute (topic_name, (wxChar *) data, size, format); + connection->OnExecute (topic_name, data, size, format); delete [] data; break; @@ -487,8 +571,8 @@ void wxTCPEventHandler::Client_OnRequest(wxSocketEvent &event) size = codeci->Read32(); data = new char[size]; sockstrm->Read(data, size); - - connection->OnAdvise (topic_name, item, (wxChar *) data, size, format); + + connection->OnAdvise (topic_name, item, data, size, format); delete [] data; break; @@ -528,7 +612,7 @@ void wxTCPEventHandler::Client_OnRequest(wxSocketEvent &event) size = codeci->Read32(); data = new wxChar[size]; sockstrm->Read(data, size); - + connection->OnPoke (topic_name, item, data, size, format); delete [] data; @@ -615,7 +699,7 @@ void wxTCPEventHandler::Server_OnRequest(wxSocketEvent &event) // Acknowledge success codeco->Write8(IPC_CONNECT); new_connection->m_topic = topic_name; - new_connection->m_sock = sock; + new_connection->m_sock = sock; new_connection->m_sockstrm = stream; new_connection->m_codeci = codeci; new_connection->m_codeco = codeco;