implemented IPC using Unix domain sockets

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@15114 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/docs/changes.txt b/docs/changes.txt
index ce40ad753b83129ca187ccc9276665098cfcde66..4fd63579219c22e063b6ceea67b6105be3861ad5 100644 (file)
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -131,6 +131,7 @@ Unix (Base/GUI):
 
 - wxWindows may be built using BSD and Solaris (and possibly other) make
   programs and not only GNU make
+- wxTCP-based IPC classes now support communicating over Unix domain sockets
 
 All (GUI):
 

diff --git a/docs/latex/wx/tipc.tex b/docs/latex/wx/tipc.tex
index 9ae5159e15161eae248f9ba322ea225016fc456e..d2c74699d7a08d5da42b0cabc605ec0e846405bd 100644 (file)
--- a/docs/latex/wx/tipc.tex
+++ b/docs/latex/wx/tipc.tex
@@ -48,8 +48,14 @@ element of some messages. To create a connection (a conversation in
 Windows parlance), the client application sends the message
 MakeConnection to the client object, with a string service name to
 identify the server and a topic name to identify the topic for the
-duration of the connection. Under Unix, the service name must contain an
-integer port identifier.
+duration of the connection. Under Unix, the service name may be either an
+integer port identifier in which case an Internet domain socket will be used
+for the communications or a valid file name (which shouldn't exist and will be
+deleted afterwards) in which case a Unix domain socket is created.
+
+{\bf SECURITY NOTE:} Using Internet domain sockets if extremely insecure for
+IPC as there is absolutely no access control for them, use Unix domain sockets
+whenever possible!
 
 The server then responds and either vetoes the connection or allows it.
 If allowed, a connection object is created which persists until the

diff --git a/include/wx/sckipc.h b/include/wx/sckipc.h
index 743da0ab9f03e0f8268422f80b55a6ea651d3a99..47f506184f3e6c8f55e3b7e2bf6a57951a819f87 100644 (file)
--- a/include/wx/sckipc.h
+++ b/include/wx/sckipc.h
@@ -122,6 +122,11 @@ public:
 
 protected:
   wxSocketServer *m_server;
+
+#ifdef __UNIX_LIKE__
+  // the name of the file associated to the Unix domain socket, may be empty
+  wxString m_filename;
+#endif // __UNIX_LIKE__
 };
 
 class wxTCPClient: public wxClientBase

diff --git a/src/common/sckipc.cpp b/src/common/sckipc.cpp
index 3fea37e1ece57ee211fdb76dfeac8efb01cff32b..c3ad40ca7ffbb9979809ae8b1e718fe565ecc364 100644 (file)
--- 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 <stdlib.h>
 #include <stdio.h>
+#include <errno.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
 
 // --------------------------------------------------------------------------
 // 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 <sys/types.h>
+    #include <sys/stat.h>
+#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
+#ifdef __UNIX_LIKE__
+    // 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,11 +171,14 @@ 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;
+
+  bool ok = client->Connect(*addr);
+  delete addr;
 
-  if (client->Connect(addr))
+  if ( ok )
   {
     unsigned char msg;
   
@@ -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) )
+        {
+            wxLogDebug(_T("Stale AF_UNIX file '%s' left."), m_filename.c_str());
+        }
+    }
+#endif // __UNIX_LIKE__
 }
 
 wxConnectionBase *wxTCPServer::OnAcceptConnection( const wxString& WXUNUSED(topic) )