dbus: move AF_UNIX code to server-socket

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>

7 files changed, 276 insertions, 317 deletions

diff --git a/dbus/CMakeLists.txt b/dbus/CMakeLists.txt
index 2f56e62c..4d92b79f 100644
--- a/dbus/CMakeLists.txt
+++ b/dbus/CMakeLists.txt
@@ -89,7 +89,6 @@ set(DBUS_LIB_HEADERS
     dbus-resources.h
     dbus-server-debug-pipe.h
     dbus-server-protected.h
-    dbus-server-unix.h
     dbus-sha.h
     dbus-timeout.h
     dbus-threads.h
@@ -209,7 +208,6 @@ else(WIN32)
         dbus-userdb.c
     )
     set(DBUS_SHARED_HEADERS ${DBUS_SHARED_HEADERS}
-        dbus-server-unix.h
         dbus-transport-unix.h
         dbus-sysdeps-unix.h
         dbus-userdb.h
diff --git a/dbus/Makefile.am b/dbus/Makefile.am
index 3c2ea87c..4c6633f3 100644
--- a/dbus/Makefile.am
+++ b/dbus/Makefile.am
@@ -102,8 +102,7 @@ endif
 DBUS_LIB_arch_sources = 			\
 	dbus-uuidgen.c				\
 	dbus-uuidgen.h				\
-	dbus-server-unix.c 			\
-	dbus-server-unix.h
+	dbus-server-unix.c
 
 DBUS_SHARED_arch_sources = 			\
 	$(launchd_source)			\
diff --git a/dbus/dbus-server-socket.c b/dbus/dbus-server-socket.c
index 1099b5e1..fc8cee6c 100644
--- a/dbus/dbus-server-socket.c
+++ b/dbus/dbus-server-socket.c
@@ -593,5 +593,277 @@ _dbus_server_socket_own_filename (DBusServer *server,
   socket_server->socket_name = filename;
 }
 
+/**
+ * Creates a new server listening on the given Unix domain socket.
+ *
+ * @param path the path for the domain socket.
+ * @param abstract #TRUE to use abstract socket namespace
+ * @param error location to store reason for failure.
+ * @returns the new server, or #NULL on failure.
+ */
+DBusServer*
+_dbus_server_new_for_domain_socket (const char     *path,
+                                    dbus_bool_t     abstract,
+                                    DBusError      *error)
+{
+  DBusServer *server;
+  DBusSocket listen_fd;
+  DBusString address;
+  char *path_copy;
+  DBusString path_str;
+
+  _DBUS_ASSERT_ERROR_IS_CLEAR (error);
+
+  if (!_dbus_string_init (&address))
+    {
+      dbus_set_error (error, DBUS_ERROR_NO_MEMORY, NULL);
+      return NULL;
+    }
+
+  _dbus_string_init_const (&path_str, path);
+  if ((abstract &&
+       !_dbus_string_append (&address, "unix:abstract=")) ||
+      (!abstract &&
+       !_dbus_string_append (&address, "unix:path=")) ||
+      !_dbus_address_append_escaped (&address, &path_str))
+    {
+      dbus_set_error (error, DBUS_ERROR_NO_MEMORY, NULL);
+      goto failed_0;
+    }
+
+  if (abstract)
+    {
+      path_copy = NULL;
+    }
+  else
+    {
+      path_copy = _dbus_strdup (path);
+      if (path_copy == NULL)
+        {
+          dbus_set_error (error, DBUS_ERROR_NO_MEMORY, NULL);
+          goto failed_0;
+        }
+    }
+
+  listen_fd = _dbus_listen_unix_socket (path, abstract, error);
+
+  if (!_dbus_socket_is_valid (listen_fd))
+    {
+      _DBUS_ASSERT_ERROR_IS_SET (error);
+      goto failed_1;
+    }
+
+  server = _dbus_server_new_for_socket (&listen_fd, 1, &address, 0, error);
+  if (server == NULL)
+    {
+      goto failed_2;
+    }
+
+  if (path_copy != NULL)
+    _dbus_server_socket_own_filename(server, path_copy);
+
+  _dbus_string_free (&address);
+
+  return server;
+
+ failed_2:
+  _dbus_close_socket (&listen_fd, NULL);
+ failed_1:
+  dbus_free (path_copy);
+ failed_0:
+  _dbus_string_free (&address);
+
+  return NULL;
+}
+
+/**
+ * Tries to interpret the address entry for UNIX socket
+ * addresses.
+ *
+ * Sets error if the result is not OK.
+ *
+ * @param entry an address entry
+ * @param server_p location to store a new DBusServer, or #NULL on failure.
+ * @param error location to store rationale for failure on bad address
+ * @returns the outcome
+ *
+ */
+DBusServerListenResult
+_dbus_server_listen_unix_socket (DBusAddressEntry *entry,
+                                 DBusServer      **server_p,
+                                 DBusError        *error)
+{
+  const char *method;
+
+  *server_p = NULL;
+
+  method = dbus_address_entry_get_method (entry);
+
+  if (strcmp (method, "unix") == 0)
+    {
+      const char *path = dbus_address_entry_get_value (entry, "path");
+      const char *dir = dbus_address_entry_get_value (entry, "dir");
+      const char *tmpdir = dbus_address_entry_get_value (entry, "tmpdir");
+      const char *abstract = dbus_address_entry_get_value (entry, "abstract");
+      const char *runtime = dbus_address_entry_get_value (entry, "runtime");
+      int mutually_exclusive_modes = 0;
+
+      mutually_exclusive_modes = (path != NULL) + (tmpdir != NULL) +
+        (abstract != NULL) + (runtime != NULL) + (dir != NULL);
+
+      if (mutually_exclusive_modes < 1)
+        {
+          _dbus_set_bad_address(error, "unix",
+                                "path or tmpdir or abstract or runtime or dir",
+                                NULL);
+          return DBUS_SERVER_LISTEN_BAD_ADDRESS;
+        }
+
+      if (mutually_exclusive_modes > 1)
+        {
+          _dbus_set_bad_address(error, NULL, NULL,
+                                "cannot specify two of \"path\", \"tmpdir\", \"abstract\", \"runtime\" and \"dir\" at the same time");
+          return DBUS_SERVER_LISTEN_BAD_ADDRESS;
+        }
+
+      if (runtime != NULL)
+        {
+          DBusString full_path;
+          DBusString filename;
+          const char *runtimedir;
+
+          if (strcmp (runtime, "yes") != 0)
+            {
+              _dbus_set_bad_address(error, NULL, NULL,
+                  "if given, the only value allowed for \"runtime\" is \"yes\"");
+              return DBUS_SERVER_LISTEN_BAD_ADDRESS;
+            }
+
+          runtimedir = _dbus_getenv ("XDG_RUNTIME_DIR");
+
+          if (runtimedir == NULL)
+            {
+              dbus_set_error (error,
+                  DBUS_ERROR_NOT_SUPPORTED, "\"XDG_RUNTIME_DIR\" is not set");
+              return DBUS_SERVER_LISTEN_DID_NOT_CONNECT;
+            }
+
+          _dbus_string_init_const (&filename, "bus");
+
+          if (!_dbus_string_init (&full_path))
+            {
+              _DBUS_SET_OOM (error);
+              return DBUS_SERVER_LISTEN_DID_NOT_CONNECT;
+            }
+
+          if (!_dbus_string_append (&full_path, runtimedir) ||
+              !_dbus_concat_dir_and_file (&full_path, &filename))
+            {
+              _dbus_string_free (&full_path);
+              _DBUS_SET_OOM (error);
+              return DBUS_SERVER_LISTEN_DID_NOT_CONNECT;
+            }
+
+          /* We can safely use filesystem sockets in the runtime directory,
+           * and they are preferred because they can be bind-mounted between
+           * Linux containers. */
+          *server_p = _dbus_server_new_for_domain_socket (
+              _dbus_string_get_const_data (&full_path),
+              FALSE, error);
+
+          _dbus_string_free (&full_path);
+        }
+      else if (tmpdir != NULL || dir != NULL)
+        {
+          DBusString full_path;
+          DBusString filename;
+          dbus_bool_t use_abstract = FALSE;
+
+          if (tmpdir != NULL)
+            {
+              dir = tmpdir;
+
+#ifdef __linux__
+              /* Use abstract sockets for tmpdir if supported, so that it
+               * never needs to be cleaned up. Use dir instead if you want a
+               * path-based socket. */
+              use_abstract = TRUE;
+#endif
+            }
+
+          if (!_dbus_string_init (&full_path))
+            {
+              dbus_set_error (error, DBUS_ERROR_NO_MEMORY, NULL);
+              return DBUS_SERVER_LISTEN_DID_NOT_CONNECT;
+            }
+
+          if (!_dbus_string_init (&filename))
+            {
+              _dbus_string_free (&full_path);
+              dbus_set_error (error, DBUS_ERROR_NO_MEMORY, NULL);
+              return DBUS_SERVER_LISTEN_DID_NOT_CONNECT;
+            }
+
+          if (!_dbus_string_append (&filename, "dbus-"))
+            {
+              _dbus_string_free (&full_path);
+              _dbus_string_free (&filename);
+              dbus_set_error (error, DBUS_ERROR_NO_MEMORY, NULL);
+              return DBUS_SERVER_LISTEN_DID_NOT_CONNECT;
+            }
+
+          if (!_dbus_generate_random_ascii (&filename, 10, error))
+            {
+              _dbus_string_free (&full_path);
+              _dbus_string_free (&filename);
+              return DBUS_SERVER_LISTEN_DID_NOT_CONNECT;
+            }
+
+          if (!_dbus_string_append (&full_path, dir) ||
+              !_dbus_concat_dir_and_file (&full_path, &filename))
+            {
+              _dbus_string_free (&full_path);
+              _dbus_string_free (&filename);
+              dbus_set_error (error, DBUS_ERROR_NO_MEMORY, NULL);
+              return DBUS_SERVER_LISTEN_DID_NOT_CONNECT;
+            }
+
+          *server_p =
+            _dbus_server_new_for_domain_socket (_dbus_string_get_const_data (&full_path),
+                                                use_abstract,
+                                                error);
+
+          _dbus_string_free (&full_path);
+          _dbus_string_free (&filename);
+        }
+      else
+        {
+          if (path)
+            *server_p = _dbus_server_new_for_domain_socket (path, FALSE, error);
+          else
+            *server_p = _dbus_server_new_for_domain_socket (abstract, TRUE, error);
+        }
+
+      if (*server_p != NULL)
+        {
+          _DBUS_ASSERT_ERROR_IS_CLEAR(error);
+          return DBUS_SERVER_LISTEN_OK;
+        }
+      else
+        {
+          _DBUS_ASSERT_ERROR_IS_SET(error);
+          return DBUS_SERVER_LISTEN_DID_NOT_CONNECT;
+        }
+    }
+  else
+    {
+      /* If we don't handle the method, we return NULL with the
+       * error unset
+       */
+      _DBUS_ASSERT_ERROR_IS_CLEAR(error);
+      return DBUS_SERVER_LISTEN_NOT_HANDLED;
+    }
+}
+
 
 /** @} */
diff --git a/dbus/dbus-server-socket.h b/dbus/dbus-server-socket.h
index ee5bf45f..64a51dc2 100644
--- a/dbus/dbus-server-socket.h
+++ b/dbus/dbus-server-socket.h
@@ -51,6 +51,9 @@ DBusServerListenResult _dbus_server_listen_socket (DBusAddressEntry  *entry,
 void _dbus_server_socket_own_filename (DBusServer *server,
                                        char       *filename);
 
+DBusServer* _dbus_server_new_for_domain_socket (const char       *path,
+                                                dbus_bool_t       abstract,
+                                                DBusError        *error);
 DBUS_END_DECLS
 
 #endif /* DBUS_SERVER_SOCKET_H */
diff --git a/dbus/dbus-server-unix.c b/dbus/dbus-server-unix.c
index fbb87dcb..3a0a75cd 100644
--- a/dbus/dbus-server-unix.c
+++ b/dbus/dbus-server-unix.c
@@ -23,7 +23,6 @@
 
 #include <config.h>
 #include "dbus-internals.h"
-#include "dbus-server-unix.h"
 #include "dbus-server-socket.h"
 #include "dbus-server-launchd.h"
 #include "dbus-transport-unix.h"
@@ -40,195 +39,6 @@
  */
 
 /**
- * Tries to interpret the address entry for UNIX socket
- * addresses.
- *
- * Sets error if the result is not OK.
- *
- * @param entry an address entry
- * @param server_p location to store a new DBusServer, or #NULL on failure.
- * @param error location to store rationale for failure on bad address
- * @returns the outcome
- *
- */
-DBusServerListenResult
-_dbus_server_listen_unix_socket (DBusAddressEntry *entry,
-                                 DBusServer      **server_p,
-                                 DBusError        *error)
-{
-  const char *method;
-
-  *server_p = NULL;
-
-  method = dbus_address_entry_get_method (entry);
-
-  if (strcmp (method, "unix") == 0)
-    {
-      const char *path = dbus_address_entry_get_value (entry, "path");
-      const char *dir = dbus_address_entry_get_value (entry, "dir");
-      const char *tmpdir = dbus_address_entry_get_value (entry, "tmpdir");
-      const char *abstract = dbus_address_entry_get_value (entry, "abstract");
-      const char *runtime = dbus_address_entry_get_value (entry, "runtime");
-      int mutually_exclusive_modes = 0;
-
-      mutually_exclusive_modes = (path != NULL) + (tmpdir != NULL) +
-        (abstract != NULL) + (runtime != NULL) + (dir != NULL);
-
-      if (mutually_exclusive_modes < 1)
-        {
-          _dbus_set_bad_address(error, "unix",
-                                "path or tmpdir or abstract or runtime or dir",
-                                NULL);
-          return DBUS_SERVER_LISTEN_BAD_ADDRESS;
-        }
-
-      if (mutually_exclusive_modes > 1)
-        {
-          _dbus_set_bad_address(error, NULL, NULL,
-                                "cannot specify two of \"path\", \"tmpdir\", \"abstract\", \"runtime\" and \"dir\" at the same time");
-          return DBUS_SERVER_LISTEN_BAD_ADDRESS;
-        }
-
-      if (runtime != NULL)
-        {
-          DBusString full_path;
-          DBusString filename;
-          const char *runtimedir;
-
-          if (strcmp (runtime, "yes") != 0)
-            {
-              _dbus_set_bad_address(error, NULL, NULL,
-                  "if given, the only value allowed for \"runtime\" is \"yes\"");
-              return DBUS_SERVER_LISTEN_BAD_ADDRESS;
-            }
-
-          runtimedir = _dbus_getenv ("XDG_RUNTIME_DIR");
-
-          if (runtimedir == NULL)
-            {
-              dbus_set_error (error,
-                  DBUS_ERROR_NOT_SUPPORTED, "\"XDG_RUNTIME_DIR\" is not set");
-              return DBUS_SERVER_LISTEN_DID_NOT_CONNECT;
-            }
-
-          _dbus_string_init_const (&filename, "bus");
-
-          if (!_dbus_string_init (&full_path))
-            {
-              _DBUS_SET_OOM (error);
-              return DBUS_SERVER_LISTEN_DID_NOT_CONNECT;
-            }
-
-          if (!_dbus_string_append (&full_path, runtimedir) ||
-              !_dbus_concat_dir_and_file (&full_path, &filename))
-            {
-              _dbus_string_free (&full_path);
-              _DBUS_SET_OOM (error);
-              return DBUS_SERVER_LISTEN_DID_NOT_CONNECT;
-            }
-
-          /* We can safely use filesystem sockets in the runtime directory,
-           * and they are preferred because they can be bind-mounted between
-           * Linux containers. */
-          *server_p = _dbus_server_new_for_domain_socket (
-              _dbus_string_get_const_data (&full_path),
-              FALSE, error);
-
-          _dbus_string_free (&full_path);
-        }
-      else if (tmpdir != NULL || dir != NULL)
-        {
-          DBusString full_path;
-          DBusString filename;
-          dbus_bool_t use_abstract = FALSE;
-
-          if (tmpdir != NULL)
-            {
-              dir = tmpdir;
-
-#ifdef __linux__
-              /* Use abstract sockets for tmpdir if supported, so that it
-               * never needs to be cleaned up. Use dir instead if you want a
-               * path-based socket. */
-              use_abstract = TRUE;
-#endif
-            }
-
-          if (!_dbus_string_init (&full_path))
-            {
-              dbus_set_error (error, DBUS_ERROR_NO_MEMORY, NULL);
-              return DBUS_SERVER_LISTEN_DID_NOT_CONNECT;
-            }
-
-          if (!_dbus_string_init (&filename))
-            {
-              _dbus_string_free (&full_path);
-              dbus_set_error (error, DBUS_ERROR_NO_MEMORY, NULL);
-              return DBUS_SERVER_LISTEN_DID_NOT_CONNECT;
-            }
-
-          if (!_dbus_string_append (&filename, "dbus-"))
-            {
-              _dbus_string_free (&full_path);
-              _dbus_string_free (&filename);
-              dbus_set_error (error, DBUS_ERROR_NO_MEMORY, NULL);
-              return DBUS_SERVER_LISTEN_DID_NOT_CONNECT;
-            }
-
-          if (!_dbus_generate_random_ascii (&filename, 10, error))
-            {
-              _dbus_string_free (&full_path);
-              _dbus_string_free (&filename);
-              return DBUS_SERVER_LISTEN_DID_NOT_CONNECT;
-            }
-
-          if (!_dbus_string_append (&full_path, dir) ||
-              !_dbus_concat_dir_and_file (&full_path, &filename))
-            {
-              _dbus_string_free (&full_path);
-              _dbus_string_free (&filename);
-              dbus_set_error (error, DBUS_ERROR_NO_MEMORY, NULL);
-              return DBUS_SERVER_LISTEN_DID_NOT_CONNECT;
-            }
-
-          *server_p =
-            _dbus_server_new_for_domain_socket (_dbus_string_get_const_data (&full_path),
-                                                use_abstract,
-                                                error);
-
-          _dbus_string_free (&full_path);
-          _dbus_string_free (&filename);
-        }
-      else
-        {
-          if (path)
-            *server_p = _dbus_server_new_for_domain_socket (path, FALSE, error);
-          else
-            *server_p = _dbus_server_new_for_domain_socket (abstract, TRUE, error);
-        }
-
-      if (*server_p != NULL)
-        {
-          _DBUS_ASSERT_ERROR_IS_CLEAR(error);
-          return DBUS_SERVER_LISTEN_OK;
-        }
-      else
-        {
-          _DBUS_ASSERT_ERROR_IS_SET(error);
-          return DBUS_SERVER_LISTEN_DID_NOT_CONNECT;
-        }
-    }
-  else
-    {
-      /* If we don't handle the method, we return NULL with the
-       * error unset
-       */
-      _DBUS_ASSERT_ERROR_IS_CLEAR(error);
-      return DBUS_SERVER_LISTEN_NOT_HANDLED;
-    }
-}
-
-/**
  * Tries to interpret the address entry in a platform-specific
  * way, creating a platform-specific server type if appropriate.
  * Sets error if the result is not OK.
@@ -330,87 +140,4 @@ _dbus_server_listen_platform_specific (DBusAddressEntry *entry,
     }
 }
 
-/**
- * Creates a new server listening on the given Unix domain socket.
- *
- * @param path the path for the domain socket.
- * @param abstract #TRUE to use abstract socket namespace
- * @param error location to store reason for failure.
- * @returns the new server, or #NULL on failure.
- */
-DBusServer*
-_dbus_server_new_for_domain_socket (const char     *path,
-                                    dbus_bool_t     abstract,
-                                    DBusError      *error)
-{
-  DBusServer *server;
-  DBusSocket listen_fd;
-  DBusString address;
-  char *path_copy;
-  DBusString path_str;
-
-  _DBUS_ASSERT_ERROR_IS_CLEAR (error);
-
-  if (!_dbus_string_init (&address))
-    {
-      dbus_set_error (error, DBUS_ERROR_NO_MEMORY, NULL);
-      return NULL;
-    }
-
-  _dbus_string_init_const (&path_str, path);
-  if ((abstract &&
-       !_dbus_string_append (&address, "unix:abstract=")) ||
-      (!abstract &&
-       !_dbus_string_append (&address, "unix:path=")) ||
-      !_dbus_address_append_escaped (&address, &path_str))
-    {
-      dbus_set_error (error, DBUS_ERROR_NO_MEMORY, NULL);
-      goto failed_0;
-    }
-
-  if (abstract)
-    {
-      path_copy = NULL;
-    }
-  else
-    {
-      path_copy = _dbus_strdup (path);
-      if (path_copy == NULL)
-        {
-          dbus_set_error (error, DBUS_ERROR_NO_MEMORY, NULL);
-          goto failed_0;
-        }
-    }
-
-  listen_fd = _dbus_listen_unix_socket (path, abstract, error);
-
-  if (!_dbus_socket_is_valid (listen_fd))
-    {
-      _DBUS_ASSERT_ERROR_IS_SET (error);
-      goto failed_1;
-    }
-
-  server = _dbus_server_new_for_socket (&listen_fd, 1, &address, 0, error);
-  if (server == NULL)
-    {
-      goto failed_2;
-    }
-
-  if (path_copy != NULL)
-    _dbus_server_socket_own_filename(server, path_copy);
-
-  _dbus_string_free (&address);
-
-  return server;
-
- failed_2:
-  _dbus_close_socket (&listen_fd, NULL);
- failed_1:
-  dbus_free (path_copy);
- failed_0:
-  _dbus_string_free (&address);
-
-  return NULL;
-}
-
 /** @} */
diff --git a/dbus/dbus-server-unix.h b/dbus/dbus-server-unix.h
deleted file mode 100644
index be33fa70..00000000
--- a/dbus/dbus-server-unix.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
-/* dbus-server-unix.h Server implementation for Unix network protocols.
- *
- * Copyright (C) 2002  Red Hat Inc.
- *
- * Licensed under the Academic Free License version 2.1
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- */
-#ifndef DBUS_SERVER_UNIX_H
-#define DBUS_SERVER_UNIX_H
-
-#include <dbus/dbus-internals.h>
-#include <dbus/dbus-server-protected.h>
-
-DBUS_BEGIN_DECLS
-
-DBusServer* _dbus_server_new_for_domain_socket (const char       *path,
-                                                dbus_bool_t       abstract,
-                                                DBusError        *error);
-
-DBUS_END_DECLS
-
-#endif /* DBUS_SERVER_UNIX_H */
diff --git a/dbus/dbus-server.c b/dbus/dbus-server.c
index 7051c467..b58c4e75 100644
--- a/dbus/dbus-server.c
+++ b/dbus/dbus-server.c
@@ -23,7 +23,6 @@
 
 #include <config.h>
 #include "dbus-server.h"
-#include "dbus-server-unix.h"
 #include "dbus-server-socket.h"
 #include "dbus-string.h"
 #ifdef DBUS_ENABLE_EMBEDDED_TESTS
@@ -527,9 +526,7 @@ static const struct {
                                    DBusError        *error);
 } listen_funcs[] = {
   { _dbus_server_listen_socket }
-#ifndef _WIN32 /* FIXME: remove in next commit */
   , { _dbus_server_listen_unix_socket }
-#endif
   , { _dbus_server_listen_platform_specific }
 #ifdef DBUS_ENABLE_EMBEDDED_TESTS
   , { _dbus_server_listen_debug_pipe }